Completed
Pull Request — master (#1580)
by Stephanie
48s
created
classes/models/FrmApplicationTemplate.php 1 patch
Spacing   +7 added lines, -7 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' )
43 43
 		);
@@ -119,20 +119,20 @@  discard block
 block discarded – undo
119 119
 
120 120
 		$application = array();
121 121
 		foreach ( self::$keys as $key ) {
122
-			if ( ! isset( $this->api_data[ $key ] ) ) {
122
+			if ( ! isset( $this->api_data[$key] ) ) {
123 123
 				continue;
124 124
 			}
125 125
 
126
-			$value = $this->api_data[ $key ];
126
+			$value = $this->api_data[$key];
127 127
 
128 128
 			if ( 'icon' === $key ) {
129 129
 				// Icon is an array. The first array item is the image URL.
130
-				$application[ $key ] = reset( $value );
130
+				$application[$key] = reset( $value );
131 131
 			} elseif ( 'categories' === $key ) {
132
-				$application[ $key ] = array_values(
132
+				$application[$key] = array_values(
133 133
 					array_filter(
134 134
 						$value,
135
-						function ( $category ) {
135
+						function( $category ) {
136 136
 							return false === strpos( $category, '+Views' );
137 137
 						}
138 138
 					)
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 					// Strip off the " Template" text at the end of the name as it takes up space.
149 149
 					$value = substr( $value, 0, -9 );
150 150
 				}
151
-				$application[ $key ] = $value;
151
+				$application[$key] = $value;
152 152
 			}//end if
153 153
 		}//end foreach
154 154
 
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
 		$field_val = '';
150 150
 		if ( is_object( $this->field ) ) {
151 151
 			$field_val = $this->field->{$column};
152
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
153
-			$field_val = $this->field[ $column ];
152
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
153
+			$field_val = $this->field[$column];
154 154
 		}
155 155
 
156 156
 		return $field_val;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 		if ( is_object( $this->field ) ) {
165 165
 			$this->field->{$column} = $value;
166 166
 		} elseif ( is_array( $this->field ) ) {
167
-			$this->field[ $column ] = $value;
167
+			$this->field[$column] = $value;
168 168
 		}
169 169
 	}
170 170
 
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 			printf(
607 607
 				/* translators: %s: Field type */
608 608
 				esc_html__( '%s Options', 'formidable' ),
609
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
609
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
610 610
 			);
611 611
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
612 612
 			?>
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
 	 * New field
693 693
 	 */
694 694
 	public function get_new_field_defaults() {
695
-		$field        = array(
695
+		$field = array(
696 696
 			'name'          => $this->get_new_field_name(),
697 697
 			'description'   => '',
698 698
 			'type'          => $this->type,
@@ -723,8 +723,8 @@  discard block
 block discarded – undo
723 723
 
724 724
 		$fields = array_merge( $fields, $pro_fields );
725 725
 
726
-		if ( isset( $fields[ $this->type ] ) ) {
727
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
726
+		if ( isset( $fields[$this->type] ) ) {
727
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
728 728
 		}
729 729
 
730 730
 		return $name;
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 	 * @return array
742 742
 	 */
743 743
 	public function get_default_field_options() {
744
-		$opts        = array(
744
+		$opts = array(
745 745
 			'size'               => '',
746 746
 			'max'                => '',
747 747
 			'label'              => '',
@@ -1164,8 +1164,8 @@  discard block
 block discarded – undo
1164 1164
 		$selected = $values['field_value'];
1165 1165
 
1166 1166
 		if ( isset( $values['combo_name'] ) ) {
1167
-			$options  = $options[ $values['combo_name'] ];
1168
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
1167
+			$options  = $options[$values['combo_name']];
1168
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
1169 1169
 		}
1170 1170
 
1171 1171
 		$input = $this->select_tag( $values );
@@ -1216,7 +1216,7 @@  discard block
 block discarded – undo
1216 1216
 	}
1217 1217
 
1218 1218
 	protected function fill_display_field_values( $args = array() ) {
1219
-		$defaults        = array(
1219
+		$defaults = array(
1220 1220
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1221 1221
 			'field_id'      => $this->get_field_column( 'id' ),
1222 1222
 			'field_plus_id' => '',
@@ -1269,7 +1269,7 @@  discard block
 block discarded – undo
1269 1269
 			}
1270 1270
 		}
1271 1271
 
1272
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1272
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1273 1273
 			if ( $error_comes_first ) {
1274 1274
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1275 1275
 			} else {
@@ -1348,11 +1348,11 @@  discard block
 block discarded – undo
1348 1348
 
1349 1349
 		$field_id = $this->get_field_column( 'id' );
1350 1350
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1351
-			$frm_validated_unique_values[ $field_id ] = array();
1351
+			$frm_validated_unique_values[$field_id] = array();
1352 1352
 			return false;
1353 1353
 		}
1354 1354
 
1355
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1355
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1356 1356
 		return $already_validated_this_value;
1357 1357
 	}
1358 1358
 
@@ -1377,7 +1377,7 @@  discard block
 block discarded – undo
1377 1377
 	private function value_validated_as_unique( $value ) {
1378 1378
 		global $frm_validated_unique_values;
1379 1379
 		$field_id                                   = $this->get_field_column( 'id' );
1380
-		$frm_validated_unique_values[ $field_id ][] = $value;
1380
+		$frm_validated_unique_values[$field_id][] = $value;
1381 1381
 	}
1382 1382
 
1383 1383
 	/**
@@ -1418,8 +1418,8 @@  discard block
 block discarded – undo
1418 1418
 		$value = $this->prepare_display_value( $value, $atts );
1419 1419
 
1420 1420
 		if ( is_array( $value ) ) {
1421
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
1422
-				$value = $value[ $atts['show'] ];
1421
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
1422
+				$value = $value[$atts['show']];
1423 1423
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
1424 1424
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1425 1425
 				$value = implode( $sep, $value );
@@ -1549,8 +1549,8 @@  discard block
 block discarded – undo
1549 1549
 		$saved_entries = $atts['ids'];
1550 1550
 		$new_value     = array();
1551 1551
 		foreach ( (array) $value as $old_child_id ) {
1552
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1553
-				$new_value[] = $saved_entries[ $old_child_id ];
1552
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1553
+				$new_value[] = $saved_entries[$old_child_id];
1554 1554
 			}
1555 1555
 		}
1556 1556
 
Please login to merge, or discard this patch.
classes/models/FrmFormAction.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 		$groups = FrmFormActionsController::form_action_groups();
209 209
 		$group  = 'misc';
210 210
 
211
-		if ( isset( $action_options['group'] ) && isset( $groups[ $action_options['group'] ] ) ) {
211
+		if ( isset( $action_options['group'] ) && isset( $groups[$action_options['group']] ) ) {
212 212
 			$group = $action_options['group'];
213
-		} elseif ( isset( $groups[ $this->id_base ] ) ) {
213
+		} elseif ( isset( $groups[$this->id_base] ) ) {
214 214
 			$group = $this->id_base;
215 215
 		} else {
216 216
 			foreach ( $groups as $name => $check_group ) {
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
221 221
 			}
222 222
 		}
223 223
 
224
-		$groups[ $group ]['id'] = $group;
225
-		return $groups[ $group ];
224
+		$groups[$group]['id'] = $group;
225
+		return $groups[$group];
226 226
 	}
227 227
 
228 228
 	/**
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 * @return int $post_id
334 334
 	 */
335 335
 	public function maybe_create_action( $action, $forms ) {
336
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[ $action['menu_order'] ] ) && $forms[ $action['menu_order'] ] === 'updated' ) {
336
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[$action['menu_order']] ) && $forms[$action['menu_order']] === 'updated' ) {
337 337
 			// Update action only
338 338
 			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
339 339
 			$post_id                = $this->save_settings( $action );
@@ -356,18 +356,18 @@  discard block
 block discarded – undo
356 356
 		$switch             = $this->get_global_switch_fields();
357 357
 
358 358
 		foreach ( (array) $action->post_content as $key => $val ) {
359
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
360
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
359
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
360
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
361 361
 			} elseif ( ! is_array( $val ) ) {
362
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
363
-			} elseif ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
362
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
363
+			} elseif ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
364 364
 				// loop through each value if empty
365
-				if ( empty( $switch[ $key ] ) ) {
366
-					$switch[ $key ] = array_keys( $val );
365
+				if ( empty( $switch[$key] ) ) {
366
+					$switch[$key] = array_keys( $val );
367 367
 				}
368 368
 
369
-				foreach ( $switch[ $key ] as $subkey ) {
370
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
369
+				foreach ( $switch[$key] as $subkey ) {
370
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
371 371
 				}
372 372
 			}
373 373
 
@@ -385,20 +385,20 @@  discard block
 block discarded – undo
385 385
 			foreach ( $subkey as $subkey2 ) {
386 386
 				foreach ( (array) $val as $ck => $cv ) {
387 387
 					if ( is_array( $cv ) ) {
388
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
389
-					} elseif ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
390
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
388
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
389
+					} elseif ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
390
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
391 391
 					}
392 392
 				}
393 393
 			}
394 394
 		} else {
395 395
 			foreach ( (array) $val as $ck => $cv ) {
396 396
 				if ( is_array( $cv ) ) {
397
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
398
-				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
399
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
397
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
398
+				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
399
+					$action[$ck] = $frm_duplicate_ids[$cv];
400 400
 				} elseif ( $ck == $subkey ) {
401
-					$action[ $ck ] = $this->maybe_switch_field_ids( $action[ $ck ] );
401
+					$action[$ck] = $this->maybe_switch_field_ids( $action[$ck] );
402 402
 				}
403 403
 			}
404 404
 		}//end if
@@ -422,10 +422,10 @@  discard block
 block discarded – undo
422 422
 		}
423 423
 
424 424
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
425
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
425
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
426 426
 			// Sanitizing removes scripts and <email> type of values.
427 427
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
428
-			$settings = wp_unslash( $_POST[ $this->option_name ] );
428
+			$settings = wp_unslash( $_POST[$this->option_name] );
429 429
 		} else {
430 430
 			return;
431 431
 		}
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
 		foreach ( $settings as $number => $new_instance ) {
436 436
 			$this->_set( $number );
437 437
 
438
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
438
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
439 439
 
440 440
 			if ( ! isset( $new_instance['post_status'] ) ) {
441 441
 				$new_instance['post_status'] = 'draft';
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $instance['post_content'], $instance, $new_instance, $old_instance, $this );
474 474
 
475 475
 			if ( false !== $instance ) {
476
-				$all_instances[ $number ] = $instance;
476
+				$all_instances[$number] = $instance;
477 477
 			}
478 478
 
479 479
 			$action_ids[] = $this->save_settings( $instance );
@@ -555,12 +555,12 @@  discard block
 block discarded – undo
555 555
 			// some plugins/themes are formatting the post_excerpt
556 556
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
557 557
 
558
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
558
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
559 559
 				continue;
560 560
 			}
561 561
 
562
-			$action                  = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
563
-			$settings[ $action->ID ] = $action;
562
+			$action                  = $action_controls[$action->post_excerpt]->prepare_action( $action );
563
+			$settings[$action->ID] = $action;
564 564
 
565 565
 			if ( count( $settings ) >= $limit ) {
566 566
 				break;
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
 			'limit'       => 99,
594 594
 			'post_status' => $default_status,
595 595
 		);
596
-		$args     = wp_parse_args( $args, $defaults );
596
+		$args = wp_parse_args( $args, $defaults );
597 597
 	}
598 598
 
599 599
 	/**
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 
660 660
 			$action = $this->prepare_action( $action );
661 661
 
662
-			$settings[ $action->ID ] = $action;
662
+			$settings[$action->ID] = $action;
663 663
 		}
664 664
 
665 665
 		if ( 1 === $limit ) {
@@ -702,10 +702,10 @@  discard block
 block discarded – undo
702 702
 
703 703
 		foreach ( $default_values as $k => $vals ) {
704 704
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
705
-				if ( 'event' === $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
705
+				if ( 'event' === $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
706 706
 					continue;
707 707
 				}
708
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
708
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
709 709
 			}
710 710
 		}
711 711
 
@@ -793,9 +793,9 @@  discard block
 block discarded – undo
793 793
 
794 794
 		// fill with existing options
795 795
 		foreach ( $action->post_content as $name => $val ) {
796
-			if ( isset( $form->options[ $name ] ) ) {
797
-				$action->post_content[ $name ] = $form->options[ $name ];
798
-				unset( $form->options[ $name ] );
796
+			if ( isset( $form->options[$name] ) ) {
797
+				$action->post_content[$name] = $form->options[$name];
798
+				unset( $form->options[$name] );
799 799
 			}
800 800
 		}
801 801
 
@@ -861,7 +861,7 @@  discard block
 block discarded – undo
861 861
 				$stop = $stop ? false : true;
862 862
 			}
863 863
 
864
-			$met[ $stop ] = $stop;
864
+			$met[$stop] = $stop;
865 865
 		}//end foreach
866 866
 
867 867
 		if ( $notification['conditions']['any_all'] === 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
@@ -915,8 +915,8 @@  discard block
 block discarded – undo
915 915
 	private static function get_value_from_entry( $entry, $field_id ) {
916 916
 		$observed_value = '';
917 917
 
918
-		if ( isset( $entry->metas[ $field_id ] ) ) {
919
-			$observed_value = $entry->metas[ $field_id ];
918
+		if ( isset( $entry->metas[$field_id] ) ) {
919
+			$observed_value = $entry->metas[$field_id];
920 920
 		} elseif ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
921 921
 			$field          = FrmField::getOne( $field_id );
922 922
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value(
@@ -990,7 +990,7 @@  discard block
 block discarded – undo
990 990
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'include' );
991 991
 		return array_filter(
992 992
 			$form_fields,
993
-			function ( $form_field ) {
993
+			function( $form_field ) {
994 994
 				return ! FrmField::is_no_save_field( $form_field->type );
995 995
 			}
996 996
 		);
Please login to merge, or discard this patch.
classes/helpers/FrmFormsHelper.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 			'class'        => '',
38 38
 			'inc_children' => 'exclude',
39 39
 		);
40
-		$args     = wp_parse_args( $args, $defaults );
40
+		$args = wp_parse_args( $args, $defaults );
41 41
 
42 42
 		if ( ! $args['field_id'] ) {
43 43
 			$args['field_id'] = $field_name;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 */
79 79
 	public static function add_html_attr( $class, $param, &$add_html ) {
80 80
 		if ( ! empty( $class ) ) {
81
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
81
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
82 82
 		}
83 83
 	}
84 84
 
@@ -296,8 +296,8 @@  discard block
 block discarded – undo
296 296
 			'description' => '',
297 297
 		);
298 298
 		foreach ( $defaults as $var => $default ) {
299
-			if ( ! isset( $values[ $var ] ) ) {
300
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
299
+			if ( ! isset( $values[$var] ) ) {
300
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
301 301
 			}
302 302
 		}
303 303
 
@@ -312,8 +312,8 @@  discard block
 block discarded – undo
312 312
 			'parent_form_id' => 0,
313 313
 		);
314 314
 		foreach ( $defaults as $var => $default ) {
315
-			if ( ! isset( $values[ $var ] ) ) {
316
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
315
+			if ( ! isset( $values[$var] ) ) {
316
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
317 317
 			}
318 318
 		}
319 319
 		unset( $defaults );
@@ -350,16 +350,16 @@  discard block
 block discarded – undo
350 350
 		$defaults = self::get_default_opts();
351 351
 		foreach ( $defaults as $var => $default ) {
352 352
 			if ( is_array( $default ) ) {
353
-				if ( ! isset( $values[ $var ] ) ) {
354
-					$values[ $var ] = $record && isset( $record->options[ $var ] ) ? $record->options[ $var ] : array();
353
+				if ( ! isset( $values[$var] ) ) {
354
+					$values[$var] = $record && isset( $record->options[$var] ) ? $record->options[$var] : array();
355 355
 				}
356 356
 
357 357
 				foreach ( $default as $k => $v ) {
358
-					$values[ $var ][ $k ] = $post_values && isset( $post_values[ $var ][ $k ] ) ? $post_values[ $var ][ $k ] : ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ? $record->options[ $var ][ $k ] : $v );
358
+					$values[$var][$k] = $post_values && isset( $post_values[$var][$k] ) ? $post_values[$var][$k] : ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) ? $record->options[$var][$k] : $v );
359 359
 
360 360
 					if ( is_array( $v ) ) {
361 361
 						foreach ( $v as $k1 => $v1 ) {
362
-							$values[ $var ][ $k ][ $k1 ] = $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ? $post_values[ $var ][ $k ][ $k1 ] : ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
362
+							$values[$var][$k][$k1] = $post_values && isset( $post_values[$var][$k][$k1] ) ? $post_values[$var][$k][$k1] : ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) && isset( $record->options[$var][$k][$k1] ) ? $record->options[$var][$k][$k1] : $v1 );
363 363
 							unset( $k1, $v1 );
364 364
 						}
365 365
 					}
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 					unset( $k, $v );
368 368
 				}
369 369
 			} else {
370
-				$values[ $var ] = $post_values && isset( $post_values['options'][ $var ] ) ? $post_values['options'][ $var ] : ( $record && isset( $record->options[ $var ] ) ? $record->options[ $var ] : $default );
370
+				$values[$var] = $post_values && isset( $post_values['options'][$var] ) ? $post_values['options'][$var] : ( $record && isset( $record->options[$var] ) ? $record->options[$var] : $default );
371 371
 			}
372 372
 
373 373
 			unset( $var, $default );
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 	public static function fill_form_options( &$options, $values ) {
413 413
 		$defaults = self::get_default_opts();
414 414
 		foreach ( $defaults as $var => $default ) {
415
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
415
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
416 416
 			unset( $var, $default );
417 417
 		}
418 418
 	}
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 	public static function insert_opt_html( $args ) {
590 590
 		$class  = isset( $args['class'] ) ? $args['class'] : '';
591 591
 		$fields = self::get_field_type_data_for_insert_opt_html();
592
-		$field  = isset( $fields[ $args['type'] ] ) ? $fields[ $args['type'] ] : array();
592
+		$field  = isset( $fields[$args['type']] ) ? $fields[$args['type']] : array();
593 593
 
594 594
 		self::prepare_field_type( $field );
595 595
 
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 		$last_field         = false;
706 706
 		foreach ( $fields as $field ) {
707 707
 			if ( $prev_order === $field->field_order ) {
708
-				++$add_order;
708
+				++ $add_order;
709 709
 			}
710 710
 
711 711
 			if ( $add_order ) {
@@ -1168,8 +1168,8 @@  discard block
 block discarded – undo
1168 1168
 				$link .= ' onclick="return confirm(\'' . esc_attr( $link_details['confirm'] ) . '\')"';
1169 1169
 			}
1170 1170
 
1171
-			$label = ( isset( $link_details[ $length ] ) ? $link_details[ $length ] : $link_details['label'] );
1172
-			if ( $length === 'icon' && isset( $link_details[ $length ] ) ) {
1171
+			$label = ( isset( $link_details[$length] ) ? $link_details[$length] : $link_details['label'] );
1172
+			if ( $length === 'icon' && isset( $link_details[$length] ) ) {
1173 1173
 				$label = '<span class="' . $label . '" title="' . esc_attr( $link_details['label'] ) . '" aria-hidden="true"></span>';
1174 1174
 				$link .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
1175 1175
 			}
@@ -1316,7 +1316,7 @@  discard block
 block discarded – undo
1316 1316
 			$status = 'publish';
1317 1317
 		}
1318 1318
 
1319
-		$name = $nice_names[ $status ];
1319
+		$name = $nice_names[$status];
1320 1320
 
1321 1321
 		return $name;
1322 1322
 	}
@@ -1380,7 +1380,7 @@  discard block
 block discarded – undo
1380 1380
 		$icon = $icons[''];
1381 1381
 		if ( count( $categories ) === 1 ) {
1382 1382
 			$category = reset( $categories );
1383
-			$icon     = isset( $icons[ $category ] ) ? $icons[ $category ] : $icon;
1383
+			$icon     = isset( $icons[$category] ) ? $icons[$category] : $icon;
1384 1384
 		} elseif ( ! empty( $categories ) ) {
1385 1385
 			$icons = array_intersect_key( $icons, array_flip( $categories ) );
1386 1386
 			$icon  = reset( $icons );
@@ -1518,7 +1518,7 @@  discard block
 block discarded – undo
1518 1518
 
1519 1519
 		foreach ( $item['categories'] as $k => $category ) {
1520 1520
 			if ( in_array( $category, $plans, true ) ) {
1521
-				unset( $item['categories'][ $k ] );
1521
+				unset( $item['categories'][$k] );
1522 1522
 
1523 1523
 				if ( in_array( $category, array( 'Creator', 'Personal' ), true ) ) {
1524 1524
 					// Show the current package name.
@@ -1720,9 +1720,9 @@  discard block
 block discarded – undo
1720 1720
 		}
1721 1721
 
1722 1722
 		foreach ( $shortcodes[0] as $key => $shortcode ) {
1723
-			$options = trim( $shortcodes[3][ $key ] );
1723
+			$options = trim( $shortcodes[3][$key] );
1724 1724
 
1725
-			if ( in_array( $shortcodes[1][ $key ], array( 'if ' ), true ) ) {
1725
+			if ( in_array( $shortcodes[1][$key], array( 'if ' ), true ) ) {
1726 1726
 				// Skip if shortcodes.
1727 1727
 				continue;
1728 1728
 			}
@@ -1732,7 +1732,7 @@  discard block
 block discarded – undo
1732 1732
 				continue;
1733 1733
 			}
1734 1734
 
1735
-			$new_shortcode = '[' . $shortcodes[2][ $key ];
1735
+			$new_shortcode = '[' . $shortcodes[2][$key];
1736 1736
 			if ( $options ) {
1737 1737
 				$new_shortcode .= ' ' . $options;
1738 1738
 			}
Please login to merge, or discard this patch.
classes/models/FrmDb.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -314,8 +314,8 @@  discard block
 block discarded – undo
314 314
 		);
315 315
 
316 316
 		$where_is = strtolower( $where_is );
317
-		if ( isset( $switch_to[ $where_is ] ) ) {
318
-			return ' ' . $switch_to[ $where_is ];
317
+		if ( isset( $switch_to[$where_is] ) ) {
318
+			return ' ' . $switch_to[$where_is];
319 319
 		}
320 320
 
321 321
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -380,13 +380,13 @@  discard block
 block discarded – undo
380 380
 		$temp_args = $args;
381 381
 		foreach ( $temp_args as $k => $v ) {
382 382
 			if ( $v == '' ) {
383
-				unset( $args[ $k ] );
383
+				unset( $args[$k] );
384 384
 				continue;
385 385
 			}
386 386
 
387 387
 			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
388 388
 			if ( strpos( $v, $db_name ) === false ) {
389
-				$args[ $k ] = $db_name . ' ' . $v;
389
+				$args[$k] = $db_name . ' ' . $v;
390 390
 			}
391 391
 		}
392 392
 
@@ -460,13 +460,13 @@  discard block
 block discarded – undo
460 460
 	private static function esc_query_args( &$args ) {
461 461
 		foreach ( $args as $param => $value ) {
462 462
 			if ( $param === 'order_by' ) {
463
-				$args[ $param ] = self::esc_order( $value );
463
+				$args[$param] = self::esc_order( $value );
464 464
 			} elseif ( $param === 'limit' ) {
465
-				$args[ $param ] = self::esc_limit( $value );
465
+				$args[$param] = self::esc_limit( $value );
466 466
 			}
467 467
 
468
-			if ( $args[ $param ] == '' ) {
469
-				unset( $args[ $param ] );
468
+			if ( $args[$param] == '' ) {
469
+				unset( $args[$param] );
470 470
 			}
471 471
 		}
472 472
 	}
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 		$limit = explode( ',', trim( $limit ) );
549 549
 		foreach ( $limit as $k => $l ) {
550 550
 			if ( is_numeric( $l ) ) {
551
-				$limit[ $k ] = $l;
551
+				$limit[$k] = $l;
552 552
 			}
553 553
 		}
554 554
 
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
 	 */
702 702
 	public static function add_key_to_group_cache( $key, $group ) {
703 703
 		$cached         = self::get_group_cached_keys( $group );
704
-		$cached[ $key ] = $key;
704
+		$cached[$key] = $key;
705 705
 		wp_cache_set( 'cached_keys', $cached, $group, 300 );
706 706
 	}
707 707
 
Please login to merge, or discard this patch.
classes/models/FrmField.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -300,8 +300,8 @@  discard block
 block discarded – undo
300 300
 			require_once ABSPATH . 'wp-admin/includes/plugin.php';
301 301
 		}
302 302
 		$plugins = get_plugins();
303
-		if ( isset( $plugins[ $plugin ] ) && ! empty( $plugins[ $plugin ]['Version'] ) ) {
304
-			return $plugins[ $plugin ]['Version'];
303
+		if ( isset( $plugins[$plugin] ) && ! empty( $plugins[$plugin]['Version'] ) ) {
304
+			return $plugins[$plugin]['Version'];
305 305
 		}
306 306
 		return false;
307 307
 	}
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 		$values = FrmAppHelper::maybe_filter_array( $values, array( 'name', 'description' ) );
375 375
 
376 376
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
377
-			$new_values[ $col ] = $values[ $col ];
377
+			$new_values[$col] = $values[$col];
378 378
 		}
379 379
 
380 380
 		$new_values['options']       = self::maybe_filter_options( $values['options'] );
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 		$new_values['created_at']    = current_time( 'mysql', 1 );
386 386
 
387 387
 		if ( isset( $values['id'] ) ) {
388
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
388
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
389 389
 			$new_values                                = apply_filters( 'frm_duplicated_field', $new_values );
390 390
 		}
391 391
 
@@ -394,9 +394,9 @@  discard block
 block discarded – undo
394 394
 		foreach ( $new_values as $k => $v ) {
395 395
 			if ( is_array( $v ) ) {
396 396
 				if ( $k === 'default_value' ) {
397
-					$new_values[ $k ] = FrmAppHelper::maybe_json_encode( $v );
397
+					$new_values[$k] = FrmAppHelper::maybe_json_encode( $v );
398 398
 				} else {
399
-					$new_values[ $k ] = serialize( $v );
399
+					$new_values[$k] = serialize( $v );
400 400
 				}
401 401
 			}
402 402
 			unset( $k, $v );
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 		}
417 417
 
418 418
 		if ( isset( $values['id'] ) ) {
419
-			$frm_duplicate_ids[ $values['id'] ] = $new_id;
419
+			$frm_duplicate_ids[$values['id']] = $new_id;
420 420
 		}
421 421
 
422 422
 		return $new_id;
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
 	public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
477 477
 		global $frm_duplicate_ids;
478 478
 
479
-		$where  = array(
479
+		$where = array(
480 480
 			array(
481 481
 				'or'                => 1,
482 482
 				'fi.form_id'        => $old_form_id,
@@ -522,8 +522,8 @@  discard block
 block discarded – undo
522 522
 
523 523
 			$values                                 = apply_filters( 'frm_duplicated_field', $values );
524 524
 			$new_id                                 = self::create( $values );
525
-			$frm_duplicate_ids[ $field->id ]        = $new_id;
526
-			$frm_duplicate_ids[ $field->field_key ] = $new_id;
525
+			$frm_duplicate_ids[$field->id]        = $new_id;
526
+			$frm_duplicate_ids[$field->field_key] = $new_id;
527 527
 			unset( $field );
528 528
 		}//end foreach
529 529
 	}
@@ -572,11 +572,11 @@  discard block
 block discarded – undo
572 572
 
573 573
 		// serialize array values
574 574
 		foreach ( array( 'field_options', 'options' ) as $opt ) {
575
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
575
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
576 576
 				if ( 'field_options' === $opt ) {
577
-					$values[ $opt ] = self::maybe_filter_options( $values[ $opt ] );
577
+					$values[$opt] = self::maybe_filter_options( $values[$opt] );
578 578
 				}
579
-				$values[ $opt ] = serialize( $values[ $opt ] );
579
+				$values[$opt] = serialize( $values[$opt] );
580 580
 			}
581 581
 		}
582 582
 		if ( isset( $values['default_value'] ) && is_array( $values['default_value'] ) ) {
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
 				'id'        => $id,
732 732
 				'field_key' => $id,
733 733
 			);
734
-			$type  = FrmDb::get_var( 'frm_fields', $where, $col );
734
+			$type = FrmDb::get_var( 'frm_fields', $where, $col );
735 735
 		}
736 736
 
737 737
 		return $type;
@@ -763,8 +763,8 @@  discard block
 block discarded – undo
763 763
 					continue;
764 764
 				}
765 765
 
766
-				$fields[ $result->id ] = $result;
767
-				++$count;
766
+				$fields[$result->id] = $result;
767
+				++ $count;
768 768
 				if ( $limit == 1 ) {
769 769
 					$fields = $result;
770 770
 					break;
@@ -815,8 +815,8 @@  discard block
 block discarded – undo
815 815
 			$fields = array();
816 816
 			$count  = 0;
817 817
 			foreach ( $results as $result ) {
818
-				++$count;
819
-				$fields[ $result->id ] = $result;
818
+				++ $count;
819
+				$fields[$result->id] = $result;
820 820
 				if ( ! empty( $limit ) && $count >= $limit ) {
821 821
 					break;
822 822
 				}
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
 		$query_type = $limit === ' LIMIT 1' || $limit == 1 ? 'row' : 'results';
931 931
 
932 932
 		if ( is_array( $where ) ) {
933
-			$args    = array(
933
+			$args = array(
934 934
 				'order_by' => $order_by,
935 935
 				'limit'    => $limit,
936 936
 			);
@@ -961,9 +961,9 @@  discard block
 block discarded – undo
961 961
 				FrmDb::set_cache( $result->field_key, $result, 'frm_field' );
962 962
 
963 963
 				self::prepare_options( $result );
964
-				$results[ $r_key ]->field_options = $result->field_options;
965
-				$results[ $r_key ]->options       = $result->options;
966
-				$results[ $r_key ]->default_value = $result->default_value;
964
+				$results[$r_key]->field_options = $result->field_options;
965
+				$results[$r_key]->options       = $result->options;
966
+				$results[$r_key]->default_value = $result->default_value;
967 967
 
968 968
 				unset( $r_key, $result );
969 969
 			}
@@ -1019,7 +1019,7 @@  discard block
 block discarded – undo
1019 1019
 
1020 1020
 			if ( count( $next_fields ) >= self::$transient_size ) {
1021 1021
 				// if this transient is full, check for another
1022
-				++$next;
1022
+				++ $next;
1023 1023
 				self::get_next_transient( $fields, $base_name, $next );
1024 1024
 			}
1025 1025
 		}
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 				return;
1048 1048
 			}
1049 1049
 
1050
-			++$next;
1050
+			++ $next;
1051 1051
 		}
1052 1052
 	}
1053 1053
 
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
 	 * @return bool
1196 1196
 	 */
1197 1197
 	public static function is_option_true_in_array( $field, $option ) {
1198
-		return ! empty( $field[ $option ] );
1198
+		return ! empty( $field[$option] );
1199 1199
 	}
1200 1200
 
1201 1201
 	/**
@@ -1204,7 +1204,7 @@  discard block
 block discarded – undo
1204 1204
 	 * @return bool
1205 1205
 	 */
1206 1206
 	public static function is_option_true_in_object( $field, $option ) {
1207
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
1207
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
1208 1208
 	}
1209 1209
 
1210 1210
 	/**
@@ -1213,7 +1213,7 @@  discard block
 block discarded – undo
1213 1213
 	 * @return bool
1214 1214
 	 */
1215 1215
 	public static function is_option_empty_in_array( $field, $option ) {
1216
-		return empty( $field[ $option ] );
1216
+		return empty( $field[$option] );
1217 1217
 	}
1218 1218
 
1219 1219
 	/**
@@ -1222,7 +1222,7 @@  discard block
 block discarded – undo
1222 1222
 	 * @return bool
1223 1223
 	 */
1224 1224
 	public static function is_option_empty_in_object( $field, $option ) {
1225
-		return empty( $field->field_options[ $option ] );
1225
+		return empty( $field->field_options[$option] );
1226 1226
 	}
1227 1227
 
1228 1228
 	/**
@@ -1231,7 +1231,7 @@  discard block
 block discarded – undo
1231 1231
 	 * @return bool
1232 1232
 	 */
1233 1233
 	public static function is_option_value_in_object( $field, $option ) {
1234
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
1234
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
1235 1235
 	}
1236 1236
 
1237 1237
 	/**
@@ -1257,10 +1257,10 @@  discard block
 block discarded – undo
1257 1257
 	 * @return mixed
1258 1258
 	 */
1259 1259
 	public static function get_option_in_array( $field, $option ) {
1260
-		if ( isset( $field[ $option ] ) ) {
1261
-			$this_option = $field[ $option ];
1262
-		} elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][ $option ] ) ) {
1263
-			$this_option = $field['field_options'][ $option ];
1260
+		if ( isset( $field[$option] ) ) {
1261
+			$this_option = $field[$option];
1262
+		} elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][$option] ) ) {
1263
+			$this_option = $field['field_options'][$option];
1264 1264
 		} else {
1265 1265
 			$this_option = '';
1266 1266
 		}
@@ -1274,7 +1274,7 @@  discard block
 block discarded – undo
1274 1274
 	 * @return mixed
1275 1275
 	 */
1276 1276
 	public static function get_option_in_object( $field, $option ) {
1277
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
1277
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
1278 1278
 	}
1279 1279
 
1280 1280
 	/**
Please login to merge, or discard this patch.