Strategy11 / formidable-forms

classes/models/fields/FrmFieldType.php

Spacing +17 added lines, -17 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	protected function set_type( $type ) {
 		if ( empty( $this->type ) ) {
-			$this->type = $this->get_field_column('type');
+			$this->type = $this->get_field_column( 'type' );
 			if ( empty( $this->type ) && ! empty( $type ) ) {
 				$this->type = $type;
 			}
@@ -91,8 +91,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;
 	}
@@ -105,7 +105,7 @@ 
 		if ( is_object( $this->field ) ) {
 			$this->field->{$column} = $value;
 		} elseif ( is_array( $this->field ) ) {
-			$this->field[ $column ] = $value;
+			$this->field[$column] = $value;
 		}
 	}
 
@@ -197,16 +197,16 @@ 
 	}
 
 	protected function builder_text_field() {
-		return '<input type="text" name="' . esc_attr( $this->html_name() ) . '" id="' . esc_attr( $this->html_id() ) . '" value="' . esc_attr( $this->get_field_column('default_value') ) . '" class="dyn_default_value" />';
+		return '<input type="text" name="' . esc_attr( $this->html_name() ) . '" id="' . esc_attr( $this->html_id() ) . '" value="' . esc_attr( $this->get_field_column( 'default_value' ) ) . '" class="dyn_default_value" />';
 	}
 
 	protected function html_name( $name = '' ) {
 		$prefix = empty( $name ) ? 'item_meta' : $name;
-		return $prefix . '[' . $this->get_field_column('id') . ']';
+		return $prefix . '[' . $this->get_field_column( 'id' ) . ']';
 	}
 
 	protected function html_id( $plus = '' ) {
-		return apply_filters( 'frm_field_get_html_id', 'field_' . $this->get_field_column('field_key') . $plus, $this->field );
+		return apply_filters( 'frm_field_get_html_id', 'field_' . $this->get_field_column( 'field_key' ) . $plus, $this->field );
     }
 
 	public function display_field_settings() {
@@ -296,7 +296,7 @@ 
 	}
 
 	protected function default_invalid_msg() {
-		$field_name = $this->get_field_column('name');
+		$field_name = $this->get_field_column( 'name' );
 		if ( $field_name == '' ) {
 			$invalid = __( 'This field is invalid', 'formidable' );
 		} else {
@@ -312,8 +312,8 @@ 
 		$fields = FrmField::field_selection();
 		$fields = array_merge( $fields, FrmField::pro_field_selection() );
 
-		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;
@@ -418,7 +418,7 @@ 
 	}
 
 	public function get_label_class() {
-		return $this->get_field_column('label');
+		return $this->get_field_column( 'label' );
 	}
 
 	/**
@@ -480,8 +480,8 @@ 
 
 	protected function fill_display_field_values( $args = array() ) {
 		$defaults = array(
-			'field_name'    => 'item_meta[' . $this->get_field_column('id') . ']',
-			'field_id'      => $this->get_field_column('id'),
+			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
+			'field_id'      => $this->get_field_column( 'id' ),
 			'field_plus_id' => '',
 			'section_id'    => '',
 		);
@@ -518,8 +518,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 );
@@ -578,8 +578,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];
 			}
 		}
 

classes/models/FrmFieldFormHtml.php

Spacing +22 added lines, -22 removed lines

@@ -41,8 +41,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];
 		}
 	}
 
@@ -74,8 +74,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] );
 			}
 		}
 	}
@@ -87,8 +87,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'] );
 		}
@@ -133,17 +133,17 @@ 
 		$this->html = str_replace( 'field_[key]', $this->html_id, $this->html );
 
 		//replace [key]
-		$this->html = str_replace( '[key]', $this->field_obj->get_field_column('field_key'), $this->html );
+		$this->html = str_replace( '[key]', $this->field_obj->get_field_column( 'field_key' ), $this->html );
 
 		//replace [field_name]
-		$this->html = str_replace('[field_name]', $this->field_obj->get_field_column('name'), $this->html );
+		$this->html = str_replace( '[field_name]', $this->field_obj->get_field_column( 'name' ), $this->html );
 	}
 
 	/**
 	 * @since 3.0
 	 */
 	private function replace_required_label_shortcode() {
-		$required = FrmField::is_required( $this->field_obj->get_field() ) ? $this->field_obj->get_field_column('required_indicator') : '';
+		$required = FrmField::is_required( $this->field_obj->get_field() ) ? $this->field_obj->get_field_column( 'required_indicator' ) : '';
 		FrmShortcodeHelper::remove_inline_conditions( ! empty( $required ), 'required_label', $required, $this->html );
 	}
 
@@ -151,7 +151,7 @@ 
 	 * @since 3.0
 	 */
 	private function replace_description_shortcode() {
-		$description = $this->field_obj->get_field_column('description');
+		$description = $this->field_obj->get_field_column( 'description' );
 		FrmShortcodeHelper::remove_inline_conditions( ( $description && $description != '' ), 'description', $description, $this->html );
 	}
 
@@ -159,7 +159,7 @@ 
 	 * @since 3.0
 	 */
 	private function replace_error_shortcode() {
-		$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;
 		FrmShortcodeHelper::remove_inline_conditions( ! empty( $error ), 'error', $error, $this->html );
 	}
 
@@ -195,7 +195,7 @@ 
 		$this->html .= "\n";
 
 		//Return html if conf_field to prevent loop
-		if ( $this->field_obj->get_field_column('conf_field') == 'stop' ) {
+		if ( $this->field_obj->get_field_column( 'conf_field' ) == 'stop' ) {
 			return;
 		}
 
@@ -231,10 +231,10 @@ 
 	 * @since 3.0
 	 */
 	private function replace_shortcodes_with_atts() {
-		preg_match_all("/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $this->html, $shortcodes, PREG_PATTERN_ORDER);
+		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, array( 'conditional' => false, 'conditional_check' => false ) );
 
 			$replace_with = '';
@@ -245,7 +245,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 );
 		}
 	}
 
@@ -266,7 +266,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'] : '';
@@ -290,7 +290,7 @@ 
 	private function add_class_to_label() {
 		$label_class = $this->field_obj->get_label_class();
 		$this->html = str_replace( '[label_position]', $label_class, $this->html );
-		if ( $this->field_obj->get_field_column('label') == 'inside' && $this->field_obj->get_field_column('value') != '' ) {
+		if ( $this->field_obj->get_field_column( 'label' ) == 'inside' && $this->field_obj->get_field_column( 'value' ) != '' ) {
 			$this->html = str_replace( 'frm_primary_label', 'frm_primary_label frm_visible', $this->html );
 		}
 	}
@@ -313,7 +313,7 @@ 
 	private function add_field_div_classes() {
 		$classes = $this->get_field_div_classes();
 
-		if ( $this->field_obj->get_field_column('type') == 'html' && strpos( $this->html, '[error_class]' ) === false ) {
+		if ( $this->field_obj->get_field_column( 'type' ) == 'html' && strpos( $this->html, '[error_class]' ) === false ) {
 			// there is no error_class shortcode for HTML fields
 			$this->html = str_replace( 'class="frm_form_field', 'class="frm_form_field ' . $classes, $this->html );
 		}
@@ -330,15 +330,15 @@ 
 	 */
 	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
-		$classes .= ' frm_' . $this->field_obj->get_field_column('label') . '_container';
+		$classes .= ' frm_' . $this->field_obj->get_field_column( 'label' ) . '_container';
 
 		// Add CSS layout classes
-		$extra_classes = $this->field_obj->get_field_column('classes');
+		$extra_classes = $this->field_obj->get_field_column( 'classes' );
 		if ( ! empty( $extra_classes ) ) {
-			if ( ! strpos( $this->html, 'frm_form_field ') ) {
+			if ( ! strpos( $this->html, 'frm_form_field ' ) ) {
 				$classes .= ' frm_form_field';
 			}
 			$classes .= ' ' . $extra_classes;