Strategy11 / formidable-forms

classes/controllers/FrmHooksController.php

Spacing +2 added lines, -2 removed lines

@@ -143,8 +143,8 @@
         add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
 
 		// Addons Controller
-		add_action('wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
-		add_action('wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
+		add_action( 'wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
+		add_action( 'wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
 
         // Fields Controller
         add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );

classes/helpers/FrmEntriesHelper.php

Spacing +74 added lines, -74 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -9,12 +9,12 @@ 
         global $frm_vars;
         $values = array();
 		foreach ( array( 'name' => '', 'description' => '', 'item_key' => '' ) as $var => $default ) {
-            $values[ $var ] = FrmAppHelper::get_post_param( $var, $default );
+            $values[$var] = FrmAppHelper::get_post_param( $var, $default );
         }
 
         $values['fields'] = array();
-        if ( empty($fields) ) {
-            return apply_filters('frm_setup_new_entry', $values);
+        if ( empty( $fields ) ) {
+            return apply_filters( 'frm_setup_new_entry', $values );
         }
 
         foreach ( (array) $fields as $field ) {
@@ -26,7 +26,7 @@ 
                 'default_value' => $field->default_value,
                 'name' => $field->name,
                 'description' => $field->description,
-                'type' => apply_filters('frm_field_type', $field->type, $field, $new_value),
+                'type' => apply_filters( 'frm_field_type', $field->type, $field, $new_value ),
                 'options' => $field->options,
                 'required' => $field->required,
                 'field_key' => $field->field_key,
@@ -35,43 +35,43 @@ 
 				'parent_form_id' => isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id,
             );
 
-            $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+            $opt_defaults = FrmFieldsHelper::get_default_field_opts( $field_array['type'], $field, true );
             $opt_defaults['required_indicator'] = '';
 			$opt_defaults['original_type'] = $field->type;
 
 			foreach ( $opt_defaults as $opt => $default_opt ) {
-                $field_array[ $opt ] = ( isset( $field->field_options[ $opt ] ) && $field->field_options[ $opt ] != '' ) ? $field->field_options[ $opt ] : $default_opt;
-                unset($opt, $default_opt);
+                $field_array[$opt] = ( isset( $field->field_options[$opt] ) && $field->field_options[$opt] != '' ) ? $field->field_options[$opt] : $default_opt;
+                unset( $opt, $default_opt );
             }
 
-            unset($opt_defaults);
+            unset( $opt_defaults );
 
             if ( $field_array['custom_html'] == '' ) {
-                $field_array['custom_html'] = FrmFieldsHelper::get_default_html($field->type);
+                $field_array['custom_html'] = FrmFieldsHelper::get_default_html( $field->type );
             }
 
-            $field_array = apply_filters('frm_setup_new_fields_vars', $field_array, $field);
+            $field_array = apply_filters( 'frm_setup_new_fields_vars', $field_array, $field );
             $field_array = array_merge( $field->field_options, $field_array );
 
             $values['fields'][] = $field_array;
 
-            if ( ! $form || ! isset($form->id) ) {
-                $form = FrmForm::getOne($field->form_id);
+            if ( ! $form || ! isset( $form->id ) ) {
+                $form = FrmForm::getOne( $field->form_id );
             }
         }
 
-        $form->options = maybe_unserialize($form->options);
-        if ( is_array($form->options) ) {
+        $form->options = maybe_unserialize( $form->options );
+        if ( is_array( $form->options ) ) {
             foreach ( $form->options as $opt => $value ) {
-                $values[ $opt ] = FrmAppHelper::get_post_param( $opt, $value );
-                unset($opt, $value);
+                $values[$opt] = FrmAppHelper::get_post_param( $opt, $value );
+                unset( $opt, $value );
             }
         }
 
 		$form_defaults = FrmFormsHelper::get_default_opts();
 
 		$frm_settings = FrmAppHelper::get_settings();
-		$form_defaults['custom_style']  = ( $frm_settings->load_style != 'none' );
+		$form_defaults['custom_style'] = ( $frm_settings->load_style != 'none' );
 
 		$values = array_merge( $form_defaults, $values );
 
@@ -93,15 +93,15 @@ 
 		$return_array = FrmField::is_field_with_multiple_values( $field );
 
 		// Do any shortcodes in default value and allow customization of default value
-		$field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true, $return_array);
+		$field->default_value = apply_filters( 'frm_get_default_value', $field->default_value, $field, true, $return_array );
 		// Calls FrmProFieldsHelper::get_default_value
 
 		$new_value = $field->default_value;
 
-		if ( ! $reset && $_POST && isset( $_POST['item_meta'][ $field->id ] ) ) {
+		if ( ! $reset && $_POST && isset( $_POST['item_meta'][$field->id] ) ) {
 			// If value was posted, get it
 
-			$new_value = stripslashes_deep( $_POST['item_meta'][ $field->id ] );
+			$new_value = stripslashes_deep( $_POST['item_meta'][$field->id] );
 
 		} else if ( FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
 			// If clear on focus is selected, the value should be blank (unless it was posted, of course)
@@ -110,7 +110,7 @@ 
 		}
 
 		if ( ! is_array( $new_value ) ) {
-			$new_value = str_replace('"', '&quot;', $new_value);
+			$new_value = str_replace( '"', '&quot;', $new_value );
 		}
 
 		return $new_value;
@@ -120,7 +120,7 @@ 
 		$values['item_key'] = FrmAppHelper::get_post_param( 'item_key', $record->item_key, 'sanitize_title' );
         $values['form_id'] = $record->form_id;
         $values['is_draft'] = $record->is_draft;
-        return apply_filters('frm_setup_edit_entry_vars', $values, $record);
+        return apply_filters( 'frm_setup_edit_entry_vars', $values, $record );
     }
 
     public static function get_admin_params( $form = null ) {
@@ -149,22 +149,22 @@ 
     }
 
 	public static function replace_default_message( $message, $atts ) {
-        if ( strpos($message, '[default-message') === false &&
-            strpos($message, '[default_message') === false &&
+        if ( strpos( $message, '[default-message' ) === false &&
+            strpos( $message, '[default_message' ) === false &&
             ! empty( $message ) ) {
             return $message;
         }
 
-        if ( empty($message) ) {
+        if ( empty( $message ) ) {
             $message = '[default-message]';
         }
 
-        preg_match_all("/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER);
+        preg_match_all( "/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER );
 
         foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+            $add_atts = shortcode_parse_atts( $shortcodes[2][$short_key] );
             if ( $add_atts ) {
-                $this_atts = array_merge($atts, $add_atts);
+                $this_atts = array_merge( $atts, $add_atts );
             } else {
                 $this_atts = $atts;
             }
@@ -172,31 +172,31 @@ 
 			$default = FrmEntryFormat::show_entry( $this_atts );
 
             // Add the default message
-            $message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
+            $message = str_replace( $shortcodes[0][$short_key], $default, $message );
         }
 
         return $message;
     }
 
 	public static function prepare_display_value( $entry, $field, $atts ) {
-		$field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false;
+		$field_value = isset( $entry->metas[$field->id] ) ? $entry->metas[$field->id] : false;
         if ( FrmAppHelper::pro_is_installed() ) {
 			FrmProEntriesHelper::get_dynamic_list_values( $field, $entry, $field_value );
         }
 
-        if ( $field->form_id == $entry->form_id || empty($atts['embedded_field_id']) ) {
-            return self::display_value($field_value, $field, $atts);
+        if ( $field->form_id == $entry->form_id || empty( $atts['embedded_field_id'] ) ) {
+            return self::display_value( $field_value, $field, $atts );
         }
 
         // this is an embeded form
         $val = '';
 
-	    if ( strpos($atts['embedded_field_id'], 'form') === 0 ) {
+	    if ( strpos( $atts['embedded_field_id'], 'form' ) === 0 ) {
             //this is a repeating section
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) );
         } else {
             // get all values for this field
-	        $child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
+	        $child_values = isset( $entry->metas[$atts['embedded_field_id']] ) ? $entry->metas[$atts['embedded_field_id']] : false;
 
             if ( $child_values ) {
 	            $child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
@@ -205,7 +205,7 @@ 
 
 	    $field_value = array();
 
-        if ( ! isset($child_entries) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
+        if ( ! isset( $child_entries ) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
             return $val;
         }
 
@@ -214,17 +214,17 @@ 
             $atts['post_id'] = $child_entry->post_id;
 
             // get the value for this field -- check for post values as well
-            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value($child_entry, $field);
+            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value( $child_entry, $field );
 
             if ( $entry_val ) {
                 // foreach entry get display_value
-                $field_value[] = self::display_value($entry_val, $field, $atts);
+                $field_value[] = self::display_value( $entry_val, $field, $atts );
             }
 
-            unset($child_entry);
+            unset( $child_entry );
         }
 
-        $val = implode(', ', (array) $field_value );
+        $val = implode( ', ', (array) $field_value );
 		$val = wp_kses_post( $val );
 
         return $val;
@@ -244,22 +244,22 @@ 
         );
 
         $atts = wp_parse_args( $atts, $defaults );
-        $atts = apply_filters('frm_display_value_atts', $atts, $field, $value);
+        $atts = apply_filters( 'frm_display_value_atts', $atts, $field, $value );
 
-        if ( ! isset($field->field_options['post_field']) ) {
+        if ( ! isset( $field->field_options['post_field'] ) ) {
             $field->field_options['post_field'] = '';
         }
 
-        if ( ! isset($field->field_options['custom_field']) ) {
+        if ( ! isset( $field->field_options['custom_field'] ) ) {
             $field->field_options['custom_field'] = '';
         }
 
         if ( FrmAppHelper::pro_is_installed() && $atts['post_id'] && ( $field->field_options['post_field'] || $atts['type'] == 'tag' ) ) {
             $atts['pre_truncate'] = $atts['truncate'];
             $atts['truncate'] = true;
-            $atts['exclude_cat'] = isset($field->field_options['exclude_cat']) ? $field->field_options['exclude_cat'] : 0;
+            $atts['exclude_cat'] = isset( $field->field_options['exclude_cat'] ) ? $field->field_options['exclude_cat'] : 0;
 
-            $value = FrmProEntryMetaHelper::get_post_value($atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts);
+            $value = FrmProEntryMetaHelper::get_post_value( $atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts );
             $atts['truncate'] = $atts['pre_truncate'];
         }
 
@@ -267,38 +267,38 @@ 
             return $value;
         }
 
-        $value = apply_filters('frm_display_value_custom', maybe_unserialize($value), $field, $atts);
+        $value = apply_filters( 'frm_display_value_custom', maybe_unserialize( $value ), $field, $atts );
 
         $new_value = '';
 
-        if ( is_array($value) && $atts['type'] != 'file' ) {
+        if ( is_array( $value ) && $atts['type'] != 'file' ) {
             foreach ( $value as $val ) {
-                if ( is_array($val) ) {
+                if ( is_array( $val ) ) {
 					//TODO: add options for display (li or ,)
-                    $new_value .= implode($atts['sep'], $val);
+                    $new_value .= implode( $atts['sep'], $val );
                     if ( $atts['type'] != 'data' ) {
                         $new_value .= '<br/>';
                     }
                 }
-                unset($val);
+                unset( $val );
             }
         }
 
-        if ( ! empty($new_value) ) {
+        if ( ! empty( $new_value ) ) {
             $value = $new_value;
-        } else if ( is_array($value) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
-            $value = implode($atts['sep'], $value);
+        } else if ( is_array( $value ) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
+            $value = implode( $atts['sep'], $value );
         }
 
         if ( $atts['truncate'] && $atts['type'] != 'image' ) {
-            $value = FrmAppHelper::truncate($value, 50);
+            $value = FrmAppHelper::truncate( $value, 50 );
         }
 
 		if ( ! $atts['keepjs'] && ! is_array( $value ) ) {
 			$value = wp_kses_post( $value );
 		}
 
-        return apply_filters('frm_display_value', $value, $field, $atts);
+        return apply_filters( 'frm_display_value', $value, $field, $atts );
     }
 
 	public static function set_posted_value( $field, $value, $args ) {
@@ -306,20 +306,20 @@ 
         if ( isset( $args['other'] ) && $args['other'] ) {
             $value = $args['temp_value'];
         }
-        if ( empty($args['parent_field_id']) ) {
-            $_POST['item_meta'][ $field->id ] = $value;
+        if ( empty( $args['parent_field_id'] ) ) {
+            $_POST['item_meta'][$field->id] = $value;
         } else {
-            $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
+            $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] = $value;
         }
     }
 
 	public static function get_posted_value( $field, &$value, $args ) {
 		$field_id = is_object( $field ) ? $field->id : $field;
 
-        if ( empty($args['parent_field_id']) ) {
-            $value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
+        if ( empty( $args['parent_field_id'] ) ) {
+            $value = isset( $_POST['item_meta'][$field_id] ) ? $_POST['item_meta'][$field_id] : '';
         } else {
-            $value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] : '';
+            $value = isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] ) ? $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] : '';
         }
     }
 
@@ -342,12 +342,12 @@ 
         self::set_other_repeating_vals( $field, $value, $args );
 
         // Check if there are any posted "Other" values
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][$field->id] ) ) {
 
             // Save original value
             $args['temp_value'] = $value;
             $args['other'] = true;
-            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][ $field->id ] );
+            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][$field->id] );
 
             // Set the validation value now
             self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -369,12 +369,12 @@ 
         }
 
         // Check if there are any other posted "other" values for this field
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] ) ) {
             // Save original value
             $args['temp_value'] = $value;
             $args['other'] = true;
 
-            $other_vals = $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ];
+            $other_vals = $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id];
 
             // Set the validation value now
             self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -406,27 +406,27 @@ 
             }
         } else {
 			// Radio and dropdowns
-            $other_key = array_filter( array_keys($field->options), 'is_string');
+            $other_key = array_filter( array_keys( $field->options ), 'is_string' );
             $other_key = reset( $other_key );
 
             // Multi-select dropdown
             if ( is_array( $value ) ) {
-                $o_key = array_search( $field->options[ $other_key ], $value );
+                $o_key = array_search( $field->options[$other_key], $value );
 
 				if ( $o_key !== false ) {
 					// Modify the original value so other key will be preserved
-					$value[ $other_key ] = $value[ $o_key ];
+					$value[$other_key] = $value[$o_key];
 
 					// By default, the array keys will be numeric for multi-select dropdowns
 					// If going backwards and forwards between pages, the array key will match the other key
 					if ( $o_key != $other_key ) {
-						unset( $value[ $o_key ] );
+						unset( $value[$o_key] );
 					}
 
 					$args['temp_value'] = $value;
-					$value[ $other_key ] = reset( $other_vals );
+					$value[$other_key] = reset( $other_vals );
 				}
-            } else if ( $field->options[ $other_key ] == $value ) {
+            } else if ( $field->options[$other_key] == $value ) {
                 $value = $other_vals;
             }
         }
@@ -445,9 +445,9 @@ 
 				$content .= "\n\n";
 			}
 
-			if ( is_array($val) ) {
+			if ( is_array( $val ) ) {
 				$val = FrmAppHelper::array_flatten( $val );
-			    $val = implode(',', $val);
+			    $val = implode( ',', $val );
 			}
 
 			$content .= $val;
@@ -492,6 +492,6 @@ 
 	}
 
 	public static function entries_dropdown() {
-		_deprecated_function( __FUNCTION__, '1.07.09');
+		_deprecated_function( __FUNCTION__, '1.07.09' );
 	}
 }

classes/models/FrmSettings.php

Spacing +54 added lines, -54 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class FrmSettings{
+class FrmSettings {
     public $option_name = 'frm_options';
     public $menu;
     public $mu_menu;
@@ -28,19 +28,19 @@ 
     public $re_msg;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
-        $settings = get_transient($this->option_name);
+        $settings = get_transient( $this->option_name );
 
-        if ( ! is_object($settings) ) {
-            $settings = $this->translate_settings($settings);
+        if ( ! is_object( $settings ) ) {
+            $settings = $this->translate_settings( $settings );
         }
 
         foreach ( $settings as $setting_name => $setting ) {
             $this->{$setting_name} = $setting;
-            unset($setting_name, $setting);
+            unset( $setting_name, $setting );
         }
 
         $this->set_default_options();
@@ -48,24 +48,24 @@ 
 
 	private function translate_settings( $settings ) {
         if ( $settings ) { //workaround for W3 total cache conflict
-            return unserialize(serialize($settings));
+            return unserialize( serialize( $settings ) );
         }
 
-        $settings = get_option($this->option_name);
-        if ( is_object($settings) ) {
-            set_transient($this->option_name, $settings);
+        $settings = get_option( $this->option_name );
+        if ( is_object( $settings ) ) {
+            set_transient( $this->option_name, $settings );
             return $settings;
         }
 
         // If unserializing didn't work
         if ( $settings ) { //workaround for W3 total cache conflict
-            $settings = unserialize(serialize($settings));
+            $settings = unserialize( serialize( $settings ) );
         } else {
             $settings = $this;
         }
 
-        update_option($this->option_name, $settings);
-        set_transient($this->option_name, $settings);
+        update_option( $this->option_name, $settings );
+        set_transient( $this->option_name, $settings );
 
         return $settings;
     }
@@ -98,8 +98,8 @@ 
 	private function set_default_options() {
         $this->fill_recaptcha_settings();
 
-        if ( ! isset($this->load_style) ) {
-            if ( ! isset($this->custom_style) ) {
+        if ( ! isset( $this->load_style ) ) {
+            if ( ! isset( $this->custom_style ) ) {
                 $this->custom_style = true;
             }
 
@@ -109,16 +109,16 @@ 
         $this->fill_with_defaults();
 
         if ( is_multisite() && is_admin() ) {
-            $mu_menu = get_site_option('frm_admin_menu_name');
-            if ( $mu_menu && ! empty($mu_menu) ) {
+            $mu_menu = get_site_option( 'frm_admin_menu_name' );
+            if ( $mu_menu && ! empty( $mu_menu ) ) {
                 $this->menu = $mu_menu;
                 $this->mu_menu = 1;
             }
         }
 
-        $frm_roles = FrmAppHelper::frm_capabilities('pro');
+        $frm_roles = FrmAppHelper::frm_capabilities( 'pro' );
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            if ( ! isset($this->$frm_role) ) {
+            if ( ! isset( $this->$frm_role ) ) {
                 $this->$frm_role = 'administrator';
             }
         }
@@ -128,12 +128,12 @@ 
         $settings = $this->default_options();
 
         foreach ( $settings as $setting => $default ) {
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
-				$this->{$setting} = $params[ 'frm_' . $setting ];
-            } else if ( ! isset($this->{$setting}) ) {
+			if ( isset( $params['frm_' . $setting] ) ) {
+				$this->{$setting} = $params['frm_' . $setting];
+            } else if ( ! isset( $this->{$setting}) ) {
                 $this->{$setting} = $default;
             }
-            unset($setting, $default);
+            unset( $setting, $default );
         }
     }
 
@@ -141,23 +141,23 @@ 
         $privkey = '';
         $re_lang = 'en';
 
-        if ( ! isset($this->pubkey) ) {
+        if ( ! isset( $this->pubkey ) ) {
             // get the options from the database
-            $recaptcha_opt = is_multisite() ? get_site_option('recaptcha') : get_option('recaptcha');
-            $this->pubkey = isset($recaptcha_opt['pubkey']) ? $recaptcha_opt['pubkey'] : '';
-            $privkey = isset($recaptcha_opt['privkey']) ? $recaptcha_opt['privkey'] : $privkey;
-            $re_lang = isset($recaptcha_opt['re_lang']) ? $recaptcha_opt['re_lang'] : $re_lang;
+            $recaptcha_opt = is_multisite() ? get_site_option( 'recaptcha' ) : get_option( 'recaptcha' );
+            $this->pubkey = isset( $recaptcha_opt['pubkey'] ) ? $recaptcha_opt['pubkey'] : '';
+            $privkey = isset( $recaptcha_opt['privkey'] ) ? $recaptcha_opt['privkey'] : $privkey;
+            $re_lang = isset( $recaptcha_opt['re_lang'] ) ? $recaptcha_opt['re_lang'] : $re_lang;
         }
 
-        if ( ! isset($this->re_msg) || empty($this->re_msg) ) {
+        if ( ! isset( $this->re_msg ) || empty( $this->re_msg ) ) {
             $this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
         }
 
-        if ( ! isset($this->privkey) ) {
+        if ( ! isset( $this->privkey ) ) {
             $this->privkey = $privkey;
         }
 
-        if ( ! isset($this->re_lang) ) {
+        if ( ! isset( $this->re_lang ) ) {
             $this->re_lang = $re_lang;
         }
     }
@@ -168,31 +168,31 @@ 
     }
 
 	public function update( $params ) {
-        $this->fill_with_defaults($params);
-        $this->update_settings($params);
+        $this->fill_with_defaults( $params );
+        $this->update_settings( $params );
 
         if ( $this->mu_menu ) {
-            update_site_option('frm_admin_menu_name', $this->menu);
-        } else if ( current_user_can('administrator') ) {
-            update_site_option('frm_admin_menu_name', false);
+            update_site_option( 'frm_admin_menu_name', $this->menu );
+        } else if ( current_user_can( 'administrator' ) ) {
+            update_site_option( 'frm_admin_menu_name', false );
         }
 
-        $this->update_roles($params);
+        $this->update_roles( $params );
 
         do_action( 'frm_update_settings', $params );
     }
 
 	private function update_settings( $params ) {
-        $this->mu_menu = isset($params['frm_mu_menu']) ? $params['frm_mu_menu'] : 0;
+        $this->mu_menu = isset( $params['frm_mu_menu'] ) ? $params['frm_mu_menu'] : 0;
 
-        $this->pubkey = trim($params['frm_pubkey']);
+        $this->pubkey = trim( $params['frm_pubkey'] );
         $this->privkey = $params['frm_privkey'];
         $this->re_lang = $params['frm_re_lang'];
 
         $this->load_style = $params['frm_load_style'];
         $this->preview_page_id = (int) $params['frm-preview-page-id'];
 
-        $this->use_html = isset($params['frm_use_html']) ? $params['frm_use_html'] : 0;
+        $this->use_html = isset( $params['frm_use_html'] ) ? $params['frm_use_html'] : 0;
         //$this->custom_style = isset($params['frm_custom_style']) ? $params['frm_custom_style'] : 0;
 		$this->jquery_css = isset( $params['frm_jquery_css'] ) ? absint( $params['frm_jquery_css'] ) : 0;
 		$this->accordion_js = isset( $params['frm_accordion_js'] ) ? absint( $params['frm_accordion_js'] ) : 0;
@@ -205,30 +205,30 @@ 
         $frm_roles = FrmAppHelper::frm_capabilities();
         $roles = get_editable_roles();
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
+            $this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
 
-            if ( count($this->$frm_role) === 1 ) {
-                $set_role = reset($this->$frm_role);
+            if ( count( $this->$frm_role ) === 1 ) {
+                $set_role = reset( $this->$frm_role );
                 switch ( $set_role ) {
                     case 'subscriber':
-                        array_push($this->$frm_role, 'contributor');
+                        array_push( $this->$frm_role, 'contributor' );
                     case 'contributor':
-                        array_push($this->$frm_role, 'author');
+                        array_push( $this->$frm_role, 'author' );
                     case 'author':
-                        array_push($this->$frm_role, 'editor');
+                        array_push( $this->$frm_role, 'editor' );
                     case 'editor':
-                        array_push($this->$frm_role, 'administrator');
+                        array_push( $this->$frm_role, 'administrator' );
                 }
-                unset($set_role);
+                unset( $set_role );
             }
 
             foreach ( $roles as $role => $details ) {
-                if ( in_array($role, $this->$frm_role) ) {
+                if ( in_array( $role, $this->$frm_role ) ) {
     			    $wp_roles->add_cap( $role, $frm_role );
     			} else {
     			    $wp_roles->remove_cap( $role, $frm_role );
     			}
-    			unset($role, $details);
+    			unset( $role, $details );
     		}
 		}
     }
@@ -236,10 +236,10 @@ 
 	public function store() {
         // Save the posted value in the database
 
-        update_option('frm_options', $this);
+        update_option( 'frm_options', $this );
 
-        delete_transient('frm_options');
-        set_transient('frm_options', $this);
+        delete_transient( 'frm_options' );
+        set_transient( 'frm_options', $this );
 
         do_action( 'frm_store_settings' );
     }

classes/views/frm-entries/_sidebar-shared-pub.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! isset( $entry) ) {
+if ( ! isset( $entry ) ) {
     $entry = $record;
 } ?>
 
@@ -18,4 +18,4 @@ 
 </div>
 <?php } ?>
 
-<?php do_action('frm_entry_shared_sidebar', $entry); ?>
+<?php do_action( 'frm_entry_shared_sidebar', $entry ); ?>

classes/views/frm-entries/errors.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( isset($include_extra_container) ) { ?>
+if ( isset( $include_extra_container ) ) { ?>
 <div class="<?php echo esc_attr( $include_extra_container ) ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
 <?php
 }
@@ -7,14 +7,14 @@ 
     if ( FrmAppHelper::is_admin() ) {
 		?><div id="message" class="frm_message updated frm_msg_padding"><?php echo wp_kses_post( $message ) ?></div><?php
 	} else {
-        FrmFormsHelper::get_scroll_js($form->id);
+        FrmFormsHelper::get_scroll_js( $form->id );
 
 		// we need to allow scripts here for javascript in the success message
 		echo $message;
     }
 }
 
-if ( isset($errors) && is_array( $errors ) && ! empty( $errors ) ) {
+if ( isset( $errors ) && is_array( $errors ) && ! empty( $errors ) ) {
 
 	if ( isset( $form ) && is_object( $form ) ) {
     	FrmFormsHelper::get_scroll_js( $form->id );
@@ -23,8 +23,8 @@ 
 <?php
 $img = '';
 if ( ! FrmAppHelper::is_admin() ) {
-    $img = apply_filters('frm_error_icon', $img);
-    if ( $img && ! empty($img) ) {
+    $img = apply_filters( 'frm_error_icon', $img );
+    if ( $img && ! empty( $img ) ) {
     ?><img src="<?php echo esc_attr( $img ) ?>" alt="" />
 <?php
     }
@@ -37,7 +37,7 @@ 
 <?php
 }
 
-if ( isset($include_extra_container) ) { ?>
+if ( isset( $include_extra_container ) ) { ?>
 </div>
 <?php
 }

classes/views/frm-entries/form.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( empty($values) || ! isset($values['fields']) || empty($values['fields']) ) { ?>
-<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class($form); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
+if ( empty( $values ) || ! isset( $values['fields'] ) || empty( $values['fields'] ) ) { ?>
+<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class( $form ); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
 	<div class="frm_error_style"><strong><?php _e( 'Oops!', 'formidable' ) ?></strong> <?php printf( __( 'You did not add any fields to your form. %1$sGo back%2$s and add some.', 'formidable' ), '<a href="' . esc_url( admin_url( '?page=formidable&frm_action=edit&id=' . $form->id ) ) . '">', '</a>' ) ?>
     </div>
 </div>
@@ -21,11 +21,11 @@ 
 <div class="frm_form_fields <?php echo esc_attr( apply_filters( 'frm_form_fields_class', '', $values ) ); ?>">
 <fieldset>
 <?php echo FrmFormsHelper::replace_shortcodes( $values['before_html'], $form, $title, $description ); ?>
-<input type="hidden" name="frm_action" value="<?php echo esc_attr($form_action) ?>" />
-<input type="hidden" name="form_id" value="<?php echo esc_attr($form->id) ?>" />
-<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr($frm_hide_fields) ?>" />
+<input type="hidden" name="frm_action" value="<?php echo esc_attr( $form_action ) ?>" />
+<input type="hidden" name="form_id" value="<?php echo esc_attr( $form->id ) ?>" />
+<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr( $frm_hide_fields ) ?>" />
 <input type="hidden" name="frm_helpers_<?php echo esc_attr( $form->id ) ?>" id="frm_helpers_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr( $frm_helpers ) ?>" />
-<input type="hidden" name="form_key" value="<?php echo esc_attr($form->form_key) ?>" />
+<input type="hidden" name="form_key" value="<?php echo esc_attr( $form->form_key ) ?>" />
 <input type="hidden" name="item_meta[0]" value="" />
 <?php wp_nonce_field( 'frm_submit_entry_nonce', 'frm_submit_entry_' . $form->id ); ?>
 
@@ -38,7 +38,7 @@ 
 		} else {
 			do_action( 'frm_show_other_field_type', $field, $form, array( 'action' => $form_action ) );
 		}
-    	do_action('frm_get_field_scripts', $field, $form, $form->id);
+    	do_action( 'frm_get_field_scripts', $field, $form, $form->id );
 	}
 }
 
@@ -46,13 +46,13 @@ 
 if ( FrmAppHelper::is_admin() ) { ?>
 <div class="frm_form_field form-field">
 <label class="frm_primary_label"><?php _e( 'Entry Key', 'formidable' ) ?></label>
-<input type="text" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="text" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 </div>
 <?php } else { ?>
-<input type="hidden" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="hidden" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 <?php }
 
-do_action('frm_entry_form', $form, $form_action, $errors);
+do_action( 'frm_entry_form', $form, $form_action, $errors );
 
 global $frm_vars;
 // close open section div
@@ -62,23 +62,23 @@ 
 }
 
 // close open collapsible toggle div
-if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
+if ( isset( $frm_vars['collapse_div'] ) && $frm_vars['collapse_div'] ) {
     echo "</div>\n";
-    unset($frm_vars['collapse_div']);
+    unset( $frm_vars['collapse_div'] );
 }
 
-echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);
+echo FrmFormsHelper::replace_shortcodes( $values['after_html'], $form );
 
 
-if ( has_action('frm_entries_footer_scripts') ) { ?>
+if ( has_action( 'frm_entries_footer_scripts' ) ) { ?>
 <script type="text/javascript">
-<?php do_action('frm_entries_footer_scripts', $values['fields'], $form); ?>
+<?php do_action( 'frm_entries_footer_scripts', $values['fields'], $form ); ?>
 </script><?php
 }
 
 if ( FrmForm::show_submit( $form ) ) {
-    unset($values['fields']);
-    FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
+    unset( $values['fields'] );
+    FrmFormsHelper::get_custom_submit( $values['submit_html'], $form, $submit, $form_action, $values );
 }
 ?>
 </fieldset>

classes/views/frm-fields/single-option.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <li id="frm_delete_field_<?php echo esc_attr( $field['id'] ); ?>-<?php echo esc_attr( $opt_key ) ?>_container" class="frm_single_option">
     <a href="javascript:void(0)" class="frm_single_visible_hover frm_icon_font frm_delete_icon" data-fid="<?php echo esc_attr( $field['id'] ); ?>"> </a>
     <?php if ( $field['type'] != 'select' ) { ?>
-        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name ) ?><?php echo ( $field['type'] == 'checkbox' ) ? '[]' : ''; ?>" value="<?php echo esc_attr($field_val) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
+        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name ) ?><?php echo ( $field['type'] == 'checkbox' ) ? '[]' : ''; ?>" value="<?php echo esc_attr( $field_val ) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
     <?php } ?>
-	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo $field['separate_value'] ? 'frm_with_key' : ''; ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ($opt == '') ? __( '(Blank)', 'formidable' ) : $opt ?></label>
+	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo $field['separate_value'] ? 'frm_with_key' : ''; ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ( $opt == '' ) ? __( '(Blank)', 'formidable' ) : $opt ?></label>
     <span class="frm_option_key field_<?php echo esc_attr( $field['id'] ) ?>_option_key<?php echo $field['separate_value'] ? '' : ' frm_hidden'; ?>">
 		<label class="frm-show-click frm_ipe_field_option_key" id="field_key_<?php echo esc_attr( $field['id'] . '-' . $opt_key ) ?>"><?php echo ( $field_val == '' ) ? esc_html__( '(Blank)', 'formidable' ) : $field_val ?></label>
     </span>
 </li>
 <?php
-unset($field_val, $opt, $opt_key);
+unset( $field_val, $opt, $opt_key );

classes/views/frm-form-actions/_action_inside.php

Spacing +9 added lines, -9 removed lines

@@ -1,16 +1,16 @@ 
-<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('post_excerpt', '') ) ?>" class="frm_action_name" value="<?php echo esc_attr( $form_action->post_excerpt ); ?>" />
-<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('ID', '') ) ?>" value="<?php echo esc_attr( $form_action->ID ); ?>" />
+<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'post_excerpt', '' ) ) ?>" class="frm_action_name" value="<?php echo esc_attr( $form_action->post_excerpt ); ?>" />
+<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'ID', '' ) ) ?>" value="<?php echo esc_attr( $form_action->ID ); ?>" />
 
 <table class="form-table">
     <tr>
         <th>
-            <label <?php FrmAppHelper::maybe_add_tooltip('action_title') ?>><?php _e( 'Label', 'formidable' ) ?></label>
+            <label <?php FrmAppHelper::maybe_add_tooltip( 'action_title' ) ?>><?php _e( 'Label', 'formidable' ) ?></label>
         </th>
-        <td><input type="text" name="<?php echo esc_attr( $action_control->get_field_name('post_title', '') ) ?>" value="<?php echo esc_attr($form_action->post_title); ?>" class="large-text <?php FrmAppHelper::maybe_add_tooltip('action_title', 'open') ?>" id="<?php echo esc_attr( $action_control->get_field_id('action_post_title') ) ?>" />
+        <td><input type="text" name="<?php echo esc_attr( $action_control->get_field_name( 'post_title', '' ) ) ?>" value="<?php echo esc_attr( $form_action->post_title ); ?>" class="large-text <?php FrmAppHelper::maybe_add_tooltip( 'action_title', 'open' ) ?>" id="<?php echo esc_attr( $action_control->get_field_id( 'action_post_title' ) ) ?>" />
         </td>
     </tr>
 </table>
-<?php $action_control->form($form_action, compact('form', 'action_key', 'values')); ?>
+<?php $action_control->form( $form_action, compact( 'form', 'action_key', 'values' ) ); ?>
 
 <table class="form-table frm-no-margin">
     <tr><td>
@@ -25,18 +25,18 @@ 
 
 if ( count( $action_control->action_options['event'] ) == 1 || $action_control->action_options['force_event'] ) {
 	foreach ( $action_control->action_options['event'] as $e ) { ?>
-	<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('event') ) ?>[]" value="<?php echo esc_attr( $e ) ?>" />
+	<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'event' ) ) ?>[]" value="<?php echo esc_attr( $e ) ?>" />
 <?php
 	}
 } else {
 ?>
 	<p><label class="frm_left_label"><?php _e( 'Trigger this action after', 'formidable' ) ?></label>
-		<select name="<?php echo esc_attr( $action_control->get_field_name('event') ) ?>[]" multiple="multiple" class="frm_multiselect" id="<?php echo esc_attr( $action_control->get_field_id('event') ) ?>">
+		<select name="<?php echo esc_attr( $action_control->get_field_name( 'event' ) ) ?>[]" multiple="multiple" class="frm_multiselect" id="<?php echo esc_attr( $action_control->get_field_id( 'event' ) ) ?>">
 <?php
 
 	$event_labels = FrmFormAction::trigger_labels();
 	foreach ( $action_control->action_options['event'] as $event ) { ?>
-		<option value="<?php echo esc_attr( $event ) ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo isset( $event_labels[ $event ] ) ? $event_labels[ $event ] : $event; ?></option>
+		<option value="<?php echo esc_attr( $event ) ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo isset( $event_labels[$event] ) ? $event_labels[$event] : $event; ?></option>
 <?php
 	}
 ?>		</select>
@@ -47,6 +47,6 @@ 
 do_action( 'frm_additional_action_settings', $form_action, compact( 'form', 'action_control', 'action_key', 'values' ) );
 
 ?>
-    <span class="alignright frm_action_id <?php echo empty( $form_action->ID ) ? 'frm_hidden' : ''; ?>"><?php printf( __( 'Action ID: %1$s', 'formidable' ), $form_action->ID); ?></span>
+    <span class="alignright frm_action_id <?php echo empty( $form_action->ID ) ? 'frm_hidden' : ''; ?>"><?php printf( __( 'Action ID: %1$s', 'formidable' ), $form_action->ID ); ?></span>
     </td></tr>
 </table>

classes/views/frm-form-actions/default_actions.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 // add register action
 class FrmDefRegAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_register_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_register_icon' );
 		parent::__construct( 'register', __( 'Register User', 'formidable' ), $action_ops );
 	}
 }
@@ -20,7 +20,7 @@ 
 // add paypal action
 class FrmDefPayPalAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_paypal_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_paypal_icon' );
 		parent::__construct( 'paypal', __( 'Collect Payment', 'formidable' ), $action_ops );
 	}
 }
@@ -28,7 +28,7 @@ 
 // add aweber action
 class FrmDefAweberAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_aweber_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_aweber_icon' );
 		parent::__construct( 'aweber', __( 'Aweber', 'formidable' ), $action_ops );
 	}
 }
@@ -36,7 +36,7 @@ 
 // add mailchimp action
 class FrmDefMlcmpAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_mailchimp_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_mailchimp_icon' );
 		parent::__construct( 'mailchimp', __( 'MailChimp', 'formidable' ), $action_ops );
 	}
 }
@@ -44,7 +44,7 @@ 
 // add twilio action
 class FrmDefTwilioAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_sms_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_sms_icon' );
 		parent::__construct( 'twilio', __( 'Twilio', 'formidable' ), $action_ops );
 	}
 }
@@ -52,7 +52,7 @@ 
 // add highrise action
 class FrmDefHrsAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_highrise_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_highrise_icon' );
 		parent::__construct( 'highrise', __( 'Highrise', 'formidable' ), $action_ops );
 	}
 }