Strategy11 / formidable-forms

classes/models/FrmFormTemplateApi.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 
 class FrmFormTemplateApi extends FrmFormApi {
 
-	protected static $code_option_name  = 'frm_free_license_code';
+	protected static $code_option_name = 'frm_free_license_code';
 
 	private static $base_api_url = 'https://formidableforms.com/wp-json/form-templates/v1/';
 
@@ -76,7 +76,7 @@ 
 
 		$templates    = $this->get_api_info();
 		$contact_form = 20872734;
-		return isset( $templates[ $contact_form ] ) && ! empty( $templates[ $contact_form ]['url'] );
+		return isset( $templates[$contact_form] ) && ! empty( $templates[$contact_form]['url'] );
 	}
 
 	/**
@@ -137,15 +137,15 @@ 
 					continue;
 				}
 
-				$data['urlByKey'][ $template['key'] ] = $template['url'];
+				$data['urlByKey'][$template['key']] = $template['url'];
 			}
 
-			if ( ! isset( $data['urlByKey'][ $key ] ) ) {
+			if ( ! isset( $data['urlByKey'][$key] ) ) {
 				$error = new WP_Error( 400, 'We were unable to retrieve the template' );
 				wp_send_json_error( $error );
 			}
 
-			$data['url'] = $data['urlByKey'][ $key ];
+			$data['url'] = $data['urlByKey'][$key];
 		}
 
 		wp_send_json_success( $data );

classes/models/FrmFormAction.php

Spacing +44 added lines, -44 removed lines

@@ -5,15 +5,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.
@@ -141,9 +141,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 ) {
@@ -154,8 +154,8 @@ 
 			}
 		}
 
-		$groups[ $group ]['id'] = $group;
-		return $groups[ $group ];
+		$groups[$group]['id'] = $group;
+		return $groups[$group];
 	}
 
 	/**
@@ -257,7 +257,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 );
@@ -277,18 +277,18 @@ 
 		$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 );
 				}
 			}
 
@@ -306,20 +306,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 ] = $this->maybe_switch_field_ids( $action[ $ck ] );
+					$action[$ck] = $this->maybe_switch_field_ids( $action[$ck] );
 				}
 			}
 		}
@@ -342,10 +342,10 @@ 
 			return;
 		}
 
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
 			// Sanitizing removes scripts and <email> type of values.
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$settings = wp_unslash( $_POST[ $this->option_name ] );
+			$settings = wp_unslash( $_POST[$this->option_name] );
 		} else {
 			return;
 		}
@@ -355,7 +355,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';
@@ -395,7 +395,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 );
@@ -471,12 +471,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;
@@ -506,7 +506,7 @@ 
 			'limit'       => 99,
 			'post_status' => $default_status,
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 	}
 
 	/**
@@ -567,7 +567,7 @@ 
 
 			$action = $this->prepare_action( $action );
 
-			$settings[ $action->ID ] = $action;
+			$settings[$action->ID] = $action;
 		}
 
 		if ( 1 === $limit ) {
@@ -604,10 +604,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 );
 			}
 		}
 
@@ -682,14 +682,14 @@ 
 	 * Migrate settings from form->options into new action.
 	 */
 	public function migrate_to_2( $form, $update = 'update' ) {
-		$action        = $this->prepare_new( $form->id );
+		$action = $this->prepare_new( $form->id );
 		FrmAppHelper::unserialize_or_decode( $form->options );
 
 		// 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] );
 			}
 		}
 
@@ -755,7 +755,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] ) ) {
@@ -806,8 +806,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/controllers/FrmWelcomeController.php

Braces +2 added lines, -1 removed lines

@@ -125,7 +125,8 @@
 		}
 
 		// Only do this for single site installs.
-		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) { // WPCS: CSRF ok.
+		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) {
+// WPCS: CSRF ok.
 			return;
 		}
 

classes/models/FrmInbox.php

Spacing +27 added lines, -27 removed lines

@@ -84,7 +84,7 @@ 
 			return;
 		}
 
-		if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
+		if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) {
 			// Don't replace messages unless required.
 			return;
 		}
@@ -93,13 +93,13 @@ 
 			return;
 		}
 
-		if ( isset( $this->messages[ $message['key'] ] ) ) {
+		if ( isset( $this->messages[$message['key']] ) ) {
 			// Move up and mark as new.
-			unset( $this->messages[ $message['key'] ] );
+			unset( $this->messages[$message['key']] );
 		}
 
 		$this->fill_message( $message );
-		$this->messages[ $message['key'] ] = $message;
+		$this->messages[$message['key']] = $message;
 
 		$this->update_list();
 
@@ -127,11 +127,11 @@ 
 	private function clean_messages() {
 		$removed  = false;
 		foreach ( $this->messages as $t => $message ) {
-			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
+			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
 			$expired = $this->is_expired( $message );
 			if ( $read || $expired || $dismissed ) {
-				unset( $this->messages[ $t ] );
+				unset( $this->messages[$t] );
 				$removed = true;
 			}
 		}
@@ -144,11 +144,11 @@ 
 	private function filter_messages( &$messages ) {
 		$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->is_expired( $message ) || $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 );
@@ -181,14 +181,14 @@ 
 	 * @param string $key
 	 */
 	public function mark_read( $key ) {
-		if ( ! $key || ! isset( $this->messages[ $key ] ) ) {
+		if ( ! $key || ! isset( $this->messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( $this->messages[ $key ]['read'] ) ) {
-			$this->messages[ $key ]['read'] = array();
+		if ( ! isset( $this->messages[$key]['read'] ) ) {
+			$this->messages[$key]['read'] = array();
 		}
-		$this->messages[ $key ]['read'][ get_current_user_id() ] = time();
+		$this->messages[$key]['read'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -199,9 +199,9 @@ 
 	 * @since 4.05.02
 	 */
 	public function mark_unread( $key ) {
-		$is_read = isset( $this->messages[ $key ] ) && isset( $this->messages[ $key ]['read'] ) && isset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
+		$is_read = isset( $this->messages[$key] ) && isset( $this->messages[$key]['read'] ) && isset( $this->messages[$key]['read'][get_current_user_id()] );
 		if ( $is_read ) {
-			unset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
+			unset( $this->messages[$key]['read'][get_current_user_id()] );
 			$this->update_list();
 		}
 	}
@@ -215,14 +215,14 @@ 
 			return;
 		}
 
-		if ( ! isset( $this->messages[ $key ] ) ) {
+		if ( ! isset( $this->messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( $this->messages[ $key ]['dismissed'] ) ) {
-			$this->messages[ $key ]['dismissed'] = array();
+		if ( ! isset( $this->messages[$key]['dismissed'] ) ) {
+			$this->messages[$key]['dismissed'] = array();
 		}
-		$this->messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
+		$this->messages[$key]['dismissed'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -234,11 +234,11 @@ 
 		$user_id = get_current_user_id();
 		foreach ( $this->messages as $key => $message ) {
 			if ( ! isset( $message['dismissed'] ) ) {
-				$this->messages[ $key ]['dismissed'] = array();
+				$this->messages[$key]['dismissed'] = array();
 			}
 
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
-				$this->messages[ $key ]['dismissed'][ $user_id ] = time();
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
+				$this->messages[$key]['dismissed'][$user_id] = time();
 			}
 		}
 		$this->update_list();
@@ -248,8 +248,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;
@@ -273,8 +273,8 @@ 
 	 * @since 4.05.02
 	 */
 	public function remove( $key ) {
-		if ( isset( $this->messages[ $key ] ) ) {
-			unset( $this->messages[ $key ] );
+		if ( isset( $this->messages[$key] ) ) {
+			unset( $this->messages[$key] );
 			$this->update_list();
 		}
 	}

classes/factories/FrmFieldFactory.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 			'name'     => 'FrmFieldName',
 		);
 
-		$class = isset( $type_classes[ $field_type ] ) ? $type_classes[ $field_type ] : '';
+		$class = isset( $type_classes[$field_type] ) ? $type_classes[$field_type] : '';
 
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
 	}

classes/models/fields/FrmFieldCombo.php

Braces +2 added lines, -1 removed lines

@@ -39,7 +39,8 @@
 			}
 
 			foreach ( $sub_field['options'] as $option ) {
-				if ( 'default_value' === $option ) { // We parse default value from field column.
+				if ( 'default_value' === $option ) {
+// We parse default value from field column.
 					continue;
 				}
 

Spacing +12 added lines, -12 removed lines

@@ -59,12 +59,12 @@ 
 			if ( is_array( $sub_field ) ) {
 				$sub_field                 = wp_parse_args( $sub_field, $defaults );
 				$sub_field['name']         = $name;
-				$this->sub_fields[ $name ] = $sub_field;
+				$this->sub_fields[$name] = $sub_field;
 				continue;
 			}
 
 			if ( is_string( $sub_field ) ) {
-				$this->sub_fields[ $name ] = wp_parse_args(
+				$this->sub_fields[$name] = wp_parse_args(
 					array(
 						'name'  => $name,
 						'label' => $sub_field,
@@ -116,9 +116,9 @@ 
 				}
 
 				if ( is_string( $option ) ) {
-					$extra_options[ $key . '_' . $option ] = '';
+					$extra_options[$key . '_' . $option] = '';
 				} elseif ( ! empty( $option['name'] ) ) {
-					$extra_options[ $key . '_' . $option['name'] ] = '';
+					$extra_options[$key . '_' . $option['name']] = '';
 				}
 			}
 		}
@@ -141,7 +141,7 @@ 
 		foreach ( $this->sub_fields as $name => $sub_field ) {
 			$sub_field['name'] = $name;
 			$wrapper_classes   = 'frm_grid_container frm_sub_field_options frm_sub_field_options-' . $sub_field['name'];
-			if ( ! isset( $processed_sub_fields[ $name ] ) ) {
+			if ( ! isset( $processed_sub_fields[$name] ) ) {
 				// Options for this subfield should be hidden.
 				$wrapper_classes .= ' frm_hidden';
 			}
@@ -171,7 +171,7 @@ 
 			$default_value = array();
 
 			foreach ( $this->sub_fields as $name => $sub_field ) {
-				$default_value[ $name ] = '';
+				$default_value[$name] = '';
 			}
 
 			return $default_value;
@@ -342,8 +342,8 @@ 
 		// Placeholder.
 		if ( in_array( 'placeholder', $sub_field['options'], true ) ) {
 			$placeholders = FrmField::get_option( $field, 'placeholder' );
-			if ( ! empty( $placeholders[ $sub_field['name'] ] ) ) {
-				$atts[] = 'placeholder="' . esc_attr( $placeholders[ $sub_field['name'] ] ) . '"';
+			if ( ! empty( $placeholders[$sub_field['name']] ) ) {
+				$atts[] = 'placeholder="' . esc_attr( $placeholders[$sub_field['name']] ) . '"';
 			}
 		}
 
@@ -390,9 +390,9 @@ 
 
 		// Validate not empty.
 		foreach ( $sub_fields as $name => $sub_field ) {
-			if ( empty( $sub_field['optional'] ) && empty( $args['value'][ $name ] ) ) {
-				$errors[ 'field' . $args['id'] . '-' . $name ] = '';
-				$errors[ 'field' . $args['id'] ]               = $blank_msg;
+			if ( empty( $sub_field['optional'] ) && empty( $args['value'][$name] ) ) {
+				$errors['field' . $args['id'] . '-' . $name] = '';
+				$errors['field' . $args['id']]               = $blank_msg;
 			}
 		}
 
@@ -411,7 +411,7 @@ 
 		$field_key  = isset( $this->field->field_key ) ? $this->field->field_key : $this->field['field_key'];
 		$sub_fields = $this->get_processed_sub_fields();
 		foreach ( $sub_fields as $name => $sub_field ) {
-			$headings[ $field_id . '_' . $name ] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
+			$headings[$field_id . '_' . $name] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
 		}
 
 		return $headings;

classes/views/frm-fields/front-end/combo-field/combo-field.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 			$sub_field_class   = "frm_form_field form-field frm_form_subfield-{$name} {$sub_field['wrapper_classes']}";
 			$sub_field_desc    = FrmField::get_option( $field, $name . '_desc' );
 
-			if ( isset( $errors[ 'field' . $field_id . '-' . $name ] ) ) {
+			if ( isset( $errors['field' . $field_id . '-' . $name] ) ) {
 				$sub_field_class .= ' frm_blank_field';
 			}
 			?>
@@ -60,7 +60,7 @@ 
 						<input
 							type="<?php echo esc_attr( $sub_field['type'] ); ?>"
 							id="<?php echo esc_attr( $html_id . '_' . $name ); ?>"
-							value="<?php echo esc_attr( isset( $field_value[ $name ] ) ? $field_value[ $name ] : '' ); ?>"
+							value="<?php echo esc_attr( isset( $field_value[$name] ) ? $field_value[$name] : '' ); ?>"
 							<?php
 							if ( empty( $args['remove_names'] ) ) {
 								echo 'name="' . esc_attr( $field_name ) . '[' . esc_attr( $name ) . ']" ';
@@ -77,9 +77,9 @@ 
 				}
 
 				// Don't show individual field errors when there is a combo field error.
-				if ( ! empty( $errors ) && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) {
+				if ( ! empty( $errors ) && isset( $errors['field' . $field_id . '-' . $name] ) && ! isset( $errors['field' . $field_id] ) ) {
 					?>
-					<div class="frm_error"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div>
+					<div class="frm_error"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div>
 				<?php } ?>
 			</div>
 		<?php } ?>

classes/views/frm-fields/back-end/combo-field/sub-field-options.php

Spacing +5 added lines, -5 removed lines

@@ -51,13 +51,13 @@ 
 							type="text"
 							name="<?php echo esc_attr( $input_name ); ?>"
 							id="<?php echo esc_attr( $input_id ); ?>"
-							value="<?php echo esc_attr( isset( $default_value[ $sub_field['name'] ] ) ? $default_value[ $sub_field['name'] ] : '' ); ?>"
+							value="<?php echo esc_attr( isset( $default_value[$sub_field['name']] ) ? $default_value[$sub_field['name']] : '' ); ?>"
 							data-changeme="field_<?php echo esc_attr( $field_key . '_' . $sub_field['name'] ); ?>"
 							data-changeatt="value"
 						/>
 					</span>
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
-						<?php echo esc_html( $labels[ $option ] ); ?>
+						<?php echo esc_html( $labels[$option] ); ?>
 					</label>
 				</p>
 				<?php
@@ -74,12 +74,12 @@ 
 						type="text"
 						name="<?php echo esc_attr( $input_name ); ?>"
 						id="<?php echo esc_attr( $input_id ); ?>"
-						value="<?php echo esc_attr( isset( $input_value[ $sub_field['name'] ] ) ? $input_value[ $sub_field['name'] ] : '' ); ?>"
+						value="<?php echo esc_attr( isset( $input_value[$sub_field['name']] ) ? $input_value[$sub_field['name']] : '' ); ?>"
 						data-changeme="field_<?php echo esc_attr( $field_key . '_' . $sub_field['name'] ); ?>"
 						data-changeatt="<?php echo esc_attr( $option ); ?>"
 					/>
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
-						<?php echo esc_html( $labels[ $option ] ); ?>
+						<?php echo esc_html( $labels[$option] ); ?>
 					</label>
 				</p>
 				<?php
@@ -100,7 +100,7 @@ 
 						data-changeme="frm_field_<?php echo esc_attr( $field_id . '_' . $sub_field['name'] ); ?>_desc"
 					/>
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
-						<?php echo esc_html( $labels[ $option ] ); ?>
+						<?php echo esc_html( $labels[$option] ); ?>
 					</label>
 				</p>
 				<?php

classes/helpers/FrmCSVExportHelper.php

Spacing +48 added lines, -48 removed lines

@@ -41,7 +41,7 @@ 
 		self::print_file_headers( $filename );
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -107,7 +107,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,
@@ -129,10 +129,10 @@ 
 		$field_headings  = array();
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
 		if ( isset( $col->field_options['separate_value'] ) && $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' ) );
 		}
 
-		$field_headings[ $col->id ] = strip_tags( $col->name );
+		$field_headings[$col->id] = strip_tags( $col->name );
 		$field_headings             = apply_filters(
 			'frm_csv_field_columns',
 			$field_headings,
@@ -151,14 +151,14 @@ 
 		foreach ( self::$fields as $col ) {
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
 				$repeater_id                           = $col->field_options['in_section'];
-				$headings[ 'repeater' . $repeater_id ] = array(); // set a placeholder to maintain order for repeater fields
+				$headings['repeater' . $repeater_id] = array(); // set a placeholder to maintain order for repeater fields
 
-				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;
 			}
@@ -177,8 +177,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 );
@@ -189,17 +189,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;
 				}
 			}
 
@@ -213,9 +213,9 @@ 
 
 		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' );
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
 			unset( $i );
 		}
@@ -258,7 +258,7 @@ 
 
 	private static function prepare_next_csv_rows( $next_set ) {
 		// order by parent_item_id so children will be first
-		$where   = array(
+		$where = array(
 			'or'             => 1,
 			'id'             => $next_set,
 			'parent_item_id' => $next_set,
@@ -303,32 +303,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;
 			}
 
 			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;
 		}
 
 		// 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;
 	}
 
 	/**
@@ -349,14 +349,14 @@ 
 		}
 
 		$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 ]                                            = '';
-				$entries[ self::$entry->parent_item_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]                                            = '';
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
 			}
 		}
 
@@ -375,7 +375,7 @@ 
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
 
 			FrmAppHelper::unserialize_or_decode( $field_value );
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -400,15 +400,15 @@ 
 						'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,
 					)
 				);
 
-				$row[ $col->id . '_label' ] = $sep_value;
+				$row[$col->id . '_label'] = $sep_value;
 				unset( $sep_value );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}
@@ -424,8 +424,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;
 						}
 					}
 
@@ -433,8 +433,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;
 				}
 			}
 		}
@@ -458,18 +458,18 @@ 
 		$sep = '';
 
 		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 ++ );
 					$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 );

Braces +2 added lines, -1 removed lines

@@ -122,7 +122,8 @@
 
 	private static function field_headings( $col ) {
 		$field_type_obj = FrmFieldFactory::get_field_factory( $col );
-		if ( ! empty( $field_type_obj->is_combo_field ) ) { // This is combo field.
+		if ( ! empty( $field_type_obj->is_combo_field ) ) {
+// This is combo field.
 			return $field_type_obj->get_export_headings();
 		}