Strategy11 / formidable-forms

classes/models/FrmField.php

Spacing +36 added lines, -36 removed lines

@@ -309,8 +309,8 @@ 
 			require_once ABSPATH . 'wp-admin/includes/plugin.php';
 		}
 		$plugins = get_plugins();
-		if ( isset( $plugins[ $plugin ] ) && ! empty( $plugins[ $plugin ]['Version'] ) ) {
-			return $plugins[ $plugin ]['Version'];
+		if ( isset( $plugins[$plugin] ) && ! empty( $plugins[$plugin]['Version'] ) ) {
+			return $plugins[$plugin]['Version'];
 		}
 		return false;
 	}
@@ -383,8 +383,8 @@ 
 		$values = FrmAppHelper::maybe_filter_array( $values, array( 'name', 'description' ) );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
-			if ( isset( $values[ $col ] ) ) {
-				$new_values[ $col ] = $values[ $col ];
+			if ( isset( $values[$col] ) ) {
+				$new_values[$col] = $values[$col];
 			}
 		}
 
@@ -396,7 +396,7 @@ 
 		$new_values['created_at']    = current_time( 'mysql', 1 );
 
 		if ( isset( $values['id'] ) ) {
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
 			$new_values                                = apply_filters( 'frm_duplicated_field', $new_values );
 		}
 
@@ -405,9 +405,9 @@ 
 		foreach ( $new_values as $k => $v ) {
 			if ( is_array( $v ) ) {
 				if ( $k === 'default_value' ) {
-					$new_values[ $k ] = FrmAppHelper::maybe_json_encode( $v );
+					$new_values[$k] = FrmAppHelper::maybe_json_encode( $v );
 				} else {
-					$new_values[ $k ] = serialize( $v );
+					$new_values[$k] = serialize( $v );
 				}
 			}
 			unset( $k, $v );
@@ -427,7 +427,7 @@ 
 		}
 
 		if ( isset( $values['id'] ) ) {
-			$frm_duplicate_ids[ $values['id'] ] = $new_id;
+			$frm_duplicate_ids[$values['id']] = $new_id;
 		}
 
 		return $new_id;
@@ -478,7 +478,7 @@ 
 			 * @param array $match Shortcode data.
 			 * @return string
 			 */
-			function ( $match ) {
+			function( $match ) {
 				$attr = shortcode_parse_atts( $match[3] );
 
 				if ( ! is_array( $attr ) ) {
@@ -503,7 +503,7 @@ 
 					}
 
 					if ( FrmAppHelper::input_key_is_safe( $key, 'update' ) ) {
-						$safe_atts[ $key ] = $value;
+						$safe_atts[$key] = $value;
 					}
 				}
 
@@ -561,7 +561,7 @@ 
 	public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
 		global $frm_duplicate_ids;
 
-		$where  = array(
+		$where = array(
 			array(
 				'or'                => 1,
 				'fi.form_id'        => $old_form_id,
@@ -607,8 +607,8 @@ 
 
 			$values                                 = apply_filters( 'frm_duplicated_field', $values );
 			$new_id                                 = self::create( $values );
-			$frm_duplicate_ids[ $field->id ]        = $new_id;
-			$frm_duplicate_ids[ $field->field_key ] = $new_id;
+			$frm_duplicate_ids[$field->id]        = $new_id;
+			$frm_duplicate_ids[$field->field_key] = $new_id;
 			unset( $field );
 		}//end foreach
 	}
@@ -657,11 +657,11 @@ 
 
 		// serialize array values
 		foreach ( array( 'field_options', 'options' ) as $opt ) {
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
 				if ( 'field_options' === $opt ) {
-					$values[ $opt ] = self::maybe_filter_options( $values[ $opt ] );
+					$values[$opt] = self::maybe_filter_options( $values[$opt] );
 				}
-				$values[ $opt ] = serialize( $values[ $opt ] );
+				$values[$opt] = serialize( $values[$opt] );
 			}
 		}
 		if ( isset( $values['default_value'] ) && is_array( $values['default_value'] ) ) {
@@ -848,8 +848,8 @@ 
 					continue;
 				}
 
-				$fields[ $result->id ] = $result;
-				++$count;
+				$fields[$result->id] = $result;
+				++ $count;
 				if ( $limit == 1 ) {
 					$fields = $result;
 					break;
@@ -900,8 +900,8 @@ 
 			$fields = array();
 			$count  = 0;
 			foreach ( $results as $result ) {
-				++$count;
-				$fields[ $result->id ] = $result;
+				++ $count;
+				$fields[$result->id] = $result;
 				if ( ! empty( $limit ) && $count >= $limit ) {
 					break;
 				}
@@ -1015,7 +1015,7 @@ 
 		$query_type = $limit === ' LIMIT 1' || $limit == 1 ? 'row' : 'results';
 
 		if ( is_array( $where ) ) {
-			$args    = array(
+			$args = array(
 				'order_by' => $order_by,
 				'limit'    => $limit,
 			);
@@ -1048,9 +1048,9 @@ 
 				FrmDb::set_cache( $result->field_key, $result, 'frm_field' );
 
 				self::prepare_options( $result );
-				$results[ $r_key ]->field_options = $result->field_options;
-				$results[ $r_key ]->options       = $result->options;
-				$results[ $r_key ]->default_value = $result->default_value;
+				$results[$r_key]->field_options = $result->field_options;
+				$results[$r_key]->options       = $result->options;
+				$results[$r_key]->default_value = $result->default_value;
 
 				unset( $r_key, $result );
 			}
@@ -1129,7 +1129,7 @@ 
 
 			if ( count( $next_fields ) >= self::$transient_size ) {
 				// if this transient is full, check for another
-				++$next;
+				++ $next;
 				self::get_next_transient( $fields, $base_name, $next );
 			}
 		}
@@ -1157,7 +1157,7 @@ 
 				return;
 			}
 
-			++$next;
+			++ $next;
 		}
 	}
 
@@ -1305,7 +1305,7 @@ 
 	 * @return bool
 	 */
 	public static function is_option_true_in_array( $field, $option ) {
-		return ! empty( $field[ $option ] );
+		return ! empty( $field[$option] );
 	}
 
 	/**
@@ -1314,7 +1314,7 @@ 
 	 * @return bool
 	 */
 	public static function is_option_true_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
 	}
 
 	/**
@@ -1323,7 +1323,7 @@ 
 	 * @return bool
 	 */
 	public static function is_option_empty_in_array( $field, $option ) {
-		return empty( $field[ $option ] );
+		return empty( $field[$option] );
 	}
 
 	/**
@@ -1332,7 +1332,7 @@ 
 	 * @return bool
 	 */
 	public static function is_option_empty_in_object( $field, $option ) {
-		return empty( $field->field_options[ $option ] );
+		return empty( $field->field_options[$option] );
 	}
 
 	/**
@@ -1341,7 +1341,7 @@ 
 	 * @return bool
 	 */
 	public static function is_option_value_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
 	}
 
 	/**
@@ -1367,10 +1367,10 @@ 
 	 * @return mixed
 	 */
 	public static function get_option_in_array( $field, $option ) {
-		if ( isset( $field[ $option ] ) ) {
-			$this_option = $field[ $option ];
-		} elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][ $option ] ) ) {
-			$this_option = $field['field_options'][ $option ];
+		if ( isset( $field[$option] ) ) {
+			$this_option = $field[$option];
+		} elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) && isset( $field['field_options'][$option] ) ) {
+			$this_option = $field['field_options'][$option];
 		} else {
 			$this_option = '';
 		}
@@ -1384,7 +1384,7 @@ 
 	 * @return mixed
 	 */
 	public static function get_option_in_object( $field, $option ) {
-		return $field->field_options[ $option ] ?? '';
+		return $field->field_options[$option] ?? '';
 	}
 
 	/**

classes/helpers/FrmTipsHelper.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 			'page'  => '',
 			'class' => 'frm-mt-0',
 		);
-		$tip      = array_merge( $defaults, $tip );
+		$tip = array_merge( $defaults, $tip );
 
 		if ( isset( $tip['link'] ) && ! isset( $tip['link']['medium'] ) ) {
 			$tip['link']['medium'] = 'tip';
@@ -393,7 +393,7 @@ 
 	public static function get_random_tip( $tips ) {
 		$random = random_int( 0, count( $tips ) - 1 );
 
-		return $tips[ $random ];
+		return $tips[$random];
 	}
 
 	/**

classes/helpers/FrmHtmlHelper.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 		wp_enqueue_script( 'formidable_settings' );
 		return FrmAppHelper::clip(
 			// @phpstan-ignore-next-line
-			function () use ( $id, $name, $args ) {
+			function() use ( $id, $name, $args ) {
 				require FrmAppHelper::plugin_path() . '/classes/views/shared/toggle.php';
 			},
 			$args['echo'] ?? false
@@ -97,7 +97,7 @@ 
 			}
 		}
 
-		$input_number_attrs          = array_merge(
+		$input_number_attrs = array_merge(
 			$args['input_number_attrs'],
 			array(
 				'type'  => ! empty( $selected_unit ) ? 'number' : 'text',

classes/helpers/FrmOnSubmitHelper.php

Spacing +11 added lines, -11 removed lines

@@ -219,17 +219,17 @@ 
 	public static function populate_on_submit_data( &$form_options, $action = null, $event = 'create' ) {
 		$opt = 'update' === $event ? 'edit_' : 'success_';
 		if ( ! $action || ! is_object( $action ) ) {
-			$form_options[ $opt . 'action' ] = self::get_default_action_type();
-			$form_options[ $opt . 'msg' ]    = self::get_default_msg();
+			$form_options[$opt . 'action'] = self::get_default_action_type();
+			$form_options[$opt . 'msg']    = self::get_default_msg();
 
 			return;
 		}
 
-		$form_options[ $opt . 'action' ] = $action->post_content['success_action'] ?? 'message';
+		$form_options[$opt . 'action'] = $action->post_content['success_action'] ?? 'message';
 
-		switch ( $form_options[ $opt . 'action' ] ) {
+		switch ( $form_options[$opt . 'action'] ) {
 			case 'redirect':
-				$form_options[ $opt . 'url' ]        = $action->post_content['success_url'] ?? '';
+				$form_options[$opt . 'url']        = $action->post_content['success_url'] ?? '';
 				$form_options['open_in_new_tab']     = ! empty( $action->post_content['open_in_new_tab'] );
 				$form_options['redirect_delay']      = ! empty( $action->post_content['redirect_delay'] );
 				$form_options['redirect_delay_time'] = $action->post_content['redirect_delay_time'];
@@ -237,11 +237,11 @@ 
 				break;
 
 			case 'page':
-				$form_options[ $opt . 'page_id' ] = $action->post_content['success_page_id'] ?? '';
+				$form_options[$opt . 'page_id'] = $action->post_content['success_page_id'] ?? '';
 				break;
 
 			default:
-				$form_options[ $opt . 'msg' ] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
+				$form_options[$opt . 'msg'] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
 				$form_options['show_form']    = ! empty( $action->post_content['show_form'] );
 		}
 	}
@@ -330,20 +330,20 @@ 
 	private static function get_on_submit_action_data_from_form_options( $form_options, $event = 'create' ) {
 		$opt  = 'update' === $event ? 'edit_' : 'success_';
 		$data = array(
-			'success_action' => $form_options[ $opt . 'action' ] ?? self::get_default_action_type(),
+			'success_action' => $form_options[$opt . 'action'] ?? self::get_default_action_type(),
 		);
 
 		switch ( $data['success_action'] ) {
 			case 'redirect':
-				$data['success_url'] = $form_options[ $opt . 'url' ] ?? '';
+				$data['success_url'] = $form_options[$opt . 'url'] ?? '';
 				break;
 
 			case 'page':
-				$data['success_page_id'] = $form_options[ $opt . 'page_id' ] ?? '';
+				$data['success_page_id'] = $form_options[$opt . 'page_id'] ?? '';
 				break;
 
 			default:
-				$data['success_msg'] = $form_options[ $opt . 'msg' ] ?? self::get_default_msg();
+				$data['success_msg'] = $form_options[$opt . 'msg'] ?? self::get_default_msg();
 				$data['show_form']   = ! empty( $form_options['show_form'] );
 		}
 

classes/helpers/FrmFormsHelper.php

Spacing +23 added lines, -23 removed lines

@@ -37,7 +37,7 @@ 
 			'class'        => '',
 			'inc_children' => 'exclude',
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
 		if ( ! $args['field_id'] ) {
 			$args['field_id'] = $field_name;
@@ -78,7 +78,7 @@ 
 	 */
 	public static function add_html_attr( $class, $param, &$add_html ) {
 		if ( ! empty( $class ) ) {
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
 		}
 	}
 
@@ -322,8 +322,8 @@ 
 			'description' => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 			}
 		}
 
@@ -338,8 +338,8 @@ 
 			'parent_form_id' => 0,
 		);
 		foreach ( $defaults as $var => $default ) {
-			if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 			}
 		}
 		unset( $defaults );
@@ -376,16 +376,16 @@ 
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
 			if ( is_array( $default ) ) {
-				if ( ! isset( $values[ $var ] ) ) {
-					$values[ $var ] = $record && isset( $record->options[ $var ] ) ? $record->options[ $var ] : array();
+				if ( ! isset( $values[$var] ) ) {
+					$values[$var] = $record && isset( $record->options[$var] ) ? $record->options[$var] : array();
 				}
 
 				foreach ( $default as $k => $v ) {
-					$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 );
+					$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 );
 
 					if ( is_array( $v ) ) {
 						foreach ( $v as $k1 => $v1 ) {
-							$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 );
+							$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 );
 							unset( $k1, $v1 );
 						}
 					}
@@ -393,7 +393,7 @@ 
 					unset( $k, $v );
 				}
 			} else {
-				$values[ $var ] = $post_values && isset( $post_values['options'][ $var ] ) ? $post_values['options'][ $var ] : ( $record && isset( $record->options[ $var ] ) ? $record->options[ $var ] : $default );
+				$values[$var] = $post_values && isset( $post_values['options'][$var] ) ? $post_values['options'][$var] : ( $record && isset( $record->options[$var] ) ? $record->options[$var] : $default );
 			}
 
 			unset( $var, $default );
@@ -438,7 +438,7 @@ 
 	public static function fill_form_options( &$options, $values ) {
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-			$options[ $var ] = $values['options'][ $var ] ?? $default;
+			$options[$var] = $values['options'][$var] ?? $default;
 			unset( $var, $default );
 		}
 	}
@@ -615,7 +615,7 @@ 
 	public static function insert_opt_html( $args ) {
 		$class  = $args['class'] ?? '';
 		$fields = self::get_field_type_data_for_insert_opt_html();
-		$field  = $fields[ $args['type'] ] ?? array();
+		$field  = $fields[$args['type']] ?? array();
 
 		self::prepare_field_type( $field );
 
@@ -747,7 +747,7 @@ 
 		$last_field         = false;
 		foreach ( $fields as $field ) {
 			if ( $prev_order === $field->field_order ) {
-				++$add_order;
+				++ $add_order;
 			}
 
 			if ( $add_order ) {
@@ -1221,8 +1221,8 @@ 
 				$link .= ' onclick="return confirm(\'' . esc_attr( $link_details['confirm'] ) . '\')"';
 			}
 
-			$label = ( $link_details[ $length ] ?? $link_details['label'] );
-			if ( $length === 'icon' && isset( $link_details[ $length ] ) ) {
+			$label = ( $link_details[$length] ?? $link_details['label'] );
+			if ( $length === 'icon' && isset( $link_details[$length] ) ) {
 				$label = '<span class="' . $label . '" title="' . esc_attr( $link_details['label'] ) . '" aria-hidden="true"></span>';
 				$link .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
 			}
@@ -1369,7 +1369,7 @@ 
 			$status = 'publish';
 		}
 
-		$name = $nice_names[ $status ];
+		$name = $nice_names[$status];
 
 		return $name;
 	}
@@ -1433,7 +1433,7 @@ 
 		$icon = $icons[''];
 		if ( count( $categories ) === 1 ) {
 			$category = reset( $categories );
-			$icon     = $icons[ $category ] ?? $icon;
+			$icon     = $icons[$category] ?? $icon;
 		} elseif ( ! empty( $categories ) ) {
 			$icons = array_intersect_key( $icons, array_flip( $categories ) );
 			$icon  = reset( $icons );
@@ -1555,7 +1555,7 @@ 
 
 		foreach ( $item['categories'] as $k => $category ) {
 			if ( in_array( $category, $plans, true ) ) {
-				unset( $item['categories'][ $k ] );
+				unset( $item['categories'][$k] );
 
 				$category = self::convert_legacy_package_names( $category );
 
@@ -1594,7 +1594,7 @@ 
 			'include_all' => true,
 			'case_lower'  => false,
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
 		$license_types = array( 'Basic', 'Plus', 'Business', 'Elite' );
 
@@ -1797,9 +1797,9 @@ 
 		}
 
 		foreach ( $shortcodes[0] as $key => $shortcode ) {
-			$options = trim( $shortcodes[3][ $key ] );
+			$options = trim( $shortcodes[3][$key] );
 
-			if ( in_array( $shortcodes[1][ $key ], array( 'if ' ), true ) ) {
+			if ( in_array( $shortcodes[1][$key], array( 'if ' ), true ) ) {
 				// Skip if shortcodes.
 				continue;
 			}
@@ -1809,7 +1809,7 @@ 
 				continue;
 			}
 
-			$new_shortcode = '[' . $shortcodes[2][ $key ];
+			$new_shortcode = '[' . $shortcodes[2][$key];
 			if ( $options ) {
 				$new_shortcode .= ' ' . $options;
 			}

classes/models/FrmInbox.php

Spacing +32 added lines, -32 removed lines

@@ -105,7 +105,7 @@ 
 			return;
 		}
 
-		if ( isset( self::$messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
+		if ( isset( self::$messages[$message['key']] ) && ! isset( $message['force'] ) ) {
 			// Don't replace messages unless required.
 			return;
 		}
@@ -114,13 +114,13 @@ 
 			return;
 		}
 
-		if ( isset( self::$messages[ $message['key'] ] ) ) {
+		if ( isset( self::$messages[$message['key']] ) ) {
 			// Move up and mark as new.
-			unset( self::$messages[ $message['key'] ] );
+			unset( self::$messages[$message['key']] );
 		}
 
 		$this->fill_message( $message );
-		self::$messages[ $message['key'] ] = $message;
+		self::$messages[$message['key']] = $message;
 
 		$this->update_list();
 
@@ -157,11 +157,11 @@ 
 	private function clean_messages() {
 		$removed = false;
 		foreach ( self::$messages as $t => $message ) {
-			$read      = ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
-			$dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
+			$read      = ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
+			$dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
 
 			if ( $read || $dismissed || ! $this->within_valid_timeframe( $message ) ) {
-				unset( self::$messages[ $t ] );
+				unset( self::$messages[$t] );
 				$removed = true;
 			}
 		}
@@ -179,11 +179,11 @@ 
 	public function filter_messages( &$messages, $type = 'unread' ) {
 		$user_id = get_current_user_id();
 		foreach ( $messages as $k => $message ) {
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
 			if ( empty( $k ) || ! $this->within_valid_timeframe( $message ) || ( $type === 'dismissed' ) !== $dismissed ) {
-				unset( $messages[ $k ] );
+				unset( $messages[$k] );
 			} elseif ( ! $this->is_for_user( $message ) ) {
-				unset( $messages[ $k ] );
+				unset( $messages[$k] );
 			}
 		}
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -257,14 +257,14 @@ 
 	 * @return void
 	 */
 	public function mark_read( $key ) {
-		if ( ! $key || ! isset( self::$messages[ $key ] ) ) {
+		if ( ! $key || ! isset( self::$messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( self::$messages[ $key ]['read'] ) ) {
-			self::$messages[ $key ]['read'] = array();
+		if ( ! isset( self::$messages[$key]['read'] ) ) {
+			self::$messages[$key]['read'] = array();
 		}
-		self::$messages[ $key ]['read'][ get_current_user_id() ] = time();
+		self::$messages[$key]['read'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -276,9 +276,9 @@ 
 	 * @return void
 	 */
 	public function mark_unread( $key ) {
-		$is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
+		$is_read = isset( self::$messages[$key] ) && isset( self::$messages[$key]['read'] ) && isset( self::$messages[$key]['read'][get_current_user_id()] );
 		if ( $is_read ) {
-			unset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
+			unset( self::$messages[$key]['read'][get_current_user_id()] );
 			$this->update_list();
 		}
 	}
@@ -294,14 +294,14 @@ 
 			return;
 		}
 
-		if ( ! isset( self::$messages[ $key ] ) ) {
+		if ( ! isset( self::$messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( self::$messages[ $key ]['dismissed'] ) ) {
-			self::$messages[ $key ]['dismissed'] = array();
+		if ( ! isset( self::$messages[$key]['dismissed'] ) ) {
+			self::$messages[$key]['dismissed'] = array();
 		}
-		self::$messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
+		self::$messages[$key]['dismissed'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -315,11 +315,11 @@ 
 		$user_id = get_current_user_id();
 		foreach ( self::$messages as $key => $message ) {
 			if ( ! isset( $message['dismissed'] ) ) {
-				self::$messages[ $key ]['dismissed'] = array();
+				self::$messages[$key]['dismissed'] = array();
 			}
 
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
-				self::$messages[ $key ]['dismissed'][ $user_id ] = time();
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
+				self::$messages[$key]['dismissed'][$user_id] = time();
 			}
 		}
 		$this->update_list();
@@ -329,8 +329,8 @@ 
 		$messages = $this->get_messages( 'filter' );
 		$user_id  = get_current_user_id();
 		foreach ( $messages as $t => $message ) {
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
-				unset( $messages[ $t ] );
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
+				unset( $messages[$t] );
 			}
 		}
 		return $messages;
@@ -369,8 +369,8 @@ 
 	 * @return void
 	 */
 	public function remove( $key ) {
-		if ( isset( self::$messages[ $key ] ) ) {
-			unset( self::$messages[ $key ] );
+		if ( isset( self::$messages[$key] ) ) {
+			unset( self::$messages[$key] );
 			$this->update_list();
 		}
 	}
@@ -416,7 +416,7 @@ 
 			 * @param array $matches The regex results for a single match.
 			 * @return string
 			 */
-			function ( $matches ) {
+			function( $matches ) {
 				$url   = $matches[2];
 				$parts = parse_url( $url );
 
@@ -479,8 +479,8 @@ 
 		$inbox = new self();
 		return array_filter(
 			$inbox->get_messages( 'filter' ),
-			function ( $message ) use ( $key ) {
-				return ! empty( $message[ $key ] );
+			function( $message ) use ( $key ) {
+				return ! empty( $message[$key] );
 			}
 		);
 	}
@@ -526,8 +526,8 @@ 
 
 		return array_reduce(
 			$keys_to_return,
-			function ( $total, $key ) use ( $message ) {
-				$total[ $key ] = $message[ $key ] ?? '';
+			function( $total, $key ) use ( $message ) {
+				$total[$key] = $message[$key] ?? '';
 				return $total;
 			},
 			array()

classes/models/FrmForm.php

Spacing +32 added lines, -32 removed lines

@@ -209,7 +209,7 @@ 
 			}
 
 			if ( $new_val !== $value ) {
-				$new_values[ $key ] = $new_val;
+				$new_values[$key] = $new_val;
 			}
 		}//end foreach
 
@@ -240,7 +240,7 @@ 
 
 		foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
-				$new_values[ $value_key ] = $value;
+				$new_values[$value_key] = $value;
 			}
 		}
 
@@ -323,15 +323,15 @@ 
 		$existing_keys = array_keys( $values['item_meta'] );
 		foreach ( $all_fields as $fid ) {
 			if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
-				$values['item_meta'][ $fid->id ] = '';
+				$values['item_meta'][$fid->id] = '';
 			}
-			$field_array[ $fid->id ] = $fid;
+			$field_array[$fid->id] = $fid;
 		}
 		unset( $all_fields );
 
 		foreach ( $values['item_meta'] as $field_id => $default_value ) {
-			if ( isset( $field_array[ $field_id ] ) ) {
-				$field = $field_array[ $field_id ];
+			if ( isset( $field_array[$field_id] ) ) {
+				$field = $field_array[$field_id];
 			} else {
 				$field = FrmField::getOne( $field_id );
 			}
@@ -340,7 +340,7 @@ 
 				continue;
 			}
 
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
 			if ( $is_settings_page ) {
 				self::get_settings_page_html( $values, $field );
 
@@ -360,22 +360,22 @@ 
 			}
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = $values['field_options'][ $opt . '_' . $field_id ] ?? $default;
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
+				$field->field_options[$opt] = $values['field_options'][$opt . '_' . $field_id] ?? $default;
+				self::sanitize_field_opt( $opt, $field->field_options[$opt] );
 			}
 
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
 
 			$new_field = array(
 				'field_options' => $field->field_options,
-				'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
+				'default_value' => isset( $values['default_value_' . $field_id] ) ? FrmAppHelper::maybe_json_encode( $values['default_value_' . $field_id] ) : '',
 			);
 
-			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) {
-				foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) {
+			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options']['options_' . $field_id] ) && is_array( $values['field_options']['options_' . $field_id] ) ) {
+				foreach ( $values['field_options']['options_' . $field_id] as $option_key => $option ) {
 					if ( is_array( $option ) ) {
 						foreach ( $option as $key => $item ) {
-							$values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' );
+							$values['field_options']['options_' . $field_id][$option_key][$key] = FrmAppHelper::kses( $item, 'all' );
 						}
 					}
 				}
@@ -405,8 +405,8 @@ 
 	 */
 	private static function maybe_update_max_option( $field, $values, &$new_field ) {
 		if ( $field->type === 'textarea' &&
-			! empty( $values['field_options'][ 'type_' . $field->id ] ) &&
-			in_array( $values['field_options'][ 'type_' . $field->id ], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
+			! empty( $values['field_options']['type_' . $field->id] ) &&
+			in_array( $values['field_options']['type_' . $field->id], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
 
 			$new_field['field_options']['max'] = '';
 
@@ -414,7 +414,7 @@ 
 			 * Update posted field setting so that new 'max' option is displayed after form is saved and page reloads.
 			 * FrmFieldsHelper::fill_default_field_opts populates field options by calling self::get_posted_field_setting.
 			 */
-			$_POST['field_options'][ 'max_' . $field->id ] = '';
+			$_POST['field_options']['max_' . $field->id] = '';
 		}
 	}
 
@@ -492,11 +492,11 @@ 
 	 * Updating the settings page
 	 */
 	private static function get_settings_page_html( $values, &$field ) {
-		if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
+		if ( isset( $values['field_options']['custom_html_' . $field->id] ) ) {
 			$prev_opts     = array();
 			$fallback_html = $field->field_options['custom_html'] ?? FrmFieldsHelper::get_default_html( $field->type );
 
-			$field->field_options['custom_html'] = $values['field_options'][ 'custom_html_' . $field->id ] ?? $fallback_html;
+			$field->field_options['custom_html'] = $values['field_options']['custom_html_' . $field->id] ?? $fallback_html;
 		} elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) {
 			$prev_opts = $field->field_options;
 		}
@@ -521,7 +521,7 @@ 
 		);
 		foreach ( $field_cols as $col => $default ) {
 			$default           = $default === '' ? $field->{$col} : $default;
-			$new_field[ $col ] = $values['field_options'][ $col . '_' . $field->id ] ?? $default;
+			$new_field[$col] = $values['field_options'][$col . '_' . $field->id] ?? $default;
 		}
 
 		if ( $field->type === 'submit' && isset( $new_field['field_order'] ) && (int) $new_field['field_order'] === FrmSubmitHelper::DEFAULT_ORDER ) {
@@ -712,7 +712,7 @@ 
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
 				self::destroy( $form->id );
 				if ( empty( $form->parent_form_id ) ) {
-					++$count;
+					++ $count;
 				}
 			}
 
@@ -935,16 +935,16 @@ 
 		foreach ( $results as $row ) {
 			if ( 'trash' != $row->status ) {
 				if ( $row->is_template ) {
-					++$counts['template'];
+					++ $counts['template'];
 				} else {
-					++$counts['published'];
+					++ $counts['published'];
 				}
 			} else {
-				++$counts['trash'];
+				++ $counts['trash'];
 			}
 
 			if ( 'draft' == $row->status ) {
-				++$counts['draft'];
+				++ $counts['draft'];
 			}
 
 			unset( $row );
@@ -985,8 +985,8 @@ 
 			self::maybe_get_form( $form );
 		}
 
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
-			return $frm_vars['form_params'][ $form->id ];
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
+			return $frm_vars['form_params'][$form->id];
 		}
 
 		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1015,15 +1015,15 @@ 
 			// If there are two forms on the same page, make sure not to submit both.
 			foreach ( $default_values as $var => $default ) {
 				if ( $var === 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -1049,7 +1049,7 @@ 
 			'sdir'     => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -1077,7 +1077,7 @@ 
 			'keep_post' => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -1180,7 +1180,7 @@ 
 		$form    = $atts['form'];
 		$default = $atts['default'] ?? '';
 
-		return $form->options[ $atts['option'] ] ?? $default;
+		return $form->options[$atts['option']] ?? $default;
 	}
 
 	/**

classes/helpers/FrmCSVExportHelper.php

Spacing +57 added lines, -57 removed lines

@@ -154,7 +154,7 @@ 
 
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -300,7 +300,7 @@ 
 	private static function prepare_csv_headings() {
 		$headings = array();
 		self::csv_headings( $headings );
-		$headings       = apply_filters(
+		$headings = apply_filters(
 			'frm_csv_columns',
 			$headings,
 			self::$form_id,
@@ -324,15 +324,15 @@ 
 		$field_headings  = array();
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
 		if ( ! empty( $col->field_options['separate_value'] ) && ! in_array( $col->type, $separate_values, true ) ) {
-			$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
+			$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
 		}
 
-		if ( ! empty( $field_headings[ $col->id . '_label' ] ) ) {
-			$field_headings[ $col->id ] = strip_tags( $col->name . ' ' . __( '(value)', 'formidable' ) );
+		if ( ! empty( $field_headings[$col->id . '_label'] ) ) {
+			$field_headings[$col->id] = strip_tags( $col->name . ' ' . __( '(value)', 'formidable' ) );
 		} else {
-			$field_headings[ $col->id ] = strip_tags( $col->name );
+			$field_headings[$col->id] = strip_tags( $col->name );
 		}
-		$field_headings             = apply_filters(
+		$field_headings = apply_filters(
 			'frm_csv_field_columns',
 			$field_headings,
 			array_merge(
@@ -352,14 +352,14 @@ 
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
 				$repeater_id = $col->field_options['in_section'];
 				// Set a placeholder to maintain order for repeater fields.
-				$headings[ 'repeater' . $repeater_id ] = array();
+				$headings['repeater' . $repeater_id] = array();
 
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
-					$fields_by_repeater_id[ $repeater_id ] = array();
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
+					$fields_by_repeater_id[$repeater_id] = array();
 					$repeater_ids[]                        = $repeater_id;
 				}
 
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
+				$fields_by_repeater_id[$repeater_id][] = $col;
 
 				continue;
 			}
@@ -378,8 +378,8 @@ 
 				$end    = strpos( $row->meta_value, ':{' );
 				$length = substr( $row->meta_value, $start, $end - $start );
 
-				if ( $length > $max[ $row->field_id ] ) {
-					$max[ $row->field_id ] = $length;
+				if ( $length > $max[$row->field_id] ) {
+					$max[$row->field_id] = $length;
 				}
 			}
 			unset( $start, $end, $length, $row, $repeater_meta, $where );
@@ -390,17 +390,17 @@ 
 					$repeater_id = str_replace( 'repeater', '', $key );
 
 					$repeater_headings = array();
-					foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) {
+					foreach ( $fields_by_repeater_id[$repeater_id] as $col ) {
 						$repeater_headings += self::field_headings( $col );
 					}
 
-					for ( $i = 0; $i < $max[ $repeater_id ]; $i++ ) {
+					for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) {
 						foreach ( $repeater_headings as $repeater_key => $repeater_name ) {
-							$flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name;
+							$flat[$repeater_key . '[' . $i . ']'] = $repeater_name;
 						}
 					}
 				} else {
-					$flat[ $key ] = $heading;
+					$flat[$key] = $heading;
 				}
 			}
 
@@ -413,10 +413,10 @@ 
 		}//end if
 
 		if ( self::$comment_count ) {
-			for ( $i = 0; $i < self::$comment_count; $i++ ) {
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
+			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
 			unset( $i );
 		}
@@ -461,7 +461,7 @@ 
 
 	private static function prepare_next_csv_rows( $next_set ) {
 		if ( FrmAppHelper::pro_is_installed() ) {
-			$where    = array(
+			$where = array(
 				'or'             => 1,
 				'id'             => $next_set,
 				'parent_item_id' => $next_set,
@@ -518,32 +518,32 @@ 
 					continue;
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]        = new stdClass();
-					$entries[ self::$entry->parent_item_id ]->metas = array();
+				if ( ! isset( $entries[self::$entry->parent_item_id] ) ) {
+					$entries[self::$entry->parent_item_id]        = new stdClass();
+					$entries[self::$entry->parent_item_id]->metas = array();
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
 					// if the data is here, it should be an array but if this field has collected data
 					// both while inside and outside of the repeating section, it's possible this is a string.
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
 				}
 
 				// Add the repeated values.
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
 			}//end foreach
 
 			self::$entry->metas                              = self::fill_missing_repeater_metas( self::$entry->metas, $entries );
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
 		}//end if
 
 		// add the embedded form id
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
 		}
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
 	}
 
 	/**
@@ -564,19 +564,19 @@ 
 		}
 
 		$repeater_id = $field->field_options['in_section'];
-		if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) {
+		if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) {
 			return $metas;
 		}
 
-		foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) {
-			if ( ! isset( $metas[ $repeater_child->id ] ) ) {
-				$metas[ $repeater_child->id ] = '';
+		foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) {
+			if ( ! isset( $metas[$repeater_child->id] ) ) {
+				$metas[$repeater_child->id] = '';
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array();
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) || ! is_array( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$repeater_child->id] = array();
 				}
 
-				$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
 			}
 		}
 
@@ -595,7 +595,7 @@ 
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = self::$entry->metas[ $col->id ] ?? false;
+			$field_value = self::$entry->metas[$col->id] ?? false;
 
 			FrmFieldsHelper::prepare_field_value( $field_value, $col->type );
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -614,20 +614,20 @@ 
 			if ( ! empty( $col->field_options['separate_value'] ) ) {
 				$label_key = $col->id . '_label';
 				if ( self::is_the_child_of_a_repeater( $col ) ) {
-					$row[ $label_key ] = array();
+					$row[$label_key] = array();
 
 					if ( is_array( $field_value ) ) {
 						foreach ( $field_value as $value ) {
-							$row[ $label_key ][] = self::get_separate_value_label( $value, $col );
+							$row[$label_key][] = self::get_separate_value_label( $value, $col );
 						}
 					}
 				} else {
-					$row[ $label_key ] = self::get_separate_value_label( $field_value, $col );
+					$row[$label_key] = self::get_separate_value_label( $field_value, $col );
 				}
 				unset( $label_key );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}//end foreach
@@ -650,7 +650,7 @@ 
 				'show_icon'         => false,
 				'entry_id'          => self::$entry->id,
 				'sep'               => self::$separator,
-				'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
+				'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
 			)
 		);
 	}
@@ -665,8 +665,8 @@ 
 					// This is combo field inside repeater. The heading key has this format: [86_first[0]].
 					foreach ( $sub_value as $sub_key => $sub_sub_value ) {
 						$column_key = $atts['col']->id . '_' . $sub_key . '[' . $key . ']';
-						if ( ! is_numeric( $sub_key ) && isset( self::$headings[ $column_key ] ) ) {
-							$row[ $column_key ] = $sub_sub_value;
+						if ( ! is_numeric( $sub_key ) && isset( self::$headings[$column_key] ) ) {
+							$row[$column_key] = $sub_sub_value;
 						}
 					}
 
@@ -674,8 +674,8 @@ 
 				}
 
 				$column_key = $atts['col']->id . '_' . $key;
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
-					$row[ $column_key ] = $sub_value;
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
+					$row[$column_key] = $sub_value;
 				}
 			}
 		}
@@ -700,18 +700,18 @@ 
 		$echo = 'echo' === self::$mode;
 
 		foreach ( self::$headings as $k => $heading ) {
-			if ( isset( $rows[ $k ] ) ) {
-				$row = $rows[ $k ];
+			if ( isset( $rows[$k] ) ) {
+				$row = $rows[$k];
 			} else {
 				$row = '';
 				// array indexed data is not at $rows[ $k ]
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
+				if ( $k[strlen( $k ) - 1] === ']' ) {
 					$start = strrpos( $k, '[' );
-					$key   = substr( $k, 0, $start++ );
+					$key   = substr( $k, 0, $start ++ );
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
 
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
-						$row = $rows[ $key ][ $index ];
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
+						$row = $rows[$key][$index];
 					}
 
 					unset( $start, $key, $index );

classes/helpers/FrmSubmitHelper.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 	public static function get_current_action_from_global_var( $form_id ) {
 		global $frm_vars;
 
-		return $frm_vars['form_params'][ $form_id ]['action'] ?? 'create';
+		return $frm_vars['form_params'][$form_id]['action'] ?? 'create';
 	}
 
 	/**
@@ -177,7 +177,7 @@ 
 	public static function remove_submit_field_from_list( &$fields ) {
 		foreach ( $fields as $key => $field ) {
 			if ( self::FIELD_TYPE === FrmField::get_field_type( $field ) ) {
-				unset( $fields[ $key ] );
+				unset( $fields[$key] );
 				return;
 			}
 		}
@@ -224,7 +224,7 @@ 
 				array( 'field_order' => $new_order )
 			);
 			if ( false !== $updated ) {
-				self::$last_row_fields_order[ $last_row_field_id ] = $new_order;
+				self::$last_row_fields_order[$last_row_field_id] = $new_order;
 			}
 		}
 	}