Completed
Push — master ( 06f781...8ac3a5 )
by Stephanie
03:24
created
classes/helpers/FrmAppHelper.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			'fill'   => '#4d4d4d',
146 146
 			'orange' => '#f05a24',
147 147
 		);
148
-		$atts     = array_merge( $defaults, $atts );
148
+		$atts = array_merge( $defaults, $atts );
149 149
 
150 150
 		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'] ) . '">
151 151
 			<path fill="' . esc_attr( $atts['orange'] ) . '" d="M289.6 384h140v76h-140z"/>
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 * @return string
334 334
 	 */
335 335
 	public static function get_server_value( $value ) {
336
-		return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[ $value ] ) ) : '';
336
+		return isset( $_SERVER[$value] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[$value] ) ) : '';
337 337
 	}
338 338
 
339 339
 	/**
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 		);
357 357
 		$ip = '';
358 358
 		foreach ( $ip_options as $key ) {
359
-			if ( ! isset( $_SERVER[ $key ] ) ) {
359
+			if ( ! isset( $_SERVER[$key] ) ) {
360 360
 				continue;
361 361
 			}
362 362
 
@@ -380,9 +380,9 @@  discard block
 block discarded – undo
380 380
 		}
381 381
 
382 382
 		if ( $src == 'get' ) {
383
-			$value = isset( $_POST[ $param ] ) ? wp_unslash( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? wp_unslash( $_GET[ $param ] ) : $default );
384
-			if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
385
-				$value = htmlspecialchars_decode( wp_unslash( $_GET[ $param ] ) );
383
+			$value = isset( $_POST[$param] ) ? wp_unslash( $_POST[$param] ) : ( isset( $_GET[$param] ) ? wp_unslash( $_GET[$param] ) : $default );
384
+			if ( ! isset( $_POST[$param] ) && isset( $_GET[$param] ) && ! is_array( $value ) ) {
385
+				$value = htmlspecialchars_decode( wp_unslash( $_GET[$param] ) );
386 386
 			}
387 387
 			self::sanitize_value( $sanitize, $value );
388 388
 		} else {
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 				}
404 404
 
405 405
 				$p     = trim( $p, ']' );
406
-				$value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
406
+				$value = isset( $value[$p] ) ? $value[$p] : $default;
407 407
 			}
408 408
 		}
409 409
 
@@ -457,20 +457,20 @@  discard block
 block discarded – undo
457 457
 			'type'     => 'get',
458 458
 			'sanitize' => 'sanitize_text_field',
459 459
 		);
460
-		$args     = wp_parse_args( $args, $defaults );
460
+		$args = wp_parse_args( $args, $defaults );
461 461
 
462 462
 		$value = $args['default'];
463 463
 		if ( $args['type'] == 'get' ) {
464
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
465
-				$value = wp_unslash( $_GET[ $args['param'] ] );
464
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
465
+				$value = wp_unslash( $_GET[$args['param']] );
466 466
 			}
467 467
 		} elseif ( $args['type'] == 'post' ) {
468
-			if ( isset( $_POST[ $args['param'] ] ) ) {
469
-				$value = maybe_unserialize( wp_unslash( $_POST[ $args['param'] ] ) );
468
+			if ( isset( $_POST[$args['param']] ) ) {
469
+				$value = maybe_unserialize( wp_unslash( $_POST[$args['param']] ) );
470 470
 			}
471 471
 		} else {
472
-			if ( isset( $_REQUEST[ $args['param'] ] ) ) {
473
-				$value = wp_unslash( $_REQUEST[ $args['param'] ] );
472
+			if ( isset( $_REQUEST[$args['param']] ) ) {
473
+				$value = wp_unslash( $_REQUEST[$args['param']] );
474 474
 			}
475 475
 		}
476 476
 
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 			if ( is_array( $value ) ) {
503 503
 				$temp_values = $value;
504 504
 				foreach ( $temp_values as $k => $v ) {
505
-					self::sanitize_value( $sanitize, $value[ $k ] );
505
+					self::sanitize_value( $sanitize, $value[$k] );
506 506
 				}
507 507
 			} else {
508 508
 				$value = call_user_func( $sanitize, $value );
@@ -513,8 +513,8 @@  discard block
 block discarded – undo
513 513
 	public static function sanitize_request( $sanitize_method, &$values ) {
514 514
 		$temp_values = $values;
515 515
 		foreach ( $temp_values as $k => $val ) {
516
-			if ( isset( $sanitize_method[ $k ] ) ) {
517
-				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
516
+			if ( isset( $sanitize_method[$k] ) ) {
517
+				$values[$k] = call_user_func( $sanitize_method[$k], $val );
518 518
 			}
519 519
 		}
520 520
 	}
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
 		if ( is_array( $value ) ) {
538 538
 			$temp_values = $value;
539 539
 			foreach ( $temp_values as $k => $v ) {
540
-				self::decode_specialchars( $value[ $k ] );
540
+				self::decode_specialchars( $value[$k] );
541 541
 			}
542 542
 		} else {
543 543
 			$value = wp_specialchars_decode( $value, ENT_COMPAT );
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
 			$allowed_html = $html;
571 571
 		} elseif ( ! empty( $allowed ) ) {
572 572
 			foreach ( (array) $allowed as $a ) {
573
-				$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
573
+				$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
574 574
 			}
575 575
 		}
576 576
 
@@ -727,8 +727,8 @@  discard block
 block discarded – undo
727 727
 		}
728 728
 
729 729
 		global $wp_query;
730
-		if ( isset( $wp_query->query_vars[ $param ] ) ) {
731
-			$value = $wp_query->query_vars[ $param ];
730
+		if ( isset( $wp_query->query_vars[$param] ) ) {
731
+			$value = $wp_query->query_vars[$param];
732 732
 		}
733 733
 
734 734
 		return $value;
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 				'new_file_path' => self::plugin_path() . '/js',
893 893
 			)
894 894
 		);
895
-		$new_file  = new FrmCreateFile( $file_atts );
895
+		$new_file = new FrmCreateFile( $file_atts );
896 896
 
897 897
 		$files = array(
898 898
 			self::plugin_path() . '/js/jquery/jquery.placeholder.min.js',
@@ -1150,8 +1150,8 @@  discard block
 block discarded – undo
1150 1150
 			return $error;
1151 1151
 		}
1152 1152
 
1153
-		$nonce_value = ( $_REQUEST && isset( $_REQUEST[ $nonce_name ] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $nonce_name ] ) ) : '';
1154
-		if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
1153
+		$nonce_value = ( $_REQUEST && isset( $_REQUEST[$nonce_name] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[$nonce_name] ) ) : '';
1154
+		if ( $_REQUEST && ( ! isset( $_REQUEST[$nonce_name] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
1155 1155
 			$frm_settings = self::get_settings();
1156 1156
 			$error        = $frm_settings->admin_permission;
1157 1157
 		}
@@ -1186,7 +1186,7 @@  discard block
 block discarded – undo
1186 1186
 			} else {
1187 1187
 				foreach ( $value as $k => $v ) {
1188 1188
 					if ( ! is_array( $v ) ) {
1189
-						$value[ $k ] = call_user_func( $original_function, $v );
1189
+						$value[$k] = call_user_func( $original_function, $v );
1190 1190
 					}
1191 1191
 				}
1192 1192
 			}
@@ -1211,7 +1211,7 @@  discard block
 block discarded – undo
1211 1211
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
1212 1212
 			} else {
1213 1213
 				if ( $keys == 'keep' ) {
1214
-					$return[ $key ] = $value;
1214
+					$return[$key] = $value;
1215 1215
 				} else {
1216 1216
 					$return[] = $value;
1217 1217
 				}
@@ -1275,11 +1275,11 @@  discard block
 block discarded – undo
1275 1275
 		}
1276 1276
 
1277 1277
 		$ver = $default;
1278
-		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
1278
+		if ( ! isset( $wp_scripts->registered[$handle] ) ) {
1279 1279
 			return $ver;
1280 1280
 		}
1281 1281
 
1282
-		$query = $wp_scripts->registered[ $handle ];
1282
+		$query = $wp_scripts->registered[$handle];
1283 1283
 		if ( is_object( $query ) && ! empty( $query->ver ) ) {
1284 1284
 			$ver = $query->ver;
1285 1285
 		}
@@ -1414,7 +1414,7 @@  discard block
 block discarded – undo
1414 1414
 
1415 1415
 		foreach ( array( 'name', 'description' ) as $var ) {
1416 1416
 			$default_val    = isset( $record->{$var} ) ? $record->{$var} : '';
1417
-			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
1417
+			$values[$var] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
1418 1418
 			unset( $var, $default_val );
1419 1419
 		}
1420 1420
 
@@ -1469,8 +1469,8 @@  discard block
 block discarded – undo
1469 1469
 			}
1470 1470
 		}
1471 1471
 
1472
-		$field_type = isset( $post_values['field_options'][ 'type_' . $field->id ] ) ? $post_values['field_options'][ 'type_' . $field->id ] : $field->type;
1473
-		$new_value  = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
1472
+		$field_type = isset( $post_values['field_options']['type_' . $field->id] ) ? $post_values['field_options']['type_' . $field->id] : $field->type;
1473
+		$new_value  = isset( $post_values['item_meta'][$field->id] ) ? maybe_unserialize( $post_values['item_meta'][$field->id] ) : $meta_value;
1474 1474
 
1475 1475
 		$field_array                   = self::start_field_array( $field );
1476 1476
 		$field_array['value']          = $new_value;
@@ -1487,7 +1487,7 @@  discard block
 block discarded – undo
1487 1487
 
1488 1488
 		$field_array = array_merge( $field->field_options, $field_array );
1489 1489
 
1490
-		$values['fields'][ $field->id ] = $field_array;
1490
+		$values['fields'][$field->id] = $field_array;
1491 1491
 	}
1492 1492
 
1493 1493
 	/**
@@ -1534,7 +1534,7 @@  discard block
 block discarded – undo
1534 1534
 		}
1535 1535
 
1536 1536
 		foreach ( $form->options as $opt => $value ) {
1537
-			$values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
1537
+			$values[$opt] = isset( $post_values[$opt] ) ? maybe_unserialize( $post_values[$opt] ) : $value;
1538 1538
 		}
1539 1539
 
1540 1540
 		self::fill_form_defaults( $post_values, $values );
@@ -1547,8 +1547,8 @@  discard block
 block discarded – undo
1547 1547
 		$form_defaults = FrmFormsHelper::get_default_opts();
1548 1548
 
1549 1549
 		foreach ( $form_defaults as $opt => $default ) {
1550
-			if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
1551
-				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
1550
+			if ( ! isset( $values[$opt] ) || $values[$opt] == '' ) {
1551
+				$values[$opt] = ( $post_values && isset( $post_values['options'][$opt] ) ) ? $post_values['options'][$opt] : $default;
1552 1552
 			}
1553 1553
 
1554 1554
 			unset( $opt, $default );
@@ -1559,8 +1559,8 @@  discard block
 block discarded – undo
1559 1559
 		}
1560 1560
 
1561 1561
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
1562
-			if ( ! isset( $values[ $h . '_html' ] ) ) {
1563
-				$values[ $h . '_html' ] = ( isset( $post_values['options'][ $h . '_html' ] ) ? $post_values['options'][ $h . '_html' ] : FrmFormsHelper::get_default_html( $h ) );
1562
+			if ( ! isset( $values[$h . '_html'] ) ) {
1563
+				$values[$h . '_html'] = ( isset( $post_values['options'][$h . '_html'] ) ? $post_values['options'][$h . '_html'] : FrmFormsHelper::get_default_html( $h ) );
1564 1564
 			}
1565 1565
 			unset( $h );
1566 1566
 		}
@@ -1710,10 +1710,10 @@  discard block
 block discarded – undo
1710 1710
 		$time_strings = self::get_time_strings();
1711 1711
 
1712 1712
 		foreach ( $time_strings as $k => $v ) {
1713
-			if ( $diff[ $k ] ) {
1714
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
1713
+			if ( $diff[$k] ) {
1714
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
1715 1715
 			} else {
1716
-				unset( $time_strings[ $k ] );
1716
+				unset( $time_strings[$k] );
1717 1717
 			}
1718 1718
 		}
1719 1719
 
@@ -1794,17 +1794,17 @@  discard block
 block discarded – undo
1794 1794
 
1795 1795
 					case 1:
1796 1796
 						$l2 = $name;
1797
-						self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
1797
+						self::add_value_to_array( $name, $l2, $this_val, $vars[$l1] );
1798 1798
 						break;
1799 1799
 
1800 1800
 					case 2:
1801 1801
 						$l3 = $name;
1802
-						self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
1802
+						self::add_value_to_array( $name, $l3, $this_val, $vars[$l1][$l2] );
1803 1803
 						break;
1804 1804
 
1805 1805
 					case 3:
1806 1806
 						$l4 = $name;
1807
-						self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
1807
+						self::add_value_to_array( $name, $l4, $this_val, $vars[$l1][$l2][$l3] );
1808 1808
 				}
1809 1809
 
1810 1810
 				unset( $this_val, $n );
@@ -1823,8 +1823,8 @@  discard block
 block discarded – undo
1823 1823
 	public static function add_value_to_array( $name, $l1, $val, &$vars ) {
1824 1824
 		if ( $name == '' ) {
1825 1825
 			$vars[] = $val;
1826
-		} elseif ( ! isset( $vars[ $l1 ] ) ) {
1827
-			$vars[ $l1 ] = $val;
1826
+		} elseif ( ! isset( $vars[$l1] ) ) {
1827
+			$vars[$l1] = $val;
1828 1828
 		}
1829 1829
 	}
1830 1830
 
@@ -1840,7 +1840,7 @@  discard block
 block discarded – undo
1840 1840
 			'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() ) ),
1841 1841
 		);
1842 1842
 
1843
-		if ( ! isset( $tooltips[ $name ] ) ) {
1843
+		if ( ! isset( $tooltips[$name] ) ) {
1844 1844
 			return;
1845 1845
 		}
1846 1846
 
@@ -1850,7 +1850,7 @@  discard block
 block discarded – undo
1850 1850
 			echo ' class="frm_help"';
1851 1851
 		}
1852 1852
 
1853
-		echo ' title="' . esc_attr( $tooltips[ $name ] );
1853
+		echo ' title="' . esc_attr( $tooltips[$name] );
1854 1854
 
1855 1855
 		if ( 'open' != $class ) {
1856 1856
 			echo '"';
@@ -1903,13 +1903,13 @@  discard block
 block discarded – undo
1903 1903
 	}
1904 1904
 
1905 1905
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
1906
-		if ( ! isset( $post_content[ $key ] ) ) {
1906
+		if ( ! isset( $post_content[$key] ) ) {
1907 1907
 			return;
1908 1908
 		}
1909 1909
 
1910 1910
 		if ( is_array( $val ) ) {
1911 1911
 			foreach ( $val as $k1 => $v1 ) {
1912
-				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
1912
+				self::prepare_action_slashes( $v1, $k1, $post_content[$key] );
1913 1913
 				unset( $k1, $v1 );
1914 1914
 			}
1915 1915
 		} else {
@@ -1917,7 +1917,7 @@  discard block
 block discarded – undo
1917 1917
 			$val = stripslashes( $val );
1918 1918
 
1919 1919
 			// Add backslashes before double quotes and forward slashes only
1920
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
1920
+			$post_content[$key] = addcslashes( $val, '"\\/' );
1921 1921
 		}
1922 1922
 	}
1923 1923
 
Please login to merge, or discard this patch.