Completed
Pull Request — master (#2229)
by
unknown
53s
created
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/FrmFieldFormHtml.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 	 * @param array  $atts
45 45
 	 */
46 46
 	private function _set( $param, $atts ) {
47
-		if ( isset( $atts[ $param ] ) ) {
48
-			$this->{$param} = $atts[ $param ];
47
+		if ( isset( $atts[$param] ) ) {
48
+			$this->{$param} = $atts[$param];
49 49
 		}
50 50
 	}
51 51
 
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
 
90 90
 		$exclude = array( 'field_obj', 'html' );
91 91
 		foreach ( $exclude as $ex ) {
92
-			if ( isset( $atts[ $ex ] ) ) {
93
-				unset( $this->pass_args[ $ex ] );
92
+			if ( isset( $atts[$ex] ) ) {
93
+				unset( $this->pass_args[$ex] );
94 94
 			}
95 95
 		}
96 96
 	}
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
 	 * @param array $set
103 103
 	 */
104 104
 	private function set_from_field( $atts, $set ) {
105
-		if ( isset( $atts[ $set['param'] ] ) ) {
106
-			$this->{$set['param']} = $atts[ $set['param'] ];
105
+		if ( isset( $atts[$set['param']] ) ) {
106
+			$this->{$set['param']} = $atts[$set['param']];
107 107
 		} else {
108 108
 			$this->{$set['param']} = $this->field_obj->get_field_column( $set['default'] );
109 109
 		}
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	 */
231 231
 	private function replace_error_shortcode() {
232 232
 		$this->maybe_add_error_id();
233
-		$error = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? $this->pass_args['errors'][ 'field' . $this->field_id ] : false;
233
+		$error = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? $this->pass_args['errors']['field' . $this->field_id] : false;
234 234
 
235 235
 		if ( ! empty( $error ) && false === strpos( $this->html, 'role="alert"' ) && FrmAppHelper::should_include_alert_role_on_field_errors() ) {
236 236
 			$error_body = self::get_error_body( $this->html );
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 	 * @since 3.06.02
272 272
 	 */
273 273
 	private function maybe_add_error_id() {
274
-		if ( ! isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ) {
274
+		if ( ! isset( $this->pass_args['errors']['field' . $this->field_id] ) ) {
275 275
 			return;
276 276
 		}
277 277
 
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 		preg_match_all( "/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $this->html, $shortcodes, PREG_PATTERN_ORDER );
352 352
 
353 353
 		foreach ( $shortcodes[0] as $short_key => $tag ) {
354
-			$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
354
+			$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][$short_key] );
355 355
 			$tag            = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key );
356 356
 
357 357
 			$replace_with = '';
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 				$replace_with = $this->replace_input_shortcode( $shortcode_atts );
363 363
 			}
364 364
 
365
-			$this->html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $this->html );
365
+			$this->html = str_replace( $shortcodes[0][$short_key], $replace_with, $this->html );
366 366
 		}
367 367
 	}
368 368
 
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 	 */
385 385
 	private function prepare_input_shortcode_atts( $shortcode_atts ) {
386 386
 		if ( isset( $shortcode_atts['opt'] ) ) {
387
-			--$shortcode_atts['opt'];
387
+			-- $shortcode_atts['opt'];
388 388
 		}
389 389
 
390 390
 		$field_class = isset( $shortcode_atts['class'] ) ? $shortcode_atts['class'] : '';
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 	 */
448 448
 	private function get_field_div_classes() {
449 449
 		// Add error class
450
-		$classes = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? ' frm_blank_field' : '';
450
+		$classes = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? ' frm_blank_field' : '';
451 451
 
452 452
 		// Add label position class
453 453
 		$settings = $this->field_obj->display_field_settings();
Please login to merge, or discard this patch.
classes/controllers/FrmUsageController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -133,15 +133,15 @@
 block discarded – undo
133 133
 			return;
134 134
 		}
135 135
 
136
-		if ( ! isset( $flows_data[ $key ] ) ) {
137
-			$flows_data[ $key ] = array();
136
+		if ( ! isset( $flows_data[$key] ) ) {
137
+			$flows_data[$key] = array();
138 138
 		}
139 139
 
140
-		if ( ! isset( $flows_data[ $key ][ $value ] ) ) {
141
-			$flows_data[ $key ][ $value ] = 0;
140
+		if ( ! isset( $flows_data[$key][$value] ) ) {
141
+			$flows_data[$key][$value] = 0;
142 142
 		}
143 143
 
144
-		$flows_data[ $key ][ $value ]++;
144
+		$flows_data[$key][$value] ++;
145 145
 		update_option( self::FLOWS_ACTION_NAME, $flows_data );
146 146
 	}
147 147
 
Please login to merge, or discard this patch.
classes/models/FrmForm.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 			}
210 210
 
211 211
 			if ( $new_val !== $value ) {
212
-				$new_values[ $key ] = $new_val;
212
+				$new_values[$key] = $new_val;
213 213
 			}
214 214
 		}//end foreach
215 215
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
 		foreach ( $values as $value_key => $value ) {
242 242
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
243
-				$new_values[ $value_key ] = $value;
243
+				$new_values[$value_key] = $value;
244 244
 			}
245 245
 		}
246 246
 
@@ -323,15 +323,15 @@  discard block
 block discarded – undo
323 323
 		$existing_keys = array_keys( $values['item_meta'] );
324 324
 		foreach ( $all_fields as $fid ) {
325 325
 			if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
326
-				$values['item_meta'][ $fid->id ] = '';
326
+				$values['item_meta'][$fid->id] = '';
327 327
 			}
328
-			$field_array[ $fid->id ] = $fid;
328
+			$field_array[$fid->id] = $fid;
329 329
 		}
330 330
 		unset( $all_fields );
331 331
 
332 332
 		foreach ( $values['item_meta'] as $field_id => $default_value ) {
333
-			if ( isset( $field_array[ $field_id ] ) ) {
334
-				$field = $field_array[ $field_id ];
333
+			if ( isset( $field_array[$field_id] ) ) {
334
+				$field = $field_array[$field_id];
335 335
 			} else {
336 336
 				$field = FrmField::getOne( $field_id );
337 337
 			}
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 				continue;
341 341
 			}
342 342
 
343
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
343
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
344 344
 			if ( $is_settings_page ) {
345 345
 				self::get_settings_page_html( $values, $field );
346 346
 
@@ -356,22 +356,22 @@  discard block
 block discarded – undo
356 356
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
357 357
 
358 358
 			foreach ( $update_options as $opt => $default ) {
359
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
360
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
359
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? $values['field_options'][$opt . '_' . $field_id] : $default;
360
+				self::sanitize_field_opt( $opt, $field->field_options[$opt] );
361 361
 			}
362 362
 
363 363
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
364 364
 
365 365
 			$new_field = array(
366 366
 				'field_options' => $field->field_options,
367
-				'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
367
+				'default_value' => isset( $values['default_value_' . $field_id] ) ? FrmAppHelper::maybe_json_encode( $values['default_value_' . $field_id] ) : '',
368 368
 			);
369 369
 
370
-			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) {
371
-				foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) {
370
+			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options']['options_' . $field_id] ) && is_array( $values['field_options']['options_' . $field_id] ) ) {
371
+				foreach ( $values['field_options']['options_' . $field_id] as $option_key => $option ) {
372 372
 					if ( is_array( $option ) ) {
373 373
 						foreach ( $option as $key => $item ) {
374
-							$values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' );
374
+							$values['field_options']['options_' . $field_id][$option_key][$key] = FrmAppHelper::kses( $item, 'all' );
375 375
 						}
376 376
 					}
377 377
 				}
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
 	 */
402 402
 	private static function maybe_update_max_option( $field, $values, &$new_field ) {
403 403
 		if ( $field->type === 'textarea' &&
404
-			! empty( $values['field_options'][ 'type_' . $field->id ] ) &&
405
-			in_array( $values['field_options'][ 'type_' . $field->id ], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
404
+			! empty( $values['field_options']['type_' . $field->id] ) &&
405
+			in_array( $values['field_options']['type_' . $field->id], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
406 406
 
407 407
 			$new_field['field_options']['max'] = '';
408 408
 
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 			 * Update posted field setting so that new 'max' option is displayed after form is saved and page reloads.
411 411
 			 * FrmFieldsHelper::fill_default_field_opts populates field options by calling self::get_posted_field_setting.
412 412
 			 */
413
-			$_POST['field_options'][ 'max_' . $field->id ] = '';
413
+			$_POST['field_options']['max_' . $field->id] = '';
414 414
 		}
415 415
 	}
416 416
 
@@ -486,11 +486,11 @@  discard block
 block discarded – undo
486 486
 	 * Updating the settings page
487 487
 	 */
488 488
 	private static function get_settings_page_html( $values, &$field ) {
489
-		if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
489
+		if ( isset( $values['field_options']['custom_html_' . $field->id] ) ) {
490 490
 			$prev_opts     = array();
491 491
 			$fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
492 492
 
493
-			$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
493
+			$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field->id] ) ? $values['field_options']['custom_html_' . $field->id] : $fallback_html;
494 494
 		} elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) {
495 495
 			$prev_opts = $field->field_options;
496 496
 		}
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
 		);
516 516
 		foreach ( $field_cols as $col => $default ) {
517 517
 			$default           = $default === '' ? $field->{$col} : $default;
518
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
518
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
519 519
 		}
520 520
 
521 521
 		if ( $field->type === 'submit' && isset( $new_field['field_order'] ) && (int) $new_field['field_order'] === FrmSubmitHelper::DEFAULT_ORDER ) {
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
703 703
 				self::destroy( $form->id );
704 704
 				if ( empty( $form->parent_form_id ) ) {
705
-					++$count;
705
+					++ $count;
706 706
 				}
707 707
 			}
708 708
 
@@ -925,16 +925,16 @@  discard block
 block discarded – undo
925 925
 		foreach ( $results as $row ) {
926 926
 			if ( 'trash' != $row->status ) {
927 927
 				if ( $row->is_template ) {
928
-					++$counts['template'];
928
+					++ $counts['template'];
929 929
 				} else {
930
-					++$counts['published'];
930
+					++ $counts['published'];
931 931
 				}
932 932
 			} else {
933
-				++$counts['trash'];
933
+				++ $counts['trash'];
934 934
 			}
935 935
 
936 936
 			if ( 'draft' == $row->status ) {
937
-				++$counts['draft'];
937
+				++ $counts['draft'];
938 938
 			}
939 939
 
940 940
 			unset( $row );
@@ -975,8 +975,8 @@  discard block
 block discarded – undo
975 975
 			self::maybe_get_form( $form );
976 976
 		}
977 977
 
978
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
979
-			return $frm_vars['form_params'][ $form->id ];
978
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
979
+			return $frm_vars['form_params'][$form->id];
980 980
 		}
981 981
 
982 982
 		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1005,15 +1005,15 @@  discard block
 block discarded – undo
1005 1005
 			// If there are two forms on the same page, make sure not to submit both.
1006 1006
 			foreach ( $default_values as $var => $default ) {
1007 1007
 				if ( $var === 'action' ) {
1008
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
1008
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
1009 1009
 				} else {
1010
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1010
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1011 1011
 				}
1012 1012
 				unset( $var, $default );
1013 1013
 			}
1014 1014
 		} else {
1015 1015
 			foreach ( $default_values as $var => $default ) {
1016
-				$values[ $var ] = $default;
1016
+				$values[$var] = $default;
1017 1017
 				unset( $var, $default );
1018 1018
 			}
1019 1019
 		}
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 			'sdir'     => '',
1040 1040
 		);
1041 1041
 		foreach ( $defaults as $var => $default ) {
1042
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1042
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1043 1043
 		}
1044 1044
 
1045 1045
 		return $values;
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
 			'keep_post' => '',
1068 1068
 		);
1069 1069
 		foreach ( $defaults as $var => $default ) {
1070
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1070
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1071 1071
 		}
1072 1072
 
1073 1073
 		return $values;
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
 		$form    = $atts['form'];
1171 1171
 		$default = isset( $atts['default'] ) ? $atts['default'] : '';
1172 1172
 
1173
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
1173
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $default;
1174 1174
 	}
1175 1175
 
1176 1176
 	/**
Please login to merge, or discard this patch.
classes/helpers/FrmShortcodeHelper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		$contextual_shortcodes = self::get_contextual_shortcodes();
75 75
 		$result                = array();
76 76
 		foreach ( $contextual_shortcodes as $type => $shortcodes ) {
77
-			$result[ $type ] = array_keys( $shortcodes );
77
+			$result[$type] = array_keys( $shortcodes );
78 78
 		}
79 79
 		return $result;
80 80
 	}
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 		}
114 114
 
115 115
 		$with_tags = $args['conditional_check'] ? 3 : 2;
116
-		if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
117
-			$tag  = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
116
+		if ( ! empty( $shortcodes[$with_tags][$short_key] ) ) {
117
+			$tag  = str_replace( '[' . $prefix, '', $shortcodes[0][$short_key] );
118 118
 			$tag  = str_replace( ']', '', $tag );
119 119
 			$tag  = str_replace( chr( 194 ) . chr( 160 ), ' ', $tag );
120 120
 			$tags = preg_split( '/\s+/', $tag, 2 );
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 				$tag = $tags[0];
123 123
 			}
124 124
 		} else {
125
-			$tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
125
+			$tag = $shortcodes[$with_tags - 1][$short_key];
126 126
 		}
127 127
 
128 128
 		return $tag;
Please login to merge, or discard this patch.
classes/models/FrmApplicationTemplate.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		 *
38 38
 		 * @param array $keys
39 39
 		 */
40
-		self::$keys             = apply_filters(
40
+		self::$keys = apply_filters(
41 41
 			'frm_application_data_keys',
42 42
 			array( 'key', 'name', 'description', 'link', 'categories', 'views', 'forms', 'used_addons' )
43 43
 		);
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 			self::get_template_keys_with_local_png_images(),
46 46
 			self::get_template_keys_with_local_webp_images()
47 47
 		);
48
-		self::$categories       = array();
48
+		self::$categories = array();
49 49
 	}
50 50
 
51 51
 	/**
@@ -144,20 +144,20 @@  discard block
 block discarded – undo
144 144
 
145 145
 		$application = array();
146 146
 		foreach ( self::$keys as $key ) {
147
-			if ( ! isset( $this->api_data[ $key ] ) ) {
147
+			if ( ! isset( $this->api_data[$key] ) ) {
148 148
 				continue;
149 149
 			}
150 150
 
151
-			$value = $this->api_data[ $key ];
151
+			$value = $this->api_data[$key];
152 152
 
153 153
 			if ( 'icon' === $key ) {
154 154
 				// Icon is an array. The first array item is the image URL.
155
-				$application[ $key ] = reset( $value );
155
+				$application[$key] = reset( $value );
156 156
 			} elseif ( 'categories' === $key ) {
157
-				$application[ $key ] = array_values(
157
+				$application[$key] = array_values(
158 158
 					array_filter(
159 159
 						$value,
160
-						function ( $category ) {
160
+						function( $category ) {
161 161
 							return false === strpos( $category, '+Views' );
162 162
 						}
163 163
 					)
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 					// Strip off the " Template" text at the end of the name as it takes up space.
174 174
 					$value = substr( $value, 0, -9 );
175 175
 				}
176
-				$application[ $key ] = $value;
176
+				$application[$key] = $value;
177 177
 			}//end if
178 178
 		}//end foreach
179 179
 
Please login to merge, or discard this patch.