Strategy11 / formidable-forms

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 );
 
@@ -356,22 +356,22 @@ 
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? $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' );
 						}
 					}
 				}
@@ -401,8 +401,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'] = '';
 
@@ -410,7 +410,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] = '';
 		}
 	}
 
@@ -486,11 +486,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 = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
 
-			$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
+			$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field->id] ) ? $values['field_options']['custom_html_' . $field->id] : $fallback_html;
 		} elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) {
 			$prev_opts = $field->field_options;
 		}
@@ -516,7 +516,7 @@ 
 		foreach ( $field_cols as $col => $default ) {
 			$default = $default === '' ? $field->{$col} : $default;
 
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
 		}
 
 		// Don't save the template option.
@@ -696,7 +696,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;
 				}
 			}
 
@@ -920,16 +920,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 );
@@ -970,8 +970,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
@@ -1000,15 +1000,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 );
 			}
 		}
@@ -1034,7 +1034,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;
@@ -1062,7 +1062,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;
@@ -1165,7 +1165,7 @@ 
 		$form    = $atts['form'];
 		$default = isset( $atts['default'] ) ? $atts['default'] : '';
 
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $default;
 	}
 
 	/**

classes/models/FrmSettings.php

Spacing +4 added lines, -4 removed lines

@@ -229,8 +229,8 @@ 
 		}
 
 		foreach ( $settings as $setting => $default ) {
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
-				$this->{$setting} = $params[ 'frm_' . $setting ];
+			if ( isset( $params['frm_' . $setting] ) ) {
+				$this->{$setting} = $params['frm_' . $setting];
 			} elseif ( ! isset( $this->{$setting} ) ) {
 				$this->{$setting} = $default;
 			}
@@ -407,7 +407,7 @@ 
 
 		$checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' );
 		foreach ( $checkboxes as $set ) {
-			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
+			$this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0;
 		}
 	}
 
@@ -420,7 +420,7 @@ 
 		$frm_roles = FrmAppHelper::frm_capabilities();
 		$roles     = get_editable_roles();
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-			$this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
+			$this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
 
 			// Make sure administrators always have permissions
 			if ( ! in_array( 'administrator', $this->$frm_role, true ) ) {

classes/helpers/FrmFormsListHelper.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 		$page     = $this->get_pagenum();
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_per_page' );
 
-		$mode    = self::get_param(
+		$mode = self::get_param(
 			array(
 				'param'   => 'mode',
 				'default' => 'list',
@@ -35,13 +35,13 @@ 
 				'default' => 'name',
 			)
 		);
-		$order   = self::get_param(
+		$order = self::get_param(
 			array(
 				'param'   => 'order',
 				'default' => 'ASC',
 			)
 		);
-		$start   = self::get_param(
+		$start = self::get_param(
 			array(
 				'param'   => 'start',
 				'default' => ( $page - 1 ) * $per_page,
@@ -173,7 +173,7 @@ 
 		$counts    = FrmForm::get_count();
 		$form_type = FrmAppHelper::simple_get( 'form_type', 'sanitize_title', 'published' );
 
-		if ( isset( $statuses[ $form_type ] ) ) {
+		if ( isset( $statuses[$form_type] ) ) {
 			$counts->$form_type = $this->total_items;
 		}
 
@@ -194,7 +194,7 @@ 
 
 			if ( $counts->{$status} || 'draft' !== $status ) {
 				/* translators: %1$s: Status, %2$s: Number of items */
-				$links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
+				$links[$status] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
 			}
 
 			unset( $status, $name );
@@ -375,7 +375,7 @@ 
 	private function get_actions( &$actions, $item, $edit_link ) {
 		$new_actions = FrmFormsHelper::get_action_links( $item->id, $item );
 		foreach ( $new_actions as $link => $action ) {
-			$new_actions[ $link ] = FrmFormsHelper::format_link_html( $action, 'short' );
+			$new_actions[$link] = FrmFormsHelper::format_link_html( $action, 'short' );
 		}
 
 		if ( 'trash' === $this->status ) {

classes/controllers/FrmAppController.php

Spacing +2 added lines, -2 removed lines

@@ -1277,7 +1277,7 @@ 
 		if ( FrmAppHelper::is_admin_page( 'formidable-settings' ) ) {
 			add_action(
 				'frm_update_settings',
-				function ( $params ) {
+				function( $params ) {
 					if ( ! empty( $params['frm_use_html'] ) ) {
 						$inbox = new FrmInbox();
 						$inbox->dismiss( 'deprecated_use_html' );
@@ -1296,7 +1296,7 @@ 
 			 * @param array $messages
 			 * @return array
 			 */
-			function ( $messages ) use ( $url ) {
+			function( $messages ) use ( $url ) {
 				$messages[] = '<p>The option to use HTML5 in forms is currently disabled. In a future release, this setting will be removed and using HTML5 will be a requirement. <a href="' . esc_url( $url ) . '">Click here to enable it in Global Settings now</a>.</p>';
 				return $messages;
 			}

classes/models/FrmApplicationTemplate.php

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 		 *
 		 * @param array $keys
 		 */
-		self::$keys             = apply_filters(
+		self::$keys = apply_filters(
 			'frm_application_data_keys',
 			array( 'key', 'name', 'description', 'link', 'categories', 'views', 'forms' )
 		);
@@ -119,20 +119,20 @@ 
 
 		$application = array();
 		foreach ( self::$keys as $key ) {
-			if ( ! isset( $this->api_data[ $key ] ) ) {
+			if ( ! isset( $this->api_data[$key] ) ) {
 				continue;
 			}
 
-			$value = $this->api_data[ $key ];
+			$value = $this->api_data[$key];
 
 			if ( 'icon' === $key ) {
 				// Icon is an array. The first array item is the image URL.
-				$application[ $key ] = reset( $value );
+				$application[$key] = reset( $value );
 			} elseif ( 'categories' === $key ) {
-				$application[ $key ] = array_values(
+				$application[$key] = array_values(
 					array_filter(
 						$value,
-						function ( $category ) {
+						function( $category ) {
 							return false === strpos( $category, '+Views' );
 						}
 					)
@@ -148,7 +148,7 @@ 
 					// Strip off the " Template" text at the end of the name as it takes up space.
 					$value = substr( $value, 0, -9 );
 				}
-				$application[ $key ] = $value;
+				$application[$key] = $value;
 			}//end if
 		}//end foreach
 

classes/models/FrmField.php

Spacing +34 added lines, -34 removed lines

@@ -300,8 +300,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;
 	}
@@ -374,7 +374,7 @@ 
 		$values = FrmAppHelper::maybe_filter_array( $values, array( 'name', 'description' ) );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
-			$new_values[ $col ] = $values[ $col ];
+			$new_values[$col] = $values[$col];
 		}
 
 		$new_values['options']       = self::maybe_filter_options( $values['options'] );
@@ -385,7 +385,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 );
 		}
 
@@ -394,9 +394,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 );
@@ -416,7 +416,7 @@ 
 		}
 
 		if ( isset( $values['id'] ) ) {
-			$frm_duplicate_ids[ $values['id'] ] = $new_id;
+			$frm_duplicate_ids[$values['id']] = $new_id;
 		}
 
 		return $new_id;
@@ -476,7 +476,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,
@@ -522,8 +522,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
 	}
@@ -572,11 +572,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'] ) ) {
@@ -731,7 +731,7 @@ 
 				'id'        => $id,
 				'field_key' => $id,
 			);
-			$type  = FrmDb::get_var( 'frm_fields', $where, $col );
+			$type = FrmDb::get_var( 'frm_fields', $where, $col );
 		}
 
 		return $type;
@@ -763,8 +763,8 @@ 
 					continue;
 				}
 
-				$fields[ $result->id ] = $result;
-				++$count;
+				$fields[$result->id] = $result;
+				++ $count;
 				if ( $limit == 1 ) {
 					$fields = $result;
 					break;
@@ -815,8 +815,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;
 				}
@@ -930,7 +930,7 @@ 
 		$query_type = $limit == ' LIMIT 1' || $limit == 1 ? 'row' : 'results';
 
 		if ( is_array( $where ) ) {
-			$args    = array(
+			$args = array(
 				'order_by' => $order_by,
 				'limit'    => $limit,
 			);
@@ -961,9 +961,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 );
 			}
@@ -1019,7 +1019,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 );
 			}
 		}
@@ -1047,7 +1047,7 @@ 
 				return;
 			}
 
-			++$next;
+			++ $next;
 		}
 	}
 
@@ -1195,7 +1195,7 @@ 
 	 * @return bool
 	 */
 	public static function is_option_true_in_array( $field, $option ) {
-		return ! empty( $field[ $option ] );
+		return ! empty( $field[$option] );
 	}
 
 	/**
@@ -1204,7 +1204,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];
 	}
 
 	/**
@@ -1213,7 +1213,7 @@ 
 	 * @return bool
 	 */
 	public static function is_option_empty_in_array( $field, $option ) {
-		return empty( $field[ $option ] );
+		return empty( $field[$option] );
 	}
 
 	/**
@@ -1222,7 +1222,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] );
 	}
 
 	/**
@@ -1231,7 +1231,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] != '';
 	}
 
 	/**
@@ -1257,10 +1257,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 = '';
 		}
@@ -1274,7 +1274,7 @@ 
 	 * @return mixed
 	 */
 	public static function get_option_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
 	}
 
 	/**

classes/models/fields/FrmFieldType.php

Spacing +19 added lines, -19 removed lines

@@ -149,8 +149,8 @@ 
 		$field_val = '';
 		if ( is_object( $this->field ) ) {
 			$field_val = $this->field->{$column};
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
-			$field_val = $this->field[ $column ];
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
+			$field_val = $this->field[$column];
 		}
 
 		return $field_val;
@@ -164,7 +164,7 @@ 
 		if ( is_object( $this->field ) ) {
 			$this->field->{$column} = $value;
 		} elseif ( is_array( $this->field ) ) {
-			$this->field[ $column ] = $value;
+			$this->field[$column] = $value;
 		}
 	}
 
@@ -606,7 +606,7 @@ 
 			printf(
 				/* translators: %s: Field type */
 				esc_html__( '%s Options', 'formidable' ),
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
 			);
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
 			?>
@@ -692,7 +692,7 @@ 
 	 * New field
 	 */
 	public function get_new_field_defaults() {
-		$field        = array(
+		$field = array(
 			'name'          => $this->get_new_field_name(),
 			'description'   => '',
 			'type'          => $this->type,
@@ -723,8 +723,8 @@ 
 
 		$fields = array_merge( $fields, $pro_fields );
 
-		if ( isset( $fields[ $this->type ] ) ) {
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
+		if ( isset( $fields[$this->type] ) ) {
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
 		}
 
 		return $name;
@@ -741,7 +741,7 @@ 
 	 * @return array
 	 */
 	public function get_default_field_options() {
-		$opts        = array(
+		$opts = array(
 			'size'               => '',
 			'max'                => '',
 			'label'              => '',
@@ -1164,8 +1164,8 @@ 
 		$selected = $values['field_value'];
 
 		if ( isset( $values['combo_name'] ) ) {
-			$options  = $options[ $values['combo_name'] ];
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
+			$options  = $options[$values['combo_name']];
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
 		}
 
 		$input = $this->select_tag( $values );
@@ -1216,7 +1216,7 @@ 
 	}
 
 	protected function fill_display_field_values( $args = array() ) {
-		$defaults        = array(
+		$defaults = array(
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
 			'field_id'      => $this->get_field_column( 'id' ),
 			'field_plus_id' => '',
@@ -1269,7 +1269,7 @@ 
 			}
 		}
 
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
 			if ( $error_comes_first ) {
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
 			} else {
@@ -1348,11 +1348,11 @@ 
 
 		$field_id = $this->get_field_column( 'id' );
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
-			$frm_validated_unique_values[ $field_id ] = array();
+			$frm_validated_unique_values[$field_id] = array();
 			return false;
 		}
 
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
 		return $already_validated_this_value;
 	}
 
@@ -1377,7 +1377,7 @@ 
 	private function value_validated_as_unique( $value ) {
 		global $frm_validated_unique_values;
 		$field_id                                   = $this->get_field_column( 'id' );
-		$frm_validated_unique_values[ $field_id ][] = $value;
+		$frm_validated_unique_values[$field_id][] = $value;
 	}
 
 	/**
@@ -1418,8 +1418,8 @@ 
 		$value = $this->prepare_display_value( $value, $atts );
 
 		if ( is_array( $value ) ) {
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
-				$value = $value[ $atts['show'] ];
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
+				$value = $value[$atts['show']];
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 				$value = implode( $sep, $value );
@@ -1549,8 +1549,8 @@ 
 		$saved_entries = $atts['ids'];
 		$new_value     = array();
 		foreach ( (array) $value as $old_child_id ) {
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
-				$new_value[] = $saved_entries[ $old_child_id ];
+			if ( isset( $saved_entries[$old_child_id] ) ) {
+				$new_value[] = $saved_entries[$old_child_id];
 			}
 		}