Completed
Branch master (69f8ff)
by Stephanie
26s
created
classes/models/FrmFieldValue.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@
 block discarded – undo
59 59
 	protected function init_saved_value( $entry ) {
60 60
 		if ( $this->field->type === 'html' ) {
61 61
 			$this->saved_value = $this->field->description;
62
-		} elseif ( isset( $entry->metas[ $this->field->id ] ) ) {
63
-			$this->saved_value = $entry->metas[ $this->field->id ];
62
+		} elseif ( isset( $entry->metas[$this->field->id] ) ) {
63
+			$this->saved_value = $entry->metas[$this->field->id];
64 64
 		} else {
65 65
 			$this->saved_value = '';
66 66
 		}
Please login to merge, or discard this patch.
classes/views/frm-form-actions/_action_inside.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 	$event_labels = FrmFormAction::trigger_labels();
37 37
 	foreach ( $action_control->action_options['event'] as $event ) {
38 38
 		?>
39
-		<option value="<?php echo esc_attr( $event ); ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo esc_html( isset( $event_labels[ $event ] ) ? $event_labels[ $event ] : $event ); ?></option>
39
+		<option value="<?php echo esc_attr( $event ); ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo esc_html( isset( $event_labels[$event] ) ? $event_labels[$event] : $event ); ?></option>
40 40
 <?php } ?>
41 41
 		</select>
42 42
 	</p>
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/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.
deprecated/FrmDeprecated.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
25 25
 
26 26
 		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
27
-		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
27
+		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[$action];
28 28
 
29 29
 		if ( $action === 'create' ) {
30 30
 			FrmFormsController::update( $values );
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 		}
33 33
 
34 34
 		$values = FrmFormsHelper::setup_new_vars( $values );
35
-		$id   = FrmForm::create( $values );
35
+		$id = FrmForm::create( $values );
36 36
 		$values['id'] = $id;
37 37
 
38 38
 		FrmFormsController::edit( $values );
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
 		$path = untrailingslashit( trim( $path ) );
458 458
 		$templates = glob( $path . '/*.php' );
459 459
 
460
-		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
461
-			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
460
+		for ( $i = count( $templates ) - 1; $i >= 0; $i -- ) {
461
+			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[$i] ) );
462 462
 			$template_query = array( 'form_key' => $filename );
463 463
 			if ( $template ) {
464 464
 				$template_query['is_template'] = 1;
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 			$values['is_template'] = $template;
474 474
 			$values['status'] = 'published';
475 475
 
476
-			include( $templates[ $i ] );
476
+			include( $templates[$i] );
477 477
 
478 478
 			//get updated form
479 479
 			if ( isset( $form ) && ! empty( $form ) ) {
Please login to merge, or discard this patch.
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -749,8 +749,8 @@  discard block
 block discarded – undo
749 749
 	 */
750 750
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
751 751
 		_deprecated_function( __FUNCTION__, '3.0', 'FrmShortcodeHelper::get_shortcode_tag' );
752
-        return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
753
-    }
752
+		return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
753
+	}
754 754
 
755 755
 	/**
756 756
 	 * @deprecated 3.01
@@ -763,52 +763,52 @@  discard block
 block discarded – undo
763 763
 	/**
764 764
 	 * @deprecated 3.02.03
765 765
 	 */
766
-    public static function jquery_themes() {
766
+	public static function jquery_themes() {
767 767
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::jquery_themes' );
768 768
 
769
-        $themes = array(
770
-            'ui-lightness'  => 'UI Lightness',
771
-            'ui-darkness'   => 'UI Darkness',
772
-            'smoothness'    => 'Smoothness',
773
-            'start'         => 'Start',
774
-            'redmond'       => 'Redmond',
775
-            'sunny'         => 'Sunny',
776
-            'overcast'      => 'Overcast',
777
-            'le-frog'       => 'Le Frog',
778
-            'flick'         => 'Flick',
769
+		$themes = array(
770
+			'ui-lightness'  => 'UI Lightness',
771
+			'ui-darkness'   => 'UI Darkness',
772
+			'smoothness'    => 'Smoothness',
773
+			'start'         => 'Start',
774
+			'redmond'       => 'Redmond',
775
+			'sunny'         => 'Sunny',
776
+			'overcast'      => 'Overcast',
777
+			'le-frog'       => 'Le Frog',
778
+			'flick'         => 'Flick',
779 779
 			'pepper-grinder' => 'Pepper Grinder',
780
-            'eggplant'      => 'Eggplant',
781
-            'dark-hive'     => 'Dark Hive',
782
-            'cupertino'     => 'Cupertino',
783
-            'south-street'  => 'South Street',
784
-            'blitzer'       => 'Blitzer',
785
-            'humanity'      => 'Humanity',
786
-            'hot-sneaks'    => 'Hot Sneaks',
787
-            'excite-bike'   => 'Excite Bike',
788
-            'vader'         => 'Vader',
789
-            'dot-luv'       => 'Dot Luv',
790
-            'mint-choc'     => 'Mint Choc',
791
-            'black-tie'     => 'Black Tie',
792
-            'trontastic'    => 'Trontastic',
793
-            'swanky-purse'  => 'Swanky Purse',
794
-        );
780
+			'eggplant'      => 'Eggplant',
781
+			'dark-hive'     => 'Dark Hive',
782
+			'cupertino'     => 'Cupertino',
783
+			'south-street'  => 'South Street',
784
+			'blitzer'       => 'Blitzer',
785
+			'humanity'      => 'Humanity',
786
+			'hot-sneaks'    => 'Hot Sneaks',
787
+			'excite-bike'   => 'Excite Bike',
788
+			'vader'         => 'Vader',
789
+			'dot-luv'       => 'Dot Luv',
790
+			'mint-choc'     => 'Mint Choc',
791
+			'black-tie'     => 'Black Tie',
792
+			'trontastic'    => 'Trontastic',
793
+			'swanky-purse'  => 'Swanky Purse',
794
+		);
795 795
 
796 796
 		$themes = apply_filters( 'frm_jquery_themes', $themes );
797
-        return $themes;
798
-    }
797
+		return $themes;
798
+	}
799 799
 
800 800
 	/**
801 801
 	 * @deprecated 3.02.03
802 802
 	 */
803
-    public static function enqueue_jquery_css() {
803
+	public static function enqueue_jquery_css() {
804 804
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::enqueue_jquery_css' );
805 805
 
806 806
 		$form = self::get_form_for_page();
807 807
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
808
-        if ( $theme_css != -1 ) {
808
+		if ( $theme_css != -1 ) {
809 809
 			wp_enqueue_style( 'jquery-theme', self::jquery_css_url( $theme_css ), array(), FrmAppHelper::plugin_version() );
810
-        }
811
-    }
810
+		}
811
+	}
812 812
 
813 813
 	/**
814 814
 	 * @deprecated 3.02.03
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
 		}
822 822
 
823 823
 		return FrmProStylesController::jquery_css_url( $theme_css );
824
-    }
824
+	}
825 825
 
826 826
 	/**
827 827
 	 * @deprecated 3.02.03
Please login to merge, or discard this patch.
classes/models/FrmUsage.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 		foreach ( $pass_settings as $setting ) {
141 141
 			if ( isset( $settings_list->$setting ) ) {
142
-				$settings[ $setting ] = $this->maybe_json( $settings_list->$setting );
142
+				$settings[$setting] = $this->maybe_json( $settings_list->$setting );
143 143
 			}
144 144
 		}
145 145
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 
172 172
 		$message_settings = array();
173 173
 		foreach ( $messages as $message ) {
174
-			$message_settings[ $message ] = $settings_list->$message;
174
+			$message_settings[$message] = $settings_list->$message;
175 175
 		}
176 176
 
177 177
 		return $message_settings;
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 
190 190
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
191 191
 			if ( isset( $settings_list->$frm_role ) ) {
192
-				$permissions[ $frm_role ] = $settings_list->$frm_role;
192
+				$permissions[$frm_role] = $settings_list->$frm_role;
193 193
 			}
194 194
 		}
195 195
 
@@ -256,8 +256,8 @@  discard block
 block discarded – undo
256 256
 			);
257 257
 
258 258
 			foreach ( $settings as $setting ) {
259
-				if ( isset( $form->options[ $setting ] ) ) {
260
-					$new_form[ $setting ] = $this->maybe_json( $form->options[ $setting ] );
259
+				if ( isset( $form->options[$setting] ) ) {
260
+					$new_form[$setting] = $this->maybe_json( $form->options[$setting] );
261 261
 				}
262 262
 			}
263 263
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 	 * @return array
309 309
 	 */
310 310
 	private function fields() {
311
-		$args   = array(
311
+		$args = array(
312 312
 			'limit'    => 50,
313 313
 			'order_by' => 'id DESC',
314 314
 		);
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		$fields = FrmDb::get_results( 'frm_fields', array(), 'form_id, name, type, field_options', $args );
317 317
 		foreach ( $fields as $k => $field ) {
318 318
 			FrmAppHelper::unserialize_or_decode( $field->field_options );
319
-			$fields[ $k ]->field_options = json_encode( $field->field_options );
319
+			$fields[$k]->field_options = json_encode( $field->field_options );
320 320
 		}
321 321
 		return $fields;
322 322
 	}
Please login to merge, or discard this patch.