Strategy11 / formidable-forms

classes/views/styles/show.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 							</a>
 						    <?php } ?>
 						    <?php
-						    if ( $style->ID ) {
+							if ( $style->ID ) {
 								echo '<span class="howto"><span>.frm_style_' . esc_attr( $style->post_name ) . '</span></span>';
 							}
 							?>

classes/models/fields/FrmFieldEmail.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	public function validate( $args ) {
 		$errors = array();
 		if ( $args['value'] != '' && ! is_email( $args['value'] ) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
 		}
 		return $errors;
 	}

classes/models/FrmEntryValues.php

Spacing +5 added lines, -5 removed lines

@@ -136,12 +136,12 @@ 
 	 * @return array
 	 */
 	private function prepare_array_property( $index, $atts ) {
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
 
-			if ( is_array( $atts[ $index ] ) ) {
-				$property = $atts[ $index ];
+			if ( is_array( $atts[$index] ) ) {
+				$property = $atts[$index];
 			} else {
-				$property = explode( ',', $atts[ $index ] );
+				$property = explode( ',', $atts[$index] );
 			}
 		} else {
 			$property = array();
@@ -274,6 +274,6 @@ 
 	 * @param stdClass $field
 	 */
 	protected function add_field_values( $field ) {
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
 	}
 }

classes/models/FrmFieldValue.php

Spacing +3 added lines, -3 removed lines

@@ -59,8 +59,8 @@ 
 	protected function init_saved_value( $entry ) {
 		if ( $this->field->type === 'html' ) {
 			$this->saved_value = $this->field->description;
-		} else if ( isset( $entry->metas[ $this->field->id ] ) ) {
-			$this->saved_value = $entry->metas[ $this->field->id ];
+		} else if ( isset( $entry->metas[$this->field->id] ) ) {
+			$this->saved_value = $entry->metas[$this->field->id];
 		} else {
 			$this->saved_value = '';
 		}
@@ -176,7 +176,7 @@ 
 		// TODO: maybe change from 'source' to 'run_filters' = 'email'
 		if ( isset( $atts['source'] ) && $atts['source'] === 'entry_formatter' ) {
 			// Deprecated frm_email_value hook
-			$meta                  = array(
+			$meta = array(
 				'item_id'    => $entry->id,
 				'field_id'   => $this->field->id,
 				'meta_value' => $this->saved_value,

classes/helpers/FrmFieldsHelper.php

Doc Comments +6 added lines, -3 removed lines

@@ -205,7 +205,7 @@ 
 	 *
 	 * @param object $field
 	 *
-	 * @return array
+	 * @return stdClass
 	 */
 	private static function get_original_field( $field ) {
 		$original_type = FrmField::get_option( $field, 'original_type' );
@@ -232,7 +232,7 @@ 
 	 *
 	 * @param string $type
 	 *
-	 * @return array
+	 * @return string
 	 */
 	public static function get_default_field( $type ) {
 		$field_type = FrmFieldFactory::get_field_type( $type );
@@ -256,7 +256,7 @@ 
 	 * @since 2.0
 	 *
 	 * @param $field
-	 * @param $error
+	 * @param string $error
 	 *
 	 * @return string
 	 */
@@ -847,6 +847,9 @@ 
         return $field_types;
     }
 
+    /**
+     * @param string[] $inputs
+     */
     private static function field_types_for_input( $inputs, $fields, &$field_types ) {
         foreach ( $inputs as $input ) {
             $field_types[ $input ] = $fields[ $input ];

Spacing +32 added lines, -32 removed lines

@@ -25,7 +25,7 @@ 
 			if ( in_array( $type, array( 'data', 'lookup' ) ) ) {
 				$values['field_options']['data_type'] = $setting;
 			} else {
-				$values['field_options'][ $setting ] = 1;
+				$values['field_options'][$setting] = 1;
 			}
 		}
 
@@ -127,10 +127,10 @@ 
 		}
 
 		foreach ( $defaults as $opt => $default ) {
-			$values[ $opt ] = isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default;
+			$values[$opt] = isset( $field->field_options[$opt] ) ? $field->field_options[$opt] : $default;
 
 			if ( $check_post ) {
-				self::get_posted_field_setting( $opt . '_' . $field->id, $values[ $opt ] );
+				self::get_posted_field_setting( $opt . '_' . $field->id, $values[$opt] );
 			}
 
 			unset( $opt, $default );
@@ -173,8 +173,8 @@ 
 	 * @param mixed $value
 	 */
 	private static function get_posted_field_setting( $setting, &$value ) {
-		if ( isset( $_POST['field_options'][ $setting ] ) ) {
-			$value = maybe_unserialize( $_POST['field_options'][ $setting ] );
+		if ( isset( $_POST['field_options'][$setting] ) ) {
+			$value = maybe_unserialize( $_POST['field_options'][$setting] );
 			if ( strpos( $setting, 'html' ) !== false ) {
 				// strip slashes from HTML but not regex
 				$value = stripslashes_deep( $value );
@@ -248,7 +248,7 @@ 
 		$values['default_value'] = maybe_serialize( $field->default_value );
 
         foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
-            $values[ $col ] = $field->{$col};
+            $values[$col] = $field->{$col};
         }
     }
 
@@ -286,7 +286,7 @@ 
 		);
 
 		$msg = FrmField::get_option( $field, $error );
-		$msg = empty( $msg ) ? $defaults[ $error ]['part'] : $msg;
+		$msg = empty( $msg ) ? $defaults[$error]['part'] : $msg;
 		$msg = do_shortcode( $msg );
 		return $msg;
 	}
@@ -615,7 +615,7 @@ 
 				continue;
 			}
 
-			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][ $short_key ] );
+			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][$short_key] );
 			$tag  = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key );
 
 			$atts['entry'] = $entry;
@@ -624,7 +624,7 @@ 
 
 			if ( $replace_with !== null ) {
 				self::sanitize_embedded_shortcodes( compact( 'entry' ), $replace_with );
-				$content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
+				$content = str_replace( $shortcodes[0][$short_key], $replace_with, $content );
 			}
 
 			unset( $atts, $replace_with );
@@ -666,8 +666,8 @@ 
 
 		$dynamic_default = array( 'admin_email', 'siteurl', 'frmurl', 'sitename', 'get' );
 
-		if ( isset( $shortcode_values[ $atts['tag'] ] ) ) {
-			$replace_with = $shortcode_values[ $atts['tag'] ];
+		if ( isset( $shortcode_values[$atts['tag']] ) ) {
+			$replace_with = $shortcode_values[$atts['tag']];
 		} elseif ( in_array( $atts['tag'], $dynamic_default ) ) {
 			$replace_with = self::dynamic_default_values( $atts['tag'], $atts );
 		} elseif ( $clean_tag == 'user_agent' ) {
@@ -877,8 +877,8 @@ 
             self::field_types_for_input( $multiple_input, $field_selection, $field_types );
 		} elseif ( in_array( $type, $other_type ) ) {
             self::field_types_for_input( $other_type, $field_selection, $field_types );
-		} elseif ( isset( $field_selection[ $type ] ) ) {
-            $field_types[ $type ] = $field_selection[ $type ];
+		} elseif ( isset( $field_selection[$type] ) ) {
+            $field_types[$type] = $field_selection[$type];
         }
 
 		$field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type' ) );
@@ -887,7 +887,7 @@ 
 
     private static function field_types_for_input( $inputs, $fields, &$field_types ) {
         foreach ( $inputs as $input ) {
-            $field_types[ $input ] = $fields[ $input ];
+            $field_types[$input] = $fields[$input];
 			unset( $input );
         }
     }
@@ -935,21 +935,21 @@ 
 		// Check posted vals before checking saved values
 
 		// For fields inside repeating sections - note, don't check if $pointer is true because it will often be zero
-		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) {
+		if ( $parent && isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ) {
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) : '';
+				$other_val = isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) ? sanitize_text_field( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) : '';
 			} else {
-				$other_val = sanitize_text_field( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] );
+				$other_val = sanitize_text_field( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] );
 			}
 			return $other_val;
 
-		} else if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) {
+		} else if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][$field['id']] ) ) {
 			// For normal fields
 
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) : '';
+				$other_val = isset( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ? sanitize_text_field( $_POST['item_meta']['other'][$field['id']][$opt_key] ) : '';
 			} else {
-				$other_val = sanitize_text_field( $_POST['item_meta']['other'][ $field['id'] ] );
+				$other_val = sanitize_text_field( $_POST['item_meta']['other'][$field['id']] );
 			}
 			return $other_val;
 		}
@@ -958,8 +958,8 @@ 
 		if ( $field['type'] == 'checkbox' && is_array( $field['value'] ) ) {
 			// Check if there is an "other" val in saved value and make sure the
 			// "other" val is not equal to the Other checkbox option
-			if ( isset( $field['value'][ $opt_key ] ) && $field['options'][ $opt_key ] != $field['value'][ $opt_key ] ) {
-				$other_val = $field['value'][ $opt_key ];
+			if ( isset( $field['value'][$opt_key] ) && $field['options'][$opt_key] != $field['value'][$opt_key] ) {
+				$other_val = $field['value'][$opt_key];
 			}
 		} else {
 			/**
@@ -971,8 +971,8 @@ 
 				// Multi-select dropdowns - key is not preserved
 				if ( is_array( $field['value'] ) ) {
 					$o_key = array_search( $temp_val, $field['value'] );
-					if ( isset( $field['value'][ $o_key ] ) ) {
-						unset( $field['value'][ $o_key ], $o_key );
+					if ( isset( $field['value'][$o_key] ) ) {
+						unset( $field['value'][$o_key], $o_key );
 					}
 				} else if ( $temp_val == $field['value'] ) {
 					// For radio and regular dropdowns
@@ -1194,7 +1194,7 @@ 
         }
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k => $v ) {
-                $val[ $k ] = str_replace( $replace, $replace_with, $v );
+                $val[$k] = str_replace( $replace, $replace_with, $v );
 				unset( $k, $v );
             }
         } else {
@@ -1265,19 +1265,19 @@ 
 	}
 
 	public static function get_bulk_prefilled_opts( array &$prepop ) {
-		$prepop[ __( 'Countries', 'formidable' ) ] = FrmFieldsHelper::get_countries();
+		$prepop[__( 'Countries', 'formidable' )] = FrmFieldsHelper::get_countries();
 
         $states = FrmFieldsHelper::get_us_states();
 		$state_abv = array_keys( $states );
 		sort( $state_abv );
-		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
+		$prepop[__( 'U.S. State Abbreviations', 'formidable' )] = $state_abv;
 
 		$states = array_values( $states );
 		sort( $states );
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
 		unset( $state_abv, $states );
 
-		$prepop[ __( 'Age', 'formidable' ) ] = array(
+		$prepop[__( 'Age', 'formidable' )] = array(
 			__( 'Under 18', 'formidable' ),
 			__( '18-24', 'formidable' ),
 			__( '25-34', 'formidable' ),
@@ -1288,7 +1288,7 @@ 
 			__( 'Prefer Not to Answer', 'formidable' ),
 		);
 
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = array(
+		$prepop[__( 'Satisfaction', 'formidable' )] = array(
 			__( 'Very Satisfied', 'formidable' ),
 			__( 'Satisfied', 'formidable' ),
 			__( 'Neutral', 'formidable' ),
@@ -1297,7 +1297,7 @@ 
 			__( 'N/A', 'formidable' ),
 		);
 
-		$prepop[ __( 'Importance', 'formidable' ) ] = array(
+		$prepop[__( 'Importance', 'formidable' )] = array(
 			__( 'Very Important', 'formidable' ),
 			__( 'Important', 'formidable' ),
 			__( 'Neutral', 'formidable' ),
@@ -1306,7 +1306,7 @@ 
 			__( 'N/A', 'formidable' ),
 		);
 
-		$prepop[ __( 'Agreement', 'formidable' ) ] = array(
+		$prepop[__( 'Agreement', 'formidable' )] = array(
 			__( 'Strongly Agree', 'formidable' ),
 			__( 'Agree', 'formidable' ),
 			__( 'Neutral', 'formidable' ),

Indentation +165 added lines, -165 removed lines

@@ -29,17 +29,17 @@ 
 			}
 		}
 
-        return $values;
-    }
+		return $values;
+	}
 
 	public static function get_html_id( $field, $plus = '' ) {
 		return apply_filters( 'frm_field_html_id', 'field_' . $field['field_key'] . $plus, $field );
-    }
+	}
 
-    public static function setup_edit_vars( $field, $doing_ajax = false ) {
+	public static function setup_edit_vars( $field, $doing_ajax = false ) {
 		$values = self::field_object_to_array( $field );
 		return apply_filters( 'frm_setup_edit_field_vars', $values, array( 'doing_ajax' => $doing_ajax ) );
-    }
+	}
 
 	public static function field_object_to_array( $field ) {
 		$values = (array) $field;
@@ -239,18 +239,18 @@ 
 		return $field_type->get_new_field_defaults();
 	}
 
-    public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
-        global $wpdb;
+	public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
+		global $wpdb;
 
 		$values['field_key'] = FrmAppHelper::get_unique_key( $new_key, $wpdb->prefix . 'frm_fields', 'field_key' );
-        $values['form_id'] = $form_id;
+		$values['form_id'] = $form_id;
 		$values['options'] = maybe_serialize( $field->options );
 		$values['default_value'] = maybe_serialize( $field->default_value );
 
-        foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
-            $values[ $col ] = $field->{$col};
-        }
-    }
+		foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
+			$values[ $col ] = $field->{$col};
+		}
+	}
 
 	/**
 	 * @since 2.0
@@ -389,26 +389,26 @@ 
 		$html_id = isset( $field['html_id'] ) ? $field['html_id'] : self::get_html_id( $field );
 
 		foreach ( $field['options'] as $opt_key => $opt ) {
-		    $field_val = self::get_value_from_array( $opt, $opt_key, $field );
-		    $opt = self::get_label_from_array( $opt, $opt_key, $field );
+			$field_val = self::get_value_from_array( $opt, $opt_key, $field );
+			$opt = self::get_label_from_array( $opt, $opt_key, $field );
 
 			// Get string for Other text field, if needed
 			$other_val = self::get_other_val( compact( 'opt_key', 'field' ) );
 
 			$checked = ( $other_val || isset( $field['value'] ) && ( ( ! is_array( $field['value'] ) && $field['value'] == $field_val ) || ( is_array( $field['value'] ) && in_array( $field_val, $field['value'] ) ) ) ) ? ' checked="checked"' : '';
 
-		    // If this is an "Other" option, get the HTML for it
+			// If this is an "Other" option, get the HTML for it
 			if ( self::is_other_opt( $opt_key ) ) {
 				if ( FrmAppHelper::pro_is_installed() ) {
 					require( FrmProAppHelper::plugin_path() . '/classes/views/frmpro-fields/other-option.php' );
 				}
-		    } else {
+			} else {
 				require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-		    }
+			}
 
 			unset( $checked, $other_val );
 		}
-    }
+	}
 
 	public static function get_value_from_array( $opt, $opt_key, $field ) {
 		$opt = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
@@ -427,9 +427,9 @@ 
 	 */
 	public static function get_term_link( $tax_id ) {
 		$tax = get_taxonomy( $tax_id );
-        if ( ! $tax ) {
-            return '';
-        }
+		if ( ! $tax ) {
+			return '';
+		}
 
 		$link = sprintf(
 			esc_html__( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
@@ -437,8 +437,8 @@ 
 		);
 		unset( $tax );
 
-        return $link;
-    }
+		return $link;
+	}
 
 	public static function value_meets_condition( $observed_value, $cond, $hide_opt ) {
 		$hide_opt = self::get_value_for_comparision( $hide_opt );
@@ -446,9 +446,9 @@ 
 
 		if ( is_array( $observed_value ) ) {
 			return self::array_value_condition( $observed_value, $cond, $hide_opt );
-        }
+		}
 
-        $m = false;
+		$m = false;
 		if ( $cond == '==' ) {
 			$m = $observed_value == $hide_opt;
 		} elseif ( $cond == '!=' ) {
@@ -469,8 +469,8 @@ 
 				$m = ( $m === false ) ? false : true;
 			}
 		}
-        return $m;
-    }
+		return $m;
+	}
 
 	/**
 	 * Trim and sanitize the values
@@ -486,8 +486,8 @@ 
 	}
 
 	public static function array_value_condition( $observed_value, $cond, $hide_opt ) {
-        $m = false;
-        if ( $cond == '==' ) {
+		$m = false;
+		if ( $cond == '==' ) {
 			if ( is_array( $hide_opt ) ) {
 				$m = array_intersect( $hide_opt, $observed_value );
 				$m = empty( $m ) ? false : true;
@@ -511,35 +511,35 @@ 
 				}
 			}
 
-            if ( $cond == 'not LIKE' ) {
-                $m = ( $m === false ) ? true : false;
-            }
-        }
+			if ( $cond == 'not LIKE' ) {
+				$m = ( $m === false ) ? true : false;
+			}
+		}
 
-        return $m;
-    }
+		return $m;
+	}
 
-    /**
-     * Replace a few basic shortcodes and field ids
-     * @since 2.0
-     * @return string
-     */
+	/**
+	 * Replace a few basic shortcodes and field ids
+	 * @since 2.0
+	 * @return string
+	 */
 	public static function basic_replace_shortcodes( $value, $form, $entry ) {
 		if ( strpos( $value, '[sitename]' ) !== false ) {
-            $new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
+			$new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
 			$value = str_replace( '[sitename]', $new_value, $value );
-        }
+		}
 
 		$value = apply_filters( 'frm_content', $value, $form, $entry );
 		$value = do_shortcode( $value );
 
-        return $value;
-    }
+		return $value;
+	}
 
 	public static function get_shortcodes( $content, $form_id ) {
-        if ( FrmAppHelper::pro_is_installed() ) {
+		if ( FrmAppHelper::pro_is_installed() ) {
 			return FrmProDisplaysHelper::get_shortcodes( $content, $form_id );
-        }
+		}
 
 		$fields = FrmField::getAll(
 			array(
@@ -552,23 +552,23 @@ 
 
 		preg_match_all( "/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER );
 
-        return $matches;
-    }
+		return $matches;
+	}
 
 	public static function allowed_shortcodes( $fields = array() ) {
 		$tagregexp = array( 'editlink', 'id', 'key', 'ip', 'siteurl', 'sitename', 'admin_email', 'post[-|_]id', 'created[-|_]at', 'updated[-|_]at', 'updated[-|_]by', 'parent[-|_]id' );
 
-        foreach ( $fields as $field ) {
-            $tagregexp[] = $field->id;
-            $tagregexp[] = $field->field_key;
-        }
+		foreach ( $fields as $field ) {
+			$tagregexp[] = $field->id;
+			$tagregexp[] = $field->field_key;
+		}
 
 		$tagregexp = implode( '|', $tagregexp );
-        return $tagregexp;
-    }
+		return $tagregexp;
+	}
 
 	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
 			if ( empty( $tag ) ) {
 				continue;
 			}
@@ -589,7 +589,7 @@ 
 		}
 
 		return $content;
-    }
+	}
 
 	/**
 	 * Prevent shortcodes in fields from being processed
@@ -698,44 +698,44 @@ 
 		return $replace_with;
 	}
 
-    /**
-     * Get the value to replace a few standard shortcodes
-     *
-     * @since 2.0
-     * @return string
-     */
-    public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
-        $new_value = '';
-        switch ( $tag ) {
-            case 'admin_email':
+	/**
+	 * Get the value to replace a few standard shortcodes
+	 *
+	 * @since 2.0
+	 * @return string
+	 */
+	public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
+		$new_value = '';
+		switch ( $tag ) {
+			case 'admin_email':
 				$new_value = get_option( 'admin_email' );
-                break;
-            case 'siteurl':
-                $new_value = FrmAppHelper::site_url();
-                break;
-            case 'frmurl':
-                $new_value = FrmAppHelper::plugin_url();
-                break;
-            case 'sitename':
-                $new_value = FrmAppHelper::site_name();
-                break;
-            case 'get':
-                $new_value = self::process_get_shortcode( $atts, $return_array );
-        }
-
-        return $new_value;
-    }
-
-    /**
-     * Process the [get] shortcode
-     *
-     * @since 2.0
-     * @return string|array
-     */
-    public static function process_get_shortcode( $atts, $return_array = false ) {
+				break;
+			case 'siteurl':
+				$new_value = FrmAppHelper::site_url();
+				break;
+			case 'frmurl':
+				$new_value = FrmAppHelper::plugin_url();
+				break;
+			case 'sitename':
+				$new_value = FrmAppHelper::site_name();
+				break;
+			case 'get':
+				$new_value = self::process_get_shortcode( $atts, $return_array );
+		}
+
+		return $new_value;
+	}
+
+	/**
+	 * Process the [get] shortcode
+	 *
+	 * @since 2.0
+	 * @return string|array
+	 */
+	public static function process_get_shortcode( $atts, $return_array = false ) {
 		if ( ! isset( $atts['param'] ) ) {
-            return '';
-        }
+			return '';
+		}
 
 		if ( strpos( $atts['param'], '[' ) ) {
 			$atts['param'] = str_replace( '[', '[', $atts['param'] );
@@ -743,22 +743,22 @@ 
 		}
 
 		$new_value = FrmAppHelper::get_param( $atts['param'], '', 'get', 'sanitize_text_field' );
-        $new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
+		$new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
 
-        if ( $new_value == '' ) {
+		if ( $new_value == '' ) {
 			if ( ! isset( $atts['prev_val'] ) ) {
-                $atts['prev_val'] = '';
-            }
+				$atts['prev_val'] = '';
+			}
 
 			$new_value = isset( $atts['default'] ) ? $atts['default'] : $atts['prev_val'];
-        }
+		}
 
 		if ( is_array( $new_value ) && ! $return_array ) {
 			$new_value = implode( ', ', $new_value );
 		}
 
-        return $new_value;
-    }
+		return $new_value;
+	}
 
 	public static function get_display_value( $value, $field, $atts = array() ) {
 
@@ -828,27 +828,27 @@ 
 
 		$field_selection = array_merge( FrmField::pro_field_selection(), FrmField::field_selection() );
 
-        $field_types = array();
+		$field_types = array();
 		if ( in_array( $type, $single_input ) ) {
-            self::field_types_for_input( $single_input, $field_selection, $field_types );
+			self::field_types_for_input( $single_input, $field_selection, $field_types );
 		} elseif ( in_array( $type, $multiple_input ) ) {
-            self::field_types_for_input( $multiple_input, $field_selection, $field_types );
+			self::field_types_for_input( $multiple_input, $field_selection, $field_types );
 		} elseif ( in_array( $type, $other_type ) ) {
-            self::field_types_for_input( $other_type, $field_selection, $field_types );
+			self::field_types_for_input( $other_type, $field_selection, $field_types );
 		} elseif ( isset( $field_selection[ $type ] ) ) {
-            $field_types[ $type ] = $field_selection[ $type ];
-        }
+			$field_types[ $type ] = $field_selection[ $type ];
+		}
 
 		$field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type' ) );
-        return $field_types;
-    }
+		return $field_types;
+	}
 
-    private static function field_types_for_input( $inputs, $fields, &$field_types ) {
-        foreach ( $inputs as $input ) {
-            $field_types[ $input ] = $fields[ $input ];
+	private static function field_types_for_input( $inputs, $fields, &$field_types ) {
+		foreach ( $inputs as $input ) {
+			$field_types[ $input ] = $fields[ $input ];
 			unset( $input );
-        }
-    }
+		}
+	}
 
 	/**
 	 * Check if current field option is an "other" option
@@ -862,14 +862,14 @@ 
 		return $opt_key && strpos( $opt_key, 'other_' ) === 0;
 	}
 
-    /**
-    * Get value that belongs in "Other" text box
-    *
-    * @since 2.0.6
-    *
-    * @param array $args
-    */
-    public static function get_other_val( $args ) {
+	/**
+	 * Get value that belongs in "Other" text box
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $args
+	 */
+	public static function get_other_val( $args ) {
 		$defaults = array(
 			'opt_key' => 0,
 			'field'   => array(),
@@ -947,20 +947,20 @@ 
 		}
 
 		return $other_val;
-    }
-
-    /**
-    * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
-    * Intended for front-end use
-    *
-    * @since 2.0.6
-    *
-    * @param array $args should include field, opt_key and field name
-    * @param boolean $other_opt
-    * @param string $checked
-    * @return array $other_args
-    */
-    public static function prepare_other_input( $args, &$other_opt, &$checked ) {
+	}
+
+	/**
+	 * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
+	 * Intended for front-end use
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $args should include field, opt_key and field name
+	 * @param boolean $other_opt
+	 * @param string $checked
+	 * @return array $other_args
+	 */
+	public static function prepare_other_input( $args, &$other_opt, &$checked ) {
 		//Check if this is an "Other" option
 		if ( ! self::is_other_opt( $args['opt_key'] ) ) {
 			return;
@@ -976,8 +976,8 @@ 
 			$checked = 'checked="checked" ';
 		}
 
-        return $other_args;
-    }
+		return $other_args;
+	}
 
 	/**
 	 * @param array $args
@@ -1034,8 +1034,8 @@ 
 	 * @since 2.0.6
 	 */
 	public static function include_other_input( $args ) {
-        if ( ! $args['other_opt'] ) {
-        	return;
+		if ( ! $args['other_opt'] ) {
+			return;
 		}
 
 		$classes = array( 'frm_other_input' );
@@ -1060,15 +1060,15 @@ 
 	}
 
 	/**
-	* Get the HTML id for an "Other" text field
-	* Note: This does not affect fields in repeating sections
-	*
-	* @since 2.0.08
-	* @param string $type - field type
-	* @param string $html_id
-	* @param string|boolean $opt_key
-	* @return string $other_id
-	*/
+	 * Get the HTML id for an "Other" text field
+	 * Note: This does not affect fields in repeating sections
+	 *
+	 * @since 2.0.08
+	 * @param string $type - field type
+	 * @param string $html_id
+	 * @param string|boolean $opt_key
+	 * @return string $other_id
+	 */
 	public static function get_other_field_html_id( $type, $html_id, $opt_key = false ) {
 		$other_id = $html_id;
 
@@ -1132,10 +1132,10 @@ 
 	}
 
 	public static function switch_field_ids( $val ) {
-        global $frm_duplicate_ids;
-        $replace = array();
-        $replace_with = array();
-        foreach ( (array) $frm_duplicate_ids as $old => $new ) {
+		global $frm_duplicate_ids;
+		$replace = array();
+		$replace_with = array();
+		foreach ( (array) $frm_duplicate_ids as $old => $new ) {
 			$replace[] = '[if ' . $old . ']';
 			$replace_with[] = '[if ' . $new . ']';
 			$replace[] = '[if ' . $old . ' ';
@@ -1151,18 +1151,18 @@ 
 			$replace[] = '[' . $old . ' ';
 			$replace_with[] = '[' . $new . ' ';
 			unset( $old, $new );
-        }
+		}
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k => $v ) {
-                $val[ $k ] = str_replace( $replace, $replace_with, $v );
+				$val[ $k ] = str_replace( $replace, $replace_with, $v );
 				unset( $k, $v );
-            }
-        } else {
+			}
+		} else {
 			$val = str_replace( $replace, $replace_with, $val );
-        }
+		}
 
-        return $val;
-    }
+		return $val;
+	}
 
 	public static function get_us_states() {
 		$states = array(
@@ -1228,7 +1228,7 @@ 
 	public static function get_bulk_prefilled_opts( array &$prepop ) {
 		$prepop[ __( 'Countries', 'formidable' ) ] = FrmFieldsHelper::get_countries();
 
-        $states = FrmFieldsHelper::get_us_states();
+		$states = FrmFieldsHelper::get_us_states();
 		$state_abv = array_keys( $states );
 		sort( $state_abv );
 		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
@@ -1277,7 +1277,7 @@ 
 		);
 
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
-    }
+	}
 
 	/**
 	 * Display a field value selector
@@ -1287,10 +1287,10 @@ 
 	 * @param int $selector_field_id
 	 * @param array $selector_args
 	 */
-    public static function display_field_value_selector( $selector_field_id, $selector_args ) {
-	    $field_value_selector = FrmFieldFactory::create_field_value_selector( $selector_field_id, $selector_args );
-	    $field_value_selector->display();
-    }
+	public static function display_field_value_selector( $selector_field_id, $selector_args ) {
+		$field_value_selector = FrmFieldFactory::create_field_value_selector( $selector_field_id, $selector_args );
+		$field_value_selector->display();
+	}
 
 	/**
 	 * Convert a field object to a flat array
@@ -1330,7 +1330,7 @@ 
 	 */
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
 		return FrmDeprecated::get_shortcode_tag( $shortcodes, $short_key, $args );
-    }
+	}
 
 	/**
 	 * @deprecated 3.0

classes/models/fields/FrmFieldUrl.php

Spacing +2 added lines, -2 removed lines

@@ -61,9 +61,9 @@
 
 		// validate the url format
 		if ( ! empty( $value ) && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value ) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
 		} elseif ( $this->field->required == '1' && empty( $value ) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );
 		}
 
 		return $errors;

classes/models/FrmEntryValidate.php

Doc Comments +3 added lines

@@ -43,6 +43,9 @@
 		}
 	}
 
+	/**
+	 * @param boolean $exclude
+	 */
 	private static function get_fields_to_validate( $values, $exclude ) {
 		$where = apply_filters( 'frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
 

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
             return $errors;
         }
 
-		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
+		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values['frm_submit_entry_' . $values['form_id']] ) || ! wp_verify_nonce( $values['frm_submit_entry_' . $values['form_id']], 'frm_submit_entry_nonce' ) ) ) {
             $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
         }
 
@@ -67,7 +67,7 @@ 
         $args = wp_parse_args( $args, $defaults );
 
 		if ( empty( $args['parent_field_id'] ) ) {
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
         } else {
             // value is from a nested form
             $value = $values;
@@ -88,7 +88,7 @@ 
 		}
 
         if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
         } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) { // WPCS: CSRF ok.
             $_POST['item_name'] = $value;
         }
@@ -183,7 +183,7 @@ 
 			$pattern = self::phone_format( $field );
 
 			if ( ! preg_match( $pattern, $value ) ) {
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
 			}
 		}
 	}
@@ -424,7 +424,7 @@ 
 
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
 			if ( $include_value ) {
-				$datas[ $key ] = $value;
+				$datas[$key] = $value;
 			}
 			unset( $key, $value );
 		}

Braces +2 added lines, -1 removed lines

@@ -89,7 +89,8 @@
 
         if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
-        } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) { // WPCS: CSRF ok.
+        } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
+// WPCS: CSRF ok.
             $_POST['item_name'] = $value;
         }
 

Indentation +52 added lines, -52 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 
 class FrmEntryValidate {
-    public static function validate( $values, $exclude = false ) {
-        FrmEntry::sanitize_entry_post( $values );
-        $errors = array();
+	public static function validate( $values, $exclude = false ) {
+		FrmEntry::sanitize_entry_post( $values );
+		$errors = array();
 
 		if ( ! isset( $values['form_id'] ) || ! isset( $values['item_meta'] ) ) {
-            $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
-            return $errors;
-        }
+			$errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
+			return $errors;
+		}
 
 		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
-            $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
-        }
+			$errors['form'] = __( 'You do not have permission to do that', 'formidable' );
+		}
 
 		self::set_item_key( $values );
 
@@ -57,24 +57,24 @@ 
 		return FrmField::getAll( $where, 'field_order' );
 	}
 
-    public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
-        $defaults = array(
-            'id'              => $posted_field->id,
-            'parent_field_id' => '', // the id of the repeat or embed form
-            'key_pointer'     => '', // the pointer in the posted array
-            'exclude'         => array(), // exclude these field types from validation
-        );
-        $args = wp_parse_args( $args, $defaults );
+	public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
+		$defaults = array(
+			'id'              => $posted_field->id,
+			'parent_field_id' => '', // the id of the repeat or embed form
+			'key_pointer'     => '', // the pointer in the posted array
+			'exclude'         => array(), // exclude these field types from validation
+		);
+		$args = wp_parse_args( $args, $defaults );
 
 		if ( empty( $args['parent_field_id'] ) ) {
 			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
-        } else {
-            // value is from a nested form
-            $value = $values;
-        }
+		} else {
+			// value is from a nested form
+			$value = $values;
+		}
 
-        // Check for values in "Other" fields
-        FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
+		// Check for values in "Other" fields
+		FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
 
 		self::maybe_clear_value_for_default_blank_setting( $posted_field, $value );
 
@@ -87,11 +87,11 @@ 
 			$value = trim( $value );
 		}
 
-        if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
+		if ( $posted_field->required == '1' && FrmAppHelper::is_empty_value( $value ) ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
-        } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) { // WPCS: CSRF ok.
-            $_POST['item_name'] = $value;
-        }
+		} else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) { // WPCS: CSRF ok.
+			$_POST['item_name'] = $value;
+		}
 
 		FrmEntriesHelper::set_posted_value( $posted_field, $value, $args );
 
@@ -103,7 +103,7 @@ 
 
 		$errors = apply_filters( 'frm_validate_' . $posted_field->type . '_field_entry', $errors, $posted_field, $value, $args );
 		$errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args );
-    }
+	}
 
 	private static function maybe_clear_value_for_default_blank_setting( $field, &$value ) {
 		$is_default = ( FrmField::is_option_true_in_object( $field, 'default_blank' ) && $value == $field->default_value );
@@ -206,32 +206,32 @@ 
 		return $pattern;
 	}
 
-    /**
-     * check for spam
-     * @param boolean $exclude
-     * @param array $values
-     * @param array $errors by reference
-     */
-    public static function spam_check( $exclude, $values, &$errors ) {
-        if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
-            // only check spam if there are no other errors
-            return;
-        }
+	/**
+	 * check for spam
+	 * @param boolean $exclude
+	 * @param array $values
+	 * @param array $errors by reference
+	 */
+	public static function spam_check( $exclude, $values, &$errors ) {
+		if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
+			// only check spam if there are no other errors
+			return;
+		}
 
 		if ( self::is_honeypot_spam() || self::is_spam_bot() ) {
 			$errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
 		}
 
-    	if ( self::blacklist_check( $values ) ) {
-            $errors['spam'] = __( 'Your entry appears to be blacklist spam!', 'formidable' );
-    	}
+		if ( self::blacklist_check( $values ) ) {
+			$errors['spam'] = __( 'Your entry appears to be blacklist spam!', 'formidable' );
+		}
 
-        if ( self::is_akismet_spam( $values ) ) {
+		if ( self::is_akismet_spam( $values ) ) {
 			if ( self::is_akismet_enabled_for_user( $values['form_id'] ) ) {
 				$errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
 			}
-	    }
-    }
+		}
+	}
 
 	private static function is_honeypot_spam() {
 		$honeypot_value = FrmAppHelper::get_param( 'frm_verify', '', 'get', 'sanitize_text_field' );
@@ -253,15 +253,15 @@ 
 		return ( isset( $form->options['akismet'] ) && ! empty( $form->options['akismet'] ) && ( $form->options['akismet'] != 'logged' || ! is_user_logged_in() ) );
 	}
 
-    public static function blacklist_check( $values ) {
+	public static function blacklist_check( $values ) {
 		if ( ! apply_filters( 'frm_check_blacklist', true, $values ) ) {
-            return false;
-        }
+			return false;
+		}
 
-    	$mod_keys = trim( get_option( 'blacklist_keys' ) );
-    	if ( empty( $mod_keys ) ) {
-    		return false;
-    	}
+		$mod_keys = trim( get_option( 'blacklist_keys' ) );
+		if ( empty( $mod_keys ) ) {
+			return false;
+		}
 
 		$content = FrmEntriesHelper::entry_array_to_string( $values );
 		if ( empty( $content ) ) {
@@ -273,7 +273,7 @@ 
 		$user_info = self::get_spam_check_user_info( $values );
 
 		return wp_blacklist_check( $user_info['comment_author'], $user_info['comment_author_email'], $user_info['comment_author_url'], $content, $ip, $user_agent );
-    }
+	}
 
 	/**
 	 * Check entries for Akismet spam

classes/models/fields/FrmFieldNumber.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 
 		//validate the number format
 		if ( ! is_numeric( $args['value'] ) && '' !== $args['value'] ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
 		}
 
 		// validate number settings
@@ -55,9 +55,9 @@ 
 			if ( $frm_settings->use_html && $maxnum !== '' && $minnum !== '' ) {
 				$value = (float) $args['value'];
 				if ( $value < $minnum ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
 				} elseif ( $value > $maxnum ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
 				}
 			}
 		}

classes/models/FrmStyle.php

Doc Comments +4 added lines, -1 removed lines

@@ -4,7 +4,7 @@ 
 	public $id = 0; // the id of the post
 
 	/**
-	 * @param int|string $id The id of the stylsheet or 'default'
+	 * @param integer $id The id of the stylsheet or 'default'
 	 */
 	public function __construct( $id = 0 ) {
         $this->id = $id;
@@ -127,6 +127,9 @@ 
 		set_transient( 'frmpro_css', $css );
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	private function get_css_content( $filename ) {
 		$css = '/* ' . __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) . ' */' . "\n";
 

Spacing +11 added lines, -11 removed lines

@@ -52,7 +52,7 @@ 
  			$new_instance = stripslashes_deep( (array) $new_instance );
  			$this->id = $new_instance['ID'];
  			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) {
-				$all_instances[ $number ] = $new_instance;
+				$all_instances[$number] = $new_instance;
 
 				if ( $new_instance['menu_order'] && $_POST && empty( $_POST['prev_menu_order'] ) && isset( $_POST['frm_style_setting']['menu_order'] ) ) {
  			        // this style was set to default, so remove default setting on previous default style
@@ -67,7 +67,7 @@ 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+            $new_instance['post_status'] = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
 			if ( empty( $id ) ) {
@@ -77,20 +77,20 @@ 
             $default_settings = $this->get_defaults();
 
             foreach ( $default_settings as $setting => $default ) {
-				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = $default;
+				if ( ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$setting] = $default;
 				}
 
 				if ( $this->is_color( $setting ) ) {
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
-				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = 0;
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $new_instance['post_content'][$setting] );
+				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$setting] = 0;
                 } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+                	$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
                 }
             }
 
-			$all_instances[ $number ] = $new_instance;
+			$all_instances[$number] = $new_instance;
 
 			$action_ids[] = $this->save( $new_instance );
 
@@ -257,12 +257,12 @@ 
 			$style->post_content = $this->override_defaults( $style->post_content );
 			$style->post_content = wp_parse_args( $style->post_content, $default_values );
 
-			$styles[ $style->ID ] = $style;
+			$styles[$style->ID] = $style;
         }
 
         if ( ! $default_style ) {
 			$default_style = reset( $styles );
-			$styles[ $default_style->ID ]->menu_order = 1;
+			$styles[$default_style->ID]->menu_order = 1;
         }
 
         return $styles;

Indentation +226 added lines, -226 removed lines

@@ -7,46 +7,46 @@ 
 	 * @param int|string $id The id of the stylsheet or 'default'
 	 */
 	public function __construct( $id = 0 ) {
-        $this->id = $id;
-    }
+		$this->id = $id;
+	}
 
-    public function get_new() {
+	public function get_new() {
 		$this->id = 0;
 
-        $max_slug_value = 2147483647;
-        $min_slug_value = 37; // we want to have at least 2 characters in the slug
+		$max_slug_value = 2147483647;
+		$min_slug_value = 37; // we want to have at least 2 characters in the slug
 		$key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
 
-        $style = array(
-            'post_type'     => FrmStylesController::$post_type,
-            'ID'            => '',
-            'post_title'    => __( 'New Style', 'formidable' ),
-            'post_name'     => $key,
-            'post_content'  => $this->get_defaults(),
-            'menu_order'    => '',
-            'post_status'   => 'publish',
-        );
+		$style = array(
+			'post_type'     => FrmStylesController::$post_type,
+			'ID'            => '',
+			'post_title'    => __( 'New Style', 'formidable' ),
+			'post_name'     => $key,
+			'post_content'  => $this->get_defaults(),
+			'menu_order'    => '',
+			'post_status'   => 'publish',
+		);
 
-        return (object) $style;
-    }
+		return (object) $style;
+	}
 
 	public function save( $settings ) {
 		return FrmDb::save_settings( $settings, 'frm_styles' );
-    }
+	}
 
 	public function duplicate( $id ) {
-        // duplicating is a pro feature
-    }
+		// duplicating is a pro feature
+	}
 
-    public function update( $id = 'default' ) {
+	public function update( $id = 'default' ) {
  		$all_instances = $this->get_all();
 
  		if ( empty( $id ) ) {
- 		     $new_style = (array) $this->get_new();
- 		     $all_instances[] = $new_style;
+ 			 $new_style = (array) $this->get_new();
+ 			 $all_instances[] = $new_style;
  		}
 
-        $action_ids = array();
+		$action_ids = array();
 
  		foreach ( $all_instances as $number => $new_instance ) {
  			$new_instance = stripslashes_deep( (array) $new_instance );
@@ -55,28 +55,28 @@ 
 				$all_instances[ $number ] = $new_instance;
 
 				if ( $new_instance['menu_order'] && $_POST && empty( $_POST['prev_menu_order'] ) && isset( $_POST['frm_style_setting']['menu_order'] ) ) {
- 			        // this style was set to default, so remove default setting on previous default style
- 			        $new_instance['menu_order'] = 0;
+ 					// this style was set to default, so remove default setting on previous default style
+ 					$new_instance['menu_order'] = 0;
 					$action_ids[] = $this->save( $new_instance );
- 			    }
+ 				}
 
- 			    // don't continue if not saving this style
- 			    continue;
+ 				// don't continue if not saving this style
+ 				continue;
  			}
 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+			$new_instance['post_status']  = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
 			if ( empty( $id ) ) {
-                $new_instance['post_name'] = $new_instance['post_title'];
-            }
+				$new_instance['post_name'] = $new_instance['post_title'];
+			}
 
-            $default_settings = $this->get_defaults();
+			$default_settings = $this->get_defaults();
 
-            foreach ( $default_settings as $setting => $default ) {
+			foreach ( $default_settings as $setting => $default ) {
 				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
 					$new_instance['post_content'][ $setting ] = $default;
 				}
@@ -85,10 +85,10 @@ 
 					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
 				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
 					$new_instance['post_content'][ $setting ] = 0;
-                } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
-                }
-            }
+				} else if ( $setting == 'font' ) {
+					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+				}
+			}
 
 			$all_instances[ $number ] = $new_instance;
 
@@ -118,16 +118,16 @@ 
 		return array_filter( $settings, array( $this, 'is_color' ) );
 	}
 
-    /**
-     * Create static css file
-     */
+	/**
+	 * Create static css file
+	 */
 	public function save_settings() {
 		$filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
 		update_option( 'frm_last_style_update', date( 'njGi' ) );
 
 		if ( ! is_file( $filename ) ) {
-            return;
-        }
+			return;
+		}
 
 		$this->clear_cache();
 
@@ -151,10 +151,10 @@ 
 		$saving = true;
 		$frm_style = $this;
 
-        ob_start();
-        include( $filename );
+		ob_start();
+		include( $filename );
 		$css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", '    ' ), '', ob_get_contents() ) );
-        ob_end_clean();
+		ob_end_clean();
 
 		return $css;
 	}
@@ -175,83 +175,83 @@ 
 
 	public function destroy( $id ) {
 		return wp_delete_post( $id );
-    }
-
-    public function get_one() {
-        if ( 'default' == $this->id ) {
-            $style = $this->get_default_style();
-            if ( $style ) {
-                $this->id = $style->ID;
-            } else {
-                $this->id = 0;
-            }
-            return $style;
-        }
+	}
+
+	public function get_one() {
+		if ( 'default' == $this->id ) {
+			$style = $this->get_default_style();
+			if ( $style ) {
+				$this->id = $style->ID;
+			} else {
+				$this->id = 0;
+			}
+			return $style;
+		}
 
 		$style = get_post( $this->id );
 
-        if ( ! $style ) {
-            return $style;
-        }
+		if ( ! $style ) {
+			return $style;
+		}
 
 		$style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
-        $default_values = $this->get_defaults();
+		$default_values = $this->get_defaults();
 
 		// fill default values
 		$style->post_content = $this->override_defaults( $style->post_content );
 		$style->post_content = wp_parse_args( $style->post_content, $default_values );
 
-        return $style;
-    }
+		return $style;
+	}
 
-    public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
-        $post_atts = array(
+	public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
+		$post_atts = array(
 			'post_type'   => FrmStylesController::$post_type,
 			'post_status' => 'publish',
 			'numberposts' => $limit,
 			'orderby'     => $orderby,
 			'order'       => $order,
-        );
+		);
 
 		$temp_styles = FrmDb::check_cache( serialize( $post_atts ), 'frm_styles', $post_atts, 'get_posts' );
 
 		if ( empty( $temp_styles ) ) {
-            global $wpdb;
-            // make sure there wasn't a conflict with the query
+			global $wpdb;
+			// make sure there wasn't a conflict with the query
 			$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' );
 			$temp_styles = FrmDb::check_cache( 'frm_backup_style_check', 'frm_styles', $query, 'get_results' );
 
 			if ( empty( $temp_styles ) ) {
-                // create a new style if there are none
-         		$new = $this->get_new();
+				// create a new style if there are none
+		 		$new = $this->get_new();
 				$new->post_title = __( 'Formidable Style', 'formidable' );
 				$new->post_name = $new->post_title;
-         		$new->menu_order = 1;
+		 		$new->menu_order = 1;
 				$new = $this->save( (array) $new );
 				$this->update( 'default' );
 
-                $post_atts['include'] = $new;
+				$post_atts['include'] = $new;
 
-                $temp_styles = get_posts( $post_atts );
-            }
-        }
-
-        $default_values = $this->get_defaults();
-        $default_style = false;
+				$temp_styles = get_posts( $post_atts );
+			}
+		}
 
-        $styles = array();
-        foreach ( $temp_styles as $style ) {
-            $this->id = $style->ID;
-            if ( $style->menu_order ) {
-                if ( $default_style ) {
-                    // only return one default
-                    $style->menu_order = 0;
-                } else {
-                    // check for a default style
-                    $default_style = $style->ID;
-                }
-            }
+		$default_values = $this->get_defaults();
+		$default_style = false;
+
+		$styles = array();
+		foreach ( $temp_styles as $style ) {
+			$this->id = $style->ID;
+			if ( $style->menu_order ) {
+				if ( $default_style ) {
+					// only return one default
+					$style->menu_order = 0;
+				} else {
+					// check for a default style
+					$default_style = $style->ID;
+				}
+			}
 
 			$style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
@@ -260,183 +260,183 @@ 
 			$style->post_content = wp_parse_args( $style->post_content, $default_values );
 
 			$styles[ $style->ID ] = $style;
-        }
+		}
 
-        if ( ! $default_style ) {
+		if ( ! $default_style ) {
 			$default_style = reset( $styles );
 			$styles[ $default_style->ID ]->menu_order = 1;
-        }
+		}
 
-        return $styles;
-    }
+		return $styles;
+	}
 
 	public function get_default_style( $styles = null ) {
 		if ( ! isset( $styles ) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
-        }
+		}
 
-        foreach ( $styles as $style ) {
-            if ( $style->menu_order ) {
-                return $style;
-            }
-        }
-    }
+		foreach ( $styles as $style ) {
+			if ( $style->menu_order ) {
+				return $style;
+			}
+		}
+	}
 
 	public function override_defaults( $settings ) {
 		if ( ! is_array( $settings ) ) {
-	        return $settings;
-	    }
+			return $settings;
+		}
 
 		$settings['line_height'] = ( ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] == 'auto' ) ? 'normal' : $settings['field_height'];
 
 		if ( ! isset( $settings['form_desc_size'] ) && isset( $settings['description_font_size'] ) ) {
-	        $settings['form_desc_size'] = $settings['description_font_size'];
-	        $settings['form_desc_color'] = $settings['description_color'];
-	        $settings['title_color'] = $settings['label_color'];
-	    }
+			$settings['form_desc_size'] = $settings['description_font_size'];
+			$settings['form_desc_color'] = $settings['description_color'];
+			$settings['title_color'] = $settings['label_color'];
+		}
 
 		if ( ! isset( $settings['section_color'] ) && isset( $settings['label_color'] ) ) {
-	        $settings['section_color'] = $settings['label_color'];
-	        $settings['section_border_color'] = $settings['border_color'];
-	    }
+			$settings['section_color'] = $settings['label_color'];
+			$settings['section_border_color'] = $settings['border_color'];
+		}
 
 		if ( ! isset( $settings['submit_hover_bg_color'] ) && isset( $settings['submit_bg_color'] ) ) {
-	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_hover_color'] = $settings['submit_text_color'];
-	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];
+			$settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_hover_color'] = $settings['submit_text_color'];
+			$settings['submit_hover_border_color'] = $settings['submit_border_color'];
 
-	        $settings['submit_active_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_active_color'] = $settings['submit_text_color'];
-            $settings['submit_active_border_color'] = $settings['submit_border_color'];
-	    }
+			$settings['submit_active_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_active_color'] = $settings['submit_text_color'];
+			$settings['submit_active_border_color'] = $settings['submit_border_color'];
+		}
 
-	    return apply_filters( 'frm_override_default_styles', $settings );
+		return apply_filters( 'frm_override_default_styles', $settings );
 	}
 
 	public function get_defaults() {
 		$defaults = array(
-            'theme_css'         => 'ui-lightness',
-            'theme_name'        => 'UI Lightness',
+			'theme_css'         => 'ui-lightness',
+			'theme_name'        => 'UI Lightness',
 
 			'center_form'       => '',
-            'form_width'        => '100%',
-            'form_align'        => 'left',
-            'direction'         => is_rtl() ? 'rtl' : 'ltr',
-            'fieldset'          => '0px',
-            'fieldset_color'    => '000000',
-            'fieldset_padding'  => '0 0 15px 0',
-            'fieldset_bg_color' => '',
-
-            'title_size'        => '20px',
-            'title_color'       => '444444',
+			'form_width'        => '100%',
+			'form_align'        => 'left',
+			'direction'         => is_rtl() ? 'rtl' : 'ltr',
+			'fieldset'          => '0px',
+			'fieldset_color'    => '000000',
+			'fieldset_padding'  => '0 0 15px 0',
+			'fieldset_bg_color' => '',
+
+			'title_size'        => '20px',
+			'title_color'       => '444444',
 			'title_margin_top'  => '10px',
 			'title_margin_bottom' => '10px',
-            'form_desc_size'    => '14px',
-            'form_desc_color'   => '666666',
+			'form_desc_size'    => '14px',
+			'form_desc_color'   => '666666',
 			'form_desc_margin_top' => '10px',
 			'form_desc_margin_bottom' => '25px',
 
-            'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
-            'font_size'         => '14px',
-            'label_color'       => '444444',
-            'weight'            => 'bold',
-            'position'          => 'none',
-            'align'             => 'left',
-            'width'             => '150px',
-            'required_color'    => 'B94A48',
-            'required_weight'   => 'bold',
-            'label_padding'     => '0 0 3px 0',
-
-            'description_font_size' => '12px',
-            'description_color' => '666666',
-            'description_weight' => 'normal',
-            'description_style' => 'normal',
-            'description_align' => 'left',
+			'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
+			'font_size'         => '14px',
+			'label_color'       => '444444',
+			'weight'            => 'bold',
+			'position'          => 'none',
+			'align'             => 'left',
+			'width'             => '150px',
+			'required_color'    => 'B94A48',
+			'required_weight'   => 'bold',
+			'label_padding'     => '0 0 3px 0',
+
+			'description_font_size' => '12px',
+			'description_color' => '666666',
+			'description_weight' => 'normal',
+			'description_style' => 'normal',
+			'description_align' => 'left',
 			'description_margin' => '0',
 
-            'field_font_size'   => '14px',
-            'field_height'      => '32px',
-            'line_height'       => 'normal',
-            'field_width'       => '100%',
-            'auto_width'        => false,
-            'field_pad'         => '6px 10px',
-            'field_margin'      => '20px',
+			'field_font_size'   => '14px',
+			'field_height'      => '32px',
+			'line_height'       => 'normal',
+			'field_width'       => '100%',
+			'auto_width'        => false,
+			'field_pad'         => '6px 10px',
+			'field_margin'      => '20px',
 			'field_weight' => 'normal',
-            'text_color'        => '555555',
-            //'border_color_hv'   => 'cccccc',
-            'border_color'      => 'cccccc',
-            'field_border_width' => '1px',
-            'field_border_style' => 'solid',
-
-            'bg_color'          => 'ffffff',
-            //'bg_color_hv'       => 'ffffff',
+			'text_color'        => '555555',
+			//'border_color_hv'   => 'cccccc',
+			'border_color'      => 'cccccc',
+			'field_border_width' => '1px',
+			'field_border_style' => 'solid',
+
+			'bg_color'          => 'ffffff',
+			//'bg_color_hv'       => 'ffffff',
 			'remove_box_shadow' => '',
-            'bg_color_active'   => 'ffffff',
+			'bg_color_active'   => 'ffffff',
 			'border_color_active' => '66afe9',
 			'remove_box_shadow_active' => '',
-            'text_color_error'  => '444444',
-            'bg_color_error'    => 'ffffff',
+			'text_color_error'  => '444444',
+			'bg_color_error'    => 'ffffff',
 			'border_color_error' => 'B94A48',
 			'border_width_error' => '1px',
 			'border_style_error' => 'solid',
-            'bg_color_disabled' => 'ffffff',
-            'border_color_disabled' => 'E5E5E5',
-            'text_color_disabled' => 'A1A1A1',
-
-            'radio_align'       => 'block',
-            'check_align'       => 'block',
-            'check_font_size'   => '13px',
-            'check_label_color' => '444444',
-            'check_weight'      => 'normal',
-
-            'section_font_size' => '18px',
-            'section_color'     => '444444',
-            'section_weight'    => 'bold',
-            'section_pad'       => '15px 0 3px 0',
-            'section_mar_top'   => '15px',
+			'bg_color_disabled' => 'ffffff',
+			'border_color_disabled' => 'E5E5E5',
+			'text_color_disabled' => 'A1A1A1',
+
+			'radio_align'       => 'block',
+			'check_align'       => 'block',
+			'check_font_size'   => '13px',
+			'check_label_color' => '444444',
+			'check_weight'      => 'normal',
+
+			'section_font_size' => '18px',
+			'section_color'     => '444444',
+			'section_weight'    => 'bold',
+			'section_pad'       => '15px 0 3px 0',
+			'section_mar_top'   => '15px',
 			'section_mar_bottom' => '12px',
-            'section_bg_color'  => '',
-            'section_border_color' => 'e8e8e8',
-            'section_border_width' => '2px',
-            'section_border_style' => 'solid',
-            'section_border_loc' => '-top',
-            'collapse_icon'     => '6',
-            'collapse_pos'      => 'after',
-            'repeat_icon'       => '1',
-
-            'submit_style'      => false,
-            'submit_font_size'  => '14px',
-            'submit_width'      => 'auto',
-            'submit_height'     => 'auto',
-            'submit_bg_color'   => 'ffffff',
-            'submit_border_color' => 'cccccc',
-            'submit_border_width' => '1px',
-            'submit_text_color' => '444444',
-            'submit_weight'     => 'normal',
-            'submit_border_radius' => '4px',
-            'submit_bg_img'     => '',
-            'submit_margin'     => '10px',
-            'submit_padding'    => '6px 11px',
-            'submit_shadow_color' => 'eeeeee',
-            'submit_hover_bg_color' => 'efefef',
-            'submit_hover_color' => '444444',
-            'submit_hover_border_color' => 'cccccc',
-            'submit_active_bg_color' => 'efefef',
-            'submit_active_color' => '444444',
-            'submit_active_border_color' => 'cccccc',
-
-            'border_radius'     => '4px',
-            'error_bg'          => 'F2DEDE',
-            'error_border'      => 'EBCCD1',
-            'error_text'        => 'B94A48',
-            'error_font_size'   => '14px',
-
-            'success_bg_color'  => 'DFF0D8',
-            'success_border_color' => 'D6E9C6',
-            'success_text_color' => '468847',
-            'success_font_size' => '14px',
-
-            'important_style'   => false,
+			'section_bg_color'  => '',
+			'section_border_color' => 'e8e8e8',
+			'section_border_width' => '2px',
+			'section_border_style' => 'solid',
+			'section_border_loc' => '-top',
+			'collapse_icon'     => '6',
+			'collapse_pos'      => 'after',
+			'repeat_icon'       => '1',
+
+			'submit_style'      => false,
+			'submit_font_size'  => '14px',
+			'submit_width'      => 'auto',
+			'submit_height'     => 'auto',
+			'submit_bg_color'   => 'ffffff',
+			'submit_border_color' => 'cccccc',
+			'submit_border_width' => '1px',
+			'submit_text_color' => '444444',
+			'submit_weight'     => 'normal',
+			'submit_border_radius' => '4px',
+			'submit_bg_img'     => '',
+			'submit_margin'     => '10px',
+			'submit_padding'    => '6px 11px',
+			'submit_shadow_color' => 'eeeeee',
+			'submit_hover_bg_color' => 'efefef',
+			'submit_hover_color' => '444444',
+			'submit_hover_border_color' => 'cccccc',
+			'submit_active_bg_color' => 'efefef',
+			'submit_active_color' => '444444',
+			'submit_active_border_color' => 'cccccc',
+
+			'border_radius'     => '4px',
+			'error_bg'          => 'F2DEDE',
+			'error_border'      => 'EBCCD1',
+			'error_text'        => 'B94A48',
+			'error_font_size'   => '14px',
+
+			'success_bg_color'  => 'DFF0D8',
+			'success_border_color' => 'D6E9C6',
+			'success_text_color' => '468847',
+			'success_font_size' => '14px',
+
+			'important_style'   => false,
 
 			'progress_bg_color'     => 'dddddd',
 			'progress_active_color' => 'ffffff',
@@ -446,10 +446,10 @@ 
 			'progress_border_size'  => '2px',
 			'progress_size'         => '30px',
 
-            'custom_css'        => '',
+			'custom_css'        => '',
 		);
 		return apply_filters( 'frm_default_style_settings', $defaults );
-    }
+	}
 
 	public function get_field_name( $field_name, $post_field = 'post_content' ) {
 		return 'frm_style_setting' . ( empty( $post_field ) ? '' : '[' . $post_field . ']' ) . '[' . $field_name . ']';