Strategy11 / formidable-forms

classes/controllers/FrmFormActionsController.php

Spacing +38 added lines, -38 removed lines

@@ -48,17 +48,17 @@ 
             'highrise'  => 'FrmDefHrsAction',
         ) );
 
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php');
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php');
+        include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php' );
+        include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php' );
 
         foreach ( $action_classes as $action_class ) {
-            self::$registered_actions->register($action_class);
+            self::$registered_actions->register( $action_class );
         }
     }
 
 	public static function get_form_actions( $action = 'all' ) {
         $temp_actions = self::$registered_actions;
-        if ( empty($temp_actions) ) {
+        if ( empty( $temp_actions ) ) {
             self::actions_init();
             $temp_actions = self::$registered_actions->actions;
         } else {
@@ -72,7 +72,7 @@ 
                 return $a;
             }
 
-			$actions[ $a->id_base ] = $a;
+			$actions[$a->id_base] = $a;
         }
         unset( $temp_actions, $a );
 
@@ -86,7 +86,7 @@ 
         arsort( $temp_actions );
         foreach ( $temp_actions as $type => $a ) {
             if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
-				unset( $actions[ $type ] );
+				unset( $actions[$type] );
                 if ( count( $actions ) <= $action_limit ) {
                     break;
                 }
@@ -118,22 +118,22 @@ 
         $action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-            $action_map[ $control->id_base ] = $key;
+            $action_map[$control->id_base] = $key;
         }
 
     	foreach ( $form_actions as $action ) {
-    	    if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+    	    if ( ! isset( $action_map[$action->post_excerpt] ) ) {
     	        // don't try and show settings if action no longer exists
     	        continue;
     	    }
 
-    		self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+    		self::action_control( $action, $form, $action->ID, $action_controls[$action_map[$action->post_excerpt]], $values );
     	}
     }
 
 	public static function action_control( $form_action, $form, $action_key, $action_control, $values ) {
-        $action_control->_set($action_key);
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+        $action_control->_set( $action_key );
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
     }
 
     public static function add_form_action() {
@@ -145,16 +145,16 @@ 
         $action_type = sanitize_text_field( $_POST['type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        $action_control->_set($action_key);
+        $action_control->_set( $action_key );
 
         $form_id = absint( $_POST['form_id'] );
 
-        $form_action = $action_control->prepare_new($form_id);
+        $form_action = $action_control->prepare_new( $form_id );
 
         $values = array();
-        $form = self::fields_to_values($form_id, $values);
+        $form = self::fields_to_values( $form_id, $values );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
         wp_die();
     }
 
@@ -165,34 +165,34 @@ 
         $action_type = sanitize_text_field( $_POST['action_type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        if ( empty($action_control) ) {
+        if ( empty( $action_control ) ) {
             wp_die();
         }
 
         $form_action = $action_control->get_single_action( $action_key );
 
         $values = array();
-        $form = self::fields_to_values($form_action->menu_order, $values);
+        $form = self::fields_to_values( $form_action->menu_order, $values );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_action_inside.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_inside.php' );
         wp_die();
     }
 
 	private static function fields_to_values( $form_id, array &$values ) {
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
 
 		$values = array( 'fields' => array(), 'id' => $form->id );
 
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
         foreach ( $fields as $k => $f ) {
             $f = (array) $f;
             $opts = (array) $f['field_options'];
-            $f = array_merge($opts, $f);
+            $f = array_merge( $opts, $f );
             if ( ! isset( $f['post_field'] ) ) {
                 $f['post_field'] = '';
             }
             $values['fields'][] = $f;
-            unset($k, $f);
+            unset( $k, $f );
         }
 
         return $form;
@@ -207,7 +207,7 @@ 
         $new_actions = array();
 
         foreach ( $registered_actions as $registered_action ) {
-            $action_ids = $registered_action->update_callback($form_id);
+            $action_ids = $registered_action->update_callback( $form_id );
             if ( ! empty( $action_ids ) ) {
                 $new_actions[] = $action_ids;
             }
@@ -284,33 +284,33 @@ 
             }
 
             // store actions so they can be triggered with the correct priority
-            $stored_actions[ $action->ID ] = $action;
-            $action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+            $stored_actions[$action->ID] = $action;
+            $action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
 
-            unset($action);
+            unset( $action );
         }
 
         if ( ! empty( $stored_actions ) ) {
-            asort($action_priority);
+            asort( $action_priority );
 
             // make sure hooks are loaded
             new FrmNotification();
 
             foreach ( $action_priority as $action_id => $priority ) {
-                $action = $stored_actions[ $action_id ];
-                do_action('frm_trigger_'. $action->post_excerpt .'_action', $action, $entry, $form, $event);
-                do_action('frm_trigger_'. $action->post_excerpt .'_'. $event .'_action', $action, $entry, $form);
+                $action = $stored_actions[$action_id];
+                do_action( 'frm_trigger_' . $action->post_excerpt . '_action', $action, $entry, $form, $event );
+                do_action( 'frm_trigger_' . $action->post_excerpt . '_' . $event . '_action', $action, $entry, $form );
 
                 // If post is created, get updated $entry object
                 if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
-                    $entry = FrmEntry::getOne($entry->id, true);
+                    $entry = FrmEntry::getOne( $entry->id, true );
                 }
             }
         }
     }
 
 	public static function duplicate_form_actions( $form_id, $values, $args = array() ) {
-        if ( ! isset($args['old_id']) || empty($args['old_id']) ) {
+        if ( ! isset( $args['old_id'] ) || empty( $args['old_id'] ) ) {
             // continue if we know which actions to copy
             return;
         }
@@ -344,22 +344,22 @@ 
 	}
 
 	public function register( $action_class ) {
-		$this->actions[ $action_class ] = new $action_class();
+		$this->actions[$action_class] = new $action_class();
 	}
 
 	public function unregister( $action_class ) {
-		if ( isset( $this->actions[ $action_class ] ) ) {
-			unset($this->actions[ $action_class ]);
+		if ( isset( $this->actions[$action_class] ) ) {
+			unset( $this->actions[$action_class] );
 		}
 	}
 
 	public function _register_actions() {
-		$keys = array_keys($this->actions);
+		$keys = array_keys( $this->actions );
 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
-			if ( ! isset( $this->actions[ $key ] ) ) {
-			    $this->actions[ $key ]->_register();
+			if ( ! isset( $this->actions[$key] ) ) {
+			    $this->actions[$key]->_register();
 			}
 		}
 	}

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/controllers/FrmStylesController.php

Spacing +54 added lines, -54 removed lines

@@ -41,25 +41,25 @@ 
     }
 
     public static function menu() {
-        add_submenu_page('formidable', 'Formidable | '. __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route');
+        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route' );
     }
 
     public static function admin_init() {
-        if ( ! FrmAppHelper::is_admin_page('formidable-styles') ) {
+        if ( ! FrmAppHelper::is_admin_page( 'formidable-styles' ) ) {
             return;
         }
 
         self::load_pro_hooks();
-        wp_enqueue_script('jquery-ui-datepicker');
+        wp_enqueue_script( 'jquery-ui-datepicker' );
 
         $version = FrmAppHelper::plugin_version();
 		wp_enqueue_script( 'jquery-frm-themepicker', FrmAppHelper::plugin_url() . '/js/jquery/jquery-ui-themepicker.js', array( 'jquery' ), $version );
 
-        wp_enqueue_style('frm-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_css');
+        wp_enqueue_style( 'frm-custom-theme', admin_url( 'admin-ajax.php' ) . '?action=frmpro_css' );
 
-        $style = apply_filters('frm_style_head', false);
+        $style = apply_filters( 'frm_style_head', false );
         if ( $style ) {
-            wp_enqueue_style('frm-single-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_load_css&flat=1&'. http_build_query($style->post_content));
+            wp_enqueue_style( 'frm-single-custom-theme', admin_url( 'admin-ajax.php' ) . '?action=frmpro_load_css&flat=1&' . http_build_query( $style->post_content ) );
         }
     }
 
@@ -129,18 +129,18 @@ 
 
 	public static function new_style( $return = '' ) {
         FrmAppHelper::update_message( __( 'create multiple styling templates', 'formidable' ), 'wrap' );
-        self::load_styler('default');
+        self::load_styler( 'default' );
     }
 
 	public static function duplicate() {
 		FrmAppHelper::update_message( __( 'duplicate styling templates', 'formidable' ), 'wrap' );
-		self::load_styler('default');
+		self::load_styler( 'default' );
 	}
 
 	public static function edit( $style_id = false, $message = '' ) {
         if ( ! $style_id ) {
 			$style_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-            if ( empty($style_id) ) {
+            if ( empty( $style_id ) ) {
                 $style_id = 'default';
             }
         }
@@ -148,12 +148,12 @@ 
         if ( 'default' == $style_id ) {
             $style = 'default';
         } else {
-            $frm_style = new FrmStyle($style_id);
+            $frm_style = new FrmStyle( $style_id );
             $style = $frm_style->get_one();
             $style = $style->ID;
         }
 
-        self::load_styler($style, $message);
+        self::load_styler( $style, $message );
     }
 
     public static function save() {
@@ -163,17 +163,17 @@ 
 		$style_nonce = FrmAppHelper::get_post_param( 'frm_style', '', 'sanitize_text_field' );
 
 		if ( $post_id !== false && wp_verify_nonce( $style_nonce, 'frm_style_nonce' ) ) {
-            $id = $frm_style->update($post_id);
-            if ( empty($post_id) && ! empty($id) ) {
+            $id = $frm_style->update( $post_id );
+            if ( empty( $post_id ) && ! empty( $id ) ) {
                 // set the post id to the new style so it will be loaded for editing
-                $post_id = reset($id);
+                $post_id = reset( $id );
             }
             // include the CSS that includes this style
 			echo '<link href="' . esc_url( admin_url( 'admin-ajax.php' ) . '?action=frmpro_css' ) . '" type="text/css" rel="Stylesheet" class="frm-custom-theme" />';
             $message = __( 'Your styling settings have been saved.', 'formidable' );
         }
 
-        return self::edit($post_id, $message);
+        return self::edit( $post_id, $message );
     }
 
 	public static function load_styler( $style, $message = '' ) {
@@ -182,15 +182,15 @@ 
         $frm_style = new FrmStyle();
         $styles = $frm_style->get_all();
 
-        if ( is_numeric($style) ) {
-            $style = $styles[ $style ];
+        if ( is_numeric( $style ) ) {
+            $style = $styles[$style];
         } else if ( 'default' == $style ) {
-            $style = $frm_style->get_default_style($styles);
+            $style = $frm_style->get_default_style( $styles );
         }
 
         self::add_meta_boxes();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/show.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/show.php' );
     }
 
 	/**
@@ -200,13 +200,13 @@ 
 	private static function manage( $message = '', $forms = array() ) {
         $frm_style = new FrmStyle();
         $styles = $frm_style->get_all();
-        $default_style = $frm_style->get_default_style($styles);
+        $default_style = $frm_style->get_default_style( $styles );
 
-        if ( empty($forms) ) {
+        if ( empty( $forms ) ) {
             $forms = FrmForm::get_published_forms();
         }
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/manage.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/manage.php' );
     }
 
     private static function manage_styles() {
@@ -219,31 +219,31 @@ 
 
 		$forms = FrmForm::get_published_forms();
         foreach ( $forms as $form ) {
-            if ( $_POST['style'][ $form->id ] == $_POST['prev_style'][ $form->id ] ) {
+            if ( $_POST['style'][$form->id] == $_POST['prev_style'][$form->id] ) {
                 continue;
             }
 
-            $form->options['custom_style'] = $_POST['style'][ $form->id ];
+            $form->options['custom_style'] = $_POST['style'][$form->id];
 
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
-            unset($form);
+            unset( $form );
         }
 
         $message = __( 'Your form styles have been saved.', 'formidable' );
-        return self::manage($message, $forms);
+        return self::manage( $message, $forms );
     }
 
     public static function custom_css( $message = '', $style = null ) {
-        wp_enqueue_style('codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css');
-        wp_enqueue_script('codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7');
+        wp_enqueue_style( 'codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css' );
+        wp_enqueue_script( 'codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7' );
         wp_enqueue_script( 'codemirror-css', FrmAppHelper::plugin_url() . '/js/codemirror/css.js', array( 'codemirror' ), '4.7' );
 
-        if ( ! isset($style) ) {
+        if ( ! isset( $style ) ) {
             $frm_style = new FrmStyle();
             $style = $frm_style->get_default_style();
         }
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/custom_css.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/custom_css.php' );
     }
 
     public static function save_css() {
@@ -253,11 +253,11 @@ 
 		$post_id = FrmAppHelper::get_post_param( 'ID', false, 'sanitize_text_field' );
 		$nonce = FrmAppHelper::get_post_param( 'frm_custom_css', '', 'sanitize_text_field' );
 		if ( wp_verify_nonce( $nonce, 'frm_custom_css_nonce' ) ) {
-            $frm_style->update($post_id);
+            $frm_style->update( $post_id );
             $message = __( 'Your styling settings have been saved.', 'formidable' );
         }
 
-        return self::custom_css($message);
+        return self::custom_css( $message );
     }
 
     public static function route() {
@@ -303,13 +303,13 @@ 
 
         // remove the # from the colors
         foreach ( $_GET['frm_style_setting']['post_content'] as $k => $v ) {
-            if ( ! is_array($v) && strpos($v, '#') === 0 ) {
-                $_GET['frm_style_setting']['post_content'][ $k ] = str_replace( '#', '', $v );
+            if ( ! is_array( $v ) && strpos( $v, '#' ) === 0 ) {
+                $_GET['frm_style_setting']['post_content'][$k] = str_replace( '#', '', $v );
             }
         }
 
         echo '<style type="text/css">';
-        include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
+        include( FrmAppHelper::plugin_path() . '/css/_single_theme.css.php' );
         echo '</style>';
         wp_die();
     }
@@ -331,24 +331,24 @@ 
         );
 
         foreach ( $meta_boxes as $nicename => $name ) {
-            add_meta_box( $nicename .'-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
-            unset($nicename, $name);
+            add_meta_box( $nicename . '-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
+            unset( $nicename, $name );
         }
     }
 
 	public static function include_style_section( $atts, $sec ) {
-        extract($atts);
+        extract( $atts );
 		$current_tab = FrmAppHelper::simple_get( 'page-tab', 'sanitize_title', 'default' );
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/_'. $sec['args'] .'.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/_' . $sec['args'] . '.php' );
     }
 
     public static function load_css() {
-        header('Content-type: text/css');
+        header( 'Content-type: text/css' );
 
         $frm_style = new FrmStyle();
         $defaults = $frm_style->get_defaults();
 
-        include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
+        include( FrmAppHelper::plugin_path() . '/css/_single_theme.css.php' );
         wp_die();
     }
 
@@ -407,11 +407,11 @@ 
             $style = 'default';
         }
 
-        $frm_style = new FrmStyle($style);
+        $frm_style = new FrmStyle( $style );
         $style = $frm_style->get_one();
 
         if ( $style ) {
-            $class .= ' frm_style_'. $style->post_name;
+            $class .= ' frm_style_' . $style->post_name;
         }
 
         return $class;
@@ -421,14 +421,14 @@ 
      * @param string $val
      */
 	public static function get_style_val( $val, $form = 'default' ) {
-        $style = self::get_form_style($form);
-        if ( $style && isset( $style->post_content[ $val ] ) ) {
-            return $style->post_content[ $val ];
+        $style = self::get_form_style( $form );
+        if ( $style && isset( $style->post_content[$val] ) ) {
+            return $style->post_content[$val];
         }
     }
 
 	public static function show_entry_styles( $default_styles ) {
-        $frm_style = new FrmStyle('default');
+        $frm_style = new FrmStyle( 'default' );
         $style = $frm_style->get_one();
 
         if ( ! $style ) {
@@ -442,15 +442,15 @@ 
             } else if ( 'alt_bg_color' == $name ) {
                 $setting = 'bg_color_active';
             }
-            $default_styles[ $name ] = $style->post_content[ $setting ];
-            unset($name, $val);
+            $default_styles[$name] = $style->post_content[$setting];
+            unset( $name, $val );
         }
 
         return $default_styles;
     }
 
 	public static function &important_style( $important, $field ) {
-        $important = self::get_style_val('important_style', $field['form_id']);
+        $important = self::get_style_val( 'important_style', $field['form_id'] );
         return $important;
     }
 
@@ -476,18 +476,18 @@ 
     	$i = 0;
     	$first_open = false;
     	do {
-			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[ $page ] ) || ! isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
+			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) ) {
 				break;
 			}
 
     		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-    			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-    				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
+    			if ( isset( $wp_meta_boxes[$page][$context][$priority] ) ) {
+    				foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
     					if ( false == $box || ! $box['title'] ) {
     						continue;
 						}
 
-    					$i++;
+    					$i ++;
     					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
     					if ( ! $first_open && empty( $hidden_class ) ) {

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/helpers/FrmEntriesListHelper.php

Spacing +26 added lines, -26 removed lines

@@ -25,15 +25,15 @@ 
 
 	    $s_query = array( 'it.form_id' => $form_id );
 
-		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+		$s = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
 
 	    if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
 	        $fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
-	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid);
+	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid );
 	    }
 
         $orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
-        if ( strpos($orderby, 'meta') !== false ) {
+        if ( strpos( $orderby, 'meta' ) !== false ) {
             $order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
 			$orderby .= in_array( $order_field_type, array( 'number', 'scale' ) ) ? ' +0 ' : '';
         }
@@ -44,8 +44,8 @@ 
         $page = $this->get_pagenum();
 		$start = (int) isset( $_REQUEST['start'] ) ? absint( $_REQUEST['start'] ) : ( ( $page - 1 ) * $per_page );
 
-        $this->items = FrmEntry::getAll($s_query, $order, ' LIMIT '. $start .','. $per_page, true, false);
-        $total_items = FrmEntry::getRecordCount($s_query);
+        $this->items = FrmEntry::getAll( $s_query, $order, ' LIMIT ' . $start . ',' . $per_page, true, false );
+        $total_items = FrmEntry::getRecordCount( $s_query );
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -55,18 +55,18 @@ 
 
 	public function no_items() {
         $s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-	    if ( ! empty($s) ) {
+	    if ( ! empty( $s ) ) {
             _e( 'No Entries Found', 'formidable' );
             return;
         }
 
         $form_id = $form = $this->params['form'];
         if ( $form_id ) {
-            $form = FrmForm::getOne($form_id);
+            $form = FrmForm::getOne( $form_id );
         }
         $colspan = $this->get_column_count();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/no_entries.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/no_entries.php' );
 	}
 
 	public function search_box( $text, $input_id ) {
@@ -99,7 +99,7 @@ 
 	public function single_row( $item, $style = '' ) {
 		// Set up the hover actions for this user
 		$actions = array();
-		$view_link = '?page=formidable-entries&frm_action=show&id='. $item->id;
+		$view_link = '?page=formidable-entries&frm_action=show&id=' . $item->id;
 
 		$this->get_actions( $actions, $item, $view_link );
 
@@ -110,11 +110,11 @@ 
 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
         $action_col = false;
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			$class = $column_name .' column-'. $column_name;
+			$class = $column_name . ' column-' . $column_name;
 
 			if ( $column_name === $primary ) {
 				$class .= ' column-primary';
@@ -127,10 +127,10 @@ 
             }
 
 			$attributes = 'class="' . esc_attr( $class ) . '"';
-			unset($class);
-			$attributes .= ' data-colname="' . $column_display_name  . '"';
+			unset( $class );
+			$attributes .= ' data-colname="' . $column_display_name . '"';
 
-            $col_name = preg_replace('/^('. $this->params['form'] .'_)/', '', $column_name);
+            $col_name = preg_replace( '/^(' . $this->params['form'] . '_)/', '', $column_name );
 			$this->column_name = $col_name;
 
 			switch ( $col_name ) {
@@ -144,24 +144,24 @@ 
 				    break;
 				case 'name':
 				case 'description':
-				    $val = FrmAppHelper::truncate(strip_tags($item->{$col_name}), 100);
+				    $val = FrmAppHelper::truncate( strip_tags( $item->{$col_name}), 100 );
 				    break;
 				case 'created_at':
 				case 'updated_at':
-				    $date = FrmAppHelper::get_formatted_time($item->{$col_name});
+				    $date = FrmAppHelper::get_formatted_time( $item->{$col_name});
 					$val = '<abbr title="' . esc_attr( FrmAppHelper::get_formatted_time( $item->{$col_name}, '', 'g:i:s A' ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'is_draft':
-				    $val = empty($item->is_draft) ? __( 'No') : __( 'Yes');
+				    $val = empty( $item->is_draft ) ? __( 'No' ) : __( 'Yes' );
 			        break;
 				case 'form_id':
-				    $val = FrmFormsHelper::edit_form_link($item->form_id);
+				    $val = FrmFormsHelper::edit_form_link( $item->form_id );
     				break;
 				case 'post_id':
-				    $val = FrmAppHelper::post_edit_link($item->post_id);
+				    $val = FrmAppHelper::post_edit_link( $item->post_id );
 				    break;
 				case 'user_id':
-				    $user = get_userdata($item->user_id);
+				    $user = get_userdata( $item->user_id );
 				    $val = $user->user_login;
 				    break;
 				default:
@@ -175,7 +175,7 @@ 
 			if ( isset( $val ) ) {
 			    $r .= "<td $attributes>";
 				if ( $column_name == $action_col ) {
-					$edit_link = '?page=formidable-entries&frm_action=edit&id='. $item->id;
+					$edit_link = '?page=formidable-entries&frm_action=edit&id=' . $item->id;
 					$r .= '<a href="' . esc_url( isset( $actions['edit'] ) ? $edit_link : $view_link ) . '" class="row-title" >' . $val . '</a> ';
 			        $r .= $action_links;
 				} else {
@@ -183,7 +183,7 @@ 
 			    }
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -194,14 +194,14 @@ 
      * @param string $view_link
      */
     private function get_actions( &$actions, $item, $view_link ) {
-		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">'. __( 'View', 'formidable' ) .'</a>';
+		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">' . __( 'View', 'formidable' ) . '</a>';
 
-        if ( current_user_can('frm_delete_entries') ) {
-            $delete_link = '?page=formidable-entries&frm_action=destroy&id='. $item->id .'&form='. $this->params['form'];
+        if ( current_user_can( 'frm_delete_entries' ) ) {
+            $delete_link = '?page=formidable-entries&frm_action=destroy&id=' . $item->id . '&form=' . $this->params['form'];
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( $delete_link ) ) . '" class="submitdelete" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete that?', 'formidable' ) ) . '\')">' . __( 'Delete' ) . '</a>';
 	    }
 
-        $actions = apply_filters('frm_row_actions', $actions, $item);
+        $actions = apply_filters( 'frm_row_actions', $actions, $item );
     }
 
 	private function get_column_value( $item, &$val ) {

classes/helpers/FrmFormsHelper.php

Spacing +66 added lines, -66 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -11,8 +11,8 @@ 
 	}
 
 	public static function get_direct_link( $key, $form = false ) {
-        $target_url = esc_url(admin_url('admin-ajax.php') . '?action=frm_forms_preview&form='. $key);
-        $target_url = apply_filters('frm_direct_link', $target_url, $key, $form);
+        $target_url = esc_url( admin_url( 'admin-ajax.php' ) . '?action=frm_forms_preview&form=' . $key );
+        $target_url = apply_filters( 'frm_direct_link', $target_url, $key, $form );
 
         return $target_url;
     }
@@ -37,7 +37,7 @@ 
 			$query['id !'] = $args['exclude'];
         }
 
-        $where = apply_filters('frm_forms_dropdown', $query, $field_name);
+        $where = apply_filters( 'frm_forms_dropdown', $query, $field_name );
 		$forms = FrmForm::get_published_forms( $where, 999, $args['inc_children'] );
 		$add_html = array();
 		self::add_html_attr( $args['onchange'], 'onchange', $add_html );
@@ -50,7 +50,7 @@ 
 		<?php } ?>
 		<?php foreach ( $forms as $form ) { ?>
 			<option value="<?php echo esc_attr( $form->id ); ?>" <?php selected( $field_value, $form->id ); ?>><?php
-				echo ( '' == $form->name ) ? esc_html__( '(no title)', 'formidable' ) : esc_html( FrmAppHelper::truncate( $form->name, 33 ) ) . ( $form->parent_form_id ? esc_html__( ' (child)', 'formidable' ) : '' ) ;
+				echo ( '' == $form->name ) ? esc_html__( '(no title)', 'formidable' ) : esc_html( FrmAppHelper::truncate( $form->name, 33 ) ) . ( $form->parent_form_id ? esc_html__( ' (child)', 'formidable' ) : '' );
 			?></option>
 		<?php } ?>
         </select>
@@ -66,7 +66,7 @@ 
 	 */
 	public static function add_html_attr( $class, $param, &$add_html ) {
 		if ( ! empty( $class ) ) {
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
 		}
 	}
 
@@ -77,7 +77,7 @@ 
 		$args = array( 'id' => 0, 'form' => 0 );
 		if ( isset( $_GET['id'] ) && ! isset( $_GET['form'] ) ) {
 			unset( $args['form'] );
-		} else if ( isset( $_GET['form']) && ! isset( $_GET['id'] ) ) {
+		} else if ( isset( $_GET['form'] ) && ! isset( $_GET['id'] ) ) {
 			unset( $args['id'] );
         }
 
@@ -85,11 +85,11 @@ 
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $frm_action, array( 'edit', 'show', 'destroy_all' ) ) ) {
             $args['frm_action'] = 'list';
             $args['form'] = 0;
-		} else if ( FrmAppHelper::is_admin_page('formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
+		} else if ( FrmAppHelper::is_admin_page( 'formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
             $args['frm_action'] = 'edit';
 		} else if ( isset( $_GET['post'] ) ) {
             $args['form'] = 0;
-            $base = admin_url('edit.php?post_type=frm_display');
+            $base = admin_url( 'edit.php?post_type=frm_display' );
         }
 
         ?>
@@ -105,7 +105,7 @@ 
 			        $args['form'] = $form->id;
 				}
                 ?>
-				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)') : FrmAppHelper::truncate( $form->name, 33 ) ); ?></a></li>
+				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 33 ) ); ?></a></li>
 			<?php
 				unset( $form );
 			} ?>
@@ -115,8 +115,8 @@ 
     }
 
 	public static function get_sortable_classes( $col, $sort_col, $sort_dir ) {
-        echo ($sort_col == $col) ? 'sorted' : 'sortable';
-        echo ($sort_col == $col && $sort_dir == 'desc') ? ' asc' : ' desc';
+        echo ( $sort_col == $col ) ? 'sorted' : 'sortable';
+        echo ( $sort_col == $col && $sort_dir == 'desc' ) ? ' asc' : ' desc';
     }
 
 	public static function get_success_message( $atts ) {
@@ -135,37 +135,37 @@ 
             $post_values = $values;
         } else {
             $values = array();
-            $post_values = isset($_POST) ? $_POST : array();
+            $post_values = isset( $_POST ) ? $_POST : array();
         }
 
 		foreach ( array( 'name' => '', 'description' => '' ) as $var => $default ) {
-			if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+			if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default );
             }
         }
 
-        $values['description'] = FrmAppHelper::use_wpautop($values['description']);
+        $values['description'] = FrmAppHelper::use_wpautop( $values['description'] );
 
 		foreach ( array( 'form_id' => '', 'logged_in' => '', 'editable' => '', 'default_template' => 0, 'is_template' => 0, 'status' => 'draft', 'parent_form_id' => 0 ) as $var => $default ) {
-            if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+            if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default );
             }
         }
 
         if ( ! isset( $values['form_key'] ) ) {
-            $values['form_key'] = ($post_values && isset($post_values['form_key'])) ? $post_values['form_key'] : FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_forms', 'form_key');
+            $values['form_key'] = ( $post_values && isset( $post_values['form_key'] ) ) ? $post_values['form_key'] : FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_forms', 'form_key' );
         }
 
-        $values = self::fill_default_opts($values, false, $post_values);
+        $values = self::fill_default_opts( $values, false, $post_values );
 
-        if ( $post_values && isset($post_values['options']['custom_style']) ) {
+        if ( $post_values && isset( $post_values['options']['custom_style'] ) ) {
             $values['custom_style'] = $post_values['options']['custom_style'];
         } else {
             $frm_settings = FrmAppHelper::get_settings();
             $values['custom_style'] = ( $frm_settings->load_style != 'none' );
         }
 
-        return apply_filters('frm_setup_new_form_vars', $values);
+        return apply_filters( 'frm_setup_new_form_vars', $values );
     }
 
     /**
@@ -176,42 +176,42 @@ 
 			$post_values = stripslashes_deep( $_POST );
 		}
 
-        $values['form_key'] = isset($post_values['form_key']) ? $post_values['form_key'] : $record->form_key;
-        $values['default_template'] = isset($post_values['default_template']) ? $post_values['default_template'] : $record->default_template;
-        $values['is_template'] = isset($post_values['is_template']) ? $post_values['is_template'] : $record->is_template;
+        $values['form_key'] = isset( $post_values['form_key'] ) ? $post_values['form_key'] : $record->form_key;
+        $values['default_template'] = isset( $post_values['default_template'] ) ? $post_values['default_template'] : $record->default_template;
+        $values['is_template'] = isset( $post_values['is_template'] ) ? $post_values['is_template'] : $record->is_template;
         $values['status'] = $record->status;
 
-        $values = self::fill_default_opts($values, $record, $post_values);
+        $values = self::fill_default_opts( $values, $record, $post_values );
 
-        return apply_filters('frm_setup_edit_form_vars', $values);
+        return apply_filters( 'frm_setup_edit_form_vars', $values );
     }
 
 	public static function fill_default_opts( $values, $record, $post_values ) {
 
         $defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-            if ( is_array($default) ) {
-                if ( ! isset( $values[ $var ] ) ) {
-					$values[ $var ] = ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : array();
+            if ( is_array( $default ) ) {
+                if ( ! isset( $values[$var] ) ) {
+					$values[$var] = ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : array();
                 }
 
                 foreach ( $default as $k => $v ) {
-					$values[ $var ][ $k ] = ( $post_values && isset( $post_values[ $var ][ $k ] ) ) ? $post_values[ $var ][ $k ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ) ? $record->options[ $var ][ $k ] : $v);
+					$values[$var][$k] = ( $post_values && isset( $post_values[$var][$k] ) ) ? $post_values[$var][$k] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) ) ? $record->options[$var][$k] : $v );
 
                     if ( is_array( $v ) ) {
                         foreach ( $v as $k1 => $v1 ) {
-							$values[ $var ][ $k ][ $k1 ] = ( $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ) ? $post_values[ $var ][ $k ][ $k1 ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
+							$values[$var][$k][$k1] = ( $post_values && isset( $post_values[$var][$k][$k1] ) ) ? $post_values[$var][$k][$k1] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) && isset( $record->options[$var][$k][$k1] ) ) ? $record->options[$var][$k][$k1] : $v1 );
                             unset( $k1, $v1 );
                         }
                     }
 
-                    unset($k, $v);
+                    unset( $k, $v );
                 }
             } else {
-				$values[ $var ] = ( $post_values && isset( $post_values['options'][ $var ] ) ) ? $post_values['options'][ $var ] : ( ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : $default );
+				$values[$var] = ( $post_values && isset( $post_values['options'][$var] ) ) ? $post_values['options'][$var] : ( ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : $default );
             }
 
-            unset($var, $default);
+            unset( $var, $default );
         }
 
         return $values;
@@ -224,9 +224,9 @@ 
             'submit_value' => $frm_settings->submit_value, 'success_action' => 'message',
             'success_msg' => $frm_settings->success_msg, 'show_form' => 0, 'akismet' => '',
             'no_save' => 0, 'ajax_load' => 0, 'form_class' => '', 'custom_style' => 1,
-            'before_html' => self::get_default_html('before'),
+            'before_html' => self::get_default_html( 'before' ),
             'after_html' => '',
-            'submit_html' => self::get_default_html('submit'),
+            'submit_html' => self::get_default_html( 'submit' ),
         );
     }
 
@@ -238,7 +238,7 @@ 
 	public static function fill_form_options( &$options, $values ) {
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
 			unset( $var, $default );
 		}
 	}
@@ -278,21 +278,21 @@ 
     }
 
 	public static function get_custom_submit( $html, $form, $submit, $form_action, $values ) {
-        $button = self::replace_shortcodes($html, $form, $submit, $form_action, $values);
-        if ( ! strpos($button, '[button_action]') ) {
+        $button = self::replace_shortcodes( $html, $form, $submit, $form_action, $values );
+        if ( ! strpos( $button, '[button_action]' ) ) {
             return;
         }
 
-        $button_parts = explode('[button_action]', $button);
+        $button_parts = explode( '[button_action]', $button );
         echo $button_parts[0];
         //echo ' id="frm_submit_"';
 
-        $classes = apply_filters('frm_submit_button_class', array(), $form);
-        if ( ! empty($classes) ) {
+        $classes = apply_filters( 'frm_submit_button_class', array(), $form );
+        if ( ! empty( $classes ) ) {
 			echo ' class="' . esc_attr( implode( ' ', $classes ) ) . '"';
         }
 
-        do_action('frm_submit_button_action', $form, $form_action);
+        do_action( 'frm_submit_button_action', $form, $form_action );
         echo $button_parts[1];
     }
 
@@ -313,7 +313,7 @@ 
 		$last_field = false;
         foreach ( $fields as $field ) {
 			if ( $prev_order === $field->field_order ) {
-				$add_order++;
+				$add_order ++;
 			}
 
 			if ( $add_order ) {
@@ -380,21 +380,21 @@ 
             if ( $code == 'form_name' ) {
                 $replace_with = $form->name;
             } else if ( $code == 'form_description' ) {
-                $replace_with = FrmAppHelper::use_wpautop($form->description);
-            } else if ( $code == 'entry_key' && isset($_GET) && isset($_GET['entry']) ) {
+                $replace_with = FrmAppHelper::use_wpautop( $form->description );
+            } else if ( $code == 'entry_key' && isset( $_GET ) && isset( $_GET['entry'] ) ) {
                 $replace_with = FrmAppHelper::simple_get( 'entry' );
             } else {
                 $replace_with = '';
             }
 
-            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true($show) && $replace_with != '' ), $code, $replace_with, $html );
+            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true( $show ) && $replace_with != '' ), $code, $replace_with, $html );
         }
 
         //replace [form_key]
-        $html = str_replace('[form_key]', $form->form_key, $html);
+        $html = str_replace( '[form_key]', $form->form_key, $html );
 
         //replace [frmurl]
-        $html = str_replace('[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html);
+        $html = str_replace( '[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html );
 
 		if ( strpos( $html, '[button_label]' ) ) {
 			add_filter( 'frm_submit_button', 'FrmFormsHelper::submit_button_label', 1 );
@@ -402,7 +402,7 @@ 
 			$html = str_replace( '[button_label]', $replace_with, $html );
         }
 
-        $html = apply_filters('frm_form_replace_shortcodes', $html, $form, $values);
+        $html = apply_filters( 'frm_form_replace_shortcodes', $html, $form, $values );
 
 		if ( strpos( $html, '[if back_button]' ) ) {
 			$html = preg_replace( '/(\[if\s+back_button\])(.*?)(\[\/if\s+back_button\])/mis', '', $html );
@@ -420,7 +420,7 @@ 
     }
 
 	public static function submit_button_label( $submit ) {
-        if ( ! $submit || empty($submit) ) {
+        if ( ! $submit || empty( $submit ) ) {
             $frm_settings = FrmAppHelper::get_settings();
             $submit = $frm_settings->submit_value;
         }
@@ -429,11 +429,11 @@ 
     }
 
 	public static function get_form_style_class( $form = false ) {
-        $style = self::get_form_style($form);
+        $style = self::get_form_style( $form );
         $class = ' with_frm_style';
 
-        if ( empty($style) ) {
-            if ( FrmAppHelper::is_admin_page('formidable-entries') ) {
+        if ( empty( $style ) ) {
+            if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) ) {
                 return $class;
             } else {
                 return;
@@ -441,7 +441,7 @@ 
         }
 
         //If submit button needs to be inline or centered
-        if ( is_object($form) ) {
+        if ( is_object( $form ) ) {
 			$form = $form->options;
 		}
 
@@ -453,7 +453,7 @@ 
 			$class .= ' frm_center_submit';
 		}
 
-        $class = apply_filters('frm_add_form_style_class', $class, $style);
+        $class = apply_filters( 'frm_add_form_style_class', $class, $style );
 
         return $class;
     }
@@ -541,12 +541,12 @@ 
     }
 
 	public static function edit_form_link( $form_id ) {
-        if ( is_object($form_id) ) {
+        if ( is_object( $form_id ) ) {
             $form = $form_id;
             $name = $form->name;
             $form_id = $form->id;
         } else {
-            $name = FrmForm::getName($form_id);
+            $name = FrmForm::getName( $form_id );
         }
 
         if ( $form_id ) {
@@ -576,14 +576,14 @@ 
         );
 
         $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
-        $base_url = '?page=formidable&form_type='. $current_page .'&id='. $id;
+        $base_url = '?page=formidable&form_type=' . $current_page . '&id=' . $id;
         if ( 'trash' == $status ) {
-			$link = '<a href="'. esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][ $length ] . '</a>';
-        } else if ( current_user_can('frm_delete_forms') ) {
+			$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][$length] . '</a>';
+        } else if ( current_user_can( 'frm_delete_forms' ) ) {
             if ( EMPTY_TRASH_DAYS ) {
-				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][ $length ] . '</a>';
+				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][$length] . '</a>';
             } else {
-				$link = '<a href="' . esc_url( wp_nonce_url( $base_url .'&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][ $length ] . '</a>';
+				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][$length] . '</a>';
             }
         }
 
@@ -597,11 +597,11 @@ 
             'publish'   => __( 'Published', 'formidable' ),
         );
 
-        if ( ! in_array($status, array_keys($nice_names)) ) {
+        if ( ! in_array( $status, array_keys( $nice_names ) ) ) {
             $status = 'publish';
         }
 
-		$name = $nice_names[ $status ];
+		$name = $nice_names[$status];
 
         return $name;
     }

classes/helpers/FrmFormsListHelper.php

Spacing +43 added lines, -43 removed lines

@@ -26,7 +26,7 @@ 
 		$page = $this->get_pagenum();
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_per_page' );
 
-		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : (( $page - 1 ) * $per_page);
+		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : ( ( $page - 1 ) * $per_page );
 
         $s_query = array();
         $s_query[] = array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 1 );
@@ -48,19 +48,19 @@ 
 		        break;
 		}
 
-        $s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+        $s = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
 	    if ( $s != '' ) {
-	        preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
-		    $search_terms = array_map('trim', $matches[0]);
+	        preg_match_all( '/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches );
+		    $search_terms = array_map( 'trim', $matches[0] );
 	        foreach ( (array) $search_terms as $term ) {
                 $s_query[] = array(
                     'or'    => true, 'name LIKE' => $term, 'description LIKE' => $term, 'created_at LIKE' => $term,
                 );
-	            unset($term);
+	            unset( $term );
             }
 	    }
 
-        $this->items = FrmForm::getAll($s_query, $orderby .' '. $order, $start .','. $per_page);
+        $this->items = FrmForm::getAll( $s_query, $orderby . ' ' . $order, $start . ',' . $per_page );
         $total_items = FrmDb::get_count( 'frm_forms', $s_query );
 
 		$this->set_pagination_args( array(
@@ -73,8 +73,8 @@ 
 	    if ( 'template' == $this->status ) {
             _e( 'No Templates Found.', 'formidable' ) ?>
             <br/><br/><?php _e( 'To add a new template:', 'formidable' ) ?>
-            <ol><li><?php printf( __( 'Create a new %1$sform%2$s.', 'formidable' ), '<a href="'. esc_url( admin_url( 'admin?page=formidable&frm_action=new' ) ) . '"', '</a>' ) ?></li>
-                <li><?php printf(__( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>') ?></li>
+            <ol><li><?php printf( __( 'Create a new %1$sform%2$s.', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin?page=formidable&frm_action=new' ) ) . '"', '</a>' ) ?></li>
+                <li><?php printf( __( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>' ) ?></li>
                 <li><?php _e( 'Place your mouse over the name of the form you just created, and click the "Create Template" link.', 'formidable' ) ?></li>
             </ol>
 <?php   } else {
@@ -91,17 +91,17 @@ 
 	    }
 
 	    if ( 'trash' == $this->status ) {
-	        if ( current_user_can('frm_edit_forms') ) {
+	        if ( current_user_can( 'frm_edit_forms' ) ) {
 	            $actions['bulk_untrash'] = __( 'Restore', 'formidable' );
 	        }
 
-	        if ( current_user_can('frm_delete_forms') ) {
+	        if ( current_user_can( 'frm_delete_forms' ) ) {
 	            $actions['bulk_delete'] = __( 'Delete Permanently', 'formidable' );
 	        }
-	    } else if ( EMPTY_TRASH_DAYS && current_user_can('frm_delete_forms') ) {
+	    } else if ( EMPTY_TRASH_DAYS && current_user_can( 'frm_delete_forms' ) ) {
 	        $actions['bulk_trash'] = __( 'Move to Trash', 'formidable' );
-	    } else if ( current_user_can('frm_delete_forms') ) {
-	        $actions['bulk_delete'] = __( 'Delete');
+	    } else if ( current_user_can( 'frm_delete_forms' ) ) {
+	        $actions['bulk_delete'] = __( 'Delete' );
 	    }
 
         return $actions;
@@ -112,7 +112,7 @@ 
             return;
         }
 
-        if ( 'trash' == $this->status && current_user_can('frm_delete_forms') ) {
+        if ( 'trash' == $this->status && current_user_can( 'frm_delete_forms' ) ) {
 ?>
             <div class="alignleft actions frm_visible_overflow">
 			<?php submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false ); ?>
@@ -128,7 +128,7 @@ 
 		$where = apply_filters( 'frm_forms_dropdown', array(), '' );
 		$forms = FrmForm::get_published_forms( $where );
 
-        $base = admin_url('admin.php?page=formidable&form_type=template');
+        $base = admin_url( 'admin.php?page=formidable&form_type=template' );
         $args = array(
             'frm_action'    => 'duplicate',
             'template'      => true,
@@ -148,7 +148,7 @@ 
 		        $args['id'] = $form->id; ?>
 			<li><a href="<?php echo esc_url( add_query_arg( $args, $base ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 33 ) ); ?></a></li>
 			<?php
-			    unset($form);
+			    unset( $form );
 			}
         }
         ?>
@@ -180,10 +180,10 @@ 
     		}
 
     		if ( $counts->{$status} || 'published' == $status ) {
-				$links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
+				$links[$status] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
 		    }
 
-		    unset($status, $name);
+		    unset( $status, $name );
 	    }
 
 		return $links;
@@ -204,10 +204,10 @@ 
 
 		// Set up the hover actions for this user
 		$actions = array();
-        $edit_link = '?page=formidable&frm_action=edit&id='. $item->id;
-	    $duplicate_link = '?page=formidable&frm_action=duplicate&id='. $item->id;
+        $edit_link = '?page=formidable&frm_action=edit&id=' . $item->id;
+	    $duplicate_link = '?page=formidable&frm_action=duplicate&id=' . $item->id;
 
-        $this->get_actions($actions, $item, $edit_link, $duplicate_link);
+        $this->get_actions( $actions, $item, $edit_link, $duplicate_link );
 
         $action_links = $this->row_actions( $actions );
 
@@ -224,7 +224,7 @@ 
 		}
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-            $class = $column_name .' column-'. $column_name . ( ('name' == $column_name) ? ' post-title page-title column-title' : '' );
+            $class = $column_name . ' column-' . $column_name . ( ( 'name' == $column_name ) ? ' post-title page-title column-title' : '' );
 
 			$style = '';
 			if ( in_array( $column_name, $hidden ) ) {
@@ -237,7 +237,7 @@ 
 
 			switch ( $column_name ) {
 				case 'cb':
-					$r .= '<th scope="row" class="check-column">'. $checkbox .'</th>';
+					$r .= '<th scope="row" class="check-column">' . $checkbox . '</th>';
 					break;
 				case 'id':
 				case 'form_key':
@@ -249,22 +249,22 @@ 
 
 				    break;
 				case 'created_at':
-				    $date = date($format, strtotime($item->created_at));
+				    $date = date( $format, strtotime( $item->created_at ) );
 					$val = '<abbr title="' . esc_attr( date( 'Y/m/d g:i:s A', strtotime( $item->created_at ) ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'shortcode':
-					$val = '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable id=' . $item->id .']' ) . '" /><br/>';
+					$val = '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable id=' . $item->id . ']' ) . '" /><br/>';
 				    if ( 'excerpt' == $mode ) {
 						$val .= '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable key=' . $item->form_key . ']' ) . '" />';
 				    }
 			        break;
 			    case 'entries':
 					if ( isset( $item->options['no_save'] ) && $item->options['no_save'] ) {
-			            $val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="'. esc_attr('Entries are not being saved', 'formidable' ) .'"></i>';
+			            $val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="' . esc_attr( 'Entries are not being saved', 'formidable' ) . '"></i>';
 			        } else {
-			            $text = FrmEntry::getRecordCount($item->id);
-                        $val = (current_user_can('frm_view_entries')) ? '<a href="'. esc_url(admin_url('admin.php') .'?page=formidable-entries&form='. $item->id ) .'">'. $text .'</a>' : $text;
-                        unset($text);
+			            $text = FrmEntry::getRecordCount( $item->id );
+                        $val = ( current_user_can( 'frm_view_entries' ) ) ? '<a href="' . esc_url( admin_url( 'admin.php' ) . '?page=formidable-entries&form=' . $item->id ) . '">' . $text . '</a>' : $text;
+                        unset( $text );
                     }
 			        break;
                 case 'type':
@@ -272,12 +272,12 @@ 
                     break;
 			}
 
-			if ( isset($val) ) {
+			if ( isset( $val ) ) {
 			    $r .= "<td $attributes>";
 			    $r .= $val;
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -290,25 +290,25 @@ 
      */
     private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
 		if ( 'trash' == $this->status ) {
-			if ( current_user_can('frm_edit_forms') ) {
+			if ( current_user_can( 'frm_edit_forms' ) ) {
 				$actions['restore'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 			}
 
-		    if ( current_user_can('frm_delete_forms') ) {
-    		    $actions['trash'] = '<a href="' . esc_url(wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id='. $item->id, 'destroy_form_'. $item->id )) .'" class="submitdelete"  onclick="return confirm(\''. __( 'Are you sure you want to permanently delete that?', 'formidable' ) .'\')">' . __( 'Delete Permanently' ) . '</a>';
+		    if ( current_user_can( 'frm_delete_forms' ) ) {
+    		    $actions['trash'] = '<a href="' . esc_url( wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id=' . $item->id, 'destroy_form_' . $item->id ) ) . '" class="submitdelete"  onclick="return confirm(\'' . __( 'Are you sure you want to permanently delete that?', 'formidable' ) . '\')">' . __( 'Delete Permanently' ) . '</a>';
     		}
             return;
 		}
 
-		if ( current_user_can('frm_edit_forms') ) {
+		if ( current_user_can( 'frm_edit_forms' ) ) {
             if ( ! $item->is_template || ! $item->default_template ) {
-		        $actions['frm_edit'] = '<a href="'. esc_url( $edit_link ) . '">'. __( 'Edit') .'</a>';
+		        $actions['frm_edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit' ) . '</a>';
             }
 
 		    if ( $item->is_template ) {
-				$actions['frm_duplicate'] = '<a href="'. esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Create Form from Template', 'formidable' ) . '</a>';
+				$actions['frm_duplicate'] = '<a href="' . esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Create Form from Template', 'formidable' ) . '</a>';
             } else {
-    		    $actions['frm_settings'] = '<a href="'. esc_url('?page=formidable&frm_action=settings&id='. $item->id ) . '">'. __( 'Settings', 'formidable' ) .'</a>';
+    		    $actions['frm_settings'] = '<a href="' . esc_url( '?page=formidable&frm_action=settings&id=' . $item->id ) . '">' . __( 'Settings', 'formidable' ) . '</a>';
 
     		    if ( FrmAppHelper::pro_is_installed() ) {
 					$actions['duplicate'] = '<a href="' . esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Duplicate', 'formidable' ) . '</a>';
@@ -322,7 +322,7 @@ 
 			unset( $actions['trash'] );
 		}
 
-		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview') . '</a>';
+		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview' ) . '</a>';
     }
 
     /**
@@ -330,8 +330,8 @@ 
      */
 	private function get_form_name( $item, $actions, $edit_link, $mode = 'list' ) {
         $form_name = $item->name;
-        if ( trim($form_name) == '' ) {
-            $form_name = __( '(no title)');
+        if ( trim( $form_name ) == '' ) {
+            $form_name = __( '(no title)' );
         }
 		$form_name = FrmAppHelper::kses( $form_name );
 		if ( 'excerpt' != $mode ) {
@@ -358,7 +358,7 @@ 
      */
     private function add_draft_label( $item, &$val ) {
         if ( 'draft' == $item->status && 'draft' != $this->status ) {
-            $val .= ' - <span class="post-state">'. __( 'Draft', 'formidable' ) .'</span>';
+            $val .= ' - <span class="post-state">' . __( 'Draft', 'formidable' ) . '</span>';
         }
     }
 
@@ -368,7 +368,7 @@ 
     private function add_form_description( $item, &$val ) {
         global $mode;
         if ( 'excerpt' == $mode ) {
-            $val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
+            $val .= FrmAppHelper::truncate( strip_tags( $item->description ), 50 );
         }
     }
 }

classes/helpers/FrmStylesHelper.php

Spacing +27 added lines, -27 removed lines

@@ -29,7 +29,7 @@ 
             'swanky-purse'  => 'Swanky Purse',
         );
 
-        $themes = apply_filters('frm_jquery_themes', $themes);
+        $themes = apply_filters( 'frm_jquery_themes', $themes );
         return $themes;
     }
 
@@ -40,15 +40,15 @@ 
 
         if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
             $css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
-        } else if ( preg_match('/^http.?:\/\/.*\..*$/', $theme_css) ) {
+        } else if ( preg_match( '/^http.?:\/\/.*\..*$/', $theme_css ) ) {
             $css_file = $theme_css;
         } else {
             $uploads = self::get_upload_base();
-            $file_path = '/formidable/css/'. $theme_css . '/jquery-ui.css';
-            if ( file_exists($uploads['basedir'] . $file_path) ) {
+            $file_path = '/formidable/css/' . $theme_css . '/jquery-ui.css';
+            if ( file_exists( $uploads['basedir'] . $file_path ) ) {
                 $css_file = $uploads['baseurl'] . $file_path;
             } else {
-                $css_file = FrmAppHelper::jquery_ui_base_url() .'/themes/'. $theme_css . '/jquery-ui.min.css';
+                $css_file = FrmAppHelper::jquery_ui_base_url() . '/themes/' . $theme_css . '/jquery-ui.min.css';
             }
         }
 
@@ -59,7 +59,7 @@ 
 		$form = self::get_form_for_page();
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
         if ( $theme_css != -1 ) {
-            wp_enqueue_style('jquery-theme', self::jquery_css_url($theme_css), array(), FrmAppHelper::plugin_version());
+            wp_enqueue_style( 'jquery-theme', self::jquery_css_url( $theme_css ), array(), FrmAppHelper::plugin_version() );
         }
     }
 
@@ -79,8 +79,8 @@ 
 
     public static function get_upload_base() {
         $uploads = wp_upload_dir();
-        if ( is_ssl() && ! preg_match('/^https:\/\/.*\..*$/', $uploads['baseurl']) ) {
-            $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
+        if ( is_ssl() && ! preg_match( '/^https:\/\/.*\..*$/', $uploads['baseurl'] ) ) {
+            $uploads['baseurl'] = str_replace( 'http://', 'https://', $uploads['baseurl'] );
         }
 
         return $uploads;
@@ -91,7 +91,7 @@ 
         <h2 class="nav-tab-wrapper">
 			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles' ) ) ?>" class="nav-tab <?php echo ( '' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Edit Styles', 'formidable' ) ?></a>
 			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=manage' ) ) ?>" class="nav-tab <?php echo ( 'manage' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Manage Form Styles', 'formidable' ) ?></a>
-			<a href="<?php echo esc_url( admin_url('admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
         </h2>
 <?php
     }
@@ -130,15 +130,15 @@ 
      * @return The class for this icon
      */
 	public static function icon_key_to_class( $key, $icon = '+', $type = 'arrow' ) {
-        if ( 'arrow' == $type && is_numeric($key) ) {
+        if ( 'arrow' == $type && is_numeric( $key ) ) {
             //frm_arrowup6_icon
 			$arrow = array( '-' => 'down', '+' => 'up' );
-			$class = 'frm_arrow' . $arrow[ $icon ];
+			$class = 'frm_arrow' . $arrow[$icon];
         } else {
             //frm_minus1_icon
-            $key = str_replace('p', '', $key);
+            $key = str_replace( 'p', '', $key );
 			$plus = array( '-' => 'minus', '+' => 'plus' );
-			$class = 'frm_' . $plus[ $icon ];
+			$class = 'frm_' . $plus[$icon];
         }
 
         if ( $key ) {
@@ -156,18 +156,18 @@ 
 
         $name = ( 'arrow' == $type ) ? 'collapse_icon' : 'repeat_icon';
 ?>
-    	<select name="<?php echo esc_attr( $frm_style->get_field_name($name) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
+    	<select name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
             <?php foreach ( $icons as $key => $icon ) { ?>
-			<option value="<?php echo esc_attr( $key ) ?>" <?php selected( $style->post_content[ $name ], $key ) ?>>
-                <?php echo '&#xe'. $icon['+'] .'; &#xe'. $icon['-'] .';'; ?>
+			<option value="<?php echo esc_attr( $key ) ?>" <?php selected( $style->post_content[$name], $key ) ?>>
+                <?php echo '&#xe' . $icon['+'] . '; &#xe' . $icon['-'] . ';'; ?>
             </option>
             <?php } ?>
     	</select>
 
         <div class="btn-group hide-if-no-js" id="frm_<?php echo esc_attr( $name ) ?>_select">
             <button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
-				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ) ?>"></i>
-				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ) ?>"></i>
+				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[$name], '+', $type ) ) ?>"></i>
+				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[$name], '-', $type ) ) ?>"></i>
                 <b class="caret"></b>
             </button>
             <ul class="multiselect-container frm-dropdown-menu">
@@ -190,19 +190,19 @@ 
     }
 
 	public static function hex2rgb( $hex ) {
-        $hex = str_replace('#', '', $hex);
+        $hex = str_replace( '#', '', $hex );
 
-        if ( strlen($hex) == 3 ) {
-            $r = hexdec( substr($hex,0,1).substr($hex,0,1) );
-            $g = hexdec( substr($hex,1,1).substr($hex,1,1) );
-            $b = hexdec( substr($hex,2,1).substr($hex,2,1) );
+        if ( strlen( $hex ) == 3 ) {
+            $r = hexdec( substr( $hex, 0, 1 ) . substr( $hex, 0, 1 ) );
+            $g = hexdec( substr( $hex, 1, 1 ) . substr( $hex, 1, 1 ) );
+            $b = hexdec( substr( $hex, 2, 1 ) . substr( $hex, 2, 1 ) );
         } else {
-            $r = hexdec( substr($hex,0,2) );
-            $g = hexdec( substr($hex,2,2) );
-            $b = hexdec( substr($hex,4,2) );
+            $r = hexdec( substr( $hex, 0, 2 ) );
+            $g = hexdec( substr( $hex, 2, 2 ) );
+            $b = hexdec( substr( $hex, 4, 2 ) );
         }
 		$rgb = array( $r, $g, $b );
-        return implode(',', $rgb); // returns the rgb values separated by commas
+        return implode( ',', $rgb ); // returns the rgb values separated by commas
         //return $rgb; // returns an array with the rgb values
     }
 }

classes/models/FrmDb.php

Spacing +71 added lines, -71 removed lines

@@ -7,8 +7,8 @@ 
     var $entry_metas;
 
     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.' );
         }
 
         global $wpdb;
@@ -24,7 +24,7 @@ 
         $frm_db_version = FrmAppHelper::$db_version;
         $old_db_version = (float) $old_db_version;
         if ( ! $old_db_version ) {
-            $old_db_version = get_option('frm_db_version');
+            $old_db_version = get_option( 'frm_db_version' );
         }
 
         if ( $frm_db_version != $old_db_version ) {
@@ -34,16 +34,16 @@ 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
             $this->create_tables();
-            $this->migrate_data($frm_db_version, $old_db_version);
+            $this->migrate_data( $frm_db_version, $old_db_version );
 
             /***** SAVE DB VERSION *****/
-            update_option('frm_db_version', $frm_db_version);
+            update_option( 'frm_db_version', $frm_db_version );
 
             /**** ADD/UPDATE DEFAULT TEMPLATES ****/
             FrmXMLController::add_default_templates();
         }
 
-        do_action('frm_after_install');
+        do_action( 'frm_after_install' );
 
         /**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
@@ -60,11 +60,11 @@ 
 
         $charset_collate = '';
 		if ( ! empty( $wpdb->charset ) ) {
-			$charset_collate .= ' DEFAULT CHARACTER SET '. $wpdb->charset;
+			$charset_collate .= ' DEFAULT CHARACTER SET ' . $wpdb->charset;
 		}
 
-        if ( ! empty($wpdb->collate) ) {
-            $charset_collate .= ' COLLATE '. $wpdb->collate;
+        if ( ! empty( $wpdb->collate ) ) {
+            $charset_collate .= ' COLLATE ' . $wpdb->collate;
         }
 
         return $charset_collate;
@@ -75,7 +75,7 @@ 
         $sql = array();
 
         /* Create/Upgrade Fields Table */
-        $sql[] = 'CREATE TABLE '. $this->fields .' (
+        $sql[] = 'CREATE TABLE ' . $this->fields . ' (
                 id int(11) NOT NULL auto_increment,
 				field_key varchar(100) default NULL,
                 name text default NULL,
@@ -94,7 +94,7 @@ 
         )';
 
         /* Create/Upgrade Forms Table */
-        $sql[] = 'CREATE TABLE '. $this->forms .' (
+        $sql[] = 'CREATE TABLE ' . $this->forms . ' (
                 id int(11) NOT NULL auto_increment,
 				form_key varchar(100) default NULL,
                 name varchar(255) default NULL,
@@ -112,7 +112,7 @@ 
         )';
 
         /* Create/Upgrade Items Table */
-        $sql[] = 'CREATE TABLE '. $this->entries .' (
+        $sql[] = 'CREATE TABLE ' . $this->entries . ' (
                 id int(11) NOT NULL auto_increment,
 				item_key varchar(100) default NULL,
                 name varchar(255) default NULL,
@@ -135,7 +135,7 @@ 
         )';
 
         /* Create/Upgrade Meta Table */
-        $sql[] = 'CREATE TABLE '. $this->entry_metas .' (
+        $sql[] = 'CREATE TABLE ' . $this->entry_metas . ' (
                 id int(11) NOT NULL auto_increment,
                 meta_value longtext default NULL,
                 field_id int(11) NOT NULL,
@@ -148,12 +148,12 @@ 
 
         foreach ( $sql as $q ) {
 			if ( function_exists( 'dbDelta' ) ) {
-				dbDelta( $q . $charset_collate .';' );
+				dbDelta( $q . $charset_collate . ';' );
 			} else {
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
+            unset( $q );
         }
     }
 
@@ -164,7 +164,7 @@ 
 		$migrations = array( 4, 6, 11, 16, 17, 23, 25 );
         foreach ( $migrations as $migration ) {
             if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
-                $function_name = 'migrate_to_'. $migration;
+                $function_name = 'migrate_to_' . $migration;
                 $this->$function_name();
             }
         }
@@ -174,7 +174,7 @@ 
      * Change array into format $wpdb->prepare can use
      */
     public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+        if ( empty( $args ) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
@@ -230,12 +230,12 @@ 
     private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
-        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
-            $k = explode(' ', $key);
+        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
+            $k = explode( ' ', $key );
             $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
             $values[] = '%Y-%m-%d %H:%i:%s';
         } else {
-            $where .= ' '. $key;
+            $where .= ' ' . $key;
         }
 
 		$lowercase_key = explode( ' ', strtolower( $key ) );
@@ -257,7 +257,7 @@ 
 				}
 				$where .= ')';
 			} else if ( ! empty( $value ) ) {
-            	$where .= ' in ('. FrmAppHelper::prepare_array_values( $value, '%s' ) .')';
+            	$where .= ' in (' . FrmAppHelper::prepare_array_values( $value, '%s' ) . ')';
 				$values = array_merge( $values, $value );
 			}
         } else if ( strpos( $lowercase_key, 'like' ) !== false ) {
@@ -322,8 +322,8 @@ 
 			$query .= $where . ' ' . implode( ' ', $args );
 		}
 
-        $cache_key = str_replace( array( ' ', ',' ), '_', trim( implode('_', FrmAppHelper::array_flatten( $where ) ) . implode( '_', $args ) . $field .'_'. $type, ' WHERE' ) );
-        $results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_'. $type );
+        $cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . implode( '_', $args ) . $field . '_' . $type, ' WHERE' ) );
+        $results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_' . $type );
         return $results;
     }
 
@@ -354,7 +354,7 @@ 
 
     public static function get_records( $table, $args = array(), $order_by = '', $limit = '', $fields = '*' ) {
         _deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_results' );
-        return self::get_results( $table, $args, $fields, compact('order_by', 'limit') );
+        return self::get_results( $table, $args, $fields, compact( 'order_by', 'limit' ) );
     }
 
     /**
@@ -387,8 +387,8 @@ 
 		);
 
 		$where_is = strtolower( $where_is );
-		if ( isset( $switch_to[ $where_is ] ) ) {
-			return ' ' . $switch_to[ $where_is ];
+		if ( isset( $switch_to[$where_is] ) ) {
+			return ' ' . $switch_to[$where_is];
 		}
 
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -410,8 +410,8 @@ 
     private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
+        $table_parts = explode( ' ', $table );
+        $group = reset( $table_parts );
         $group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
@@ -426,7 +426,7 @@ 
     }
 
     private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+        if ( ! is_array( $args ) ) {
 			$args = array( 'order_by' => $args );
         }
 
@@ -441,16 +441,16 @@ 
         $temp_args = $args;
         foreach ( $temp_args as $k => $v ) {
             if ( $v == '' ) {
-				unset( $args[ $k ] );
+				unset( $args[$k] );
                 continue;
             }
 
             if ( $k == 'limit' ) {
-				$args[ $k ] = FrmAppHelper::esc_limit( $v );
+				$args[$k] = FrmAppHelper::esc_limit( $v );
             }
             $db_name = strtoupper( str_replace( '_', ' ', $k ) );
             if ( strpos( $v, $db_name ) === false ) {
-				$args[ $k ] = $db_name . ' ' . $v;
+				$args[$k] = $db_name . ' ' . $v;
             }
         }
     }
@@ -458,18 +458,18 @@ 
     public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
             $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
+            wp_die( $frm_settings->admin_permission );
         }
 
         global $wpdb, $wp_roles;
 
-        $wpdb->query( 'DROP TABLE IF EXISTS '. $this->fields );
-        $wpdb->query( 'DROP TABLE IF EXISTS '. $this->forms );
-        $wpdb->query( 'DROP TABLE IF EXISTS '. $this->entries );
-        $wpdb->query( 'DROP TABLE IF EXISTS '. $this->entry_metas );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $this->fields );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $this->forms );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+        delete_option( 'frm_options' );
+        delete_option( 'frm_db_version' );
 
         //delete roles
         $frm_roles = FrmAppHelper::frm_capabilities();
@@ -477,11 +477,11 @@ 
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
             foreach ( $roles as $role => $details ) {
                 $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
+                unset( $role, $details );
     		}
-    		unset($frm_role, $frm_role_description);
+    		unset( $frm_role, $frm_role_description );
 		}
-		unset($roles, $frm_roles);
+		unset( $roles, $frm_roles );
 
 		// delete actions, views, and styles
 
@@ -489,7 +489,7 @@ 
 		remove_action( 'before_delete_post', 'FrmProDisplaysController::before_delete_post' );
 		remove_action( 'deleted_post', 'FrmProEntriesController::delete_entry' );
 
-		$post_ids = $wpdb->get_col( $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts .' WHERE post_type in (%s, %s, %s)', FrmFormActionsController::$action_post_type, FrmStylesController::$post_type, 'frm_display' ) );
+		$post_ids = $wpdb->get_col( $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type in (%s, %s, %s)', FrmFormActionsController::$action_post_type, FrmStylesController::$post_type, 'frm_display' ) );
 		foreach ( $post_ids as $post_id ) {
 			// Delete's each post.
 			wp_delete_post( $post_id, true );
@@ -501,9 +501,9 @@ 
 		delete_transient( 'frm_options' );
 		delete_transient( 'frmpro_options' );
 
-		$wpdb->query( $wpdb->prepare( 'DELETE FROM '. $wpdb->options .' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
+		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
+        do_action( 'frm_after_uninstall' );
         return true;
     }
 
@@ -538,9 +538,9 @@ 
 	 */
 	private function migrate_to_23() {
 		global $wpdb;
-		$exists = $wpdb->get_row( 'SHOW COLUMNS FROM '. $this->forms .' LIKE "parent_form_id"' );
+		$exists = $wpdb->get_row( 'SHOW COLUMNS FROM ' . $this->forms . ' LIKE "parent_form_id"' );
 		if ( empty( $exists ) ) {
-			$wpdb->query( 'ALTER TABLE '. $this->forms .' ADD parent_form_id int(11) default 0' );
+			$wpdb->query( 'ALTER TABLE ' . $this->forms . ' ADD parent_form_id int(11) default 0' );
 		}
 	}
 
@@ -560,8 +560,8 @@ 
 
         $updated = 0;
         foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+            $f->field_options = maybe_unserialize( $f->field_options );
+            if ( empty( $f->field_options['size'] ) || ! is_numeric( $f->field_options['size'] ) ) {
                 continue;
             }
 
@@ -569,27 +569,27 @@ 
             $f->field_options['size'] .= 'px';
             $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
             if ( $u ) {
-                $updated++;
+                $updated ++;
             }
-            unset($f);
+            unset( $f );
         }
 
         // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
+        $widgets = get_option( 'widget_frm_show_form' );
+        if ( empty( $widgets ) ) {
             return;
         }
 
-        $widgets = maybe_unserialize($widgets);
+        $widgets = maybe_unserialize( $widgets );
         foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
+            if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) {
                 continue;
             }
 			$size = round( $pixel_conversion * (int) $widget['size'] );
             $size .= 'px';
-			$widgets[ $k ]['size'] = $size;
+			$widgets[$k]['size'] = $size;
         }
-        update_option('widget_frm_show_form', $widgets);
+        update_option( 'widget_frm_show_form', $widgets );
     }
 
     /**
@@ -638,7 +638,7 @@ 
 			}
 
             // Format form options
-            $form_options = maybe_unserialize($form->options);
+            $form_options = maybe_unserialize( $form->options );
 
             // Migrate settings to actions
             FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
@@ -648,10 +648,10 @@ 
     private function migrate_to_11() {
         global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+        $forms = FrmDb::get_results( $this->forms, array(), 'id, options' );
 
         $sending = __( 'Sending', 'formidable' );
-        $img = FrmAppHelper::plugin_url() .'/images/ajax_loader.gif';
+        $img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
         $old_default_html = <<<DEFAULT_HTML
 <div class="frm_submit">
 [if back_button]<input type="submit" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" [back_hook] />[/if back_button]
@@ -659,13 +659,13 @@ 
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+        unset( $sending, $img );
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
+        $new_default_html = FrmFormsHelper::get_default_html( 'submit' );
         $draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+            $form->options = maybe_unserialize( $form->options );
+            if ( ! isset( $form->options['submit_html'] ) || empty( $form->options['submit_html'] ) ) {
                 continue;
             }
 
@@ -673,12 +673,12 @@ 
                 $form->options['submit_html'] = $new_default_html;
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
 			} else if ( ! strpos( $form->options['submit_html'], 'save_draft' ) ) {
-                $form->options['submit_html'] = preg_replace('~\<\/div\>(?!.*\<\/div\>)~', $draft_link ."\r\n</div>", $form->options['submit_html']);
+                $form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
             }
-            unset($form);
+            unset( $form );
         }
-        unset($forms);
+        unset( $forms );
     }
 
     private function migrate_to_6() {
@@ -707,16 +707,16 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
+        $new_default_html = FrmFieldsHelper::get_default_html( 'text' );
         foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+            $field->field_options = maybe_unserialize( $field->field_options );
 			if ( ! FrmField::is_option_empty( $field, 'custom_html' ) || $field->field_options['custom_html'] == $default_html || $field->field_options['custom_html'] == $old_default_html ) {
                 $field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
             }
-            unset($field);
+            unset( $field );
         }
-        unset($default_html, $old_default_html, $fields);
+        unset( $default_html, $old_default_html, $fields );
     }
 
     private function migrate_to_4() {