Completed
Pull Request — master (#601)
by Stephanie
42s
created
classes/controllers/FrmFormsController.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1082,7 +1082,8 @@
 block discarded – undo
1082 1082
 	private static function maybe_get_form_to_show( $id ) {
1083 1083
 		$form = false;
1084 1084
 
1085
-		if ( ! empty( $id ) ) { // no form id or key set
1085
+		if ( ! empty( $id ) ) {
1086
+// no form id or key set
1086 1087
 			$form = FrmForm::getOne( $id );
1087 1088
 			if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
1088 1089
 				$form = false;
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -443,11 +443,11 @@  discard block
 block discarded – undo
443 443
 			),
444 444
 		);
445 445
 
446
-		if ( ! isset( $available_status[ $status ] ) ) {
446
+		if ( ! isset( $available_status[$status] ) ) {
447 447
 			return;
448 448
 		}
449 449
 
450
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
450
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
451 451
 
452 452
 		$params = FrmForm::list_page_params();
453 453
 
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 		check_admin_referer( $status . '_form_' . $params['id'] );
456 456
 
457 457
 		$count = 0;
458
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
458
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
459 459
 			$count ++;
460 460
 		}
461 461
 
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
473 473
 		$available_status['trash']['message']   = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
474 474
 
475
-		$message = $available_status[ $status ]['message'];
475
+		$message = $available_status[$status]['message'];
476 476
 
477 477
 		self::display_forms_list( $params, $message );
478 478
 	}
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 				'type'  => 'request',
494 494
 			)
495 495
 		);
496
-		$message      = sprintf(
496
+		$message = sprintf(
497 497
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
498 498
 			_n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ),
499 499
 			$count,
@@ -858,11 +858,11 @@  discard block
 block discarded – undo
858 858
 			}
859 859
 
860 860
 			foreach ( $template['categories'] as $category ) {
861
-				if ( ! isset( $templates_by_category[ $category ] ) ) {
862
-					$templates_by_category[ $category ] = array();
861
+				if ( ! isset( $templates_by_category[$category] ) ) {
862
+					$templates_by_category[$category] = array();
863 863
 				}
864 864
 
865
-				$templates_by_category[ $category ][] = $template;
865
+				$templates_by_category[$category][] = $template;
866 866
 			}
867 867
 		}
868 868
 		unset( $template );
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 		$forms                    = FrmForm::get_published_forms( $where );
892 892
 		$view_path                = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
893 893
 
894
-		$templates_by_category[ $my_templates_translation ] = $custom_templates;
894
+		$templates_by_category[$my_templates_translation] = $custom_templates;
895 895
 
896 896
 		unset( $pricing, $license_type, $where );
897 897
 		wp_enqueue_script( 'accordion' ); // register accordion for template groups
@@ -1125,7 +1125,7 @@  discard block
 block discarded – undo
1125 1125
 				$section['id'] = $section['anchor'];
1126 1126
 			}
1127 1127
 
1128
-			$sections[ $key ] = $section;
1128
+			$sections[$key] = $section;
1129 1129
 		}
1130 1130
 
1131 1131
 		return $sections;
@@ -1228,7 +1228,7 @@  discard block
 block discarded – undo
1228 1228
 		if ( ! empty( $user_fields ) ) {
1229 1229
 			$user_helpers = array();
1230 1230
 			foreach ( $user_fields as $uk => $uf ) {
1231
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1231
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1232 1232
 				unset( $uk, $uf );
1233 1233
 			}
1234 1234
 
@@ -1358,7 +1358,7 @@  discard block
 block discarded – undo
1358 1358
 		if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1359 1359
 			$frm_vars['js_validate_forms'] = array();
1360 1360
 		}
1361
-		$frm_vars['js_validate_forms'][ $form->id ] = $form;
1361
+		$frm_vars['js_validate_forms'][$form->id] = $form;
1362 1362
 	}
1363 1363
 
1364 1364
 	public static function get_email_html() {
@@ -1479,7 +1479,7 @@  discard block
 block discarded – undo
1479 1479
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1480 1480
 			} else {
1481 1481
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1482
-				$action = $vars[ $action ];
1482
+				$action = $vars[$action];
1483 1483
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
1484 1484
 				$_REQUEST = array_merge( $_REQUEST, $vars );
1485 1485
 				$_POST    = array_merge( $_POST, $_REQUEST );
@@ -1605,7 +1605,7 @@  discard block
 block discarded – undo
1605 1605
 		$actions = array();
1606 1606
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
1607 1607
 			if ( is_object( $form ) ) {
1608
-				$actions[ $form->id ] = $form->name;
1608
+				$actions[$form->id] = $form->name;
1609 1609
 			}
1610 1610
 			unset( $form );
1611 1611
 		}
@@ -1814,8 +1814,8 @@  discard block
 block discarded – undo
1814 1814
 	private static function get_saved_errors( $form, $params ) {
1815 1815
 		global $frm_vars;
1816 1816
 
1817
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
1818
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
1817
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) {
1818
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
1819 1819
 		} else {
1820 1820
 			$errors = array();
1821 1821
 		}
@@ -1829,7 +1829,7 @@  discard block
 block discarded – undo
1829 1829
 	public static function just_created_entry( $form_id ) {
1830 1830
 		global $frm_vars;
1831 1831
 
1832
-		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
1832
+		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form_id] ) && isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) ? $frm_vars['created_entries'][$form_id]['entry_id'] : 0;
1833 1833
 	}
1834 1834
 
1835 1835
 	/**
@@ -1837,7 +1837,7 @@  discard block
 block discarded – undo
1837 1837
 	 */
1838 1838
 	private static function get_confirmation_method( $atts ) {
1839 1839
 		$opt    = 'success_action';
1840
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
1840
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
1841 1841
 		$method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
1842 1842
 
1843 1843
 		if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
@@ -1850,7 +1850,7 @@  discard block
 block discarded – undo
1850 1850
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
1851 1851
 		if ( ! isset( $params['id'] ) ) {
1852 1852
 			global $frm_vars;
1853
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
1853
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
1854 1854
 		}
1855 1855
 
1856 1856
 		$conf_method = self::get_confirmation_method(
@@ -1894,7 +1894,7 @@  discard block
 block discarded – undo
1894 1894
 		$opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
1895 1895
 
1896 1896
 		$args['success_opt'] = $opt;
1897
-		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
1897
+		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
1898 1898
 			self::load_page_after_submit( $args );
1899 1899
 		} elseif ( $args['conf_method'] === 'redirect' ) {
1900 1900
 			self::redirect_after_submit( $args );
@@ -1909,8 +1909,8 @@  discard block
 block discarded – undo
1909 1909
 	private static function load_page_after_submit( $args ) {
1910 1910
 		global $post;
1911 1911
 		$opt = $args['success_opt'];
1912
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
1913
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
1912
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
1913
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
1914 1914
 			$old_post = $post;
1915 1915
 			$post     = $page;
1916 1916
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -1928,11 +1928,11 @@  discard block
 block discarded – undo
1928 1928
 		add_filter( 'frm_use_wpautop', '__return_false' );
1929 1929
 
1930 1930
 		$opt         = $args['success_opt'];
1931
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
1931
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
1932 1932
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
1933 1933
 		$success_url = do_shortcode( $success_url );
1934 1934
 
1935
-		$success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
1935
+		$success_msg = isset( $args['form']->options[$opt . '_msg'] ) ? $args['form']->options[$opt . '_msg'] : __( 'Please wait while you are redirected.', 'formidable' );
1936 1936
 
1937 1937
 		$redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
1938 1938
 
@@ -2070,7 +2070,7 @@  discard block
 block discarded – undo
2070 2070
 			'description' => false,
2071 2071
 			'reset'       => false,
2072 2072
 		);
2073
-		$args     = wp_parse_args( $args, $defaults );
2073
+		$args = wp_parse_args( $args, $defaults );
2074 2074
 	}
2075 2075
 
2076 2076
 	/**
Please login to merge, or discard this patch.
classes/models/FrmEntryShortcodeFormatter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
 			'type'  => $field->type,
286 286
 		);
287 287
 
288
-		$this->array_content[ $field->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
288
+		$this->array_content[$field->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
289 289
 	}
290 290
 
291 291
 	/**
Please login to merge, or discard this patch.
classes/views/xml/xml.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,17 +7,17 @@  discard block
 block discarded – undo
7 7
 <?php
8 8
 foreach ( $type as $tb_type ) {
9 9
 
10
-	if ( ! isset( $tables[ $tb_type ] ) ) {
10
+	if ( ! isset( $tables[$tb_type] ) ) {
11 11
 		do_action( 'frm_xml_import_' . $tb_type, $args );
12 12
 		continue;
13 13
 	}
14 14
 
15 15
 	//no records
16
-	if ( ! isset( $records[ $tb_type ] ) ) {
16
+	if ( ! isset( $records[$tb_type] ) ) {
17 17
 		continue;
18 18
 	}
19 19
 
20
-	$item_ids = $records[ $tb_type ];
20
+	$item_ids = $records[$tb_type];
21 21
 	if ( in_array( $tb_type, array( 'styles', 'actions' ), true ) ) {
22 22
 		include( dirname( __FILE__ ) . '/posts_xml.php' );
23 23
 	} elseif ( file_exists( dirname( __FILE__ ) . '/' . $tb_type . '_xml.php' ) ) {
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		include( FrmProAppHelper::plugin_path() . '/classes/views/xml/' . $tb_type . '_xml.php' );
27 27
 	}
28 28
 
29
-	unset( $item_ids, $records[ $tb_type ], $tb_type );
29
+	unset( $item_ids, $records[$tb_type], $tb_type );
30 30
 }
31 31
 
32 32
 ?>
Please login to merge, or discard this patch.
classes/models/FrmEntryValues.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
 	 * @return array
137 137
 	 */
138 138
 	private function prepare_array_property( $index, $atts ) {
139
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
139
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
140 140
 
141
-			if ( is_array( $atts[ $index ] ) ) {
142
-				$property = $atts[ $index ];
141
+			if ( is_array( $atts[$index] ) ) {
142
+				$property = $atts[$index];
143 143
 			} else {
144
-				$property = explode( ',', $atts[ $index ] );
144
+				$property = explode( ',', $atts[$index] );
145 145
 			}
146 146
 		} else {
147 147
 			$property = array();
@@ -274,6 +274,6 @@  discard block
 block discarded – undo
274 274
 	 * @param stdClass $field
275 275
 	 */
276 276
 	protected function add_field_values( $field ) {
277
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
277
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
278 278
 	}
279 279
 }
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldNumber.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 		//validate the number format
45 45
 		if ( ! is_numeric( $args['value'] ) && '' !== $args['value'] ) {
46
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
46
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
47 47
 		}
48 48
 
49 49
 		// validate number settings
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 			if ( $frm_settings->use_html && $maxnum !== '' && $minnum !== '' ) {
56 56
 				$value = (float) $args['value'];
57 57
 				if ( $value < $minnum ) {
58
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
58
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
59 59
 				} elseif ( $value > $maxnum ) {
60
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
60
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
61 61
 				}
62 62
 			}
63 63
 		}
Please login to merge, or discard this patch.
classes/models/FrmInstallerSkin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 	 */
22 22
 	public function set_upgrader( &$upgrader ) {
23 23
 		if ( is_object( $upgrader ) ) {
24
-			$this->upgrader =& $upgrader;
24
+			$this->upgrader = & $upgrader;
25 25
 		}
26 26
 	}
27 27
 
Please login to merge, or discard this patch.
classes/models/FrmAddon.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -306,7 +306,8 @@  discard block
 block discarded – undo
306 306
 
307 307
 		if ( isset( $version_info->new_version ) && ! empty( $version_info->new_version ) ) {
308 308
 			$this->clear_old_plugin_version( $version_info );
309
-			if ( $version_info === false ) { // was cleared with timeout
309
+			if ( $version_info === false ) {
310
+// was cleared with timeout
310 311
 				$transient = false;
311 312
 			} else {
312 313
 				$this->maybe_use_beta_url( $version_info );
@@ -393,7 +394,8 @@  discard block
 block discarded – undo
393 394
 	}
394 395
 
395 396
 	private function is_license_revoked() {
396
-		if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) { // WPCS: CSRF ok.
397
+		if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) {
398
+// WPCS: CSRF ok.
397 399
 			return;
398 400
 		}
399 401
 
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	}
42 42
 
43 43
 	public function insert_installed_addon( $plugins ) {
44
-		$plugins[ $this->plugin_slug ] = $this;
44
+		$plugins[$this->plugin_slug] = $this;
45 45
 
46 46
 		return $plugins;
47 47
 	}
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	public static function get_addon( $plugin_slug ) {
50 50
 		$plugins = apply_filters( 'frm_installed_addons', array() );
51 51
 		$plugin  = false;
52
-		if ( isset( $plugins[ $plugin_slug ] ) ) {
53
-			$plugin = $plugins[ $plugin_slug ];
52
+		if ( isset( $plugins[$plugin_slug] ) ) {
53
+			$plugin = $plugins[$plugin_slug];
54 54
 		}
55 55
 
56 56
 		return $plugin;
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		} else {
110 110
 			$api     = FrmFormApi::get_instance( $this->license );
111 111
 			$plugins = $api->get_api_info();
112
-			$_data   = $plugins[ $item_id ];
112
+			$_data   = $plugins[$item_id];
113 113
 		}
114 114
 
115 115
 		$_data['sections'] = array(
@@ -331,19 +331,19 @@  discard block
 block discarded – undo
331 331
 
332 332
 		if ( $this->is_current_version( $transient ) ) {
333 333
 			//make sure it doesn't show there is an update if plugin is up-to-date
334
-			if ( isset( $transient->response[ $this->plugin_folder ] ) ) {
335
-				unset( $transient->response[ $this->plugin_folder ] );
334
+			if ( isset( $transient->response[$this->plugin_folder] ) ) {
335
+				unset( $transient->response[$this->plugin_folder] );
336 336
 			}
337
-		} elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) {
338
-			$this->prepare_update_details( $transient->response[ $this->plugin_folder ] );
337
+		} elseif ( isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) ) {
338
+			$this->prepare_update_details( $transient->response[$this->plugin_folder] );
339 339
 
340 340
 			// if the transient has expired, clear the update and trigger it again
341
-			if ( $transient->response[ $this->plugin_folder ] === false ) {
341
+			if ( $transient->response[$this->plugin_folder] === false ) {
342 342
 				if ( ! $this->has_been_cleared() ) {
343 343
 					$this->cleared_plugins();
344 344
 					$this->manually_queue_update();
345 345
 				}
346
-				unset( $transient->response[ $this->plugin_folder ] );
346
+				unset( $transient->response[$this->plugin_folder] );
347 347
 			}
348 348
 		}
349 349
 
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 	}
432 432
 
433 433
 	private function is_current_version( $transient ) {
434
-		if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) {
434
+		if ( empty( $transient->checked ) || ! isset( $transient->checked[$this->plugin_folder] ) ) {
435 435
 			return false;
436 436
 		}
437 437
 
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 			return true;
441 441
 		}
442 442
 
443
-		return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version;
443
+		return isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) && $transient->checked[$this->plugin_folder] === $transient->response[$this->plugin_folder]->new_version;
444 444
 	}
445 445
 
446 446
 	private function has_been_cleared() {
@@ -531,8 +531,8 @@  discard block
 block discarded – undo
531 531
 			$response['message'] = $response['status'];
532 532
 		} else {
533 533
 			$messages = $this->get_messages();
534
-			if ( is_string( $response['status'] ) && isset( $messages[ $response['status'] ] ) ) {
535
-				$response['message'] = $messages[ $response['status'] ];
534
+			if ( is_string( $response['status'] ) && isset( $messages[$response['status']] ) ) {
535
+				$response['message'] = $messages[$response['status']];
536 536
 			} else {
537 537
 				$response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) );
538 538
 			}
Please login to merge, or discard this patch.
deprecated/FrmDeprecated.php 2 patches
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -624,8 +624,8 @@  discard block
 block discarded – undo
624 624
 	 */
625 625
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
626 626
 		_deprecated_function( __FUNCTION__, '3.0', 'FrmShortcodeHelper::get_shortcode_tag' );
627
-        return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
628
-    }
627
+		return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
628
+	}
629 629
 
630 630
 	/**
631 631
 	 * @deprecated 3.01
@@ -638,52 +638,52 @@  discard block
 block discarded – undo
638 638
 	/**
639 639
 	 * @deprecated 3.02.03
640 640
 	 */
641
-    public static function jquery_themes() {
641
+	public static function jquery_themes() {
642 642
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::jquery_themes' );
643 643
 
644
-        $themes = array(
645
-            'ui-lightness'  => 'UI Lightness',
646
-            'ui-darkness'   => 'UI Darkness',
647
-            'smoothness'    => 'Smoothness',
648
-            'start'         => 'Start',
649
-            'redmond'       => 'Redmond',
650
-            'sunny'         => 'Sunny',
651
-            'overcast'      => 'Overcast',
652
-            'le-frog'       => 'Le Frog',
653
-            'flick'         => 'Flick',
644
+		$themes = array(
645
+			'ui-lightness'  => 'UI Lightness',
646
+			'ui-darkness'   => 'UI Darkness',
647
+			'smoothness'    => 'Smoothness',
648
+			'start'         => 'Start',
649
+			'redmond'       => 'Redmond',
650
+			'sunny'         => 'Sunny',
651
+			'overcast'      => 'Overcast',
652
+			'le-frog'       => 'Le Frog',
653
+			'flick'         => 'Flick',
654 654
 			'pepper-grinder' => 'Pepper Grinder',
655
-            'eggplant'      => 'Eggplant',
656
-            'dark-hive'     => 'Dark Hive',
657
-            'cupertino'     => 'Cupertino',
658
-            'south-street'  => 'South Street',
659
-            'blitzer'       => 'Blitzer',
660
-            'humanity'      => 'Humanity',
661
-            'hot-sneaks'    => 'Hot Sneaks',
662
-            'excite-bike'   => 'Excite Bike',
663
-            'vader'         => 'Vader',
664
-            'dot-luv'       => 'Dot Luv',
665
-            'mint-choc'     => 'Mint Choc',
666
-            'black-tie'     => 'Black Tie',
667
-            'trontastic'    => 'Trontastic',
668
-            'swanky-purse'  => 'Swanky Purse',
669
-        );
655
+			'eggplant'      => 'Eggplant',
656
+			'dark-hive'     => 'Dark Hive',
657
+			'cupertino'     => 'Cupertino',
658
+			'south-street'  => 'South Street',
659
+			'blitzer'       => 'Blitzer',
660
+			'humanity'      => 'Humanity',
661
+			'hot-sneaks'    => 'Hot Sneaks',
662
+			'excite-bike'   => 'Excite Bike',
663
+			'vader'         => 'Vader',
664
+			'dot-luv'       => 'Dot Luv',
665
+			'mint-choc'     => 'Mint Choc',
666
+			'black-tie'     => 'Black Tie',
667
+			'trontastic'    => 'Trontastic',
668
+			'swanky-purse'  => 'Swanky Purse',
669
+		);
670 670
 
671 671
 		$themes = apply_filters( 'frm_jquery_themes', $themes );
672
-        return $themes;
673
-    }
672
+		return $themes;
673
+	}
674 674
 
675 675
 	/**
676 676
 	 * @deprecated 3.02.03
677 677
 	 */
678
-    public static function enqueue_jquery_css() {
678
+	public static function enqueue_jquery_css() {
679 679
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::enqueue_jquery_css' );
680 680
 
681 681
 		$form = self::get_form_for_page();
682 682
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
683
-        if ( $theme_css != -1 ) {
683
+		if ( $theme_css != -1 ) {
684 684
 			wp_enqueue_style( 'jquery-theme', self::jquery_css_url( $theme_css ), array(), FrmAppHelper::plugin_version() );
685
-        }
686
-    }
685
+		}
686
+	}
687 687
 
688 688
 	/**
689 689
 	 * @deprecated 3.02.03
@@ -691,26 +691,26 @@  discard block
 block discarded – undo
691 691
 	public static function jquery_css_url( $theme_css ) {
692 692
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::jquery_css_url' );
693 693
 
694
-        if ( $theme_css == -1 ) {
695
-            return;
696
-        }
694
+		if ( $theme_css == -1 ) {
695
+			return;
696
+		}
697 697
 
698
-        if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
699
-            $css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
698
+		if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
699
+			$css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
700 700
 		} elseif ( preg_match( '/^http.?:\/\/.*\..*$/', $theme_css ) ) {
701
-            $css_file = $theme_css;
702
-        } else {
703
-            $uploads = FrmStylesHelper::get_upload_base();
701
+			$css_file = $theme_css;
702
+		} else {
703
+			$uploads = FrmStylesHelper::get_upload_base();
704 704
 			$file_path = '/formidable/css/' . $theme_css . '/jquery-ui.css';
705 705
 			if ( file_exists( $uploads['basedir'] . $file_path ) ) {
706
-                $css_file = $uploads['baseurl'] . $file_path;
707
-            } else {
706
+				$css_file = $uploads['baseurl'] . $file_path;
707
+			} else {
708 708
 				$css_file = FrmAppHelper::jquery_ui_base_url() . '/themes/' . $theme_css . '/jquery-ui.min.css';
709
-            }
710
-        }
709
+			}
710
+		}
711 711
 
712
-        return $css_file;
713
-    }
712
+		return $css_file;
713
+	}
714 714
 
715 715
 	/**
716 716
 	 * @deprecated 3.02.03
Please login to merge, or discard this patch.
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.
deprecated/FrmEDD_SL_Plugin_Updater.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -297,11 +297,13 @@
 block discarded – undo
297 297
 
298 298
 		global $frm_edd_plugin_data;
299 299
 
300
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) { // WPCS: CSRF ok.
300
+		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) {
301
+// WPCS: CSRF ok.
301 302
 			return;
302 303
 		}
303 304
 
304
-		if ( empty( $_REQUEST['plugin'] ) || empty( $_REQUEST['slug'] ) ) { // WPCS: CSRF ok.
305
+		if ( empty( $_REQUEST['plugin'] ) || empty( $_REQUEST['slug'] ) ) {
306
+// WPCS: CSRF ok.
305 307
 			return;
306 308
 		}
307 309
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
45 45
 		$this->cache_key   = md5( serialize( $this->slug . $this->version . $this->api_data['license'] . $this->beta ) );
46 46
 
47
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
47
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
48 48
 
49 49
 		/**
50 50
 		 * Fires after the $frm_edd_plugin_data is setup.
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			$_transient_data = new stdClass();
94 94
 		}
95 95
 
96
-		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $this->name ] ) && false === $this->wp_override ) {
96
+		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[$this->name] ) && false === $this->wp_override ) {
97 97
 			return $_transient_data;
98 98
 		}
99 99
 
@@ -120,12 +120,12 @@  discard block
 block discarded – undo
120 120
 					$version_info->plugin = $this->name;
121 121
 				}
122 122
 
123
-				$_transient_data->response[ $this->name ] = $version_info;
123
+				$_transient_data->response[$this->name] = $version_info;
124 124
 
125 125
 			}
126 126
 
127 127
 			$_transient_data->last_checked           = time();
128
-			$_transient_data->checked[ $this->name ] = $this->version;
128
+			$_transient_data->checked[$this->name] = $this->version;
129 129
 
130 130
 		}
131 131
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 		if ( isset( $_data->sections ) && ! is_array( $_data->sections ) ) {
190 190
 			$new_sections = array();
191 191
 			foreach ( $_data->sections as $key => $value ) {
192
-				$new_sections[ $key ] = $value;
192
+				$new_sections[$key] = $value;
193 193
 			}
194 194
 
195 195
 			$_data->sections = $new_sections;
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 		if ( isset( $_data->banners ) && ! is_array( $_data->banners ) ) {
200 200
 			$new_banners = array();
201 201
 			foreach ( $_data->banners as $key => $value ) {
202
-				$new_banners[ $key ] = $value;
202
+				$new_banners[$key] = $value;
203 203
 			}
204 204
 
205 205
 			$_data->banners = $new_banners;
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		}
317 317
 
318 318
 		$slug         = sanitize_text_field( $_REQUEST['slug'] ); // WPCS: CSRF ok.
319
-		$data         = $frm_edd_plugin_data[ $slug ];
319
+		$data         = $frm_edd_plugin_data[$slug];
320 320
 		$beta         = ! empty( $data['beta'] ) ? true : false;
321 321
 		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' ); // WPCS: CSRF ok.
322 322
 		$version_info = $this->get_cached_version_info( $cache_key );
Please login to merge, or discard this patch.