Strategy11 / formidable-forms

classes/models/FrmFieldFormHtml.php

Spacing +14 added lines, -14 removed lines

@@ -44,8 +44,8 @@ 
 	 * @param array  $atts
 	 */
 	private function _set( $param, $atts ) {
-		if ( isset( $atts[ $param ] ) ) {
-			$this->{$param} = $atts[ $param ];
+		if ( isset( $atts[$param] ) ) {
+			$this->{$param} = $atts[$param];
 		}
 	}
 
@@ -89,8 +89,8 @@ 
 
 		$exclude = array( 'field_obj', 'html' );
 		foreach ( $exclude as $ex ) {
-			if ( isset( $atts[ $ex ] ) ) {
-				unset( $this->pass_args[ $ex ] );
+			if ( isset( $atts[$ex] ) ) {
+				unset( $this->pass_args[$ex] );
 			}
 		}
 	}
@@ -102,8 +102,8 @@ 
 	 * @param array $set
 	 */
 	private function set_from_field( $atts, $set ) {
-		if ( isset( $atts[ $set['param'] ] ) ) {
-			$this->{$set['param']} = $atts[ $set['param'] ];
+		if ( isset( $atts[$set['param']] ) ) {
+			$this->{$set['param']} = $atts[$set['param']];
 		} else {
 			$this->{$set['param']} = $this->field_obj->get_field_column( $set['default'] );
 		}
@@ -230,7 +230,7 @@ 
 	 */
 	private function replace_error_shortcode() {
 		$this->maybe_add_error_id();
-		$error = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? $this->pass_args['errors'][ 'field' . $this->field_id ] : false;
+		$error = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? $this->pass_args['errors']['field' . $this->field_id] : false;
 
 		if ( ! empty( $error ) && false === strpos( $this->html, 'role="alert"' ) && FrmAppHelper::should_include_alert_role_on_field_errors() ) {
 			$error_body = self::get_error_body( $this->html );
@@ -271,7 +271,7 @@ 
 	 * @since 3.06.02
 	 */
 	private function maybe_add_error_id() {
-		if ( ! isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ) {
+		if ( ! isset( $this->pass_args['errors']['field' . $this->field_id] ) ) {
 			return;
 		}
 
@@ -351,7 +351,7 @@ 
 		preg_match_all( "/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $this->html, $shortcodes, PREG_PATTERN_ORDER );
 
 		foreach ( $shortcodes[0] as $short_key => $tag ) {
-			$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
+			$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][$short_key] );
 			$tag            = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key );
 
 			$replace_with = '';
@@ -362,7 +362,7 @@ 
 				$replace_with = $this->replace_input_shortcode( $shortcode_atts );
 			}
 
-			$this->html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $this->html );
+			$this->html = str_replace( $shortcodes[0][$short_key], $replace_with, $this->html );
 		}
 	}
 
@@ -384,7 +384,7 @@ 
 	 */
 	private function prepare_input_shortcode_atts( $shortcode_atts ) {
 		if ( isset( $shortcode_atts['opt'] ) ) {
-			--$shortcode_atts['opt'];
+			-- $shortcode_atts['opt'];
 		}
 
 		$field_class = isset( $shortcode_atts['class'] ) ? $shortcode_atts['class'] : '';
@@ -397,7 +397,7 @@ 
 		if ( $this->field_obj->get_field_column( 'type' ) === 'name' ) {
 			$this->set_aria_invalid_error_for_name_part( $shortcode_atts );
 		} else {
-			$shortcode_atts['aria-invalid'] = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
+			$shortcode_atts['aria-invalid'] = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
 		}
 
 		$this->field_obj->set_field_column( 'shortcodes', $shortcode_atts );
@@ -415,7 +415,7 @@ 
 	 */
 	private function set_aria_invalid_error_for_name_part( &$shortcode_atts ) {
 		foreach ( array( 'first', 'middle', 'last' ) as $name_part ) {
-			$shortcode_atts[ 'aria-invalid-' . $name_part ] = isset( $this->pass_args['errors'][ 'field' . $this->field_id . '-' . $name_part ] ) ? 'true' : 'false';
+			$shortcode_atts['aria-invalid-' . $name_part] = isset( $this->pass_args['errors']['field' . $this->field_id . '-' . $name_part] ) ? 'true' : 'false';
 		}
 	}
 
@@ -465,7 +465,7 @@ 
 	 */
 	private function get_field_div_classes() {
 		// Add error class
-		$classes = isset( $this->pass_args['errors'][ 'field' . $this->field_id ] ) ? ' frm_blank_field' : '';
+		$classes = isset( $this->pass_args['errors']['field' . $this->field_id] ) ? ' frm_blank_field' : '';
 
 		// Add label position class
 		$settings = $this->field_obj->display_field_settings();

classes/controllers/FrmFieldsController.php

Spacing +26 added lines, -26 removed lines

@@ -25,7 +25,7 @@ 
 
 		$_GET['page'] = 'formidable';
 
-		$values     = array(
+		$values = array(
 			'id'         => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
 			'doing_ajax' => true,
 		);
@@ -48,7 +48,7 @@ 
 
 			ob_start();
 			self::load_single_field( $field, $values );
-			$field_html[ absint( $field->id ) ] = ob_get_contents();
+			$field_html[absint( $field->id )] = ob_get_contents();
 			ob_end_clean();
 		}
 
@@ -263,7 +263,7 @@ 
 			foreach ( $opts as $opt_key => $opt ) {
 				if ( strpos( $opt, '|' ) !== false ) {
 					$vals             = explode( '|', $opt );
-					$opts[ $opt_key ] = array(
+					$opts[$opt_key] = array(
 						'label' => trim( $vals[0] ),
 						'value' => trim( $vals[1] ),
 					);
@@ -278,7 +278,7 @@ 
 			$other_array = array();
 			foreach ( $field['options'] as $opt_key => $opt ) {
 				if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
-					$other_array[ $opt_key ] = $opt;
+					$other_array[$opt_key] = $opt;
 				}
 				unset( $opt_key, $opt );
 			}
@@ -321,18 +321,18 @@ 
 		$frm_settings         = FrmAppHelper::get_settings();
 		$field_types          = FrmFieldTypeOptionData::get_field_types( $field['type'] );
 
-		if ( ! isset( $all_field_types[ $field['type'] ] ) ) {
+		if ( ! isset( $all_field_types[$field['type']] ) ) {
 			// Add fallback for an add-on field type that has been deactivated.
-			$all_field_types[ $field['type'] ] = array(
+			$all_field_types[$field['type']] = array(
 				'name' => ucfirst( $field['type'] ),
 				'icon' => 'frm_icon_font frm_pencil_icon',
 			);
-		} elseif ( ! is_array( $all_field_types[ $field['type'] ] ) ) {
+		} elseif ( ! is_array( $all_field_types[$field['type']] ) ) {
 			// Fallback for fields added in a more basic way.
-			FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] );
+			FrmFormsHelper::prepare_field_type( $all_field_types[$field['type']] );
 		}
 
-		$type_name = $all_field_types[ $field['type'] ]['name'];
+		$type_name = $all_field_types[$field['type']]['name'];
 		if ( $field['type'] === 'divider' && FrmField::is_option_true( $field, 'repeat' ) ) {
 			$type_name = $all_field_types['divider|repeat']['name'];
 		}
@@ -406,13 +406,13 @@ 
 		$active   = 'default_value';
 
 		foreach ( $settings as $type ) {
-			if ( ! empty( $field[ $type ] ) ) {
+			if ( ! empty( $field[$type] ) ) {
 				$active = $type;
 			}
 		}
 
-		$types[ $active ]['class']  .= ' current';
-		$types[ $active ]['current'] = true;
+		$types[$active]['class']  .= ' current';
+		$types[$active]['current'] = true;
 
 		return $types;
 	}
@@ -430,8 +430,8 @@ 
 			'website' => 'url',
 			'image'   => 'url',
 		);
-		if ( isset( $type_switch[ $type ] ) ) {
-			$type = $type_switch[ $type ];
+		if ( isset( $type_switch[$type] ) ) {
+			$type = $type_switch[$type];
 		}
 
 		$pro_fields = FrmField::pro_field_selection();
@@ -584,11 +584,11 @@ 
 		// include "col" for valid html
 		$unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
 
-		if ( ! isset( $calc[ $unit ] ) ) {
+		if ( ! isset( $calc[$unit] ) ) {
 			return;
 		}
 
-		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
 	}
@@ -826,11 +826,11 @@ 
 	private static function get_form_for_js_validation( $field ) {
 		global $frm_vars;
 		if ( ! empty( $frm_vars['js_validate_forms'] ) ) {
-			if ( isset( $frm_vars['js_validate_forms'][ $field['form_id'] ] ) ) {
-				return $frm_vars['js_validate_forms'][ $field['form_id'] ];
+			if ( isset( $frm_vars['js_validate_forms'][$field['form_id']] ) ) {
+				return $frm_vars['js_validate_forms'][$field['form_id']];
 			}
-			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][ $field['parent_form_id'] ] ) ) {
-				return $frm_vars['js_validate_forms'][ $field['parent_form_id'] ];
+			if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][$field['parent_form_id']] ) ) {
+				return $frm_vars['js_validate_forms'][$field['parent_form_id']];
 			}
 		}
 		return false;
@@ -917,13 +917,13 @@ 
 		foreach ( $field['shortcodes'] as $k => $v ) {
 			if ( isset( $field['subfield_name'] ) && 0 === strpos( $k, 'aria-invalid' ) ) {
 				$subfield_name = $field['subfield_name'];
-				if ( ! isset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] ) ) {
+				if ( ! isset( $field['shortcodes']['aria-invalid-' . $subfield_name] ) ) {
 					continue;
 				}
 				// Change the key to the correct aria-invalid value so that $add_html is set correctly for the current subfield of a combo field.
 				$k = 'aria-invalid';
-				$v = $field['shortcodes'][ 'aria-invalid-' . $subfield_name ];
-				unset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] );
+				$v = $field['shortcodes']['aria-invalid-' . $subfield_name];
+				unset( $field['shortcodes']['aria-invalid-' . $subfield_name] );
 			}
 			if ( 'opt' === $k || ! self::should_allow_input_attribute( $k ) ) {
 				continue;
@@ -931,10 +931,10 @@ 
 
 			if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
 				$add_html[] = $v;
-			} elseif ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
+			} elseif ( ! empty( $k ) && isset( $add_html[$k] ) ) {
+				$add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
 			} else {
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
 			}
 
 			unset( $k, $v );