Completed
Pull Request — master (#2373)
by
unknown
43s
created
classes/views/styles/components/templates/slider.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -137,10 +137,13 @@  discard block
 block discarded – undo
137 137
 		</div>
138 138
 		<input type="hidden" <?php echo esc_attr( $field_name ); ?> value="<?php echo esc_attr( $field_value ); ?>" id="<?php echo esc_attr( $component['id'] ); ?>" />
139 139
 	</div>
140
-<?php else : ?>
140
+<?php else {
141
+	: ?>
141 142
 	<div>
142 143
 		<?php if ( empty( $component['independent_fields'] ) ) : ?>
143
-			<div class="frm-slider-component <?php echo esc_attr( $component_class ); ?>" <?php echo esc_attr( $component_attr ); ?> data-display-sliders="top,bottom" data-type="vertical" data-max-value="<?php echo (int) $component['max_value']; ?>">
144
+			<div class="frm-slider-component <?php echo esc_attr( $component_class );
145
+}
146
+?>" <?php echo esc_attr( $component_attr ); ?> data-display-sliders="top,bottom" data-type="vertical" data-max-value="<?php echo (int) $component['max_value']; ?>">
144 147
 				<div class="frm-flex-justify">
145 148
 					<div class="frm-slider-container">
146 149
 						<?php if ( ! empty( $component['icon'] ) ) : ?>
@@ -165,8 +168,11 @@  discard block
 block discarded – undo
165 168
 					</div>
166 169
 				</div>
167 170
 			</div>
168
-		<?php else : ?>
169
-			<div class="<?php echo esc_attr( $component_class ); ?>" <?php echo esc_attr( $component_attr ); ?> >
171
+		<?php else {
172
+	: ?>
173
+			<div class="<?php echo esc_attr( $component_class );
174
+}
175
+?>" <?php echo esc_attr( $component_attr ); ?> >
170 176
 				<div class="frm-slider-component frm-group-sliders frm-has-independent-fields" data-display-sliders="top,bottom" data-max-value="<?php echo (int) $component['max_value']; ?>">
171 177
 					<div class="frm-flex-justify">
172 178
 						<div class="frm-slider-container">
Please login to merge, or discard this patch.
stripe/models/FrmTransLiteAction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@
 block discarded – undo
181 181
 				$has_field  = true;
182 182
 				$key_exists = array_key_exists( $field_atts['name'], $form_atts['form_action']->post_content );
183 183
 				?>
184
-				<option value="<?php echo esc_attr( $field->id ); ?>" <?php selected( $key_exists ? $form_atts['form_action']->post_content[ $field_atts['name'] ] : 0, $field->id ); ?>>
184
+				<option value="<?php echo esc_attr( $field->id ); ?>" <?php selected( $key_exists ? $form_atts['form_action']->post_content[$field_atts['name']] : 0, $field->id ); ?>>
185 185
 					<?php
186 186
 					echo esc_attr( FrmAppHelper::truncate( $field->name, 50, 1 ) );
187 187
 
Please login to merge, or discard this patch.
stripe/helpers/FrmTransLiteListHelper.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			'payments'      => $frm_payment->get_count(),
124 124
 			'subscriptions' => $frm_sub->get_count(),
125 125
 		);
126
-		$type        = FrmAppHelper::get_simple_request(
126
+		$type = FrmAppHelper::get_simple_request(
127 127
 			array(
128 128
 				'param'   => 'trans_type',
129 129
 				'type'    => 'request',
@@ -138,10 +138,10 @@  discard block
 block discarded – undo
138 138
 				$class = '';
139 139
 			}
140 140
 
141
-			if ( $counts[ $status ] || 'published' === $status ) {
142
-				$links[ $status ] = '<a href="' . esc_url( '?page=formidable-payments&trans_type=' . $status ) . '" ' . $class . '>'
141
+			if ( $counts[$status] || 'published' === $status ) {
142
+				$links[$status] = '<a href="' . esc_url( '?page=formidable-payments&trans_type=' . $status ) . '" ' . $class . '>'
143 143
 					// translators: %1$s: Transaction type (Payments or Subscriptions), %2$s: Span start tag, %3$s: Count, %4$s: Span close tag.
144
-					. sprintf( esc_html__( '%1$s %2$s(%3$s)%4$s', 'formidable' ), esc_html( $name ), '<span class="count">', number_format_i18n( $counts[ $status ] ), '</span>' )
144
+					. sprintf( esc_html__( '%1$s %2$s(%3$s)%4$s', 'formidable' ), esc_html( $name ), '<span class="count">', number_format_i18n( $counts[$status] ), '</span>' )
145 145
 					. '</a>';
146 146
 			}
147 147
 
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 			echo '<tr id="payment-' . esc_attr( $item->id ) . '" ';
219 219
 
220 220
 			$is_alternate = 0 === $alt % 2;
221
-			++$alt;
221
+			++ $alt;
222 222
 
223 223
 			if ( $is_alternate ) {
224 224
 				echo 'class="alternate"';
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 
310 310
 		$form_ids = array();
311 311
 		foreach ( $forms as $form ) {
312
-			$form_ids[ $form->id ] = $form;
312
+			$form_ids[$form->id] = $form;
313 313
 			unset( $form );
314 314
 		}
315 315
 
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 			'href'  => esc_url( $link ),
361 361
 			'title' => __( 'View', 'formidable' ),
362 362
 		);
363
-		$link        = '<a ' . FrmAppHelper::array_to_html_params( $link_params ) . '>'
363
+		$link = '<a ' . FrmAppHelper::array_to_html_params( $link_params ) . '>'
364 364
 			. $item->{$field}
365 365
 			. '</a>';
366 366
 
@@ -415,8 +415,8 @@  discard block
 block discarded – undo
415 415
 	 * @return mixed
416 416
 	 */
417 417
 	private function get_form_id_column( $item, $atts ) {
418
-		if ( isset( $atts['form_ids'][ $item->item_id ] ) ) {
419
-			$form_link = FrmFormsHelper::edit_form_link( $atts['form_ids'][ $item->item_id ]->form_id );
418
+		if ( isset( $atts['form_ids'][$item->item_id] ) ) {
419
+			$form_link = FrmFormsHelper::edit_form_link( $atts['form_ids'][$item->item_id]->form_id );
420 420
 			return $form_link;
421 421
 		}
422 422
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 	 */
492 492
 	private function get_processing_tooltip() {
493 493
 		return FrmAppHelper::clip(
494
-			function () {
494
+			function() {
495 495
 				FrmAppHelper::tooltip_icon( __( 'This payment method may take between 4-5 business days to process.', 'formidable' ) );
496 496
 			}
497 497
 		);
Please login to merge, or discard this patch.
classes/controllers/FrmStylesController.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 			/**
155 155
 			 * Update the form data on the "Manage Styles" tab after global settings are saved.
156 156
 			 */
157
-			function () {
157
+			function() {
158 158
 				self::manage_styles();
159 159
 			}
160 160
 		);
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 
326 326
 		$style_id = self::get_style_id_for_styler();
327 327
 		if ( ! $style_id ) {
328
-			$error_args   = array(
328
+			$error_args = array(
329 329
 				'title'      => __( 'No styles', 'formidable' ),
330 330
 				'body'       => __( 'You must have a style to use the Visual Styler.', 'formidable' ),
331 331
 				'cancel_url' => admin_url( 'admin.php?page=formidable' ),
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 		$form = FrmForm::getOne( $form_id );
343 343
 
344 344
 		if ( ! is_object( $form ) ) {
345
-			$error_args   = array(
345
+			$error_args = array(
346 346
 				'title'      => __( 'No forms', 'formidable' ),
347 347
 				'body'       => __( 'You must have a form to use the Visual Styler.', 'formidable' ),
348 348
 				'cancel_url' => admin_url( 'admin.php?page=formidable' ),
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 		if ( ! $form_id ) {
416 416
 			// TODO: Show a message why a random form is being shown (because no form is assigned to the style).
417 417
 			// Fallback to any form.
418
-			$where   = array(
418
+			$where = array(
419 419
 				'status'         => 'published',
420 420
 				// Make sure it's not a repeater.
421 421
 				'parent_form_id' => array( null, 0 ),
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 	private static function disable_admin_page_styling_on_submit_buttons() {
435 435
 		add_filter(
436 436
 			'frm_submit_button_class',
437
-			function ( $classes ) {
437
+			function( $classes ) {
438 438
 				$classes[] = 'frm_no_style_button';
439 439
 				return $classes;
440 440
 			}
@@ -643,13 +643,13 @@  discard block
 block discarded – undo
643 643
 	private static function force_form_style( $style ) {
644 644
 		add_filter(
645 645
 			'frm_add_form_style_class',
646
-			function ( $class ) use ( $style ) {
647
-				$split   = array_filter(
646
+			function( $class ) use ( $style ) {
647
+				$split = array_filter(
648 648
 					explode( ' ', $class ),
649 649
 					/**
650 650
 					 * @param string $class
651 651
 					 */
652
-					function ( $class ) {
652
+					function( $class ) {
653 653
 						return $class && 0 !== strpos( $class, 'frm_style_' );
654 654
 					}
655 655
 				);
@@ -765,11 +765,11 @@  discard block
 block discarded – undo
765 765
 
766 766
 		$forms = FrmForm::get_published_forms();
767 767
 		foreach ( $forms as $form ) {
768
-			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
768
+			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][$form->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
769 769
 				continue;
770 770
 			}
771 771
 
772
-			$new_style = sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
772
+			$new_style = sanitize_text_field( wp_unslash( $_POST['style'][$form->id] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
773 773
 
774 774
 			$form->options['custom_style'] = $new_style;
775 775
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
@@ -1178,8 +1178,8 @@  discard block
 block discarded – undo
1178 1178
 	 */
1179 1179
 	public static function get_style_val( $val, $form = 'default' ) {
1180 1180
 		$style = self::get_form_style( $form );
1181
-		if ( $style && isset( $style->post_content[ $val ] ) ) {
1182
-			return $style->post_content[ $val ];
1181
+		if ( $style && isset( $style->post_content[$val] ) ) {
1182
+			return $style->post_content[$val];
1183 1183
 		}
1184 1184
 	}
1185 1185
 
@@ -1198,7 +1198,7 @@  discard block
 block discarded – undo
1198 1198
 			} elseif ( 'alt_bg_color' == $name ) {
1199 1199
 				$setting = 'bg_color_active';
1200 1200
 			}
1201
-			$default_styles[ $name ] = $style->post_content[ $setting ];
1201
+			$default_styles[$name] = $style->post_content[$setting];
1202 1202
 			unset( $name, $val );
1203 1203
 		}
1204 1204
 
@@ -1244,16 +1244,16 @@  discard block
 block discarded – undo
1244 1244
 		$i          = 0;
1245 1245
 		$first_open = false;
1246 1246
 
1247
-		if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
1247
+		if ( isset( $wp_meta_boxes[$page][$context] ) ) {
1248 1248
 			foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
1249
-				if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
1250
-					foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
1249
+				if ( isset( $wp_meta_boxes[$page][$context][$priority] ) ) {
1250
+					foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
1251 1251
 						if ( false === $box || ! $box['title'] ) {
1252 1252
 							continue;
1253 1253
 						}
1254 1254
 
1255
-						++$i;
1256
-						$icon_id = array_key_exists( $box['id'], $icon_ids ) ? $icon_ids[ $box['id'] ] : 'frm-' . $box['id'];
1255
+						++ $i;
1256
+						$icon_id = array_key_exists( $box['id'], $icon_ids ) ? $icon_ids[$box['id']] : 'frm-' . $box['id'];
1257 1257
 
1258 1258
 						$open_class = '';
1259 1259
 						if ( ! $first_open ) {
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -144,7 +144,8 @@  discard block
 block discarded – undo
144 144
 	 * @return void
145 145
 	 */
146 146
 	private static function maybe_hook_into_global_settings_save() {
147
-		if ( empty( $_POST ) || ! isset( $_POST['style'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
147
+		if ( empty( $_POST ) || ! isset( $_POST['style'] ) ) {
148
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
148 149
 			// Avoid changing any style data if the style array is not sent in the request.
149 150
 			return;
150 151
 		}
@@ -765,7 +766,8 @@  discard block
 block discarded – undo
765 766
 
766 767
 		$forms = FrmForm::get_published_forms();
767 768
 		foreach ( $forms as $form ) {
768
-			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
769
+			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) {
770
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
769 771
 				continue;
770 772
 			}
771 773
 
Please login to merge, or discard this patch.
classes/models/FrmInstallPlugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		// Get posted data.
83 83
 		$plugin_slug = FrmAppHelper::get_post_param( 'plugin', '', 'sanitize_text_field' );
84 84
 
85
-		if ( ! empty( get_plugins()[ $plugin_slug ] ) ) {
85
+		if ( ! empty( get_plugins()[$plugin_slug] ) ) {
86 86
 			$activate = activate_plugin( $plugin_slug );
87 87
 		} else {
88 88
 			// Include necessary files for plugin installation.
@@ -163,6 +163,6 @@  discard block
 block discarded – undo
163 163
 	 * @return bool
164 164
 	 */
165 165
 	private static function is_plugin_installed( $plugin_file ) {
166
-		return isset( get_plugins()[ $plugin_file ] );
166
+		return isset( get_plugins()[$plugin_file] );
167 167
 	}
168 168
 }
Please login to merge, or discard this patch.
classes/views/frm-entries/direct.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 
6 6
 add_filter(
7 7
 	'document_title',
8
-	function ( $title ) use ( $form ) {
8
+	function( $title ) use ( $form ) {
9 9
 		$form_name = '' === $form->name ? FrmFormsHelper::get_no_title_text() : $form->name;
10 10
 		return get_bloginfo( 'name', 'display' ) . ' | ' . wp_strip_all_tags( $form_name );
11 11
 	}
Please login to merge, or discard this patch.
classes/widgets/FrmElementorWidget.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 
76 76
 			foreach ( $forms as $form ) {
77 77
 				$form_title           = '' === $form->name ? FrmFormsHelper::get_no_title_text() : FrmAppHelper::truncate( $form->name, 50 );
78
-				$options[ $form->id ] = esc_html( $form_title );
78
+				$options[$form->id] = esc_html( $form_title );
79 79
 			}
80 80
 
81 81
 			return $options;
Please login to merge, or discard this patch.
classes/controllers/FrmFieldsController.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 		$_GET['page'] = 'formidable';
27 27
 
28
-		$values     = array(
28
+		$values = array(
29 29
 			'id'         => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
30 30
 			'doing_ajax' => true,
31 31
 		);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
 			ob_start();
50 50
 			self::load_single_field( $field, $values );
51
-			$field_html[ absint( $field->id ) ] = ob_get_contents();
51
+			$field_html[absint( $field->id )] = ob_get_contents();
52 52
 			ob_end_clean();
53 53
 		}
54 54
 
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 			foreach ( $opts as $opt_key => $opt ) {
264 264
 				if ( strpos( $opt, '|' ) !== false ) {
265 265
 					$vals             = explode( '|', $opt );
266
-					$opts[ $opt_key ] = array(
266
+					$opts[$opt_key] = array(
267 267
 						'label' => trim( $vals[0] ),
268 268
 						'value' => trim( $vals[1] ),
269 269
 					);
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 			$other_array = array();
279 279
 			foreach ( $field['options'] as $opt_key => $opt ) {
280 280
 				if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
281
-					$other_array[ $opt_key ] = $opt;
281
+					$other_array[$opt_key] = $opt;
282 282
 				}
283 283
 				unset( $opt_key, $opt );
284 284
 			}
@@ -321,18 +321,18 @@  discard block
 block discarded – undo
321 321
 		$frm_settings         = FrmAppHelper::get_settings();
322 322
 		$field_types          = FrmFieldTypeOptionData::get_field_types( $field['type'] );
323 323
 
324
-		if ( ! isset( $all_field_types[ $field['type'] ] ) ) {
324
+		if ( ! isset( $all_field_types[$field['type']] ) ) {
325 325
 			// Add fallback for an add-on field type that has been deactivated.
326
-			$all_field_types[ $field['type'] ] = array(
326
+			$all_field_types[$field['type']] = array(
327 327
 				'name' => ucfirst( $field['type'] ),
328 328
 				'icon' => 'frm_icon_font frm_pencil_icon',
329 329
 			);
330
-		} elseif ( ! is_array( $all_field_types[ $field['type'] ] ) ) {
330
+		} elseif ( ! is_array( $all_field_types[$field['type']] ) ) {
331 331
 			// Fallback for fields added in a more basic way.
332
-			FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] );
332
+			FrmFormsHelper::prepare_field_type( $all_field_types[$field['type']] );
333 333
 		}
334 334
 
335
-		$type_name = $all_field_types[ $field['type'] ]['name'];
335
+		$type_name = $all_field_types[$field['type']]['name'];
336 336
 		if ( $field['type'] === 'divider' && FrmField::is_option_true( $field, 'repeat' ) ) {
337 337
 			$type_name = $all_field_types['divider|repeat']['name'];
338 338
 		}
@@ -406,13 +406,13 @@  discard block
 block discarded – undo
406 406
 		$active   = 'default_value';
407 407
 
408 408
 		foreach ( $settings as $type ) {
409
-			if ( ! empty( $field[ $type ] ) ) {
409
+			if ( ! empty( $field[$type] ) ) {
410 410
 				$active = $type;
411 411
 			}
412 412
 		}
413 413
 
414
-		$types[ $active ]['class']  .= ' current';
415
-		$types[ $active ]['current'] = true;
414
+		$types[$active]['class']  .= ' current';
415
+		$types[$active]['current'] = true;
416 416
 
417 417
 		return $types;
418 418
 	}
@@ -430,8 +430,8 @@  discard block
 block discarded – undo
430 430
 			'website' => 'url',
431 431
 			'image'   => 'url',
432 432
 		);
433
-		if ( isset( $type_switch[ $type ] ) ) {
434
-			$type = $type_switch[ $type ];
433
+		if ( isset( $type_switch[$type] ) ) {
434
+			$type = $type_switch[$type];
435 435
 		}
436 436
 
437 437
 		$pro_fields = FrmField::pro_field_selection();
@@ -584,11 +584,11 @@  discard block
 block discarded – undo
584 584
 		// include "col" for valid html
585 585
 		$unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
586 586
 
587
-		if ( ! isset( $calc[ $unit ] ) ) {
587
+		if ( ! isset( $calc[$unit] ) ) {
588 588
 			return;
589 589
 		}
590 590
 
591
-		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
591
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
592 592
 
593 593
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
594 594
 	}
@@ -826,11 +826,11 @@  discard block
 block discarded – undo
826 826
 	private static function get_form_for_js_validation( $field ) {
827 827
 		global $frm_vars;
828 828
 		if ( ! empty( $frm_vars['js_validate_forms'] ) ) {
829
-			if ( isset( $frm_vars['js_validate_forms'][ $field['form_id'] ] ) ) {
830
-				return $frm_vars['js_validate_forms'][ $field['form_id'] ];
829
+			if ( isset( $frm_vars['js_validate_forms'][$field['form_id']] ) ) {
830
+				return $frm_vars['js_validate_forms'][$field['form_id']];
831 831
 			}
832
-			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][ $field['parent_form_id'] ] ) ) {
833
-				return $frm_vars['js_validate_forms'][ $field['parent_form_id'] ];
832
+			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][$field['parent_form_id']] ) ) {
833
+				return $frm_vars['js_validate_forms'][$field['parent_form_id']];
834 834
 			}
835 835
 		}
836 836
 		return false;
@@ -917,13 +917,13 @@  discard block
 block discarded – undo
917 917
 		foreach ( $field['shortcodes'] as $k => $v ) {
918 918
 			if ( isset( $field['subfield_name'] ) && 0 === strpos( $k, 'aria-invalid' ) ) {
919 919
 				$subfield_name = $field['subfield_name'];
920
-				if ( ! isset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] ) ) {
920
+				if ( ! isset( $field['shortcodes']['aria-invalid-' . $subfield_name] ) ) {
921 921
 					continue;
922 922
 				}
923 923
 				// Change the key to the correct aria-invalid value so that $add_html is set correctly for the current subfield of a combo field.
924 924
 				$k = 'aria-invalid';
925
-				$v = $field['shortcodes'][ 'aria-invalid-' . $subfield_name ];
926
-				unset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] );
925
+				$v = $field['shortcodes']['aria-invalid-' . $subfield_name];
926
+				unset( $field['shortcodes']['aria-invalid-' . $subfield_name] );
927 927
 			}
928 928
 			if ( 'opt' === $k || ! self::should_allow_input_attribute( $k ) ) {
929 929
 				continue;
@@ -931,10 +931,10 @@  discard block
 block discarded – undo
931 931
 
932 932
 			if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
933 933
 				$add_html[] = $v;
934
-			} elseif ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
935
-				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
934
+			} elseif ( ! empty( $k ) && isset( $add_html[$k] ) ) {
935
+				$add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
936 936
 			} else {
937
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
937
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
938 938
 			}
939 939
 
940 940
 			unset( $k, $v );
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
 		$field_val = '';
157 157
 		if ( is_object( $this->field ) ) {
158 158
 			$field_val = $this->field->{$column};
159
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
160
-			$field_val = $this->field[ $column ];
159
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
160
+			$field_val = $this->field[$column];
161 161
 		}
162 162
 
163 163
 		return $field_val;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		if ( is_object( $this->field ) ) {
172 172
 			$this->field->{$column} = $value;
173 173
 		} elseif ( is_array( $this->field ) ) {
174
-			$this->field[ $column ] = $value;
174
+			$this->field[$column] = $value;
175 175
 		}
176 176
 	}
177 177
 
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
 			printf(
614 614
 				/* translators: %s: Field type */
615 615
 				esc_html__( '%s Options', 'formidable' ),
616
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
616
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
617 617
 			);
618 618
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
619 619
 			?>
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
 	 * New field
714 714
 	 */
715 715
 	public function get_new_field_defaults() {
716
-		$field        = array(
716
+		$field = array(
717 717
 			'name'          => $this->get_new_field_name(),
718 718
 			'description'   => '',
719 719
 			'type'          => $this->type,
@@ -744,8 +744,8 @@  discard block
 block discarded – undo
744 744
 
745 745
 		$fields = array_merge( $fields, $pro_fields );
746 746
 
747
-		if ( isset( $fields[ $this->type ] ) ) {
748
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
747
+		if ( isset( $fields[$this->type] ) ) {
748
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
749 749
 		}
750 750
 
751 751
 		return $name;
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
762 762
 	 * @return array
763 763
 	 */
764 764
 	public function get_default_field_options() {
765
-		$opts        = array(
765
+		$opts = array(
766 766
 			'size'               => '',
767 767
 			'max'                => '',
768 768
 			'label'              => '',
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
1006 1006
 	 * @return void
1007 1007
 	 */
1008 1008
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
1009
-		$shortcode_atts['aria-invalid'] = isset( $args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
1009
+		$shortcode_atts['aria-invalid'] = isset( $args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
1010 1010
 	}
1011 1011
 
1012 1012
 	/**
@@ -1192,8 +1192,8 @@  discard block
 block discarded – undo
1192 1192
 		$selected = $values['field_value'];
1193 1193
 
1194 1194
 		if ( isset( $values['combo_name'] ) ) {
1195
-			$options  = $options[ $values['combo_name'] ];
1196
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
1195
+			$options  = $options[$values['combo_name']];
1196
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
1197 1197
 		}
1198 1198
 
1199 1199
 		$input = $this->select_tag( $values );
@@ -1248,7 +1248,7 @@  discard block
 block discarded – undo
1248 1248
 	}
1249 1249
 
1250 1250
 	protected function fill_display_field_values( $args = array() ) {
1251
-		$defaults        = array(
1251
+		$defaults = array(
1252 1252
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1253 1253
 			'field_id'      => $this->get_field_column( 'id' ),
1254 1254
 			'field_plus_id' => '',
@@ -1305,7 +1305,7 @@  discard block
 block discarded – undo
1305 1305
 			}
1306 1306
 		}
1307 1307
 
1308
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1308
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1309 1309
 			if ( $error_comes_first ) {
1310 1310
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1311 1311
 			} else {
@@ -1384,11 +1384,11 @@  discard block
 block discarded – undo
1384 1384
 
1385 1385
 		$field_id = $this->get_field_column( 'id' );
1386 1386
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1387
-			$frm_validated_unique_values[ $field_id ] = array();
1387
+			$frm_validated_unique_values[$field_id] = array();
1388 1388
 			return false;
1389 1389
 		}
1390 1390
 
1391
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1391
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1392 1392
 		return $already_validated_this_value;
1393 1393
 	}
1394 1394
 
@@ -1413,7 +1413,7 @@  discard block
 block discarded – undo
1413 1413
 	private function value_validated_as_unique( $value ) {
1414 1414
 		global $frm_validated_unique_values;
1415 1415
 		$field_id                                   = $this->get_field_column( 'id' );
1416
-		$frm_validated_unique_values[ $field_id ][] = $value;
1416
+		$frm_validated_unique_values[$field_id][] = $value;
1417 1417
 	}
1418 1418
 
1419 1419
 	/**
@@ -1454,8 +1454,8 @@  discard block
 block discarded – undo
1454 1454
 		$value = $this->prepare_display_value( $value, $atts );
1455 1455
 
1456 1456
 		if ( is_array( $value ) ) {
1457
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
1458
-				$value = $value[ $atts['show'] ];
1457
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
1458
+				$value = $value[$atts['show']];
1459 1459
 			} elseif ( empty( $atts['return_array'] ) ) {
1460 1460
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1461 1461
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1585,8 +1585,8 @@  discard block
 block discarded – undo
1585 1585
 		$saved_entries = $atts['ids'];
1586 1586
 		$new_value     = array();
1587 1587
 		foreach ( (array) $value as $old_child_id ) {
1588
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1589
-				$new_value[] = $saved_entries[ $old_child_id ];
1588
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1589
+				$new_value[] = $saved_entries[$old_child_id];
1590 1590
 			}
1591 1591
 		}
1592 1592
 
Please login to merge, or discard this patch.