Completed
Pull Request — master (#251)
by Stephanie
02:34
created
classes/views/frm-forms/list-templates.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 	</li><?php
17 17
 	$render_icon = true;
18 18
 	foreach ( array( 20872734, 20874748, 20882522, 20874739 ) as $template ) {
19
-		if ( isset( $templates[ $template ] ) ) {
20
-			$template = $templates[ $template ];
19
+		if ( isset( $templates[$template] ) ) {
20
+			$template = $templates[$template];
21 21
 			require $view_path . 'list-template.php';
22 22
 		}
23 23
 	}
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	<ul class="frm-templates-list frm-categories-list">
46 46
 		<?php foreach ( $categories as $category ) { ?>
47 47
 			<?php
48
-			$category_templates = $templates_by_category[ $category ];
48
+			$category_templates = $templates_by_category[$category];
49 49
 			$count              = count( $category_templates );
50 50
 			$available          = FrmFormsHelper::available_count( $category_templates, $args );
51 51
 			?>
Please login to merge, or discard this patch.
classes/controllers/FrmFormsController.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -418,11 +418,11 @@  discard block
 block discarded – undo
418 418
 			),
419 419
 		);
420 420
 
421
-		if ( ! isset( $available_status[ $status ] ) ) {
421
+		if ( ! isset( $available_status[$status] ) ) {
422 422
 			return;
423 423
 		}
424 424
 
425
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
425
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
426 426
 
427 427
 		$params = FrmForm::list_page_params();
428 428
 
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 		check_admin_referer( $status . '_form_' . $params['id'] );
431 431
 
432 432
 		$count = 0;
433
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
433
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
434 434
 			$count ++;
435 435
 		}
436 436
 
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
448 448
 		$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>' );
449 449
 
450
-		$message = $available_status[ $status ]['message'];
450
+		$message = $available_status[$status]['message'];
451 451
 
452 452
 		self::display_forms_list( $params, $message );
453 453
 	}
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 				'type'  => 'request',
469 469
 			)
470 470
 		);
471
-		$message      = sprintf(
471
+		$message = sprintf(
472 472
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
473 473
 			_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' ),
474 474
 			$count,
@@ -834,11 +834,11 @@  discard block
 block discarded – undo
834 834
 			}
835 835
 
836 836
 			foreach ( $template['categories'] as $category ) {
837
-				if ( ! isset( $templates_by_category[ $category ] ) ) {
838
-					$templates_by_category[ $category ] = array();
837
+				if ( ! isset( $templates_by_category[$category] ) ) {
838
+					$templates_by_category[$category] = array();
839 839
 				}
840 840
 
841
-				$templates_by_category[ $category ][] = $template;
841
+				$templates_by_category[$category][] = $template;
842 842
 			}
843 843
 		}
844 844
 		unset( $template );
@@ -864,7 +864,7 @@  discard block
 block discarded – undo
864 864
 		$forms                    = FrmForm::get_published_forms( $where );
865 865
 		$view_path                = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
866 866
 
867
-		$templates_by_category[ $my_templates_translation ] = $custom_templates;
867
+		$templates_by_category[$my_templates_translation] = $custom_templates;
868 868
 
869 869
 		unset( $pricing, $license_type, $where );
870 870
 		wp_enqueue_script( 'accordion' ); // register accordion for template groups
@@ -1078,7 +1078,7 @@  discard block
 block discarded – undo
1078 1078
 				$section['id'] = $section['anchor'];
1079 1079
 			}
1080 1080
 
1081
-			$sections[ $key ] = $section;
1081
+			$sections[$key] = $section;
1082 1082
 		}
1083 1083
 
1084 1084
 		return $sections;
@@ -1160,7 +1160,7 @@  discard block
 block discarded – undo
1160 1160
 		if ( ! empty( $user_fields ) ) {
1161 1161
 			$user_helpers = array();
1162 1162
 			foreach ( $user_fields as $uk => $uf ) {
1163
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1163
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1164 1164
 				unset( $uk, $uf );
1165 1165
 			}
1166 1166
 
@@ -1397,7 +1397,7 @@  discard block
 block discarded – undo
1397 1397
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1398 1398
 			} else {
1399 1399
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1400
-				$action = $vars[ $action ];
1400
+				$action = $vars[$action];
1401 1401
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
1402 1402
 				$_REQUEST = array_merge( $_REQUEST, $vars );
1403 1403
 				$_POST    = array_merge( $_POST, $_REQUEST );
@@ -1523,7 +1523,7 @@  discard block
 block discarded – undo
1523 1523
 		$actions = array();
1524 1524
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
1525 1525
 			if ( is_object( $form ) ) {
1526
-				$actions[ $form->id ] = $form->name;
1526
+				$actions[$form->id] = $form->name;
1527 1527
 			}
1528 1528
 			unset( $form );
1529 1529
 		}
@@ -1732,8 +1732,8 @@  discard block
 block discarded – undo
1732 1732
 	private static function get_saved_errors( $form, $params ) {
1733 1733
 		global $frm_vars;
1734 1734
 
1735
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
1736
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
1735
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) {
1736
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
1737 1737
 		} else {
1738 1738
 			$errors = array();
1739 1739
 		}
@@ -1747,7 +1747,7 @@  discard block
 block discarded – undo
1747 1747
 	public static function just_created_entry( $form_id ) {
1748 1748
 		global $frm_vars;
1749 1749
 
1750
-		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;
1750
+		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;
1751 1751
 	}
1752 1752
 
1753 1753
 	/**
@@ -1755,7 +1755,7 @@  discard block
 block discarded – undo
1755 1755
 	 */
1756 1756
 	private static function get_confirmation_method( $atts ) {
1757 1757
 		$opt    = 'success_action';
1758
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
1758
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
1759 1759
 		$method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
1760 1760
 
1761 1761
 		if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
@@ -1768,7 +1768,7 @@  discard block
 block discarded – undo
1768 1768
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
1769 1769
 		if ( ! isset( $params['id'] ) ) {
1770 1770
 			global $frm_vars;
1771
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
1771
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
1772 1772
 		}
1773 1773
 
1774 1774
 		$conf_method = self::get_confirmation_method(
@@ -1812,7 +1812,7 @@  discard block
 block discarded – undo
1812 1812
 		$opt = ( ! isset( $args['action'] ) || $args['action'] == 'create' ) ? 'success' : 'edit';
1813 1813
 
1814 1814
 		$args['success_opt'] = $opt;
1815
-		if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
1815
+		if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
1816 1816
 			self::load_page_after_submit( $args );
1817 1817
 		} elseif ( $args['conf_method'] == 'redirect' ) {
1818 1818
 			self::redirect_after_submit( $args );
@@ -1827,8 +1827,8 @@  discard block
 block discarded – undo
1827 1827
 	private static function load_page_after_submit( $args ) {
1828 1828
 		global $post;
1829 1829
 		$opt = $args['success_opt'];
1830
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
1831
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
1830
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
1831
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
1832 1832
 			$old_post = $post;
1833 1833
 			$post     = $page;
1834 1834
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -1846,11 +1846,11 @@  discard block
 block discarded – undo
1846 1846
 		add_filter( 'frm_use_wpautop', '__return_false' );
1847 1847
 
1848 1848
 		$opt         = $args['success_opt'];
1849
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
1849
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
1850 1850
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
1851 1851
 		$success_url = do_shortcode( $success_url );
1852 1852
 
1853
-		$success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
1853
+		$success_msg = isset( $args['form']->options[$opt . '_msg'] ) ? $args['form']->options[$opt . '_msg'] : __( 'Please wait while you are redirected.', 'formidable' );
1854 1854
 
1855 1855
 		$redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
1856 1856
 
@@ -1986,7 +1986,7 @@  discard block
 block discarded – undo
1986 1986
 			'description' => false,
1987 1987
 			'reset'       => false,
1988 1988
 		);
1989
-		$args     = wp_parse_args( $args, $defaults );
1989
+		$args = wp_parse_args( $args, $defaults );
1990 1990
 	}
1991 1991
 
1992 1992
 	/**
Please login to merge, or discard this patch.
classes/controllers/FrmAppController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -283,7 +283,7 @@
 block discarded – undo
283 283
 				'content' => 'upgrade',
284 284
 			)
285 285
 		);
286
-		$renew_link       = FrmAppHelper::admin_upgrade_link(
286
+		$renew_link = FrmAppHelper::admin_upgrade_link(
287 287
 			array(
288 288
 				'medium'  => 'new-template',
289 289
 				'content' => 'renew',
Please login to merge, or discard this patch.
classes/models/FrmFormTemplateApi.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 
6 6
 class FrmFormTemplateApi extends FrmFormApi {
7 7
 
8
-	protected static $code_option_name  = 'frm_free_license_code';
8
+	protected static $code_option_name = 'frm_free_license_code';
9 9
 
10 10
 	private static $base_api_url = 'https://formidableforms.com/wp-json/form-templates/v1/';
11 11
 
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
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 			'class'        => '',
29 29
 			'inc_children' => 'exclude',
30 30
 		);
31
-		$args     = wp_parse_args( $args, $defaults );
31
+		$args = wp_parse_args( $args, $defaults );
32 32
 
33 33
 		if ( ! $args['field_id'] ) {
34 34
 			$args['field_id'] = $field_name;
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public static function add_html_attr( $class, $param, &$add_html ) {
72 72
 		if ( ! empty( $class ) ) {
73
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
73
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
74 74
 		}
75 75
 	}
76 76
 
@@ -276,8 +276,8 @@  discard block
 block discarded – undo
276 276
 			'description' => '',
277 277
 		);
278 278
 		foreach ( $defaults as $var => $default ) {
279
-			if ( ! isset( $values[ $var ] ) ) {
280
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
279
+			if ( ! isset( $values[$var] ) ) {
280
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
281 281
 			}
282 282
 		}
283 283
 
@@ -292,8 +292,8 @@  discard block
 block discarded – undo
292 292
 			'parent_form_id' => 0,
293 293
 		);
294 294
 		foreach ( $defaults as $var => $default ) {
295
-			if ( ! isset( $values[ $var ] ) ) {
296
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
295
+			if ( ! isset( $values[$var] ) ) {
296
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
297 297
 			}
298 298
 		}
299 299
 		unset( $defaults );
@@ -330,16 +330,16 @@  discard block
 block discarded – undo
330 330
 		$defaults = self::get_default_opts();
331 331
 		foreach ( $defaults as $var => $default ) {
332 332
 			if ( is_array( $default ) ) {
333
-				if ( ! isset( $values[ $var ] ) ) {
334
-					$values[ $var ] = ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : array();
333
+				if ( ! isset( $values[$var] ) ) {
334
+					$values[$var] = ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : array();
335 335
 				}
336 336
 
337 337
 				foreach ( $default as $k => $v ) {
338
-					$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 );
338
+					$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 );
339 339
 
340 340
 					if ( is_array( $v ) ) {
341 341
 						foreach ( $v as $k1 => $v1 ) {
342
-							$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 );
342
+							$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 );
343 343
 							unset( $k1, $v1 );
344 344
 						}
345 345
 					}
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 					unset( $k, $v );
348 348
 				}
349 349
 			} else {
350
-				$values[ $var ] = ( $post_values && isset( $post_values['options'][ $var ] ) ) ? $post_values['options'][ $var ] : ( ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : $default );
350
+				$values[$var] = ( $post_values && isset( $post_values['options'][$var] ) ) ? $post_values['options'][$var] : ( ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : $default );
351 351
 			}
352 352
 
353 353
 			unset( $var, $default );
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 	public static function fill_form_options( &$options, $values ) {
386 386
 		$defaults = self::get_default_opts();
387 387
 		foreach ( $defaults as $var => $default ) {
388
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
388
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
389 389
 			unset( $var, $default );
390 390
 		}
391 391
 	}
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
 	public static function insert_opt_html( $args ) {
542 542
 		$class  = isset( $args['class'] ) ? $args['class'] : '';
543 543
 		$fields = FrmField::all_field_selection();
544
-		$field  = isset( $fields[ $args['type'] ] ) ? $fields[ $args['type'] ] : array();
544
+		$field  = isset( $fields[$args['type']] ) ? $fields[$args['type']] : array();
545 545
 
546 546
 		self::prepare_field_type( $field );
547 547
 
@@ -693,7 +693,7 @@  discard block
 block discarded – undo
693 693
 			FrmField::update( $field->id, array( 'field_order' => $field->field_order + 2 ) );
694 694
 		}
695 695
 
696
-		$add_order    += 2;
696
+		$add_order += 2;
697 697
 		$open         = false;
698 698
 		$reset_fields = true;
699 699
 	}
@@ -1045,10 +1045,10 @@  discard block
 block discarded – undo
1045 1045
 				$link .= ' onclick="return confirm(\'' . esc_attr( $link_details['confirm'] ) . '\')"';
1046 1046
 			}
1047 1047
 
1048
-			$label = ( isset( $link_details[ $length ] ) ? $link_details[ $length ] : $link_details['label'] );
1049
-			if ( $length == 'icon' && isset( $link_details[ $length ] ) ) {
1048
+			$label = ( isset( $link_details[$length] ) ? $link_details[$length] : $link_details['label'] );
1049
+			if ( $length == 'icon' && isset( $link_details[$length] ) ) {
1050 1050
 				$label = '<span class="' . $label . '" title="' . esc_attr( $link_details['label'] ) . '" aria-hidden="true"></span>';
1051
-				$link  .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
1051
+				$link .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
1052 1052
 			}
1053 1053
 
1054 1054
 			$link .= '>' . $label . '</a>';
@@ -1204,7 +1204,7 @@  discard block
 block discarded – undo
1204 1204
 			$status = 'publish';
1205 1205
 		}
1206 1206
 
1207
-		$name = $nice_names[ $status ];
1207
+		$name = $nice_names[$status];
1208 1208
 
1209 1209
 		return $name;
1210 1210
 	}
@@ -1237,17 +1237,17 @@  discard block
 block discarded – undo
1237 1237
 			''                    => array( 'align_right' ),
1238 1238
 		);
1239 1239
 
1240
-		$icons[ __( 'My Templates', 'formidable' ) ] = array( 'user', 'var(--orange)' );
1240
+		$icons[__( 'My Templates', 'formidable' )] = array( 'user', 'var(--orange)' );
1241 1241
 
1242 1242
 		$icon = $icons[''];
1243 1243
 
1244 1244
 		if ( count( $categories ) === 1 ) {
1245 1245
 			$category = reset( $categories );
1246
-			$icon     = isset( $icons[ $category ] ) ? $icons[ $category ] : $icon;
1246
+			$icon     = isset( $icons[$category] ) ? $icons[$category] : $icon;
1247 1247
 		} elseif ( ! empty( $categories ) ) {
1248 1248
 			foreach ( $icons as $cat => $icon ) {
1249 1249
 				if ( ! in_array( $cat, $categories ) ) {
1250
-					unset( $icons[ $cat ] );
1250
+					unset( $icons[$cat] );
1251 1251
 				}
1252 1252
 			}
1253 1253
 			$icon = reset( $icons );
@@ -1373,7 +1373,7 @@  discard block
 block discarded – undo
1373 1373
 
1374 1374
 		foreach ( $item['categories'] as $k => $category ) {
1375 1375
 			if ( in_array( $category, $plans, true ) ) {
1376
-				unset( $item['categories'][ $k ] );
1376
+				unset( $item['categories'][$k] );
1377 1377
 
1378 1378
 				if ( $category === 'Personal' ) {
1379 1379
 					// Show the current package name.
Please login to merge, or discard this patch.