Completed
Pull Request — master (#1802)
by
unknown
01:02
created
classes/helpers/FrmAddonsHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 			'zapier'                          => 'zapier',
111 111
 		);
112 112
 
113
-		$icon = array_key_exists( $slug, $icons_map ) ? 'frm_' . $icons_map[ $slug ] . '_icon' : 'frm_logo_icon';
113
+		$icon = array_key_exists( $slug, $icons_map ) ? 'frm_' . $icons_map[$slug] . '_icon' : 'frm_logo_icon';
114 114
 		if ( 'ai' === $slug ) {
115 115
 			$icon = str_replace( '_', '-', $icon );
116 116
 		}
Please login to merge, or discard this patch.
classes/controllers/FrmAddonsController.php 1 patch
Spacing   +25 added lines, -27 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 			unset( $addons['error'] );
129 129
 		}
130 130
 
131
-		$pro    = array(
131
+		$pro = array(
132 132
 			'pro' => array(
133 133
 				'title'      => 'Formidable Forms Pro',
134 134
 				'slug'       => 'formidable-pro',
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 
166 166
 		// Extract the elements to move
167 167
 		foreach ( $plans as $plan ) {
168
-			if ( isset( self::$categories[ $plan ] ) ) {
169
-				$bottom_categories[ $plan ] = self::$categories[ $plan ];
170
-				unset( self::$categories[ $plan ] );
168
+			if ( isset( self::$categories[$plan] ) ) {
169
+				$bottom_categories[$plan] = self::$categories[$plan];
170
+				unset( self::$categories[$plan] );
171 171
 			}
172 172
 		}
173 173
 
@@ -219,14 +219,12 @@  discard block
 block discarded – undo
219 219
 			// Add the slug to the new array.
220 220
 			$addon['category-slugs'][] = $category_slug;
221 221
 
222
-			if ( ! isset( self::$categories[ $category_slug ] ) ) {
223
-				self::$categories[ $category_slug ] = array(
222
+			if ( ! isset( self::$categories[$category_slug] ) ) {
223
+				self::$categories[$category_slug] = array(
224 224
 					'name'  => $category,
225 225
 					'count' => 0,
226 226
 				);
227
-			}
228
-
229
-			++self::$categories[ $category_slug ]['count'];
227
+			} ++self::$categories[$category_slug]['count'];
230 228
 		}
231 229
 	}
232 230
 
@@ -258,7 +256,7 @@  discard block
 block discarded – undo
258 256
 		} else {
259 257
 			foreach ( $addons as $k => $addon ) {
260 258
 				if ( empty( $addon['excerpt'] ) && $k !== 'error' ) {
261
-					unset( $addons[ $k ] );
259
+					unset( $addons[$k] );
262 260
 				}
263 261
 			}
264 262
 		}
@@ -372,7 +370,7 @@  discard block
 block discarded – undo
372 370
 
373 371
 		foreach ( $list as $k => $info ) {
374 372
 			$info['slug'] = $k;
375
-			$list[ $k ]   = array_merge( $defaults, $info );
373
+			$list[$k]   = array_merge( $defaults, $info );
376 374
 		}
377 375
 		return $list;
378 376
 	}
@@ -523,17 +521,17 @@  discard block
 block discarded – undo
523 521
 				continue;
524 522
 			}
525 523
 
526
-			$wp_plugin    = isset( $wp_plugins[ $folder ] ) ? $wp_plugins[ $folder ] : array();
524
+			$wp_plugin    = isset( $wp_plugins[$folder] ) ? $wp_plugins[$folder] : array();
527 525
 			$wp_version   = isset( $wp_plugin['Version'] ) ? $wp_plugin['Version'] : '1.0';
528 526
 			$plugin->slug = explode( '/', $folder )[0];
529 527
 
530 528
 			if ( version_compare( $wp_version, $plugin->new_version, '<' ) ) {
531
-				$transient->response[ $folder ] = $plugin;
529
+				$transient->response[$folder] = $plugin;
532 530
 			} else {
533
-				$transient->no_update[ $folder ] = $plugin;
531
+				$transient->no_update[$folder] = $plugin;
534 532
 			}
535 533
 
536
-			$transient->checked[ $folder ] = $wp_version;
534
+			$transient->checked[$folder] = $wp_version;
537 535
 
538 536
 		}//end foreach
539 537
 
@@ -566,7 +564,7 @@  discard block
 block discarded – undo
566 564
 	 */
567 565
 	protected static function is_installed( $plugin ) {
568 566
 		$all_plugins = self::get_plugins();
569
-		return isset( $all_plugins[ $plugin ] );
567
+		return isset( $all_plugins[$plugin] );
570 568
 	}
571 569
 
572 570
 	/**
@@ -605,13 +603,13 @@  discard block
 block discarded – undo
605 603
 			}
606 604
 
607 605
 			$download_id = isset( $plugin['id'] ) ? $plugin['id'] : 0;
608
-			if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) {
606
+			if ( ! empty( $download_id ) && ! isset( $version_info[$download_id]['package'] ) ) {
609 607
 				// if this addon is using its own license, get the update url
610 608
 				$addon_info = $api->get_api_info();
611 609
 
612
-				$version_info[ $download_id ] = $addon_info[ $download_id ];
610
+				$version_info[$download_id] = $addon_info[$download_id];
613 611
 				if ( isset( $addon_info['error'] ) ) {
614
-					$version_info[ $download_id ]['error'] = array(
612
+					$version_info[$download_id]['error'] = array(
615 613
 						'message' => $addon_info['error']['message'],
616 614
 						'code'    => $addon_info['error']['code'],
617 615
 					);
@@ -710,8 +708,8 @@  discard block
 block discarded – undo
710 708
 					return $addon;
711 709
 				}
712 710
 			}
713
-		} elseif ( isset( $addons[ $download_id ] ) ) {
714
-			$plugin = $addons[ $download_id ];
711
+		} elseif ( isset( $addons[$download_id] ) ) {
712
+			$plugin = $addons[$download_id];
715 713
 		}
716 714
 
717 715
 		return $plugin;
@@ -777,7 +775,7 @@  discard block
 block discarded – undo
777 775
 			self::set_addon_status( $addon );
778 776
 			self::set_categories( $addon );
779 777
 
780
-			$addons[ $id ] = $addon;
778
+			$addons[$id] = $addon;
781 779
 		}//end foreach
782 780
 	}
783 781
 
@@ -818,7 +816,7 @@  discard block
 block discarded – undo
818 816
 			'utm_medium'   => 'addons',
819 817
 			'utm_campaign' => 'liteplugin',
820 818
 		);
821
-		$link       = add_query_arg( $query_args, $link );
819
+		$link = add_query_arg( $query_args, $link );
822 820
 	}
823 821
 
824 822
 	/**
@@ -1246,7 +1244,7 @@  discard block
 block discarded – undo
1246 1244
 	 */
1247 1245
 	public static function ajax_activate_addon() {
1248 1246
 		self::process_addon_action(
1249
-			function ( $plugin ) {
1247
+			function( $plugin ) {
1250 1248
 				return self::handle_addon_action( $plugin, 'activate' );
1251 1249
 			},
1252 1250
 			array( 'FrmAddonsController', 'get_addon_activation_response' )
@@ -1271,7 +1269,7 @@  discard block
 block discarded – undo
1271 1269
 	 */
1272 1270
 	public static function ajax_deactivate_addon() {
1273 1271
 		self::process_addon_action(
1274
-			function ( $plugin ) {
1272
+			function( $plugin ) {
1275 1273
 				return self::handle_addon_action( $plugin, 'deactivate' );
1276 1274
 			}
1277 1275
 		);
@@ -1286,7 +1284,7 @@  discard block
 block discarded – undo
1286 1284
 	 */
1287 1285
 	public static function ajax_uninstall_addon() {
1288 1286
 		self::process_addon_action(
1289
-			function ( $plugin ) {
1287
+			function( $plugin ) {
1290 1288
 				return self::handle_addon_action( $plugin, 'uninstall' );
1291 1289
 			}
1292 1290
 		);
@@ -1683,7 +1681,7 @@  discard block
 block discarded – undo
1683 1681
 		$addons = $api->get_api_info();
1684 1682
 
1685 1683
 		if ( is_array( $addons ) && array_key_exists( $addon_id, $addons ) ) {
1686
-			$dates    = $addons[ $addon_id ];
1684
+			$dates    = $addons[$addon_id];
1687 1685
 			$requires = FrmFormsHelper::get_plan_required( $dates );
1688 1686
 		}
1689 1687
 
Please login to merge, or discard this patch.
classes/controllers/FrmFormTemplatesController.php 1 patch
Spacing   +12 added lines, -14 removed lines patch added patch discarded remove patch
@@ -328,11 +328,11 @@  discard block
 block discarded – undo
328 328
 
329 329
 		// Perform add or remove operation.
330 330
 		if ( 'add' === $operation ) {
331
-			self::$favorite_templates[ $key ][] = $template_id;
331
+			self::$favorite_templates[$key][] = $template_id;
332 332
 		} elseif ( 'remove' === $operation ) {
333
-			$position = array_search( $template_id, self::$favorite_templates[ $key ], true );
333
+			$position = array_search( $template_id, self::$favorite_templates[$key], true );
334 334
 			if ( $position !== false ) {
335
-				unset( self::$favorite_templates[ $key ][ $position ] );
335
+				unset( self::$favorite_templates[$key][$position] );
336 336
 			}
337 337
 		}
338 338
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 		foreach ( self::$templates as $key => &$template ) {
462 462
 			// Skip the template if the categories are not set.
463 463
 			if ( ! isset( $template['categories'] ) ) {
464
-				unset( self::$templates[ $key ] );
464
+				unset( self::$templates[$key] );
465 465
 				continue;
466 466
 			}
467 467
 
@@ -475,14 +475,12 @@  discard block
 block discarded – undo
475 475
 				// Add the slug to the new array.
476 476
 				$template['category_slugs'][] = $category_slug;
477 477
 
478
-				if ( ! isset( self::$categories[ $category_slug ] ) ) {
479
-					self::$categories[ $category_slug ] = array(
478
+				if ( ! isset( self::$categories[$category_slug] ) ) {
479
+					self::$categories[$category_slug] = array(
480 480
 						'name'  => $category,
481 481
 						'count' => 0,
482 482
 					);
483
-				}
484
-
485
-				++self::$categories[ $category_slug ]['count'];
483
+				} ++self::$categories[$category_slug]['count'];
486 484
 			}
487 485
 
488 486
 			// Mark the template as favorite if it's in the favorite templates list.
@@ -497,7 +495,7 @@  discard block
 block discarded – undo
497 495
 		$redundant_cats = array_merge( array( 'PayPal', 'Stripe', 'Twilio' ), FrmFormsHelper::get_license_types() );
498 496
 		foreach ( $redundant_cats as $redundant_cat ) {
499 497
 			$category_slug = sanitize_title( $redundant_cat );
500
-			unset( self::$categories[ $category_slug ] );
498
+			unset( self::$categories[$category_slug] );
501 499
 		}
502 500
 
503 501
 		// Sort the categories by keys alphabetically.
@@ -522,7 +520,7 @@  discard block
 block discarded – undo
522 520
 				'count' => 0,
523 521
 			);
524 522
 		}
525
-		$special_categories['all-items']      = array(
523
+		$special_categories['all-items'] = array(
526 524
 			'name'  => __( 'All Templates', 'formidable' ),
527 525
 			'count' => self::get_template_count(),
528 526
 		);
@@ -550,9 +548,9 @@  discard block
 block discarded – undo
550 548
 	 */
551 549
 	private static function assign_featured_templates() {
552 550
 		foreach ( self::FEATURED_TEMPLATES_KEYS as $key ) {
553
-			if ( isset( self::$templates[ $key ] ) ) {
554
-				self::$templates[ $key ]['is_featured'] = true;
555
-				self::$featured_templates[]             = self::$templates[ $key ];
551
+			if ( isset( self::$templates[$key] ) ) {
552
+				self::$templates[$key]['is_featured'] = true;
553
+				self::$featured_templates[]             = self::$templates[$key];
556 554
 			}
557 555
 		}
558 556
 	}
Please login to merge, or discard this patch.
classes/helpers/FrmFormsHelper.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 			'class'        => '',
38 38
 			'inc_children' => 'exclude',
39 39
 		);
40
-		$args     = wp_parse_args( $args, $defaults );
40
+		$args = wp_parse_args( $args, $defaults );
41 41
 
42 42
 		if ( ! $args['field_id'] ) {
43 43
 			$args['field_id'] = $field_name;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 */
79 79
 	public static function add_html_attr( $class, $param, &$add_html ) {
80 80
 		if ( ! empty( $class ) ) {
81
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
81
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
82 82
 		}
83 83
 	}
84 84
 
@@ -296,8 +296,8 @@  discard block
 block discarded – undo
296 296
 			'description' => '',
297 297
 		);
298 298
 		foreach ( $defaults as $var => $default ) {
299
-			if ( ! isset( $values[ $var ] ) ) {
300
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
299
+			if ( ! isset( $values[$var] ) ) {
300
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
301 301
 			}
302 302
 		}
303 303
 
@@ -312,8 +312,8 @@  discard block
 block discarded – undo
312 312
 			'parent_form_id' => 0,
313 313
 		);
314 314
 		foreach ( $defaults as $var => $default ) {
315
-			if ( ! isset( $values[ $var ] ) ) {
316
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
315
+			if ( ! isset( $values[$var] ) ) {
316
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
317 317
 			}
318 318
 		}
319 319
 		unset( $defaults );
@@ -350,16 +350,16 @@  discard block
 block discarded – undo
350 350
 		$defaults = self::get_default_opts();
351 351
 		foreach ( $defaults as $var => $default ) {
352 352
 			if ( is_array( $default ) ) {
353
-				if ( ! isset( $values[ $var ] ) ) {
354
-					$values[ $var ] = $record && isset( $record->options[ $var ] ) ? $record->options[ $var ] : array();
353
+				if ( ! isset( $values[$var] ) ) {
354
+					$values[$var] = $record && isset( $record->options[$var] ) ? $record->options[$var] : array();
355 355
 				}
356 356
 
357 357
 				foreach ( $default as $k => $v ) {
358
-					$values[ $var ][ $k ] = $post_values && isset( $post_values[ $var ][ $k ] ) ? $post_values[ $var ][ $k ] : ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ? $record->options[ $var ][ $k ] : $v );
358
+					$values[$var][$k] = $post_values && isset( $post_values[$var][$k] ) ? $post_values[$var][$k] : ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) ? $record->options[$var][$k] : $v );
359 359
 
360 360
 					if ( is_array( $v ) ) {
361 361
 						foreach ( $v as $k1 => $v1 ) {
362
-							$values[ $var ][ $k ][ $k1 ] = $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ? $post_values[ $var ][ $k ][ $k1 ] : ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
362
+							$values[$var][$k][$k1] = $post_values && isset( $post_values[$var][$k][$k1] ) ? $post_values[$var][$k][$k1] : ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) && isset( $record->options[$var][$k][$k1] ) ? $record->options[$var][$k][$k1] : $v1 );
363 363
 							unset( $k1, $v1 );
364 364
 						}
365 365
 					}
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 					unset( $k, $v );
368 368
 				}
369 369
 			} else {
370
-				$values[ $var ] = $post_values && isset( $post_values['options'][ $var ] ) ? $post_values['options'][ $var ] : ( $record && isset( $record->options[ $var ] ) ? $record->options[ $var ] : $default );
370
+				$values[$var] = $post_values && isset( $post_values['options'][$var] ) ? $post_values['options'][$var] : ( $record && isset( $record->options[$var] ) ? $record->options[$var] : $default );
371 371
 			}
372 372
 
373 373
 			unset( $var, $default );
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 	public static function fill_form_options( &$options, $values ) {
413 413
 		$defaults = self::get_default_opts();
414 414
 		foreach ( $defaults as $var => $default ) {
415
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
415
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
416 416
 			unset( $var, $default );
417 417
 		}
418 418
 	}
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 	public static function insert_opt_html( $args ) {
590 590
 		$class  = isset( $args['class'] ) ? $args['class'] : '';
591 591
 		$fields = self::get_field_type_data_for_insert_opt_html();
592
-		$field  = isset( $fields[ $args['type'] ] ) ? $fields[ $args['type'] ] : array();
592
+		$field  = isset( $fields[$args['type']] ) ? $fields[$args['type']] : array();
593 593
 
594 594
 		self::prepare_field_type( $field );
595 595
 
@@ -721,7 +721,7 @@  discard block
 block discarded – undo
721 721
 		$last_field         = false;
722 722
 		foreach ( $fields as $field ) {
723 723
 			if ( $prev_order === $field->field_order ) {
724
-				++$add_order;
724
+				++ $add_order;
725 725
 			}
726 726
 
727 727
 			if ( $add_order ) {
@@ -1176,8 +1176,8 @@  discard block
 block discarded – undo
1176 1176
 				$link .= ' onclick="return confirm(\'' . esc_attr( $link_details['confirm'] ) . '\')"';
1177 1177
 			}
1178 1178
 
1179
-			$label = ( isset( $link_details[ $length ] ) ? $link_details[ $length ] : $link_details['label'] );
1180
-			if ( $length === 'icon' && isset( $link_details[ $length ] ) ) {
1179
+			$label = ( isset( $link_details[$length] ) ? $link_details[$length] : $link_details['label'] );
1180
+			if ( $length === 'icon' && isset( $link_details[$length] ) ) {
1181 1181
 				$label = '<span class="' . $label . '" title="' . esc_attr( $link_details['label'] ) . '" aria-hidden="true"></span>';
1182 1182
 				$link .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
1183 1183
 			}
@@ -1324,7 +1324,7 @@  discard block
 block discarded – undo
1324 1324
 			$status = 'publish';
1325 1325
 		}
1326 1326
 
1327
-		$name = $nice_names[ $status ];
1327
+		$name = $nice_names[$status];
1328 1328
 
1329 1329
 		return $name;
1330 1330
 	}
@@ -1388,7 +1388,7 @@  discard block
 block discarded – undo
1388 1388
 		$icon = $icons[''];
1389 1389
 		if ( count( $categories ) === 1 ) {
1390 1390
 			$category = reset( $categories );
1391
-			$icon     = isset( $icons[ $category ] ) ? $icons[ $category ] : $icon;
1391
+			$icon     = isset( $icons[$category] ) ? $icons[$category] : $icon;
1392 1392
 		} elseif ( ! empty( $categories ) ) {
1393 1393
 			$icons = array_intersect_key( $icons, array_flip( $categories ) );
1394 1394
 			$icon  = reset( $icons );
@@ -1515,7 +1515,7 @@  discard block
 block discarded – undo
1515 1515
 
1516 1516
 		foreach ( $item['categories'] as $k => $category ) {
1517 1517
 			if ( in_array( $category, $plans, true ) ) {
1518
-				unset( $item['categories'][ $k ] );
1518
+				unset( $item['categories'][$k] );
1519 1519
 
1520 1520
 				$category = self::convert_legacy_package_names( $category );
1521 1521
 
@@ -1554,7 +1554,7 @@  discard block
 block discarded – undo
1554 1554
 			'include_all' => true,
1555 1555
 			'case_lower'  => false,
1556 1556
 		);
1557
-		$args     = wp_parse_args( $args, $defaults );
1557
+		$args = wp_parse_args( $args, $defaults );
1558 1558
 
1559 1559
 		$license_types = array( 'Basic', 'Plus', 'Business', 'Elite' );
1560 1560
 
@@ -1757,9 +1757,9 @@  discard block
 block discarded – undo
1757 1757
 		}
1758 1758
 
1759 1759
 		foreach ( $shortcodes[0] as $key => $shortcode ) {
1760
-			$options = trim( $shortcodes[3][ $key ] );
1760
+			$options = trim( $shortcodes[3][$key] );
1761 1761
 
1762
-			if ( in_array( $shortcodes[1][ $key ], array( 'if ' ), true ) ) {
1762
+			if ( in_array( $shortcodes[1][$key], array( 'if ' ), true ) ) {
1763 1763
 				// Skip if shortcodes.
1764 1764
 				continue;
1765 1765
 			}
@@ -1769,7 +1769,7 @@  discard block
 block discarded – undo
1769 1769
 				continue;
1770 1770
 			}
1771 1771
 
1772
-			$new_shortcode = '[' . $shortcodes[2][ $key ];
1772
+			$new_shortcode = '[' . $shortcodes[2][$key];
1773 1773
 			if ( $options ) {
1774 1774
 				$new_shortcode .= ' ' . $options;
1775 1775
 			}
Please login to merge, or discard this patch.