Completed
Pull Request — master (#233)
by
unknown
02:21
created
classes/views/frm-form-actions/default_actions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 class FrmDefPostAction extends FrmFormAction {
4 4
 	public function __construct() {
5 5
 		$action_ops = FrmFormAction::default_action_opts( 'frm_wordpress_icon frm-inverse frm_show_upgrade' );
6
-		$action_ops['color']   = 'rgb(0,160,210)';
6
+		$action_ops['color'] = 'rgb(0,160,210)';
7 7
 
8 8
 		parent::__construct( 'wppost', __( 'Create Post', 'formidable' ), $action_ops );
9 9
 	}
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 class FrmDefMlcmpAction extends FrmFormAction {
43 43
 	public function __construct() {
44 44
 		$action_ops = FrmFormAction::default_action_opts( 'frm_mailchimp_icon frm_show_upgrade frm-inverse' );
45
-		$action_ops['color']   = 'var(--dark-grey)';
45
+		$action_ops['color'] = 'var(--dark-grey)';
46 46
 
47 47
 		parent::__construct( 'mailchimp', 'MailChimp', $action_ops );
48 48
 	}
Please login to merge, or discard this patch.
classes/helpers/FrmEntriesListHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 			$s_query['it.form_id'] = $form_id;
18 18
 			$join_form_in_query    = false;
19 19
 		} else {
20
-			$s_query[]          = array(
20
+			$s_query[] = array(
21 21
 				'or'               => 1,
22 22
 				'parent_form_id'   => null,
23 23
 				'parent_form_id <' => 1,
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
 		if ( strpos( $orderby, 'meta' ) !== false ) {
50 50
 			$order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
51
-			$orderby          .= in_array( $order_field_type, array( 'number', 'scale', 'star' ) ) ? '+0' : '';
51
+			$orderby .= in_array( $order_field_type, array( 'number', 'scale', 'star' ) ) ? '+0' : '';
52 52
 		}
53 53
 
54 54
 		$order = self::get_param(
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 
159 159
 		$r = "<tr id='item-action-{$item->id}'$style>";
160 160
 
161
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
161
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
162 162
 		$action_col = false;
163 163
 
164 164
 		foreach ( $columns as $column_name => $column_display_name ) {
Please login to merge, or discard this patch.
classes/helpers/FrmTipsHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 	}
297 297
 
298 298
 	public static function get_banner_tip() {
299
-		$tips       = array(
299
+		$tips = array(
300 300
 			array(
301 301
 				'link' => array(
302 302
 					'medium'  => 'banner',
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 			),
324 324
 		);
325 325
 		$random     = rand( 0, count( $tips ) - 1 );
326
-		$tip        = $tips[ $random ];
326
+		$tip        = $tips[$random];
327 327
 		$tip['num'] = $random;
328 328
 
329 329
 		return $tip;
@@ -332,6 +332,6 @@  discard block
 block discarded – undo
332 332
 	public static function get_random_tip( $tips ) {
333 333
 		$random = rand( 0, count( $tips ) - 1 );
334 334
 
335
-		return $tips[ $random ];
335
+		return $tips[$random];
336 336
 	}
337 337
 }
Please login to merge, or discard this patch.
classes/helpers/FrmFormsListHelper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 		$page     = $this->get_pagenum();
19 19
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_per_page' );
20 20
 
21
-		$mode    = self::get_param(
21
+		$mode = self::get_param(
22 22
 			array(
23 23
 				'param'   => 'mode',
24 24
 				'default' => 'list',
@@ -30,13 +30,13 @@  discard block
 block discarded – undo
30 30
 				'default' => 'name',
31 31
 			)
32 32
 		);
33
-		$order   = self::get_param(
33
+		$order = self::get_param(
34 34
 			array(
35 35
 				'param'   => 'order',
36 36
 				'default' => 'ASC',
37 37
 			)
38 38
 		);
39
-		$start   = self::get_param(
39
+		$start = self::get_param(
40 40
 			array(
41 41
 				'param'   => 'start',
42 42
 				'default' => ( $page - 1 ) * $per_page,
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
 			if ( $counts->{$status} || 'draft' !== $status ) {
179 179
 				/* translators: %1$s: Status, %2$s: Number of items */
180
-				$links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
180
+				$links[$status] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
181 181
 			}
182 182
 
183 183
 			unset( $status, $name );
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 	private function get_actions( &$actions, $item, $edit_link ) {
283 283
 		$new_actions = FrmFormsHelper::get_action_links( $item->id, $item );
284 284
 		foreach ( $new_actions as $link => $action ) {
285
-			$new_actions[ $link ] = FrmFormsHelper::format_link_html( $action, 'short' );
285
+			$new_actions[$link] = FrmFormsHelper::format_link_html( $action, 'short' );
286 286
 		}
287 287
 
288 288
 		if ( 'trash' == $this->status ) {
Please login to merge, or discard this patch.
classes/helpers/FrmShortcodeHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 		}
62 62
 
63 63
 		$with_tags = $args['conditional_check'] ? 3 : 2;
64
-		if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
65
-			$tag  = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
64
+		if ( ! empty( $shortcodes[$with_tags][$short_key] ) ) {
65
+			$tag  = str_replace( '[' . $prefix, '', $shortcodes[0][$short_key] );
66 66
 			$tag  = str_replace( ']', '', $tag );
67 67
 			$tag  = str_replace( chr( 194 ) . chr( 160 ), ' ', $tag );
68 68
 			$tags = preg_split( '/\s+/', $tag, 2 );
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 				$tag = $tags[0];
71 71
 			}
72 72
 		} else {
73
-			$tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
73
+			$tag = $shortcodes[$with_tags - 1][$short_key];
74 74
 		}
75 75
 
76 76
 		return $tag;
Please login to merge, or discard this patch.
classes/helpers/FrmXMLHelper.php 2 patches
Spacing   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
 			if ( $term && is_array( $term ) ) {
118 118
 				$imported['imported']['terms'] ++;
119
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
119
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
120 120
 			}
121 121
 
122 122
 			unset( $term, $t );
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 					}
173 173
 
174 174
 					// Keep track of whether this specific form was updated or not.
175
-					$imported['form_status'][ $form_id ] = 'imported';
175
+					$imported['form_status'][$form_id] = 'imported';
176 176
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
177 177
 				}
178 178
 			}
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 			// Update field ids/keys to new ones.
185 185
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
186 186
 
187
-			$imported['forms'][ (int) $item->id ] = $form_id;
187
+			$imported['forms'][(int) $item->id] = $form_id;
188 188
 
189 189
 			// Send pre 2.0 form options through function that creates actions.
190 190
 			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, true );
@@ -243,15 +243,15 @@  discard block
 block discarded – undo
243 243
 		}
244 244
 
245 245
 		// Keep track of whether this specific form was updated or not
246
-		$imported['form_status'][ $form_id ] = 'updated';
246
+		$imported['form_status'][$form_id] = 'updated';
247 247
 	}
248 248
 
249 249
 	private static function get_form_fields( $form_id ) {
250 250
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
251 251
 		$old_fields  = array();
252 252
 		foreach ( $form_fields as $f ) {
253
-			$old_fields[ $f->id ]        = $f;
254
-			$old_fields[ $f->field_key ] = $f->id;
253
+			$old_fields[$f->id]        = $f;
254
+			$old_fields[$f->field_key] = $f->id;
255 255
 			unset( $f );
256 256
 		}
257 257
 		$form_fields = $old_fields;
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 	 */
309 309
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
310 310
 		if ( $parent_form_id ) {
311
-			$child_forms[ $form_id ] = $parent_form_id;
311
+			$child_forms[$form_id] = $parent_form_id;
312 312
 		}
313 313
 	}
314 314
 
@@ -324,9 +324,9 @@  discard block
 block discarded – undo
324 324
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
325 325
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
326 326
 
327
-			if ( isset( $imported_forms[ $old_parent_form_id ] ) && $imported_forms[ $old_parent_form_id ] != $old_parent_form_id ) {
327
+			if ( isset( $imported_forms[$old_parent_form_id] ) && $imported_forms[$old_parent_form_id] != $old_parent_form_id ) {
328 328
 				// Update all children with this old parent_form_id
329
-				$new_parent_form_id = (int) $imported_forms[ $old_parent_form_id ];
329
+				$new_parent_form_id = (int) $imported_forms[$old_parent_form_id];
330 330
 
331 331
 				FrmForm::update( $child_form_id, array( 'parent_form_id' => $new_parent_form_id ) );
332 332
 			}
@@ -373,25 +373,25 @@  discard block
 block discarded – undo
373 373
 
374 374
 			if ( ! empty( $this_form ) ) {
375 375
 				// check for field to edit by field id
376
-				if ( isset( $form_fields[ $f['id'] ] ) ) {
376
+				if ( isset( $form_fields[$f['id']] ) ) {
377 377
 					FrmField::update( $f['id'], $f );
378 378
 					$imported['updated']['fields'] ++;
379 379
 
380
-					unset( $form_fields[ $f['id'] ] );
380
+					unset( $form_fields[$f['id']] );
381 381
 
382 382
 					//unset old field key
383
-					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
384
-						unset( $form_fields[ $f['field_key'] ] );
383
+					if ( isset( $form_fields[$f['field_key']] ) ) {
384
+						unset( $form_fields[$f['field_key']] );
385 385
 					}
386
-				} elseif ( isset( $form_fields[ $f['field_key'] ] ) ) {
386
+				} elseif ( isset( $form_fields[$f['field_key']] ) ) {
387 387
 					// check for field to edit by field key
388 388
 					unset( $f['id'] );
389 389
 
390
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
390
+					FrmField::update( $form_fields[$f['field_key']], $f );
391 391
 					$imported['updated']['fields'] ++;
392 392
 
393
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] ); //unset old field id
394
-					unset( $form_fields[ $f['field_key'] ] ); //unset old field key
393
+					unset( $form_fields[$form_fields[$f['field_key']]] ); //unset old field id
394
+					unset( $form_fields[$f['field_key']] ); //unset old field key
395 395
 				} else {
396 396
 					// if no matching field id or key in this form, create the field
397 397
 					self::create_imported_field( $f, $imported );
@@ -460,8 +460,8 @@  discard block
 block discarded – undo
460 460
 		if ( $f['type'] == 'form' || ( $f['type'] == 'divider' && FrmField::is_option_true( $f['field_options'], 'repeat' ) ) ) {
461 461
 			if ( FrmField::is_option_true( $f['field_options'], 'form_select' ) ) {
462 462
 				$form_select = (int) $f['field_options']['form_select'];
463
-				if ( isset( $imported['forms'][ $form_select ] ) ) {
464
-					$f['field_options']['form_select'] = $imported['forms'][ $form_select ];
463
+				if ( isset( $imported['forms'][$form_select] ) ) {
464
+					$f['field_options']['form_select'] = $imported['forms'][$form_select];
465 465
 				}
466 466
 			}
467 467
 		}
@@ -482,8 +482,8 @@  discard block
 block discarded – undo
482 482
 
483 483
 		if ( FrmField::is_option_true_in_array( $f['field_options'], 'get_values_form' ) ) {
484 484
 			$old_form = $f['field_options']['get_values_form'];
485
-			if ( isset( $imported['forms'][ $old_form ] ) ) {
486
-				$f['field_options']['get_values_form'] = $imported['forms'][ $old_form ];
485
+			if ( isset( $imported['forms'][$old_form] ) ) {
486
+				$f['field_options']['get_values_form'] = $imported['forms'][$old_form];
487 487
 			}
488 488
 		}
489 489
 	}
@@ -504,12 +504,12 @@  discard block
 block discarded – undo
504 504
 	private static function migrate_placeholders( &$f ) {
505 505
 		$update_values = self::migrate_field_placeholder( $f, 'clear_on_focus' );
506 506
 		foreach ( $update_values as $k => $v ) {
507
-			$f[ $k ] = $v;
507
+			$f[$k] = $v;
508 508
 		}
509 509
 
510 510
 		$update_values = self::migrate_field_placeholder( $f, 'default_blank' );
511 511
 		foreach ( $update_values as $k => $v ) {
512
-			$f[ $k ] = $v;
512
+			$f[$k] = $v;
513 513
 		}
514 514
 	}
515 515
 
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 	public static function migrate_field_placeholder( $field, $type ) {
524 524
 		$field = (array) $field;
525 525
 		$field_options = $field['field_options'];
526
-		if ( empty( $field_options[ $type ] ) || empty( $field['default_value'] ) ) {
526
+		if ( empty( $field_options[$type] ) || empty( $field['default_value'] ) ) {
527 527
 			return array();
528 528
 		}
529 529
 
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 				}
550 550
 
551 551
 				if ( $opt == $default_value ) {
552
-					unset( $options[ $opt_key ] );
552
+					unset( $options[$opt_key] );
553 553
 					break;
554 554
 				}
555 555
 			}
@@ -704,17 +704,17 @@  discard block
 block discarded – undo
704 704
 			self::update_postmeta( $post, $post_id );
705 705
 
706 706
 			$this_type = 'posts';
707
-			if ( isset( $post_types[ $post['post_type'] ] ) ) {
708
-				$this_type = $post_types[ $post['post_type'] ];
707
+			if ( isset( $post_types[$post['post_type']] ) ) {
708
+				$this_type = $post_types[$post['post_type']];
709 709
 			}
710 710
 
711 711
 			if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
712
-				$imported['updated'][ $this_type ] ++;
712
+				$imported['updated'][$this_type] ++;
713 713
 			} else {
714
-				$imported['imported'][ $this_type ] ++;
714
+				$imported['imported'][$this_type] ++;
715 715
 			}
716 716
 
717
-			$imported['posts'][ (int) $old_id ] = $post_id;
717
+			$imported['posts'][(int) $old_id] = $post_id;
718 718
 
719 719
 			do_action( 'frm_after_import_view', $post_id, $post );
720 720
 
@@ -731,9 +731,9 @@  discard block
 block discarded – undo
731 731
 			$post['attachment_url'] = (string) $item->attachment_url;
732 732
 		}
733 733
 
734
-		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
734
+		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][(int) $post['menu_order']] ) ) {
735 735
 			// update to new form id
736
-			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
736
+			$post['menu_order'] = $imported['forms'][(int) $post['menu_order']];
737 737
 		}
738 738
 
739 739
 		// Don't allow default styles to take over a site's default style
@@ -760,8 +760,8 @@  discard block
 block discarded – undo
760 760
 		);
761 761
 
762 762
 		//switch old form and field ids to new ones
763
-		if ( $m['key'] == 'frm_form_id' && isset( $imported['forms'][ (int) $m['value'] ] ) ) {
764
-			$m['value'] = $imported['forms'][ (int) $m['value'] ];
763
+		if ( $m['key'] == 'frm_form_id' && isset( $imported['forms'][(int) $m['value']] ) ) {
764
+			$m['value'] = $imported['forms'][(int) $m['value']];
765 765
 		} else {
766 766
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
767 767
 
@@ -772,15 +772,15 @@  discard block
 block discarded – undo
772 772
 				} elseif ( $m['key'] == 'frm_options' ) {
773 773
 
774 774
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
775
-						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
776
-							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
775
+						if ( isset( $m['value'][$setting_name] ) && is_numeric( $m['value'][$setting_name] ) && isset( $frm_duplicate_ids[$m['value'][$setting_name]] ) ) {
776
+							$m['value'][$setting_name] = $frm_duplicate_ids[$m['value'][$setting_name]];
777 777
 						}
778 778
 					}
779 779
 
780 780
 					$check_dup_array = array();
781 781
 					if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
782
-						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
783
-							$m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
782
+						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[$m['value']['order_by']] ) ) {
783
+							$m['value']['order_by'] = $frm_duplicate_ids[$m['value']['order_by']];
784 784
 						} elseif ( is_array( $m['value']['order_by'] ) ) {
785 785
 							$check_dup_array[] = 'order_by';
786 786
 						}
@@ -791,9 +791,9 @@  discard block
 block discarded – undo
791 791
 					}
792 792
 
793 793
 					foreach ( $check_dup_array as $check_k ) {
794
-						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
795
-							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
796
-								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
794
+						foreach ( (array) $m['value'][$check_k] as $mk => $mv ) {
795
+							if ( isset( $frm_duplicate_ids[$mv] ) ) {
796
+								$m['value'][$check_k][$mk] = $frm_duplicate_ids[$mv];
797 797
 							}
798 798
 							unset( $mk, $mv );
799 799
 						}
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
807 807
 		}
808 808
 
809
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
809
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
810 810
 	}
811 811
 
812 812
 	/**
@@ -834,11 +834,11 @@  discard block
 block discarded – undo
834 834
 				$name = (string) $c;
835 835
 			}
836 836
 
837
-			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
838
-				$post['tax_input'][ $taxonomy ] = array();
837
+			if ( ! isset( $post['tax_input'][$taxonomy] ) ) {
838
+				$post['tax_input'][$taxonomy] = array();
839 839
 			}
840 840
 
841
-			$post['tax_input'][ $taxonomy ][] = $name;
841
+			$post['tax_input'][$taxonomy][] = $name;
842 842
 			unset( $name );
843 843
 		}
844 844
 	}
@@ -937,7 +937,7 @@  discard block
 block discarded – undo
937 937
 
938 938
 		$message = '<ul>';
939 939
 		foreach ( $result as $type => $results ) {
940
-			if ( ! isset( $t_strings[ $type ] ) ) {
940
+			if ( ! isset( $t_strings[$type] ) ) {
941 941
 				// only print imported and updated
942 942
 				continue;
943 943
 			}
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
949 949
 			}
950 950
 
951 951
 			if ( ! empty( $s_message ) ) {
952
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
952
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
953 953
 				$message .= implode( ', ', $s_message );
954 954
 				$message .= '</li>';
955 955
 			}
@@ -989,7 +989,7 @@  discard block
 block discarded – undo
989 989
 			'actions' => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
990 990
 		);
991 991
 
992
-		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
992
+		$s_message[] = isset( $strings[$type] ) ? $strings[$type] : ' ' . $m . ' ' . ucfirst( $type );
993 993
 	}
994 994
 
995 995
 	/**
@@ -1120,10 +1120,10 @@  discard block
 block discarded – undo
1120 1120
 		$array_defaults = array_filter( $defaults, 'is_array' );
1121 1121
 		foreach ( $array_defaults as $d => $default ) {
1122 1122
 			// compare array defaults
1123
-			if ( $default == $saved[ $d ] ) {
1124
-				unset( $saved[ $d ] );
1123
+			if ( $default == $saved[$d] ) {
1124
+				unset( $saved[$d] );
1125 1125
 			}
1126
-			unset( $defaults[ $d ] );
1126
+			unset( $defaults[$d] );
1127 1127
 		}
1128 1128
 		$saved = array_diff_assoc( (array) $saved, $defaults );
1129 1129
 	}
@@ -1134,14 +1134,14 @@  discard block
 block discarded – undo
1134 1134
 	 * @since 3.06
1135 1135
 	 */
1136 1136
 	private static function remove_default_html( $html_name, $defaults, &$options ) {
1137
-		if ( ! isset( $options[ $html_name ] ) || ! isset( $defaults[ $html_name ] ) ) {
1137
+		if ( ! isset( $options[$html_name] ) || ! isset( $defaults[$html_name] ) ) {
1138 1138
 			return;
1139 1139
 		}
1140 1140
 
1141
-		$old_html     = str_replace( "\r\n", "\n", $options[ $html_name ] );
1142
-		$default_html = $defaults[ $html_name ];
1141
+		$old_html     = str_replace( "\r\n", "\n", $options[$html_name] );
1142
+		$default_html = $defaults[$html_name];
1143 1143
 		if ( $old_html == $default_html ) {
1144
-			unset( $options[ $html_name ] );
1144
+			unset( $options[$html_name] );
1145 1145
 
1146 1146
 			return;
1147 1147
 		}
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
 		// Account for some of the older field default HTML.
1150 1150
 		$default_html = str_replace( ' id="frm_desc_field_[key]"', '', $default_html );
1151 1151
 		if ( $old_html == $default_html ) {
1152
-			unset( $options[ $html_name ] );
1152
+			unset( $options[$html_name] );
1153 1153
 		}
1154 1154
 	}
1155 1155
 
@@ -1235,8 +1235,8 @@  discard block
 block discarded – undo
1235 1235
 		);
1236 1236
 
1237 1237
 		foreach ( $post_settings as $post_setting ) {
1238
-			if ( isset( $form_options[ $post_setting ] ) ) {
1239
-				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
1238
+			if ( isset( $form_options[$post_setting] ) ) {
1239
+				$new_action['post_content'][$post_setting] = $form_options[$post_setting];
1240 1240
 			}
1241 1241
 			unset( $post_setting );
1242 1242
 		}
@@ -1306,11 +1306,11 @@  discard block
 block discarded – undo
1306 1306
 		foreach ( $post_content as $key => $setting ) {
1307 1307
 			if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
1308 1308
 				// Replace old IDs with new IDs
1309
-				$post_content[ $key ] = str_replace( $old, $new, $setting );
1309
+				$post_content[$key] = str_replace( $old, $new, $setting );
1310 1310
 			} elseif ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
1311 1311
 				foreach ( $setting as $k => $val ) {
1312 1312
 					// Replace old IDs with new IDs
1313
-					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
1313
+					$post_content[$key][$k] = str_replace( $old, $new, $val );
1314 1314
 				}
1315 1315
 			}
1316 1316
 			unset( $key, $setting );
@@ -1386,8 +1386,8 @@  discard block
 block discarded – undo
1386 1386
 	private static function remove_deprecated_notification_settings( $form_id, $form_options ) {
1387 1387
 		$delete_settings = array( 'notification', 'autoresponder', 'email_to' );
1388 1388
 		foreach ( $delete_settings as $index ) {
1389
-			if ( isset( $form_options[ $index ] ) ) {
1390
-				unset( $form_options[ $index ] );
1389
+			if ( isset( $form_options[$index] ) ) {
1390
+				unset( $form_options[$index] );
1391 1391
 			}
1392 1392
 		}
1393 1393
 		FrmForm::update( $form_id, array( 'options' => $form_options ) );
@@ -1440,12 +1440,12 @@  discard block
 block discarded – undo
1440 1440
 			'reply_to_name' => '',
1441 1441
 		);
1442 1442
 		foreach ( $reply_fields as $f => $val ) {
1443
-			if ( isset( $notification[ $f ] ) ) {
1444
-				$atts[ $f ] = $notification[ $f ];
1445
-				if ( 'custom' == $notification[ $f ] ) {
1446
-					$atts[ $f ] = $notification[ 'cust_' . $f ];
1447
-				} elseif ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
1448
-					$atts[ $f ] = '[' . $atts[ $f ] . ']';
1443
+			if ( isset( $notification[$f] ) ) {
1444
+				$atts[$f] = $notification[$f];
1445
+				if ( 'custom' == $notification[$f] ) {
1446
+					$atts[$f] = $notification['cust_' . $f];
1447
+				} elseif ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
1448
+					$atts[$f] = '[' . $atts[$f] . ']';
1449 1449
 				}
1450 1450
 			}
1451 1451
 			unset( $f, $val );
@@ -1476,13 +1476,13 @@  discard block
 block discarded – undo
1476 1476
 		foreach ( $atts['email_to'] as $key => $email_field ) {
1477 1477
 
1478 1478
 			if ( is_numeric( $email_field ) ) {
1479
-				$atts['email_to'][ $key ] = '[' . $email_field . ']';
1479
+				$atts['email_to'][$key] = '[' . $email_field . ']';
1480 1480
 			}
1481 1481
 
1482 1482
 			if ( strpos( $email_field, '|' ) ) {
1483 1483
 				$email_opt = explode( '|', $email_field );
1484 1484
 				if ( isset( $email_opt[0] ) ) {
1485
-					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
1485
+					$atts['email_to'][$key] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
1486 1486
 				}
1487 1487
 				unset( $email_opt );
1488 1488
 			}
@@ -1503,12 +1503,12 @@  discard block
 block discarded – undo
1503 1503
 		// Add more fields to the new notification
1504 1504
 		$add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
1505 1505
 		foreach ( $add_fields as $add_field ) {
1506
-			if ( isset( $notification[ $add_field ] ) ) {
1507
-				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
1506
+			if ( isset( $notification[$add_field] ) ) {
1507
+				$new_notification['post_content'][$add_field] = $notification[$add_field];
1508 1508
 			} elseif ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
1509
-				$new_notification['post_content'][ $add_field ] = 0;
1509
+				$new_notification['post_content'][$add_field] = 0;
1510 1510
 			} else {
1511
-				$new_notification['post_content'][ $add_field ] = '';
1511
+				$new_notification['post_content'][$add_field] = '';
1512 1512
 			}
1513 1513
 			unset( $add_field );
1514 1514
 		}
@@ -1532,7 +1532,7 @@  discard block
 block discarded – undo
1532 1532
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
1533 1533
 			foreach ( $post_content['conditions'] as $email_key => $val ) {
1534 1534
 				if ( is_numeric( $email_key ) ) {
1535
-					$post_content['conditions'][ $email_key ] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
1535
+					$post_content['conditions'][$email_key] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
1536 1536
 				}
1537 1537
 				unset( $email_key, $val );
1538 1538
 			}
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,8 @@
 block discarded – undo
78 78
 
79 79
 		if ( ! isset( $imported['form_status'] ) || empty( $imported['form_status'] ) ) {
80 80
 			// Check for an error message in the XML.
81
-			if ( isset( $xml->Code ) && isset( $xml->Message ) ) { // phpcs:ignore WordPress.NamingConventions
81
+			if ( isset( $xml->Code ) && isset( $xml->Message ) ) {
82
+// phpcs:ignore WordPress.NamingConventions
82 83
 				$imported['error'] = reset( $xml->Message ); // phpcs:ignore WordPress.NamingConventions
83 84
 			}
84 85
 		}
Please login to merge, or discard this patch.
classes/controllers/FrmSettingsController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 				$section['function'] = $original;
116 116
 			}
117 117
 
118
-			$sections[ $key ] = $section;
118
+			$sections[$key] = $section;
119 119
 		}
120 120
 
121 121
 		return $sections;
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 
128 128
 		$section  = FrmAppHelper::get_post_param( 'tab', '', 'sanitize_text_field' );
129 129
 		$sections = self::get_settings_tabs();
130
-		if ( ! isset( $sections[ $section ] ) ) {
130
+		if ( ! isset( $sections[$section] ) ) {
131 131
 			wp_die();
132 132
 		}
133 133
 
134
-		$section = $sections[ $section ];
134
+		$section = $sections[$section];
135 135
 
136 136
 		if ( isset( $section['class'] ) ) {
137 137
 			call_user_func( array( $section['class'], $section['function'] ) );
Please login to merge, or discard this patch.
classes/controllers/FrmFormActionsController.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -98,19 +98,19 @@  discard block
 block discarded – undo
98 98
 		}
99 99
 
100 100
 		foreach ( $action_controls as $action ) {
101
-			if ( isset( $groups[ $action->id_base ] ) || in_array( $action->id_base, $grouped ) ) {
101
+			if ( isset( $groups[$action->id_base] ) || in_array( $action->id_base, $grouped ) ) {
102 102
 				continue;
103 103
 			}
104 104
 
105 105
 			$this_group = $action->action_options['group'];
106
-			if ( ! isset( $groups[ $this_group ] ) ) {
106
+			if ( ! isset( $groups[$this_group] ) ) {
107 107
 				$this_group = 'misc';
108 108
 			}
109 109
 
110
-			if ( ! isset( $groups[ $this_group ]['actions'] ) ) {
111
-				$groups[ $this_group ]['actions'] = array();
110
+			if ( ! isset( $groups[$this_group]['actions'] ) ) {
111
+				$groups[$this_group]['actions'] = array();
112 112
 			}
113
-			$groups[ $this_group ]['actions'][] = $action->id_base;
113
+			$groups[$this_group]['actions'][] = $action->id_base;
114 114
 
115 115
 			unset( $action );
116 116
 		}
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 				return $a;
242 242
 			}
243 243
 
244
-			$actions[ $a->id_base ] = $a;
244
+			$actions[$a->id_base] = $a;
245 245
 		}
246 246
 
247 247
 		return $actions;
@@ -272,16 +272,16 @@  discard block
 block discarded – undo
272 272
 		$action_map = array();
273 273
 
274 274
 		foreach ( $action_controls as $key => $control ) {
275
-			$action_map[ $control->id_base ] = $key;
275
+			$action_map[$control->id_base] = $key;
276 276
 		}
277 277
 
278 278
 		foreach ( $form_actions as $action ) {
279
-			if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
279
+			if ( ! isset( $action_map[$action->post_excerpt] ) ) {
280 280
 				// don't try and show settings if action no longer exists
281 281
 				continue;
282 282
 			}
283 283
 
284
-			self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
284
+			self::action_control( $action, $form, $action->ID, $action_controls[$action_map[$action->post_excerpt]], $values );
285 285
 		}
286 286
 	}
287 287
 
@@ -489,8 +489,8 @@  discard block
 block discarded – undo
489 489
 			}
490 490
 
491 491
 			// Store actions so they can be triggered with the correct priority.
492
-			$stored_actions[ $action->ID ]  = $action;
493
-			$action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
492
+			$stored_actions[$action->ID]  = $action;
493
+			$action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
494 494
 
495 495
 			unset( $action );
496 496
 		}
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 			new FrmNotification();
503 503
 
504 504
 			foreach ( $action_priority as $action_id => $priority ) {
505
-				$action = $stored_actions[ $action_id ];
505
+				$action = $stored_actions[$action_id];
506 506
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_action', $action, $entry, $form, $event );
507 507
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_' . $event . '_action', $action, $entry, $form );
508 508
 
@@ -549,12 +549,12 @@  discard block
 block discarded – undo
549 549
 	}
550 550
 
551 551
 	public function register( $action_class ) {
552
-		$this->actions[ $action_class ] = new $action_class();
552
+		$this->actions[$action_class] = new $action_class();
553 553
 	}
554 554
 
555 555
 	public function unregister( $action_class ) {
556
-		if ( isset( $this->actions[ $action_class ] ) ) {
557
-			unset( $this->actions[ $action_class ] );
556
+		if ( isset( $this->actions[$action_class] ) ) {
557
+			unset( $this->actions[$action_class] );
558 558
 		}
559 559
 	}
560 560
 
@@ -563,8 +563,8 @@  discard block
 block discarded – undo
563 563
 
564 564
 		foreach ( $keys as $key ) {
565 565
 			// don't register new action if old action with the same id is already registered
566
-			if ( ! isset( $this->actions[ $key ] ) ) {
567
-				$this->actions[ $key ]->_register();
566
+			if ( ! isset( $this->actions[$key] ) ) {
567
+				$this->actions[$key]->_register();
568 568
 			}
569 569
 		}
570 570
 	}
Please login to merge, or discard this patch.
classes/views/frm-forms/list-templates.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
30 30
 			</li>
31 31
 			<?php
32 32
 			foreach ( array( 20872734, 20874748, 20882522, 20874739 ) as $template ) {
33
-				if ( ! isset( $templates[ $template ] ) ) {
33
+				if ( ! isset( $templates[$template] ) ) {
34 34
 					continue;
35 35
 				}
36 36
 
37
-				$template      = $templates[ $template ];
37
+				$template      = $templates[$template];
38 38
 				$plan_required = FrmFormsHelper::get_plan_required( $template );
39 39
 				$link          = FrmFormsHelper::get_template_install_link( $template, compact( 'pricing', 'license_type', 'plan_required' ) );
40 40
 				?>
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 					</div>
139 139
 				</td>
140 140
 				</tr>
141
-				<?php unset( $template, $templates[ $k ] ); ?>
141
+				<?php unset( $template, $templates[$k] ); ?>
142 142
 			<?php } ?>
143 143
 		</tbody>
144 144
 </table>
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 							</div>
239 239
 						</td>
240 240
 					</tr>
241
-					<?php unset( $template, $templates[ $k ] ); ?>
241
+					<?php unset( $template, $templates[$k] ); ?>
242 242
 				<?php } ?>
243 243
 				</tbody>
244 244
 			</table>
Please login to merge, or discard this patch.