Completed
Pull Request — master (#2266)
by
unknown
51s
created
classes/models/FrmSettings.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -239,8 +239,8 @@  discard block
 block discarded – undo
239 239
 		}
240 240
 
241 241
 		foreach ( $settings as $setting => $default ) {
242
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
243
-				$this->{$setting} = $params[ 'frm_' . $setting ];
242
+			if ( isset( $params['frm_' . $setting] ) ) {
243
+				$this->{$setting} = $params['frm_' . $setting];
244 244
 			} elseif ( ! isset( $this->{$setting} ) ) {
245 245
 				$this->{$setting} = $default;
246 246
 			}
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
 			'denylist_check',
433 433
 		);
434 434
 		foreach ( $checkboxes as $set ) {
435
-			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
435
+			$this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0;
436 436
 		}
437 437
 	}
438 438
 
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 		$frm_roles = FrmAppHelper::frm_capabilities();
446 446
 		$roles     = get_editable_roles();
447 447
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
448
-			$this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
448
+			$this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
449 449
 
450 450
 			// Make sure administrators always have permissions
451 451
 			if ( ! in_array( 'administrator', $this->$frm_role, true ) ) {
Please login to merge, or discard this patch.
square/models/FrmSquareLiteSettings.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -82,12 +82,12 @@
 block discarded – undo
82 82
 		$settings = $this->default_options();
83 83
 
84 84
 		foreach ( $settings as $setting => $default ) {
85
-			if ( isset( $params[ 'frm_' . $this->param() . '_' . $setting ] ) ) {
86
-				$this->settings->{$setting} = trim( sanitize_text_field( $params[ 'frm_' . $this->param() . '_' . $setting ] ) );
85
+			if ( isset( $params['frm_' . $this->param() . '_' . $setting] ) ) {
86
+				$this->settings->{$setting} = trim( sanitize_text_field( $params['frm_' . $this->param() . '_' . $setting] ) );
87 87
 			}
88 88
 		}
89 89
 
90
-		$this->settings->test_mode = isset( $params[ 'frm_' . $this->param() . '_test_mode' ] ) ? absint( $params[ 'frm_' . $this->param() . '_test_mode' ] ) : 0;
90
+		$this->settings->test_mode = isset( $params['frm_' . $this->param() . '_test_mode'] ) ? absint( $params['frm_' . $this->param() . '_test_mode'] ) : 0;
91 91
 	}
92 92
 
93 93
 	/**
Please login to merge, or discard this patch.
square/controllers/FrmSquareLiteAppController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 		$address_setting    = $action->post_content['billing_address'];
124 124
 
125 125
 		$entry      = self::generate_false_entry();
126
-		$first_name = $first_name_setting && isset( $entry->metas[ $first_name_setting ] ) ? $entry->metas[ $first_name_setting ] : '';
127
-		$last_name  = $last_name_setting && isset( $entry->metas[ $last_name_setting ] ) ? $entry->metas[ $last_name_setting ] : '';
128
-		$address    = $address_setting && isset( $entry->metas[ $address_setting ] ) ? $entry->metas[ $address_setting ] : '';
126
+		$first_name = $first_name_setting && isset( $entry->metas[$first_name_setting] ) ? $entry->metas[$first_name_setting] : '';
127
+		$last_name  = $last_name_setting && isset( $entry->metas[$last_name_setting] ) ? $entry->metas[$last_name_setting] : '';
128
+		$address    = $address_setting && isset( $entry->metas[$address_setting] ) ? $entry->metas[$address_setting] : '';
129 129
 
130 130
 		if ( is_array( $first_name ) && isset( $first_name['first'] ) ) {
131 131
 			$first_name = $first_name['first'];
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		);
142 142
 
143 143
 		if ( $email_setting ) {
144
-			$shortcode_atts   = array(
144
+			$shortcode_atts = array(
145 145
 				'entry' => $entry,
146 146
 				'form'  => $action->menu_order,
147 147
 				'value' => $email_setting,
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 				if ( is_array( $v ) ) {
182 182
 					foreach ( $v as $f => $value ) {
183 183
 						FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
184
-						$entry->metas[ absint( $f ) ] = $value;
184
+						$entry->metas[absint( $f )] = $value;
185 185
 					}
186 186
 				}
187 187
 			} else {
Please login to merge, or discard this patch.
square/controllers/FrmSquareLiteActionsController.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,7 +139,8 @@  discard block
 block discarded – undo
139 139
 	 * @return string|true string on error, true on success.
140 140
 	 */
141 141
 	private static function trigger_one_time_payment( $atts ) {
142
-		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
142
+		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) {
143
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
143 144
 			return __( 'Please enter a valid credit card', 'formidable' );
144 145
 		}
145 146
 
@@ -199,7 +200,8 @@  discard block
 block discarded – undo
199 200
 	 * @return bool|string True on success, error message on failure
200 201
 	 */
201 202
 	private static function trigger_recurring_payment( $atts ) {
202
-		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
203
+		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) {
204
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
203 205
 			return __( 'Please enter a valid credit card', 'formidable' );
204 206
 		}
205 207
 
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 			$gateway   = $payment_action->post_content['gateway'];
77 77
 			$is_square = $gateway === 'square' || ( is_array( $gateway ) && in_array( 'square', $gateway, true ) );
78 78
 			if ( ! $is_square || empty( $payment_action->post_content['amount'] ) ) {
79
-				unset( $payment_actions[ $k ] );
79
+				unset( $payment_actions[$k] );
80 80
 			}
81 81
 		}
82 82
 		return $payment_actions;
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 			'run_triggers' => false,
98 98
 			'show_errors'  => true,
99 99
 		);
100
-		$atts     = compact( 'action', 'entry', 'form' );
100
+		$atts = compact( 'action', 'entry', 'form' );
101 101
 
102 102
 		$amount = self::prepare_amount( $action->post_content['amount'], $atts );
103 103
 		if ( empty( $amount ) || $amount == 000 ) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 				'value' => $atts['action']->post_content['description'],
151 151
 			)
152 152
 		);
153
-		$result             = FrmSquareLiteConnectHelper::create_payment( $atts['amount'], $currency, $square_token, $verification_token, $description );
153
+		$result = FrmSquareLiteConnectHelper::create_payment( $atts['amount'], $currency, $square_token, $verification_token, $description );
154 154
 
155 155
 		if ( false === $result ) {
156 156
 			return FrmSquareLiteConnectHelper::get_latest_error_from_square_api();
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 			false
456 456
 		);
457 457
 
458
-		$square_vars     = array(
458
+		$square_vars = array(
459 459
 			'formId'     => $form_id,
460 460
 			'nonce'      => wp_create_nonce( 'frm_square_ajax' ),
461 461
 			'ajax'       => esc_url_raw( FrmAppHelper::get_ajax_url() ),
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 		$disallowed = array( ';', ':', '!important' );
573 573
 		foreach ( $settings as $k => $s ) {
574 574
 			if ( is_string( $s ) ) {
575
-				$settings[ $k ] = str_replace( $disallowed, '', $s );
575
+				$settings[$k] = str_replace( $disallowed, '', $s );
576 576
 			}
577 577
 		}
578 578
 
@@ -598,11 +598,11 @@  discard block
 block discarded – undo
598 598
 
599 599
 		$field_id = isset( $field->temp_id ) ? $field->temp_id : $field->id;
600 600
 
601
-		if ( isset( $errors[ 'field' . $field_id . '-cc' ] ) ) {
602
-			unset( $errors[ 'field' . $field_id . '-cc' ] );
601
+		if ( isset( $errors['field' . $field_id . '-cc'] ) ) {
602
+			unset( $errors['field' . $field_id . '-cc'] );
603 603
 		}
604
-		if ( isset( $errors[ 'field' . $field_id ] ) ) {
605
-			unset( $errors[ 'field' . $field_id ] );
604
+		if ( isset( $errors['field' . $field_id] ) ) {
605
+			unset( $errors['field' . $field_id] );
606 606
 		}
607 607
 
608 608
 		return $errors;
Please login to merge, or discard this patch.
stripe/controllers/FrmTransLiteActionsController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -472,8 +472,8 @@  discard block
 block discarded – undo
472 472
 			return $values;
473 473
 		}
474 474
 
475
-		if ( is_array( $previous_entry->metas ) && isset( $previous_entry->metas[ $field->id ] ) ) {
476
-			$values['value'] = $previous_entry->metas[ $field->id ];
475
+		if ( is_array( $previous_entry->metas ) && isset( $previous_entry->metas[$field->id] ) ) {
476
+			$values['value'] = $previous_entry->metas[$field->id];
477 477
 		}
478 478
 
479 479
 		$frm_vars['trans_filled'] = true;
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 			 * @param Closure    $destroy_callback
509 509
 			 * @return void
510 510
 			 */
511
-			function () use ( $entry_id, &$destroy_callback ) {
511
+			function() use ( $entry_id, &$destroy_callback ) {
512 512
 				FrmEntry::destroy( $entry_id );
513 513
 				// Only call this once.
514 514
 				remove_action( 'frm_entry_form', $destroy_callback );
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
 	 * @return array
529 529
 	 */
530 530
 	public static function before_save_settings( $settings, $action ) {
531
-		$settings['gateway']  = ! empty( $settings['gateway'] ) ? (array) $settings['gateway'] : array( 'stripe' );
531
+		$settings['gateway'] = ! empty( $settings['gateway'] ) ? (array) $settings['gateway'] : array( 'stripe' );
532 532
 
533 533
 		if ( in_array( 'square', $settings['gateway'] ) ) {
534 534
 			$currency = FrmSquareLiteConnectHelper::get_merchant_currency();
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +22 added lines, -22 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
 
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 			printf(
631 631
 				/* translators: %s: Field type */
632 632
 				esc_html__( '%s Options', 'formidable' ),
633
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
633
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
634 634
 			);
635 635
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
636 636
 			?>
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 	 * New field
731 731
 	 */
732 732
 	public function get_new_field_defaults() {
733
-		$field        = array(
733
+		$field = array(
734 734
 			'name'          => $this->get_new_field_name(),
735 735
 			'description'   => '',
736 736
 			'type'          => $this->type,
@@ -761,8 +761,8 @@  discard block
 block discarded – undo
761 761
 
762 762
 		$fields = array_merge( $fields, $pro_fields );
763 763
 
764
-		if ( isset( $fields[ $this->type ] ) ) {
765
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
764
+		if ( isset( $fields[$this->type] ) ) {
765
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
766 766
 		}
767 767
 
768 768
 		return $name;
@@ -779,7 +779,7 @@  discard block
 block discarded – undo
779 779
 	 * @return array
780 780
 	 */
781 781
 	public function get_default_field_options() {
782
-		$opts        = array(
782
+		$opts = array(
783 783
 			'size'               => '',
784 784
 			'max'                => '',
785 785
 			'label'              => '',
@@ -1023,7 +1023,7 @@  discard block
 block discarded – undo
1023 1023
 	 * @return void
1024 1024
 	 */
1025 1025
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
1026
-		$shortcode_atts['aria-invalid'] = isset( $args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
1026
+		$shortcode_atts['aria-invalid'] = isset( $args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
1027 1027
 	}
1028 1028
 
1029 1029
 	/**
@@ -1183,11 +1183,11 @@  discard block
 block discarded – undo
1183 1183
 		}
1184 1184
 
1185 1185
 		$options = array_values( $this->field['options'] );
1186
-		if ( ! isset( $options[ $opt ] ) ) {
1186
+		if ( ! isset( $options[$opt] ) ) {
1187 1187
 			return $hidden;
1188 1188
 		}
1189 1189
 
1190
-		$option = $options[ $opt ];
1190
+		$option = $options[$opt];
1191 1191
 		if ( is_array( $option ) ) {
1192 1192
 			$option = $option['value'];
1193 1193
 		}
@@ -1251,8 +1251,8 @@  discard block
 block discarded – undo
1251 1251
 		$selected = $values['field_value'];
1252 1252
 
1253 1253
 		if ( isset( $values['combo_name'] ) ) {
1254
-			$options  = $options[ $values['combo_name'] ];
1255
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
1254
+			$options  = $options[$values['combo_name']];
1255
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
1256 1256
 		}
1257 1257
 
1258 1258
 		$input = $this->select_tag( $values );
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
 	}
1308 1308
 
1309 1309
 	protected function fill_display_field_values( $args = array() ) {
1310
-		$defaults        = array(
1310
+		$defaults = array(
1311 1311
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1312 1312
 			'field_id'      => $this->get_field_column( 'id' ),
1313 1313
 			'field_plus_id' => '',
@@ -1364,7 +1364,7 @@  discard block
 block discarded – undo
1364 1364
 			}
1365 1365
 		}
1366 1366
 
1367
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1367
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1368 1368
 			if ( $error_comes_first ) {
1369 1369
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1370 1370
 			} else {
@@ -1442,11 +1442,11 @@  discard block
 block discarded – undo
1442 1442
 
1443 1443
 		$field_id = $this->get_field_column( 'id' );
1444 1444
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1445
-			$frm_validated_unique_values[ $field_id ] = array();
1445
+			$frm_validated_unique_values[$field_id] = array();
1446 1446
 			return false;
1447 1447
 		}
1448 1448
 
1449
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1449
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1450 1450
 		return $already_validated_this_value;
1451 1451
 	}
1452 1452
 
@@ -1471,7 +1471,7 @@  discard block
 block discarded – undo
1471 1471
 	private function value_validated_as_unique( $value ) {
1472 1472
 		global $frm_validated_unique_values;
1473 1473
 		$field_id                                   = $this->get_field_column( 'id' );
1474
-		$frm_validated_unique_values[ $field_id ][] = $value;
1474
+		$frm_validated_unique_values[$field_id][] = $value;
1475 1475
 	}
1476 1476
 
1477 1477
 	/**
@@ -1516,8 +1516,8 @@  discard block
 block discarded – undo
1516 1516
 		$value = $this->prepare_display_value( $value, $atts );
1517 1517
 
1518 1518
 		if ( is_array( $value ) ) {
1519
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
1520
-				$value = $value[ $atts['show'] ];
1519
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
1520
+				$value = $value[$atts['show']];
1521 1521
 			} elseif ( empty( $atts['return_array'] ) ) {
1522 1522
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1523 1523
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1647,8 +1647,8 @@  discard block
 block discarded – undo
1647 1647
 		$saved_entries = $atts['ids'];
1648 1648
 		$new_value     = array();
1649 1649
 		foreach ( (array) $value as $old_child_id ) {
1650
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1651
-				$new_value[] = $saved_entries[ $old_child_id ];
1650
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1651
+				$new_value[] = $saved_entries[$old_child_id];
1652 1652
 			}
1653 1653
 		}
1654 1654
 
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
 		}
@@ -409,14 +409,14 @@  discard block
 block discarded – undo
409 409
 
410 410
 		if ( FrmAppHelper::pro_is_connected() ) {
411 411
 			foreach ( $settings as $type ) {
412
-				if ( ! empty( $field[ $type ] ) ) {
412
+				if ( ! empty( $field[$type] ) ) {
413 413
 					$active = $type;
414 414
 				}
415 415
 			}
416 416
 		}
417 417
 
418
-		$types[ $active ]['class']  .= ' current';
419
-		$types[ $active ]['current'] = true;
418
+		$types[$active]['class']  .= ' current';
419
+		$types[$active]['current'] = true;
420 420
 
421 421
 		return $types;
422 422
 	}
@@ -434,8 +434,8 @@  discard block
 block discarded – undo
434 434
 			'website' => 'url',
435 435
 			'image'   => 'url',
436 436
 		);
437
-		if ( isset( $type_switch[ $type ] ) ) {
438
-			$type = $type_switch[ $type ];
437
+		if ( isset( $type_switch[$type] ) ) {
438
+			$type = $type_switch[$type];
439 439
 		}
440 440
 
441 441
 		$pro_fields = FrmField::pro_field_selection();
@@ -590,11 +590,11 @@  discard block
 block discarded – undo
590 590
 		// include "col" for valid html
591 591
 		$unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
592 592
 
593
-		if ( ! isset( $calc[ $unit ] ) ) {
593
+		if ( ! isset( $calc[$unit] ) ) {
594 594
 			return;
595 595
 		}
596 596
 
597
-		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
597
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
598 598
 
599 599
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
600 600
 	}
@@ -827,11 +827,11 @@  discard block
 block discarded – undo
827 827
 	private static function get_form_for_js_validation( $field ) {
828 828
 		global $frm_vars;
829 829
 		if ( ! empty( $frm_vars['js_validate_forms'] ) ) {
830
-			if ( isset( $frm_vars['js_validate_forms'][ $field['form_id'] ] ) ) {
831
-				return $frm_vars['js_validate_forms'][ $field['form_id'] ];
830
+			if ( isset( $frm_vars['js_validate_forms'][$field['form_id']] ) ) {
831
+				return $frm_vars['js_validate_forms'][$field['form_id']];
832 832
 			}
833
-			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][ $field['parent_form_id'] ] ) ) {
834
-				return $frm_vars['js_validate_forms'][ $field['parent_form_id'] ];
833
+			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][$field['parent_form_id']] ) ) {
834
+				return $frm_vars['js_validate_forms'][$field['parent_form_id']];
835 835
 			}
836 836
 		}
837 837
 		return false;
@@ -918,13 +918,13 @@  discard block
 block discarded – undo
918 918
 		foreach ( $field['shortcodes'] as $k => $v ) {
919 919
 			if ( isset( $field['subfield_name'] ) && 0 === strpos( $k, 'aria-invalid' ) ) {
920 920
 				$subfield_name = $field['subfield_name'];
921
-				if ( ! isset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] ) ) {
921
+				if ( ! isset( $field['shortcodes']['aria-invalid-' . $subfield_name] ) ) {
922 922
 					continue;
923 923
 				}
924 924
 				// Change the key to the correct aria-invalid value so that $add_html is set correctly for the current subfield of a combo field.
925 925
 				$k = 'aria-invalid';
926
-				$v = $field['shortcodes'][ 'aria-invalid-' . $subfield_name ];
927
-				unset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] );
926
+				$v = $field['shortcodes']['aria-invalid-' . $subfield_name];
927
+				unset( $field['shortcodes']['aria-invalid-' . $subfield_name] );
928 928
 			}
929 929
 			if ( 'opt' === $k || ! self::should_allow_input_attribute( $k ) ) {
930 930
 				continue;
@@ -932,10 +932,10 @@  discard block
 block discarded – undo
932 932
 
933 933
 			if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
934 934
 				$add_html[] = $v;
935
-			} elseif ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
936
-				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
935
+			} elseif ( ! empty( $k ) && isset( $add_html[$k] ) ) {
936
+				$add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
937 937
 			} else {
938
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
938
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
939 939
 			}
940 940
 
941 941
 			unset( $k, $v );
Please login to merge, or discard this patch.
classes/views/frm-fields/back-end/settings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 						if ( ! is_callable( array( 'FrmProHtmlHelper', 'echo_radio_group' ) ) ) {
190 190
 							switch ( $type ) {
191 191
 								case 'calc':
192
-									$default_value_type['data']  = array(
192
+									$default_value_type['data'] = array(
193 193
 										'show'    => '#calc-for-{id}',
194 194
 										'disable' => '#default-value-for-{id}',
195 195
 									);
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 						);
217 217
 
218 218
 						foreach ( $default_value_type['data'] as $data_key => $data_value ) {
219
-							$toggle_args['input_html'][ 'data-' . $data_key ] = $data_value . ( substr( $data_value, -1 ) === '-' ? $field['id'] : '' );
219
+							$toggle_args['input_html']['data-' . $data_key] = $data_value . ( substr( $data_value, -1 ) === '-' ? $field['id'] : '' );
220 220
 						}
221 221
 
222 222
 						?>
Please login to merge, or discard this patch.