Strategy11 / formidable-forms

classes/controllers/FrmFormActionsController.php

Spacing +17 added lines, -17 removed lines

@@ -98,19 +98,19 @@ 
 		}
 
 		foreach ( $action_controls as $action ) {
-			if ( isset( $groups[ $action->id_base ] ) || in_array( $action->id_base, $grouped ) ) {
+			if ( isset( $groups[$action->id_base] ) || in_array( $action->id_base, $grouped ) ) {
 				continue;
 			}
 
 			$this_group = $action->action_options['group'];
-			if ( ! isset( $groups[ $this_group ] ) ) {
+			if ( ! isset( $groups[$this_group] ) ) {
 				$this_group = 'misc';
 			}
 
-			if ( ! isset( $groups[ $this_group ]['actions'] ) ) {
-				$groups[ $this_group ]['actions'] = array();
+			if ( ! isset( $groups[$this_group]['actions'] ) ) {
+				$groups[$this_group]['actions'] = array();
 			}
-			$groups[ $this_group ]['actions'][] = $action->id_base;
+			$groups[$this_group]['actions'][] = $action->id_base;
 
 			unset( $action );
 		}
@@ -241,7 +241,7 @@ 
 				return $a;
 			}
 
-			$actions[ $a->id_base ] = $a;
+			$actions[$a->id_base] = $a;
 		}
 
 		return $actions;
@@ -272,16 +272,16 @@ 
 		$action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-			$action_map[ $control->id_base ] = $key;
+			$action_map[$control->id_base] = $key;
 		}
 
 		foreach ( $form_actions as $action ) {
-			if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_map[$action->post_excerpt] ) ) {
 				// don't try and show settings if action no longer exists
 				continue;
 			}
 
-			self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+			self::action_control( $action, $form, $action->ID, $action_controls[$action_map[$action->post_excerpt]], $values );
 		}
 	}
 
@@ -489,8 +489,8 @@ 
 			}
 
 			// Store actions so they can be triggered with the correct priority.
-			$stored_actions[ $action->ID ]  = $action;
-			$action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+			$stored_actions[$action->ID]  = $action;
+			$action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
 
 			unset( $action );
 		}
@@ -502,7 +502,7 @@ 
 			new FrmNotification();
 
 			foreach ( $action_priority as $action_id => $priority ) {
-				$action = $stored_actions[ $action_id ];
+				$action = $stored_actions[$action_id];
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_action', $action, $entry, $form, $event );
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_' . $event . '_action', $action, $entry, $form );
 
@@ -549,12 +549,12 @@ 
 	}
 
 	public function register( $action_class ) {
-		$this->actions[ $action_class ] = new $action_class();
+		$this->actions[$action_class] = new $action_class();
 	}
 
 	public function unregister( $action_class ) {
-		if ( isset( $this->actions[ $action_class ] ) ) {
-			unset( $this->actions[ $action_class ] );
+		if ( isset( $this->actions[$action_class] ) ) {
+			unset( $this->actions[$action_class] );
 		}
 	}
 
@@ -563,8 +563,8 @@ 
 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
-			if ( ! isset( $this->actions[ $key ] ) ) {
-				$this->actions[ $key ]->_register();
+			if ( ! isset( $this->actions[$key] ) ) {
+				$this->actions[$key]->_register();
 			}
 		}
 	}

css/_single_theme.css.php

Spacing +4 added lines, -4 removed lines

@@ -85,11 +85,11 @@ 
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_icon_font.frm_minus_icon:before{
-	content:"\e<?php echo esc_html( isset( $minus_icons[ $repeat_icon ] ) ? $minus_icons[ $repeat_icon ]['-'] : $minus_icons[1]['-'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $minus_icons[$repeat_icon] ) ? $minus_icons[$repeat_icon]['-'] : $minus_icons[1]['-'] ); ?>";
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_icon_font.frm_plus_icon:before{
-	content:"\e<?php echo esc_html( isset( $minus_icons[ $repeat_icon ] ) ? $minus_icons[ $repeat_icon ]['+'] : $minus_icons[1]['+'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $minus_icons[$repeat_icon] ) ? $minus_icons[$repeat_icon]['+'] : $minus_icons[1]['+'] ); ?>";
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_icon_font.frm_minus_icon:before,
@@ -99,12 +99,12 @@ 
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_trigger.active .frm_icon_font.frm_arrow_icon:before{
-	content:"\e<?php echo esc_html( isset( $arrow_icons[ $collapse_icon ] ) ? $arrow_icons[ $collapse_icon ]['-'] : $arrow_icons[1]['-'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $arrow_icons[$collapse_icon] ) ? $arrow_icons[$collapse_icon]['-'] : $arrow_icons[1]['-'] ); ?>";
 	color:<?php echo esc_html( $section_color . $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_trigger .frm_icon_font.frm_arrow_icon:before{
-	content:"\e<?php echo esc_html( isset( $arrow_icons[ $collapse_icon ] ) ? $arrow_icons[ $collapse_icon ]['+'] : $arrow_icons[1]['+'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $arrow_icons[$collapse_icon] ) ? $arrow_icons[$collapse_icon]['+'] : $arrow_icons[1]['+'] ); ?>";
 	color:<?php echo esc_html( $section_color . $important ); ?>;
 }
 

classes/helpers/FrmAppHelper.php

Doc Comments +25 added lines

@@ -69,6 +69,9 @@ 
 		return $url;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function get_affiliate() {
 		return absint( apply_filters( 'frm_affiliate_id', 0 ) );
 	}
@@ -129,6 +132,9 @@ 
 		return $frm_settings;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function get_menu_name() {
 		$frm_settings = self::get_settings();
 
@@ -413,6 +419,9 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param string $param
+	 */
 	public static function get_post_param( $param, $default = '', $sanitize = '' ) {
 		return self::get_simple_request(
 			array(
@@ -1151,6 +1160,9 @@ 
 		return ( is_array( $values ) && in_array( $current, $values ) ) || ( ! is_array( $values ) && $values == $current );
 	}
 
+	/**
+	 * @param string $function
+	 */
 	public static function recursive_function_map( $value, $function ) {
 		if ( is_array( $value ) ) {
 			$original_function = $function;
@@ -1199,6 +1211,9 @@ 
 		return $return;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function esc_textarea( $text, $is_rich_text = false ) {
 		$safe_text = str_replace( '"', '"', $text );
 		if ( ! $is_rich_text ) {
@@ -1411,6 +1426,9 @@ 
 		return $values;
 	}
 
+	/**
+	 * @param string $fields
+	 */
 	private static function prepare_field_arrays( $fields, $record, array &$values, $args ) {
 		if ( ! empty( $fields ) ) {
 			foreach ( (array) $fields as $field ) {
@@ -1604,6 +1622,9 @@ 
 		return $sub . ( ( $len < $original_len ) ? $continue : '' );
 	}
 
+	/**
+	 * @param string[] $function_names
+	 */
 	public static function mb_function( $function_names, $args ) {
 		$mb_function_name = $function_names[0];
 		$function_name    = $function_names[1];
@@ -1638,6 +1659,9 @@ 
 		return $formatted;
 	}
 
+	/**
+	 * @param string $time_format
+	 */
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
 			$time_format = get_option( 'time_format' );
@@ -2062,6 +2086,7 @@ 
 	 * If Pro is far outdated, show a message.
 	 *
 	 * @since 4.0.01
+	 * @param string $min_version
 	 */
 	public static function min_pro_version_notice( $min_version ) {
 		if ( ! self::is_formidable_admin() ) {

Spacing +50 added lines, -50 removed lines

@@ -145,7 +145,7 @@ 
 			'fill'   => '#4d4d4d',
 			'orange' => '#f05a24',
 		);
-		$atts     = array_merge( $defaults, $atts );
+		$atts = array_merge( $defaults, $atts );
 
 		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'] ) . '">
 				<defs />
@@ -336,7 +336,7 @@ 
 	 * @return string
 	 */
 	public static function get_server_value( $value ) {
-		return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[ $value ] ) ) : '';
+		return isset( $_SERVER[$value] ) ? wp_strip_all_tags( wp_unslash( $_SERVER[$value] ) ) : '';
 	}
 
 	/**
@@ -359,7 +359,7 @@ 
 		);
 		$ip = '';
 		foreach ( $ip_options as $key ) {
-			if ( ! isset( $_SERVER[ $key ] ) ) {
+			if ( ! isset( $_SERVER[$key] ) ) {
 				continue;
 			}
 
@@ -383,9 +383,9 @@ 
 		}
 
 		if ( $src == 'get' ) {
-			$value = isset( $_POST[ $param ] ) ? wp_unslash( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? wp_unslash( $_GET[ $param ] ) : $default );
-			if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
-				$value = htmlspecialchars_decode( wp_unslash( $_GET[ $param ] ) );
+			$value = isset( $_POST[$param] ) ? wp_unslash( $_POST[$param] ) : ( isset( $_GET[$param] ) ? wp_unslash( $_GET[$param] ) : $default );
+			if ( ! isset( $_POST[$param] ) && isset( $_GET[$param] ) && ! is_array( $value ) ) {
+				$value = htmlspecialchars_decode( wp_unslash( $_GET[$param] ) );
 			}
 			self::sanitize_value( $sanitize, $value );
 		} else {
@@ -406,7 +406,7 @@ 
 				}
 
 				$p     = trim( $p, ']' );
-				$value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
+				$value = isset( $value[$p] ) ? $value[$p] : $default;
 			}
 		}
 
@@ -460,20 +460,20 @@ 
 			'type'     => 'get',
 			'sanitize' => 'sanitize_text_field',
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
 		$value = $args['default'];
 		if ( $args['type'] == 'get' ) {
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
-				$value = wp_unslash( $_GET[ $args['param'] ] );
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
+				$value = wp_unslash( $_GET[$args['param']] );
 			}
 		} elseif ( $args['type'] == 'post' ) {
-			if ( isset( $_POST[ $args['param'] ] ) ) {
-				$value = maybe_unserialize( wp_unslash( $_POST[ $args['param'] ] ) );
+			if ( isset( $_POST[$args['param']] ) ) {
+				$value = maybe_unserialize( wp_unslash( $_POST[$args['param']] ) );
 			}
 		} else {
-			if ( isset( $_REQUEST[ $args['param'] ] ) ) {
-				$value = wp_unslash( $_REQUEST[ $args['param'] ] );
+			if ( isset( $_REQUEST[$args['param']] ) ) {
+				$value = wp_unslash( $_REQUEST[$args['param']] );
 			}
 		}
 
@@ -505,7 +505,7 @@ 
 			if ( is_array( $value ) ) {
 				$temp_values = $value;
 				foreach ( $temp_values as $k => $v ) {
-					self::sanitize_value( $sanitize, $value[ $k ] );
+					self::sanitize_value( $sanitize, $value[$k] );
 				}
 			} else {
 				$value = call_user_func( $sanitize, $value );
@@ -516,8 +516,8 @@ 
 	public static function sanitize_request( $sanitize_method, &$values ) {
 		$temp_values = $values;
 		foreach ( $temp_values as $k => $val ) {
-			if ( isset( $sanitize_method[ $k ] ) ) {
-				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
+			if ( isset( $sanitize_method[$k] ) ) {
+				$values[$k] = call_user_func( $sanitize_method[$k], $val );
 			}
 		}
 	}
@@ -540,7 +540,7 @@ 
 		if ( is_array( $value ) ) {
 			$temp_values = $value;
 			foreach ( $temp_values as $k => $v ) {
-				self::decode_specialchars( $value[ $k ] );
+				self::decode_specialchars( $value[$k] );
 			}
 		} else {
 			$value = wp_specialchars_decode( $value, ENT_COMPAT );
@@ -573,7 +573,7 @@ 
 			$allowed_html = $html;
 		} elseif ( ! empty( $allowed ) ) {
 			foreach ( (array) $allowed as $a ) {
-				$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
+				$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
 			}
 		}
 
@@ -730,8 +730,8 @@ 
 		}
 
 		global $wp_query;
-		if ( isset( $wp_query->query_vars[ $param ] ) ) {
-			$value = $wp_query->query_vars[ $param ];
+		if ( isset( $wp_query->query_vars[$param] ) ) {
+			$value = $wp_query->query_vars[$param];
 		}
 
 		return $value;
@@ -895,7 +895,7 @@ 
 				'new_file_path' => self::plugin_path() . '/js',
 			)
 		);
-		$new_file  = new FrmCreateFile( $file_atts );
+		$new_file = new FrmCreateFile( $file_atts );
 
 		$files = array(
 			self::plugin_path() . '/js/jquery/jquery.placeholder.min.js',
@@ -1153,8 +1153,8 @@ 
 			return $error;
 		}
 
-		$nonce_value = ( $_REQUEST && isset( $_REQUEST[ $nonce_name ] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[ $nonce_name ] ) ) : '';
-		if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
+		$nonce_value = ( $_REQUEST && isset( $_REQUEST[$nonce_name] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST[$nonce_name] ) ) : '';
+		if ( $_REQUEST && ( ! isset( $_REQUEST[$nonce_name] ) || ! wp_verify_nonce( $nonce_value, $nonce ) ) ) {
 			$frm_settings = self::get_settings();
 			$error        = $frm_settings->admin_permission;
 		}
@@ -1189,7 +1189,7 @@ 
 			} else {
 				foreach ( $value as $k => $v ) {
 					if ( ! is_array( $v ) ) {
-						$value[ $k ] = call_user_func( $original_function, $v );
+						$value[$k] = call_user_func( $original_function, $v );
 					}
 				}
 			}
@@ -1214,7 +1214,7 @@ 
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
 			} else {
 				if ( $keys == 'keep' ) {
-					$return[ $key ] = $value;
+					$return[$key] = $value;
 				} else {
 					$return[] = $value;
 				}
@@ -1278,11 +1278,11 @@ 
 		}
 
 		$ver = $default;
-		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
+		if ( ! isset( $wp_scripts->registered[$handle] ) ) {
 			return $ver;
 		}
 
-		$query = $wp_scripts->registered[ $handle ];
+		$query = $wp_scripts->registered[$handle];
 		if ( is_object( $query ) && ! empty( $query->ver ) ) {
 			$ver = $query->ver;
 		}
@@ -1417,7 +1417,7 @@ 
 
 		foreach ( array( 'name', 'description' ) as $var ) {
 			$default_val    = isset( $record->{$var} ) ? $record->{$var} : '';
-			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
+			$values[$var] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
 			unset( $var, $default_val );
 		}
 
@@ -1472,8 +1472,8 @@ 
 			}
 		}
 
-		$field_type = isset( $post_values['field_options'][ 'type_' . $field->id ] ) ? $post_values['field_options'][ 'type_' . $field->id ] : $field->type;
-		$new_value  = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
+		$field_type = isset( $post_values['field_options']['type_' . $field->id] ) ? $post_values['field_options']['type_' . $field->id] : $field->type;
+		$new_value  = isset( $post_values['item_meta'][$field->id] ) ? maybe_unserialize( $post_values['item_meta'][$field->id] ) : $meta_value;
 
 		$field_array                   = self::start_field_array( $field );
 		$field_array['value']          = $new_value;
@@ -1490,7 +1490,7 @@ 
 
 		$field_array = array_merge( $field->field_options, $field_array );
 
-		$values['fields'][ $field->id ] = $field_array;
+		$values['fields'][$field->id] = $field_array;
 	}
 
 	/**
@@ -1537,7 +1537,7 @@ 
 		}
 
 		foreach ( $form->options as $opt => $value ) {
-			$values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
+			$values[$opt] = isset( $post_values[$opt] ) ? maybe_unserialize( $post_values[$opt] ) : $value;
 		}
 
 		self::fill_form_defaults( $post_values, $values );
@@ -1550,8 +1550,8 @@ 
 		$form_defaults = FrmFormsHelper::get_default_opts();
 
 		foreach ( $form_defaults as $opt => $default ) {
-			if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
-				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
+			if ( ! isset( $values[$opt] ) || $values[$opt] == '' ) {
+				$values[$opt] = ( $post_values && isset( $post_values['options'][$opt] ) ) ? $post_values['options'][$opt] : $default;
 			}
 
 			unset( $opt, $default );
@@ -1562,8 +1562,8 @@ 
 		}
 
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
-			if ( ! isset( $values[ $h . '_html' ] ) ) {
-				$values[ $h . '_html' ] = ( isset( $post_values['options'][ $h . '_html' ] ) ? $post_values['options'][ $h . '_html' ] : FrmFormsHelper::get_default_html( $h ) );
+			if ( ! isset( $values[$h . '_html'] ) ) {
+				$values[$h . '_html'] = ( isset( $post_values['options'][$h . '_html'] ) ? $post_values['options'][$h . '_html'] : FrmFormsHelper::get_default_html( $h ) );
 			}
 			unset( $h );
 		}
@@ -1713,10 +1713,10 @@ 
 		$time_strings = self::get_time_strings();
 
 		foreach ( $time_strings as $k => $v ) {
-			if ( $diff[ $k ] ) {
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
+			if ( $diff[$k] ) {
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
 			} else {
-				unset( $time_strings[ $k ] );
+				unset( $time_strings[$k] );
 			}
 		}
 
@@ -1797,17 +1797,17 @@ 
 
 					case 1:
 						$l2 = $name;
-						self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
+						self::add_value_to_array( $name, $l2, $this_val, $vars[$l1] );
 						break;
 
 					case 2:
 						$l3 = $name;
-						self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
+						self::add_value_to_array( $name, $l3, $this_val, $vars[$l1][$l2] );
 						break;
 
 					case 3:
 						$l4 = $name;
-						self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
+						self::add_value_to_array( $name, $l4, $this_val, $vars[$l1][$l2][$l3] );
 				}
 
 				unset( $this_val, $n );
@@ -1826,8 +1826,8 @@ 
 	public static function add_value_to_array( $name, $l1, $val, &$vars ) {
 		if ( $name == '' ) {
 			$vars[] = $val;
-		} elseif ( ! isset( $vars[ $l1 ] ) ) {
-			$vars[ $l1 ] = $val;
+		} elseif ( ! isset( $vars[$l1] ) ) {
+			$vars[$l1] = $val;
 		}
 	}
 
@@ -1843,7 +1843,7 @@ 
 			'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() ) ),
 		);
 
-		if ( ! isset( $tooltips[ $name ] ) ) {
+		if ( ! isset( $tooltips[$name] ) ) {
 			return;
 		}
 
@@ -1853,7 +1853,7 @@ 
 			echo ' class="frm_help"';
 		}
 
-		echo ' title="' . esc_attr( $tooltips[ $name ] );
+		echo ' title="' . esc_attr( $tooltips[$name] );
 
 		if ( 'open' != $class ) {
 			echo '"';
@@ -1906,13 +1906,13 @@ 
 	}
 
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
-		if ( ! isset( $post_content[ $key ] ) ) {
+		if ( ! isset( $post_content[$key] ) ) {
 			return;
 		}
 
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k1 => $v1 ) {
-				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
+				self::prepare_action_slashes( $v1, $k1, $post_content[$key] );
 				unset( $k1, $v1 );
 			}
 		} else {
@@ -1920,7 +1920,7 @@ 
 			$val = stripslashes( $val );
 
 			// Add backslashes before double quotes and forward slashes only
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
+			$post_content[$key] = addcslashes( $val, '"\\/' );
 		}
 	}
 

classes/views/frm-fields/back-end/settings.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		printf(
 			/* translators: %s: Field type */
 			esc_html__( '%s Options', 'formidable' ),
-			esc_html( $all_field_types[ $display['type'] ]['name'] )
+			esc_html( $all_field_types[$display['type']]['name'] )
 		);
 		?>
 		<i class="frm_icon_font frm_arrowdown6_icon"></i>

classes/models/FrmFormAction.php

Spacing +43 added lines, -43 removed lines

@@ -2,15 +2,15 @@ 
 
 class FrmFormAction {
 
-	public $id_base;         // Root id for all actions of this type.
-	public $name;            // Name for this action type.
+	public $id_base; // Root id for all actions of this type.
+	public $name; // Name for this action type.
 	public $option_name;
-	public $action_options;  // Option array passed to wp_register_sidebar_widget()
+	public $action_options; // Option array passed to wp_register_sidebar_widget()
 	public $control_options; // Option array passed to wp_register_widget_control()
 
-	public $form_id;         // The ID of the form to evaluate
-	public $number = false;  // Unique ID number of the current instance.
-	public $id = '';         // Unique ID string of the current instance (id_base-number)
+	public $form_id; // The ID of the form to evaluate
+	public $number = false; // Unique ID number of the current instance.
+	public $id = ''; // Unique ID string of the current instance (id_base-number)
 	public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
 
 	// Member functions that you must over-ride.
@@ -133,9 +133,9 @@ 
 		$groups = FrmFormActionsController::form_action_groups();
 		$group  = 'misc';
 
-		if ( isset( $action_options['group'] ) && isset( $groups[ $action_options['group'] ] ) ) {
+		if ( isset( $action_options['group'] ) && isset( $groups[$action_options['group']] ) ) {
 			$group = $action_options['group'];
-		} elseif ( isset( $groups[ $this->id_base ] ) ) {
+		} elseif ( isset( $groups[$this->id_base] ) ) {
 			$group = $this->id_base;
 		} else {
 			foreach ( $groups as $name => $check_group ) {
@@ -146,8 +146,8 @@ 
 			}
 		}
 
-		$groups[ $group ]['id'] = $group;
-		return $groups[ $group ];
+		$groups[$group]['id'] = $group;
+		return $groups[$group];
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 * @return integer $post_id
 	 */
 	public function maybe_create_action( $action, $forms ) {
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[ $action['menu_order'] ] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[$action['menu_order']] ) && $forms[$action['menu_order']] == 'updated' ) {
 			// Update action only
 			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
 			$post_id                = $this->save_settings( $action );
@@ -268,18 +268,18 @@ 
 		$action->menu_order = $form_id;
 		$switch             = $this->get_global_switch_fields();
 		foreach ( (array) $action->post_content as $key => $val ) {
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
 			} elseif ( ! is_array( $val ) ) {
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
-			} elseif ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
+			} elseif ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
 				// loop through each value if empty
-				if ( empty( $switch[ $key ] ) ) {
-					$switch[ $key ] = array_keys( $val );
+				if ( empty( $switch[$key] ) ) {
+					$switch[$key] = array_keys( $val );
 				}
 
-				foreach ( $switch[ $key ] as $subkey ) {
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
+				foreach ( $switch[$key] as $subkey ) {
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
 				}
 			}
 
@@ -297,20 +297,20 @@ 
 			foreach ( $subkey as $subkey2 ) {
 				foreach ( (array) $val as $ck => $cv ) {
 					if ( is_array( $cv ) ) {
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
-					} elseif ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
+					} elseif ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
 					}
 				}
 			}
 		} else {
 			foreach ( (array) $val as $ck => $cv ) {
 				if ( is_array( $cv ) ) {
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
-				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
+				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
+					$action[$ck] = $frm_duplicate_ids[$cv];
 				} elseif ( $ck == $subkey ) {
-					$action[ $ck ] = FrmFieldsHelper::switch_field_ids( $action[ $ck ] );
+					$action[$ck] = FrmFieldsHelper::switch_field_ids( $action[$ck] );
 				}
 			}
 		}
@@ -333,8 +333,8 @@ 
 			return;
 		}
 
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
-			$settings = wp_unslash( $_POST[ $this->option_name ] );
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
+			$settings = wp_unslash( $_POST[$this->option_name] );
 		} else {
 			return;
 		}
@@ -344,7 +344,7 @@ 
 		foreach ( $settings as $number => $new_instance ) {
 			$this->_set( $number );
 
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
 
 			if ( ! isset( $new_instance['post_status'] ) ) {
 				$new_instance['post_status'] = 'draft';
@@ -384,7 +384,7 @@ 
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $new_instance['post_content'], $instance, $new_instance, $old_instance, $this );
 
 			if ( false !== $instance ) {
-				$all_instances[ $number ] = $instance;
+				$all_instances[$number] = $instance;
 			}
 
 			$action_ids[] = $this->save_settings( $instance );
@@ -460,12 +460,12 @@ 
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
 				continue;
 			}
 
-			$action                  = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
-			$settings[ $action->ID ] = $action;
+			$action                  = $action_controls[$action->post_excerpt]->prepare_action( $action );
+			$settings[$action->ID] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
@@ -495,7 +495,7 @@ 
 			'limit'       => 99,
 			'post_status' => $default_status,
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 	}
 
 	/**
@@ -556,7 +556,7 @@ 
 
 			$action = $this->prepare_action( $action );
 
-			$settings[ $action->ID ] = $action;
+			$settings[$action->ID] = $action;
 		}
 
 		if ( 1 === $limit ) {
@@ -593,10 +593,10 @@ 
 
 		foreach ( $default_values as $k => $vals ) {
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
-				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
+				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
 					continue;
 				}
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
 			}
 		}
 
@@ -674,9 +674,9 @@ 
 
 		// fill with existing options
 		foreach ( $action->post_content as $name => $val ) {
-			if ( isset( $form->options[ $name ] ) ) {
-				$action->post_content[ $name ] = $form->options[ $name ];
-				unset( $form->options[ $name ] );
+			if ( isset( $form->options[$name] ) ) {
+				$action->post_content[$name] = $form->options[$name];
+				unset( $form->options[$name] );
 			}
 		}
 
@@ -737,7 +737,7 @@ 
 				$stop = $stop ? false : true;
 			}
 
-			$met[ $stop ] = $stop;
+			$met[$stop] = $stop;
 		}
 
 		if ( $notification['conditions']['any_all'] == 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
@@ -779,8 +779,8 @@ 
 	private static function get_value_from_entry( $entry, $field_id ) {
 		$observed_value = '';
 
-		if ( isset( $entry->metas[ $field_id ] ) ) {
-			$observed_value = $entry->metas[ $field_id ];
+		if ( isset( $entry->metas[$field_id] ) ) {
+			$observed_value = $entry->metas[$field_id];
 		} elseif ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
 			$field          = FrmField::getOne( $field_id );
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value(

classes/helpers/FrmEntriesHelper.php

Spacing +28 added lines, -28 removed lines

@@ -117,10 +117,10 @@ 
 		if ( $_POST ) {
 			$repeating = isset( $args['repeating'] ) && $args['repeating'];
 			if ( $repeating ) {
-				if ( isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] ) ) {
+				if ( isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] ) ) {
 					$value_is_posted = true;
 				}
-			} elseif ( isset( $_POST['item_meta'][ $field->id ] ) ) {
+			} elseif ( isset( $_POST['item_meta'][$field->id] ) ) {
 				$value_is_posted = true;
 			}
 		}
@@ -150,7 +150,7 @@ 
 		preg_match_all( "/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER );
 
 		foreach ( $shortcodes[0] as $short_key => $tag ) {
-			$add_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
+			$add_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][$short_key] );
 			if ( ! empty( $add_atts ) ) {
 				$this_atts = array_merge( $atts, $add_atts );
 			} else {
@@ -160,14 +160,14 @@ 
 			$default = FrmEntriesController::show_entry_shortcode( $this_atts );
 
 			// Add the default message.
-			$message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
+			$message = str_replace( $shortcodes[0][$short_key], $default, $message );
 		}
 
 		return $message;
 	}
 
 	public static function prepare_display_value( $entry, $field, $atts ) {
-		$field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false;
+		$field_value = isset( $entry->metas[$field->id] ) ? $entry->metas[$field->id] : false;
 
 		if ( FrmAppHelper::pro_is_installed() ) {
 			FrmProEntriesHelper::get_dynamic_list_values( $field, $entry, $field_value );
@@ -185,7 +185,7 @@ 
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) );
 		} else {
 			// Get all values for this field.
-			$child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
+			$child_values = isset( $entry->metas[$atts['embedded_field_id']] ) ? $entry->metas[$atts['embedded_field_id']] : false;
 
 			if ( $child_values ) {
 				$child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
@@ -298,7 +298,7 @@ 
 			$value = $args['temp_value'];
 		}
 		if ( empty( $args['parent_field_id'] ) ) {
-			$_POST['item_meta'][ $field->id ] = $value;
+			$_POST['item_meta'][$field->id] = $value;
 		} else {
 			self::set_parent_field_posted_value( $field, $value, $args );
 		}
@@ -310,29 +310,29 @@ 
 	 * @since 4.01
 	 */
 	private static function set_parent_field_posted_value( $field, $value, $args ) {
-		if ( isset( $_POST['item_meta'][ $args['parent_field_id'] ] ) &&
-			 is_array( $_POST['item_meta'][ $args['parent_field_id'] ] ) ) {
+		if ( isset( $_POST['item_meta'][$args['parent_field_id']] ) &&
+			 is_array( $_POST['item_meta'][$args['parent_field_id']] ) ) {
 
-			if ( ! isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] ) ||
-				 ! is_array( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] ) ) {
-				$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] = array();
+			if ( ! isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] ) ||
+				 ! is_array( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] ) ) {
+				$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] = array();
 			}
 		} else {
 			// All of the section was probably removed.
-			$_POST['item_meta'][ $args['parent_field_id'] ] = array();
-			$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] = array();
+			$_POST['item_meta'][$args['parent_field_id']] = array();
+			$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] = array();
 		}
 
-		$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
+		$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] = $value;
 	}
 
 	public static function get_posted_value( $field, &$value, $args ) {
 		$field_id = is_object( $field ) ? $field->id : $field;
 
 		if ( empty( $args['parent_field_id'] ) ) {
-			$value = isset( $_POST['item_meta'][ $field_id ] ) ? wp_unslash( $_POST['item_meta'][ $field_id ] ) : '';
+			$value = isset( $_POST['item_meta'][$field_id] ) ? wp_unslash( $_POST['item_meta'][$field_id] ) : '';
 		} else {
-			$value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? wp_unslash( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) : '';
+			$value = isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] ) ? wp_unslash( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] ) : '';
 		}
 
 		if ( is_array( $field ) ) {
@@ -365,12 +365,12 @@ 
 		self::set_other_repeating_vals( $field, $value, $args );
 
 		// Check if there are any posted "Other" values.
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][$field->id] ) ) {
 
 			// Save original value.
 			$args['temp_value'] = $value;
 			$args['other']      = true;
-			$other_vals         = wp_unslash( $_POST['item_meta']['other'][ $field->id ] );
+			$other_vals         = wp_unslash( $_POST['item_meta']['other'][$field->id] );
 
 			// Set the validation value now
 			self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -392,12 +392,12 @@ 
 		}
 
 		// Check if there are any other posted "other" values for this field.
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] ) ) {
 			// Save original value
 			$args['temp_value'] = $value;
 			$args['other']      = true;
 
-			$other_vals = wp_unslash( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] );
+			$other_vals = wp_unslash( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] );
 
 			// Set the validation value now.
 			self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -434,25 +434,25 @@ 
 
 			// Multi-select dropdown.
 			if ( is_array( $value ) ) {
-				$o_key = array_search( $field->options[ $other_key ], $value );
+				$o_key = array_search( $field->options[$other_key], $value );
 
 				if ( $o_key !== false ) {
 					// Modify the original value so other key will be preserved.
-					$value[ $other_key ] = $value[ $o_key ];
+					$value[$other_key] = $value[$o_key];
 
 					// By default, the array keys will be numeric for multi-select dropdowns.
 					// If going backwards and forwards between pages, the array key will match the other key.
 					if ( $o_key !== $other_key ) {
-						unset( $value[ $o_key ] );
+						unset( $value[$o_key] );
 					}
 
 					$args['temp_value']  = $value;
-					$value[ $other_key ] = reset( $other_vals );
-					if ( FrmAppHelper::is_empty_value( $value[ $other_key ] ) ) {
-						unset( $value[ $other_key ] );
+					$value[$other_key] = reset( $other_vals );
+					if ( FrmAppHelper::is_empty_value( $value[$other_key] ) ) {
+						unset( $value[$other_key] );
 					}
 				}
-			} elseif ( $field->options[ $other_key ] == $value ) {
+			} elseif ( $field->options[$other_key] == $value ) {
 				$value = $other_vals;
 			}
 		}