Completed
Push — master ( da536e...a50277 )
by Stephanie
02:41
created
classes/helpers/FrmAppHelper.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 			'fill'   => '#4d4d4d',
150 150
 			'orange' => '#f05a24',
151 151
 		);
152
-		$atts     = array_merge( $defaults, $atts );
152
+		$atts = array_merge( $defaults, $atts );
153 153
 
154 154
 		return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 599.68 601.37" width="' . esc_attr( $atts['width'] ) . '" height="' . esc_attr( $atts['height'] ) . '">
155 155
 			<path fill="' . esc_attr( $atts['orange'] ) . '" d="M289.6 384h140v76h-140z"/>
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @return string
338 338
 	 */
339 339
 	public static function get_server_value( $value ) {
340
-		return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[ $value ] ) ) : '';
340
+		return isset( $_SERVER[$value] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[$value] ) ) : '';
341 341
 	}
342 342
 
343 343
 	/**
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 		);
361 361
 		$ip = '';
362 362
 		foreach ( $ip_options as $key ) {
363
-			if ( ! isset( $_SERVER[ $key ] ) ) {
363
+			if ( ! isset( $_SERVER[$key] ) ) {
364 364
 				continue;
365 365
 			}
366 366
 
@@ -385,10 +385,10 @@  discard block
 block discarded – undo
385 385
 
386 386
 		if ( $src == 'get' ) {
387 387
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
388
-			$value = isset( $_POST[ $param ] ) ? wp_unslash( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? wp_unslash( $_GET[ $param ] ) : $default );
389
-			if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
388
+			$value = isset( $_POST[$param] ) ? wp_unslash( $_POST[$param] ) : ( isset( $_GET[$param] ) ? wp_unslash( $_GET[$param] ) : $default );
389
+			if ( ! isset( $_POST[$param] ) && isset( $_GET[$param] ) && ! is_array( $value ) ) {
390 390
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
391
-				$value = htmlspecialchars_decode( wp_unslash( $_GET[ $param ] ) );
391
+				$value = htmlspecialchars_decode( wp_unslash( $_GET[$param] ) );
392 392
 			}
393 393
 			self::sanitize_value( $sanitize, $value );
394 394
 		} else {
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 				}
410 410
 
411 411
 				$p     = trim( $p, ']' );
412
-				$value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
412
+				$value = isset( $value[$p] ) ? $value[$p] : $default;
413 413
 			}
414 414
 		}
415 415
 
@@ -465,26 +465,26 @@  discard block
 block discarded – undo
465 465
 			'sanitize' => 'sanitize_text_field',
466 466
 			'serialized' => false,
467 467
 		);
468
-		$args     = wp_parse_args( $args, $defaults );
468
+		$args = wp_parse_args( $args, $defaults );
469 469
 
470 470
 		$value = $args['default'];
471 471
 		if ( $args['type'] == 'get' ) {
472
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
472
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
473 473
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
474
-				$value = wp_unslash( $_GET[ $args['param'] ] );
474
+				$value = wp_unslash( $_GET[$args['param']] );
475 475
 			}
476 476
 		} elseif ( $args['type'] == 'post' ) {
477
-			if ( isset( $_POST[ $args['param'] ] ) ) {
477
+			if ( isset( $_POST[$args['param']] ) ) {
478 478
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
479
-				$value = wp_unslash( $_POST[ $args['param'] ] );
479
+				$value = wp_unslash( $_POST[$args['param']] );
480 480
 				if ( $args['serialized'] === true && is_serialized_string( $value ) && is_serialized( $value ) ) {
481 481
 					self::unserialize_or_decode( $value );
482 482
 				}
483 483
 			}
484 484
 		} else {
485
-			if ( isset( $_REQUEST[ $args['param'] ] ) ) {
485
+			if ( isset( $_REQUEST[$args['param']] ) ) {
486 486
 				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
487
-				$value = wp_unslash( $_REQUEST[ $args['param'] ] );
487
+				$value = wp_unslash( $_REQUEST[$args['param']] );
488 488
 			}
489 489
 		}
490 490
 
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 			if ( is_array( $value ) ) {
517 517
 				$temp_values = $value;
518 518
 				foreach ( $temp_values as $k => $v ) {
519
-					self::sanitize_value( $sanitize, $value[ $k ] );
519
+					self::sanitize_value( $sanitize, $value[$k] );
520 520
 				}
521 521
 			} else {
522 522
 				$value = call_user_func( $sanitize, $value );
@@ -527,8 +527,8 @@  discard block
 block discarded – undo
527 527
 	public static function sanitize_request( $sanitize_method, &$values ) {
528 528
 		$temp_values = $values;
529 529
 		foreach ( $temp_values as $k => $val ) {
530
-			if ( isset( $sanitize_method[ $k ] ) ) {
531
-				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
530
+			if ( isset( $sanitize_method[$k] ) ) {
531
+				$values[$k] = call_user_func( $sanitize_method[$k], $val );
532 532
 			}
533 533
 		}
534 534
 	}
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 		if ( is_array( $value ) ) {
552 552
 			$temp_values = $value;
553 553
 			foreach ( $temp_values as $k => $v ) {
554
-				self::decode_specialchars( $value[ $k ] );
554
+				self::decode_specialchars( $value[$k] );
555 555
 			}
556 556
 		} else {
557 557
 			self::decode_amp( $value );
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 			$allowed_html = $html;
629 629
 		} elseif ( ! empty( $allowed ) ) {
630 630
 			foreach ( (array) $allowed as $a ) {
631
-				$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
631
+				$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
632 632
 			}
633 633
 		}
634 634
 
@@ -785,8 +785,8 @@  discard block
 block discarded – undo
785 785
 		}
786 786
 
787 787
 		global $wp_query;
788
-		if ( isset( $wp_query->query_vars[ $param ] ) ) {
789
-			$value = $wp_query->query_vars[ $param ];
788
+		if ( isset( $wp_query->query_vars[$param] ) ) {
789
+			$value = $wp_query->query_vars[$param];
790 790
 		}
791 791
 
792 792
 		return $value;
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
 				'new_file_path' => self::plugin_path() . '/js',
951 951
 			)
952 952
 		);
953
-		$new_file  = new FrmCreateFile( $file_atts );
953
+		$new_file = new FrmCreateFile( $file_atts );
954 954
 
955 955
 		$files = array(
956 956
 			self::plugin_path() . '/js/jquery/jquery.placeholder.min.js',
@@ -1208,8 +1208,8 @@  discard block
 block discarded – undo
1208 1208
 			return $error;
1209 1209
 		}
1210 1210
 
1211
-		$nonce_value = ( $_REQUEST && isset( $_REQUEST[ $nonce_name ] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $nonce_name ] ) ) : '';
1212
-		if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
1211
+		$nonce_value = ( $_REQUEST && isset( $_REQUEST[$nonce_name] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[$nonce_name] ) ) : '';
1212
+		if ( $_REQUEST && ( ! isset( $_REQUEST[$nonce_name] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
1213 1213
 			$frm_settings = self::get_settings();
1214 1214
 			$error        = $frm_settings->admin_permission;
1215 1215
 		}
@@ -1244,7 +1244,7 @@  discard block
 block discarded – undo
1244 1244
 			} else {
1245 1245
 				foreach ( $value as $k => $v ) {
1246 1246
 					if ( ! is_array( $v ) ) {
1247
-						$value[ $k ] = call_user_func( $original_function, $v );
1247
+						$value[$k] = call_user_func( $original_function, $v );
1248 1248
 					}
1249 1249
 				}
1250 1250
 			}
@@ -1269,7 +1269,7 @@  discard block
 block discarded – undo
1269 1269
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
1270 1270
 			} else {
1271 1271
 				if ( $keys == 'keep' ) {
1272
-					$return[ $key ] = $value;
1272
+					$return[$key] = $value;
1273 1273
 				} else {
1274 1274
 					$return[] = $value;
1275 1275
 				}
@@ -1333,11 +1333,11 @@  discard block
 block discarded – undo
1333 1333
 		}
1334 1334
 
1335 1335
 		$ver = $default;
1336
-		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
1336
+		if ( ! isset( $wp_scripts->registered[$handle] ) ) {
1337 1337
 			return $ver;
1338 1338
 		}
1339 1339
 
1340
-		$query = $wp_scripts->registered[ $handle ];
1340
+		$query = $wp_scripts->registered[$handle];
1341 1341
 		if ( is_object( $query ) && ! empty( $query->ver ) ) {
1342 1342
 			$ver = $query->ver;
1343 1343
 		}
@@ -1472,7 +1472,7 @@  discard block
 block discarded – undo
1472 1472
 
1473 1473
 		foreach ( array( 'name', 'description' ) as $var ) {
1474 1474
 			$default_val    = isset( $record->{$var} ) ? $record->{$var} : '';
1475
-			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
1475
+			$values[$var] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
1476 1476
 			unset( $var, $default_val );
1477 1477
 		}
1478 1478
 
@@ -1527,9 +1527,9 @@  discard block
 block discarded – undo
1527 1527
 			}
1528 1528
 		}
1529 1529
 
1530
-		$field_type = isset( $post_values['field_options'][ 'type_' . $field->id ] ) ? $post_values['field_options'][ 'type_' . $field->id ] : $field->type;
1531
-		if ( isset( $post_values['item_meta'][ $field->id ] ) ) {
1532
-			$new_value = $post_values['item_meta'][ $field->id ];
1530
+		$field_type = isset( $post_values['field_options']['type_' . $field->id] ) ? $post_values['field_options']['type_' . $field->id] : $field->type;
1531
+		if ( isset( $post_values['item_meta'][$field->id] ) ) {
1532
+			$new_value = $post_values['item_meta'][$field->id];
1533 1533
 			self::unserialize_or_decode( $new_value );
1534 1534
 		} else {
1535 1535
 			$new_value = $meta_value;
@@ -1550,7 +1550,7 @@  discard block
 block discarded – undo
1550 1550
 
1551 1551
 		$field_array = array_merge( $field->field_options, $field_array );
1552 1552
 
1553
-		$values['fields'][ $field->id ] = $field_array;
1553
+		$values['fields'][$field->id] = $field_array;
1554 1554
 	}
1555 1555
 
1556 1556
 	/**
@@ -1597,11 +1597,11 @@  discard block
 block discarded – undo
1597 1597
 		}
1598 1598
 
1599 1599
 		foreach ( $form->options as $opt => $value ) {
1600
-			if ( isset( $post_values[ $opt ] ) ) {
1601
-				$values[ $opt ] = $post_values[ $opt ];
1602
-				self::unserialize_or_decode( $values[ $opt ] );
1600
+			if ( isset( $post_values[$opt] ) ) {
1601
+				$values[$opt] = $post_values[$opt];
1602
+				self::unserialize_or_decode( $values[$opt] );
1603 1603
 			} else {
1604
-				$values[ $opt ] = $value;
1604
+				$values[$opt] = $value;
1605 1605
 			}
1606 1606
 		}
1607 1607
 
@@ -1615,8 +1615,8 @@  discard block
 block discarded – undo
1615 1615
 		$form_defaults = FrmFormsHelper::get_default_opts();
1616 1616
 
1617 1617
 		foreach ( $form_defaults as $opt => $default ) {
1618
-			if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
1619
-				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
1618
+			if ( ! isset( $values[$opt] ) || $values[$opt] == '' ) {
1619
+				$values[$opt] = ( $post_values && isset( $post_values['options'][$opt] ) ) ? $post_values['options'][$opt] : $default;
1620 1620
 			}
1621 1621
 
1622 1622
 			unset( $opt, $default );
@@ -1627,8 +1627,8 @@  discard block
 block discarded – undo
1627 1627
 		}
1628 1628
 
1629 1629
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
1630
-			if ( ! isset( $values[ $h . '_html' ] ) ) {
1631
-				$values[ $h . '_html' ] = ( isset( $post_values['options'][ $h . '_html' ] ) ? $post_values['options'][ $h . '_html' ] : FrmFormsHelper::get_default_html( $h ) );
1630
+			if ( ! isset( $values[$h . '_html'] ) ) {
1631
+				$values[$h . '_html'] = ( isset( $post_values['options'][$h . '_html'] ) ? $post_values['options'][$h . '_html'] : FrmFormsHelper::get_default_html( $h ) );
1632 1632
 			}
1633 1633
 			unset( $h );
1634 1634
 		}
@@ -1778,10 +1778,10 @@  discard block
 block discarded – undo
1778 1778
 		$time_strings = self::get_time_strings();
1779 1779
 
1780 1780
 		foreach ( $time_strings as $k => $v ) {
1781
-			if ( $diff[ $k ] ) {
1782
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
1781
+			if ( $diff[$k] ) {
1782
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
1783 1783
 			} else {
1784
-				unset( $time_strings[ $k ] );
1784
+				unset( $time_strings[$k] );
1785 1785
 			}
1786 1786
 		}
1787 1787
 
@@ -1862,17 +1862,17 @@  discard block
 block discarded – undo
1862 1862
 
1863 1863
 					case 1:
1864 1864
 						$l2 = $name;
1865
-						self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
1865
+						self::add_value_to_array( $name, $l2, $this_val, $vars[$l1] );
1866 1866
 						break;
1867 1867
 
1868 1868
 					case 2:
1869 1869
 						$l3 = $name;
1870
-						self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
1870
+						self::add_value_to_array( $name, $l3, $this_val, $vars[$l1][$l2] );
1871 1871
 						break;
1872 1872
 
1873 1873
 					case 3:
1874 1874
 						$l4 = $name;
1875
-						self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
1875
+						self::add_value_to_array( $name, $l4, $this_val, $vars[$l1][$l2][$l3] );
1876 1876
 				}
1877 1877
 
1878 1878
 				unset( $this_val, $n );
@@ -1891,8 +1891,8 @@  discard block
 block discarded – undo
1891 1891
 	public static function add_value_to_array( $name, $l1, $val, &$vars ) {
1892 1892
 		if ( $name == '' ) {
1893 1893
 			$vars[] = $val;
1894
-		} elseif ( ! isset( $vars[ $l1 ] ) ) {
1895
-			$vars[ $l1 ] = $val;
1894
+		} elseif ( ! isset( $vars[$l1] ) ) {
1895
+			$vars[$l1] = $val;
1896 1896
 		}
1897 1897
 	}
1898 1898
 
@@ -1908,7 +1908,7 @@  discard block
 block discarded – undo
1908 1908
 			'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
1909 1909
 		);
1910 1910
 
1911
-		if ( ! isset( $tooltips[ $name ] ) ) {
1911
+		if ( ! isset( $tooltips[$name] ) ) {
1912 1912
 			return;
1913 1913
 		}
1914 1914
 
@@ -1918,7 +1918,7 @@  discard block
 block discarded – undo
1918 1918
 			echo ' class="frm_help"';
1919 1919
 		}
1920 1920
 
1921
-		echo ' title="' . esc_attr( $tooltips[ $name ] );
1921
+		echo ' title="' . esc_attr( $tooltips[$name] );
1922 1922
 
1923 1923
 		if ( 'open' != $class ) {
1924 1924
 			echo '"';
@@ -1971,13 +1971,13 @@  discard block
 block discarded – undo
1971 1971
 	}
1972 1972
 
1973 1973
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
1974
-		if ( ! isset( $post_content[ $key ] ) ) {
1974
+		if ( ! isset( $post_content[$key] ) ) {
1975 1975
 			return;
1976 1976
 		}
1977 1977
 
1978 1978
 		if ( is_array( $val ) ) {
1979 1979
 			foreach ( $val as $k1 => $v1 ) {
1980
-				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
1980
+				self::prepare_action_slashes( $v1, $k1, $post_content[$key] );
1981 1981
 				unset( $k1, $v1 );
1982 1982
 			}
1983 1983
 		} else {
@@ -1985,7 +1985,7 @@  discard block
 block discarded – undo
1985 1985
 			$val = stripslashes( $val );
1986 1986
 
1987 1987
 			// Add backslashes before double quotes and forward slashes only
1988
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
1988
+			$post_content[$key] = addcslashes( $val, '"\\/' );
1989 1989
 		}
1990 1990
 	}
1991 1991
 
@@ -2044,14 +2044,14 @@  discard block
 block discarded – undo
2044 2044
 				continue;
2045 2045
 			}
2046 2046
 			$key = $input['name'];
2047
-			if ( isset( $formatted[ $key ] ) ) {
2048
-				if ( is_array( $formatted[ $key ] ) ) {
2049
-					$formatted[ $key ][] = $input['value'];
2047
+			if ( isset( $formatted[$key] ) ) {
2048
+				if ( is_array( $formatted[$key] ) ) {
2049
+					$formatted[$key][] = $input['value'];
2050 2050
 				} else {
2051
-					$formatted[ $key ] = array( $formatted[ $key ], $input['value'] );
2051
+					$formatted[$key] = array( $formatted[$key], $input['value'] );
2052 2052
 				}
2053 2053
 			} else {
2054
-				$formatted[ $key ] = $input['value'];
2054
+				$formatted[$key] = $input['value'];
2055 2055
 			}
2056 2056
 		}
2057 2057
 
Please login to merge, or discard this patch.