Strategy11 / formidable-forms

deprecated/FrmEDD_SL_Plugin_Updater.php

Spacing +7 added lines, -7 removed lines

@@ -44,7 +44,7 @@ 
 		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
 		$this->cache_key   = md5( serialize( $this->slug . $this->version . $this->api_data['license'] . $this->beta ) );
 
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
 
 		/**
 		 * Fires after the $frm_edd_plugin_data is setup.
@@ -93,7 +93,7 @@ 
 			$_transient_data = new stdClass();
 		}
 
-		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $this->name ] ) && false === $this->wp_override ) {
+		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[$this->name] ) && false === $this->wp_override ) {
 			return $_transient_data;
 		}
 
@@ -120,12 +120,12 @@ 
 					$version_info->plugin = $this->name;
 				}
 
-				$_transient_data->response[ $this->name ] = $version_info;
+				$_transient_data->response[$this->name] = $version_info;
 
 			}
 
 			$_transient_data->last_checked           = time();
-			$_transient_data->checked[ $this->name ] = $this->version;
+			$_transient_data->checked[$this->name] = $this->version;
 
 		}
 
@@ -189,7 +189,7 @@ 
 		if ( isset( $_data->sections ) && ! is_array( $_data->sections ) ) {
 			$new_sections = array();
 			foreach ( $_data->sections as $key => $value ) {
-				$new_sections[ $key ] = $value;
+				$new_sections[$key] = $value;
 			}
 
 			$_data->sections = $new_sections;
@@ -199,7 +199,7 @@ 
 		if ( isset( $_data->banners ) && ! is_array( $_data->banners ) ) {
 			$new_banners = array();
 			foreach ( $_data->banners as $key => $value ) {
-				$new_banners[ $key ] = $value;
+				$new_banners[$key] = $value;
 			}
 
 			$_data->banners = $new_banners;
@@ -316,7 +316,7 @@ 
 		}
 
 		$slug         = sanitize_text_field( $_REQUEST['slug'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
-		$data         = $frm_edd_plugin_data[ $slug ];
+		$data         = $frm_edd_plugin_data[$slug];
 		$beta         = ! empty( $data['beta'] ) ? true : false;
 		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		$version_info = $this->get_cached_version_info( $cache_key );

Braces +4 added lines, -2 removed lines

@@ -303,11 +303,13 @@
 
 		global $frm_edd_plugin_data;
 
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			return;
 		}
 
-		if ( empty( $_REQUEST['plugin'] ) || empty( $_REQUEST['slug'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( empty( $_REQUEST['plugin'] ) || empty( $_REQUEST['slug'] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 			return;
 		}
 

classes/views/solutions/_import.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 				$info['url'] = $xml;
 			}
 
-			$disabled = isset( $imported[ $info['form'] ] ) ? ' disabled' : '';
+			$disabled = isset( $imported[$info['form']] ) ? ' disabled' : '';
 			$url   = isset( $info['url'] ) ? $info['url'] : '';
 			$value = $importing === 'form' ? $info['form'] : $info['key'];
 			if ( ! isset( $info['img'] ) ) {
@@ -21,7 +21,7 @@ 
 				continue;
 			}
 
-			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[ $info['form'] ] ) );
+			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[$info['form']] ) );
 			?>
 			<div class="frm_radio radio-inline radio frm_image_option<?php echo esc_attr( $importing === 'view' ? ' show_sub_opt show_' . $info['form'] : '' ); ?>" style="<?php echo esc_attr( $hide_views ? 'display:none' : '' ); ?>">
 				<?php if ( $importing === 'form' ) { ?>
@@ -41,7 +41,7 @@ 
 					<?php } ?>
 					/>
 					<div class="frm_image_option_container frm_label_with_image">
-						<?php echo FrmAppHelper::kses( $info['img'], array( 'svg', 'rect', 'path' ) );  // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+						<?php echo FrmAppHelper::kses( $info['img'], array( 'svg', 'rect', 'path' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 						<span class="frm_text_label_for_image">
 							<?php
 							if ( ! empty( $disabled ) ) {
@@ -54,7 +54,7 @@ 
 							}
 
 							if ( $importing === 'form' && $disabled ) {
-								echo FrmAppHelper::kses( FrmFormsHelper::edit_form_link( $imported[ $info['form'] ] ), array( 'a' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+								echo FrmAppHelper::kses( FrmFormsHelper::edit_form_link( $imported[$info['form']] ), array( 'a' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 							} else {
 								echo esc_html( $info['name'] );
 							}

classes/helpers/FrmStylesHelper.php

Spacing +13 added lines, -13 removed lines

@@ -194,7 +194,7 @@ 
 				'-' => 'down',
 				'+' => 'up',
 			);
-			$class = 'frm_arrow' . $arrow[ $icon ];
+			$class = 'frm_arrow' . $arrow[$icon];
 		} else {
 			//frm_minus1_icon
 			$key   = str_replace( 'p', '', $key );
@@ -202,7 +202,7 @@ 
 				'-' => 'minus',
 				'+' => 'plus',
 			);
-			$class = 'frm_' . $plus[ $icon ];
+			$class = 'frm_' . $plus[$icon];
 		}
 
 		if ( $key ) {
@@ -222,8 +222,8 @@ 
 		?>
 		<div class="btn-group" id="frm_<?php echo esc_attr( $name ); ?>_select">
 			<button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ); ?>
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ); ?>
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '+', $type ) ); ?>
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '-', $type ) ); ?>
 				<b class="caret"></b>
 			</button>
 			<ul class="multiselect-container frm-dropdown-menu">
@@ -231,7 +231,7 @@ 
 					<li <?php echo ( $style->post_content['collapse_icon'] == $key ) ? 'class="active"' : ''; ?>>
 						<a href="javascript:void(0);">
 							<label>
-								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[ $name ], $key ); ?>/>
+								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[$name], $key ); ?>/>
 								<span>
 									<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '+', $type ) ); ?>
 									<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '-', $type ) ); ?>
@@ -313,15 +313,15 @@ 
 		$vars   = array_diff( $vars, $remove );
 
 		foreach ( $vars as $var ) {
-			if ( ! isset( $settings[ $var ] ) ) {
+			if ( ! isset( $settings[$var] ) ) {
 				continue;
 			}
-			if ( ! isset( $defaults[ $var ] ) ) {
-				$defaults[ $var ] = '';
+			if ( ! isset( $defaults[$var] ) ) {
+				$defaults[$var] = '';
 			}
-			$show = empty( $defaults ) || ( $settings[ $var ] !== '' && $settings[ $var ] !== $defaults[ $var ] );
+			$show = empty( $defaults ) || ( $settings[$var] !== '' && $settings[$var] !== $defaults[$var] );
 			if ( $show ) {
-				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[ $var ] ) : esc_html( $settings[ $var ] ) ) . ';'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[$var] ) : esc_html( $settings[$var] ) ) . ';'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			}
 		}
 	}
@@ -371,8 +371,8 @@ 
 
 		$checkbox_opts = array( 'important_style', 'auto_width', 'submit_style', 'collapse_icon', 'center_form' );
 		foreach ( $checkbox_opts as $opt ) {
-			if ( ! isset( $settings[ $opt ] ) ) {
-				$settings[ $opt ] = 0;
+			if ( ! isset( $settings[$opt] ) ) {
+				$settings[$opt] = 0;
 			}
 		}
 
@@ -400,7 +400,7 @@ 
 				$css = '';
 			}
 			foreach ( $opts as $opt ) {
-				self::get_color_output( $css, $settings[ $opt ] );
+				self::get_color_output( $css, $settings[$opt] );
 			}
 		}
 	}

Braces +2 added lines, -1 removed lines

@@ -336,7 +336,8 @@
 		if ( self::previewing_style() ) {
 
 			$frm_style = new FrmStyle();
-			if ( isset( $_POST['frm_style_setting'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+			if ( isset( $_POST['frm_style_setting'] ) ) {
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 				// Sanitizing is done later.
 				$posted = wp_unslash( $_POST['frm_style_setting'] ); //phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing

classes/views/frm-fields/back-end/html-content.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 				'title'     => esc_attr__( 'Toggle Options', 'formidable' ),
 			)
 		);
-		$e_args  = array(
+		$e_args = array(
 			'textarea_name' => 'field_options[description_' . absint( $field['id'] ) . ']',
 			'textarea_rows' => 8,
 		);

classes/models/fields/FrmFieldCaptcha.php

Spacing +5 added lines, -5 removed lines

@@ -151,8 +151,8 @@ 
 
 		if ( is_wp_error( $resp ) ) {
 			$error_string                     = $resp->get_error_message();
-			$errors[ 'field' . $args['id'] ]  = __( 'There was a problem verifying your recaptcha', 'formidable' );
-			$errors[ 'field' . $args['id'] ] .= ' ' . $error_string;
+			$errors['field' . $args['id']]  = __( 'There was a problem verifying your recaptcha', 'formidable' );
+			$errors['field' . $args['id']] .= ' ' . $error_string;
 			return $errors;
 		}
 
@@ -174,7 +174,7 @@ 
 		if ( isset( $response['success'] ) && ! $response['success'] ) {
 			// What happens when the CAPTCHA was entered incorrectly
 			$invalid_message                 = FrmField::get_option( $this->field, 'invalid' );
-			$errors[ 'field' . $args['id'] ] = ( $invalid_message == '' ? $frm_settings->re_msg : $invalid_message );
+			$errors['field' . $args['id']] = ( $invalid_message == '' ? $frm_settings->re_msg : $invalid_message );
 		}
 
 		return $errors;
@@ -190,8 +190,8 @@ 
 			$frm_vars['captcha_scores'] = array();
 		}
 		$form_id = is_object( $this->field ) ? $this->field->form_id : $this->field['form_id'];
-		if ( ! isset( $frm_vars['captcha_scores'][ $form_id ] ) ) {
-			$frm_vars['captcha_scores'][ $form_id ] = $score;
+		if ( ! isset( $frm_vars['captcha_scores'][$form_id] ) ) {
+			$frm_vars['captcha_scores'][$form_id] = $score;
 		}
 	}
 

classes/models/FrmEntry.php

Spacing +19 added lines, -19 removed lines

@@ -80,7 +80,7 @@ 
 			$metas       = FrmEntryMeta::get_entry_meta_info( $entry_exist );
 			$field_metas = array();
 			foreach ( $metas as $meta ) {
-				$field_metas[ $meta->field_id ] = $meta->meta_value;
+				$field_metas[$meta->field_id] = $meta->meta_value;
 			}
 
 			$filtered_vals = array_filter( $values['item_meta'] );
@@ -136,10 +136,10 @@ 
 		$reduced = array();
 		foreach ( $filter_vals as $field_id => $value ) {
 			$field                = FrmFieldFactory::get_field_object( $field_id );
-			$reduced[ $field_id ] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
-			$reduced[ $field_id ] = $field->set_value_before_save( $reduced[ $field_id ] );
-			if ( '' === $reduced[ $field_id ] || ( is_array( $reduced[ $field_id ] ) && 0 === count( $reduced[ $field_id ] ) ) ) {
-				unset( $reduced[ $field_id ] );
+			$reduced[$field_id] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
+			$reduced[$field_id] = $field->set_value_before_save( $reduced[$field_id] );
+			if ( '' === $reduced[$field_id] || ( is_array( $reduced[$field_id] ) && 0 === count( $reduced[$field_id] ) ) ) {
+				unset( $reduced[$field_id] );
 			}
 		}
 		return $reduced;
@@ -332,7 +332,7 @@ 
 		$query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
 
-		$query      .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
+		$query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
 		$query_args = array( $id );
 		$query      = $wpdb->prepare( $query, $query_args ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 
@@ -377,7 +377,7 @@ 
 	private static function prepare_entries( &$entries ) {
 		foreach ( $entries as $k => $entry ) {
 			self::prepare_entry( $entry );
-			$entries[ $k ] = $entry;
+			$entries[$k] = $entry;
 		}
 	}
 
@@ -402,20 +402,20 @@ 
 		foreach ( $metas as $meta_val ) {
 			if ( $meta_val->item_id == $entry->id ) {
 				FrmAppHelper::unserialize_or_decode( $meta_val->meta_value );
-				$entry->metas[ $meta_val->field_id ] = $meta_val->meta_value;
+				$entry->metas[$meta_val->field_id] = $meta_val->meta_value;
 				if ( $include_key ) {
-					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
+					$entry->metas[$meta_val->field_key] = $entry->metas[$meta_val->field_id];
 				}
 				continue;
 			}
 
 			// include sub entries in an array
-			if ( ! isset( $entry->metas[ $meta_val->field_id ] ) ) {
-				$entry->metas[ $meta_val->field_id ] = array();
+			if ( ! isset( $entry->metas[$meta_val->field_id] ) ) {
+				$entry->metas[$meta_val->field_id] = array();
 			}
 
 			FrmAppHelper::unserialize_or_decode( $meta_val->meta_value );
-			$entry->metas[ $meta_val->field_id ][] = $meta_val->meta_value;
+			$entry->metas[$meta_val->field_id][] = $meta_val->meta_value;
 
 			unset( $meta_val );
 		}
@@ -462,7 +462,7 @@ 
 
 			if ( $inc_form ) {
 				$fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
-				$table  .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
+				$table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
 			}
 
 			if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
@@ -506,16 +506,16 @@ 
 		}
 
 		foreach ( $metas as $m_key => $meta_val ) {
-			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+			if ( ! isset( $entries[$meta_val->item_id] ) ) {
 				continue;
 			}
 
-			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
-				$entries[ $meta_val->item_id ]->metas = array();
+			if ( ! isset( $entries[$meta_val->item_id]->metas ) ) {
+				$entries[$meta_val->item_id]->metas = array();
 			}
 
 			FrmAppHelper::unserialize_or_decode( $meta_val->meta_value );
-			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = $meta_val->meta_value;
+			$entries[$meta_val->item_id]->metas[$meta_val->field_id] = $meta_val->meta_value;
 			unset( $m_key, $meta_val );
 		}
 
@@ -693,7 +693,7 @@ 
 	}
 
 	private static function get_entry_value( $values, $name, $default ) {
-		return isset( $values[ $name ] ) ? $values[ $name ] : $default;
+		return isset( $values[$name] ) ? $values[$name] : $default;
 	}
 
 	/**
@@ -874,7 +874,7 @@ 
 	private static function maybe_add_captcha_meta( $form_id, $entry_id ) {
 		global $frm_vars;
 		if ( array_key_exists( 'captcha_scores', $frm_vars ) && array_key_exists( $form_id, $frm_vars['captcha_scores'] ) ) {
-			$captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][ $form_id ] );
+			$captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][$form_id] );
 			FrmEntryMeta::add_entry_meta( $entry_id, 0, '', maybe_serialize( $captcha_score_meta ) );
 		}
 	}

classes/views/frm-forms/landing-page-preview-option.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 $data_keys = array_keys( $data );
 $params    = array();
 foreach ( $data_keys as $key ) {
-	$params[ 'data-' . $key ] = $data[ $key ];
+	$params['data-' . $key] = $data[$key];
 }
 $params['class'] = 'frm_show_upgrade frm_noallow';
 $params['href']  = '#';

classes/helpers/FrmFormsHelper.php

Spacing +25 added lines, -25 removed lines

@@ -28,7 +28,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;
@@ -70,7 +70,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 ) ) ) . '"';
 		}
 	}
 
@@ -276,8 +276,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' );
 			}
 		}
 
@@ -292,8 +292,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 );
@@ -330,16 +330,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 );
 						}
 					}
@@ -347,7 +347,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 );
@@ -387,7 +387,7 @@ 
 	public static function fill_form_options( &$options, $values ) {
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
 			unset( $var, $default );
 		}
 	}
@@ -549,7 +549,7 @@ 
 	public static function insert_opt_html( $args ) {
 		$class  = isset( $args['class'] ) ? $args['class'] : '';
 		$fields = FrmField::all_field_selection();
-		$field  = isset( $fields[ $args['type'] ] ) ? $fields[ $args['type'] ] : array();
+		$field  = isset( $fields[$args['type']] ) ? $fields[$args['type']] : array();
 
 		self::prepare_field_type( $field );
 
@@ -705,7 +705,7 @@ 
 			FrmField::update( $field->id, array( 'field_order' => $field->field_order + 2 ) );
 		}
 
-		$add_order    += 2;
+		$add_order += 2;
 		$open         = false;
 		$reset_fields = true;
 	}
@@ -1108,10 +1108,10 @@ 
 				$link .= ' onclick="return confirm(\'' . esc_attr( $link_details['confirm'] ) . '\')"';
 			}
 
-			$label = ( isset( $link_details[ $length ] ) ? $link_details[ $length ] : $link_details['label'] );
-			if ( $length == 'icon' && isset( $link_details[ $length ] ) ) {
+			$label = ( isset( $link_details[$length] ) ? $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'] ) . '"';
+				$link .= ' aria-label="' . esc_attr( $link_details['label'] ) . '"';
 			}
 
 			$link .= '>' . $label . '</a>';
@@ -1250,7 +1250,7 @@ 
 			$status = 'publish';
 		}
 
-		$name = $nice_names[ $status ];
+		$name = $nice_names[$status];
 
 		return $name;
 	}
@@ -1283,17 +1283,17 @@ 
 			''                    => array( 'align_right' ),
 		);
 
-		$icons[ __( 'My Templates', 'formidable' ) ] = array( 'user', 'var(--orange)' );
+		$icons[__( 'My Templates', 'formidable' )] = array( 'user', 'var(--orange)' );
 
 		$icon = $icons[''];
 
 		if ( count( $categories ) === 1 ) {
 			$category = reset( $categories );
-			$icon     = isset( $icons[ $category ] ) ? $icons[ $category ] : $icon;
+			$icon     = isset( $icons[$category] ) ? $icons[$category] : $icon;
 		} elseif ( ! empty( $categories ) ) {
 			foreach ( $icons as $cat => $icon ) {
 				if ( ! in_array( $cat, $categories ) ) {
-					unset( $icons[ $cat ] );
+					unset( $icons[$cat] );
 				}
 			}
 			$icon = reset( $icons );
@@ -1422,7 +1422,7 @@ 
 
 		foreach ( $item['categories'] as $k => $category ) {
 			if ( in_array( $category, $plans, true ) ) {
-				unset( $item['categories'][ $k ] );
+				unset( $item['categories'][$k] );
 
 				if ( in_array( $category, array( 'Creator', 'Personal' ), true ) ) {
 					// Show the current package name.
@@ -1650,9 +1650,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;
 			}
@@ -1662,7 +1662,7 @@ 
 				continue;
 			}
 
-			$new_shortcode = '[' . $shortcodes[2][ $key ];
+			$new_shortcode = '[' . $shortcodes[2][$key];
 			if ( $options ) {
 				$new_shortcode .= ' ' . $options;
 			}

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

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,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';
 			}
 			?>
@@ -61,7 +61,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 ) . ']" ';
@@ -78,9 +78,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" role="alert"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div>
+					<div class="frm_error" role="alert"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div>
 				<?php } ?>
 			</div>
 		<?php } ?>