Strategy11 / formidable-forms

classes/views/styles/_form-title.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('title_size') ) ?>" id="frm_title_size" value="<?php echo esc_attr( $style->post_content['title_size'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'title_size' ) ) ?>" id="frm_title_size" value="<?php echo esc_attr( $style->post_content['title_size'] ) ?>" />
 </div>
 
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('title_color') ) ?>" id="frm_title_color" class="hex" value="<?php echo esc_attr( $style->post_content['title_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'title_color' ) ) ?>" id="frm_title_color" class="hex" value="<?php echo esc_attr( $style->post_content['title_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-half">
 	<label><?php _e( 'Margin Top', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('title_margin_top') ) ?>" id="frm_title_margin_top" value="<?php echo esc_attr( $style->post_content['title_margin_top'] ) ?>" size="4" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'title_margin_top' ) ) ?>" id="frm_title_margin_top" value="<?php echo esc_attr( $style->post_content['title_margin_top'] ) ?>" size="4" />
 </div>
 <div class="field-group clearfix frm-half">
     <label><?php _e( 'Margin Bottom', 'formidable' ) ?></label>
-    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('title_margin_bottom') ) ?>" id="frm_title_margin_bottom" value="<?php echo esc_attr( $style->post_content['title_margin_bottom'] ) ?>" size="4" />
+    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'title_margin_bottom' ) ) ?>" id="frm_title_margin_bottom" value="<?php echo esc_attr( $style->post_content['title_margin_bottom'] ) ?>" size="4" />
 </div>

classes/helpers/FrmTipsHelper.php

Spacing +2 added lines, -2 removed lines

@@ -181,13 +181,13 @@
 			),
 		);
 		$random = rand( 0, count( $tips ) - 1 );
-		$tip = $tips[ $random ];
+		$tip = $tips[$random];
 		$tip['num'] = $random;
 		return $tip;
 	}
 
 	public static function get_random_tip( $tips ) {
 		$random = rand( 0, count( $tips ) - 1 );
-		return $tips[ $random ];
+		return $tips[$random];
 	}
 }

classes/controllers/FrmFormsController.php

Spacing +121 added lines, -121 removed lines

@@ -7,7 +7,7 @@ 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
 		}
-		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
+		add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
     }
@@ -18,14 +18,14 @@ 
 			return;
 		}
 
-		add_filter('get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
+		add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
 
-		add_filter('manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
-		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
+		add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
+		add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
     public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+        wp_enqueue_script( 'formidable-editinplace' );
 
         if ( wp_is_mobile() ) {
     		wp_enqueue_script( 'jquery-touch-punch' );
@@ -33,39 +33,39 @@ 
     }
 
     public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
+        require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
+        register_widget( 'FrmShowForm' );
     }
 
     public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+        FrmAppHelper::permission_check( 'frm_view_forms' );
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+        $errors = self::process_bulk_form_actions( array() );
+        $errors = apply_filters( 'frm_admin_list_form_action', $errors );
 
 		return self::display_forms_list( $params, '', $errors );
     }
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[$action];
 
 		if ( $action == 'create' ) {
-            return self::create($values);
+            return self::create( $values );
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
+            $values = FrmFormsHelper::setup_new_vars( $values );
             $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+            $form = FrmForm::getOne( $id );
 
             // add default email notification
             $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->create($form->id);
+            $action_control->create( $form->id );
 
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
@@ -75,7 +75,7 @@ 
     }
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
         if ( empty( $values ) ) {
@@ -87,22 +87,22 @@ 
             $values = FrmProEntry::mod_other_vals( $values, 'back' );
         }
 
-		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
+		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
         if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
             $frm_settings = FrmAppHelper::get_settings();
             $errors = array( 'form' => $frm_settings->admin_permission );
         } else {
-            $errors = FrmForm::validate($values);
+            $errors = FrmForm::validate( $values );
         }
 
-        if ( count($errors) > 0 ) {
+        if ( count( $errors ) > 0 ) {
             $hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
             $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+            $fields = FrmField::get_all_for_form( $id );
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+            $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -114,32 +114,32 @@ 
     }
 
     public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
+        return self::get_edit_vars( $id );
     }
 
     public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        if ( ! $id || ! is_numeric($id) ) {
+        if ( ! $id || ! is_numeric( $id ) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
         }
 		return self::get_settings_vars( $id, array(), $message );
     }
 
     public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
+        $errors = FrmForm::validate( $_POST );
+        if ( count( $errors ) > 0 ) {
+            return self::get_settings_vars( $id, $errors );
         }
 
-        do_action('frm_before_update_form_settings', $id);
+        do_action( 'frm_before_update_form_settings', $id );
 
 		FrmForm::update( $id, $_POST );
 
@@ -161,7 +161,7 @@ 
 
 	private static function edit_in_place_value( $field ) {
 		check_ajax_referer( 'frm_ajax', 'nonce' );
-		FrmAppHelper::permission_check('frm_edit_forms', 'hide');
+		FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
 
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_filter_post_kses' );
@@ -219,7 +219,7 @@ 
 	 * @since 2.0
 	 */
 	public static function _create_from_template() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
@@ -234,15 +234,15 @@ 
 	}
 
     public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$params = FrmForm::list_page_params();
         $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+        $message = ( $params['template'] ) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
         if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
         } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+            return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
         }
     }
 
@@ -304,11 +304,11 @@ 
     }
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         $count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+        $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
         return $message;
     }
 
@@ -327,11 +327,11 @@ 
 			'trash'   => array( 'permission' => 'frm_delete_forms', 'new_status' => 'trash' ),
 		);
 
-		if ( ! isset( $available_status[ $status ] ) ) {
+		if ( ! isset( $available_status[$status] ) ) {
 			return;
 		}
 
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
 
 		$params = FrmForm::list_page_params();
 
@@ -339,25 +339,25 @@ 
 		check_admin_referer( $status . '_form_' . $params['id'] );
 
 		$count = 0;
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
-			$count++;
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
+			$count ++;
 		}
 
-		$available_status['untrash']['message'] = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
+		$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
 		$available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . ( isset( $_REQUEST['form_type'] ) ? sanitize_title( $_REQUEST['form_type'] ) : '' ) . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
 
-		$message = $available_status[ $status ]['message'];
+		$message = $available_status[$status]['message'];
 
 		self::display_forms_list( $params, $message );
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             if ( FrmForm::trash( $id ) ) {
-                $count++;
+                $count ++;
             }
         }
 
@@ -368,49 +368,49 @@ 
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
 		$params = FrmForm::list_page_params();
 
         //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+        check_admin_referer( 'destroy_form_' . $params['id'] );
 
         $count = 0;
         if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
+            $count ++;
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( $params, $message );
     }
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             $d = FrmForm::destroy( $id );
             if ( $d ) {
-                $count++;
+                $count ++;
             }
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
         return $message;
     }
 
     private static function delete_all() {
         //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
         if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
             return;
         }
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( array(), $message );
     }
@@ -427,7 +427,7 @@ 
 	* @since 2.0.15
 	*/
 	public static function insert_form_button() {
-		if ( current_user_can('frm_view_forms') ) {
+		if ( current_user_can( 'frm_view_forms' ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
 			$content = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">
 				<span class="frm-buttons-icon wp-media-buttons-icon"></span> ' .
@@ -448,17 +448,17 @@ 
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
         );
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+        $shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
     }
 
     public static function get_shortcode_opts() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
+        if ( empty( $shortcode ) ) {
             wp_die();
         }
 
@@ -478,7 +478,7 @@ 
                 );
             break;
         }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+        $opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -595,11 +595,11 @@ 
         }
 
         if ( $form->parent_form_id ) {
-			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
+			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ) );
         }
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
 
         // Automatically add end section fields if they don't exist (2.0 migration)
         $reset_fields = false;
@@ -609,9 +609,9 @@ 
             $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
         }
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+        unset( $end_section_values, $last_order, $open, $reset_fields );
 
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 
         $edit_message = __( 'Form was Successfully Updated', 'formidable' );
         if ( $form->is_template && $message == $edit_message ) {
@@ -621,8 +621,8 @@ 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
         if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
+        } else if ( defined( 'DOING_AJAX' ) ) {
             wp_die();
         } else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -638,28 +638,28 @@ 
 
         $form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+        $fields = FrmField::get_all_for_form( $id );
+        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
+        if ( isset( $values['default_template'] ) && $values['default_template'] ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
         }
 
         $action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
+        $sections = apply_filters( 'frm_add_form_settings_section', array(), $values );
         $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+        $styles = apply_filters( 'frm_get_style_opts', array() );
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
     }
 
     public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
+        $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
         $linked_forms = array();
         $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+        $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -737,13 +737,13 @@ 
 
     // Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+        if ( isset( $form->options['form_class'] ) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
         }
     }
 
     public static function get_email_html() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
@@ -840,11 +840,11 @@ 
     public static function add_default_templates( $path, $default = true, $template = true ) {
         _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+        $path = untrailingslashit( trim( $path ) );
 		$templates = glob( $path . '/*.php' );
 
-		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
-			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
+		for ( $i = count( $templates ) - 1; $i >= 0; $i -- ) {
+			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[$i] ) );
 			$template_query = array( 'form_key' => $filename );
             if ( $template ) {
                 $template_query['is_template'] = 1;
@@ -862,12 +862,12 @@ 
                 $values['default_template'] = 1;
             }
 
-            include( $templates[ $i ] );
+            include( $templates[$i] );
 
             //get updated form
-            if ( isset($form) && ! empty($form) ) {
+            if ( isset( $form ) && ! empty( $form ) ) {
                 $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
+                $form = FrmForm::getOne( $form->id );
             } else {
                 $old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
@@ -880,24 +880,24 @@ 
     }
 
     public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
         $vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
+            $json_vars = htmlspecialchars_decode( nl2br( stripslashes( str_replace( '&quot;', '\\\"', $_POST['frm_compact_fields'] ) ) ) );
+            $json_vars = json_decode( $json_vars, true );
+            if ( empty( $json_vars ) ) {
                 // json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
                 if ( 'edit' == $action ) {
                     $action = 'update';
                 }
 
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
+                add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
             } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+                $vars = FrmAppHelper::json_to_array( $json_vars );
+                $action = $vars[$action];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
@@ -915,7 +915,7 @@ 
 
         switch ( $action ) {
             case 'new':
-                return self::new_form($vars);
+                return self::new_form( $vars );
             case 'create':
             case 'edit':
             case 'update':
@@ -938,7 +938,7 @@ 
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
                 }
 
-                if ( strpos($action, 'bulk_') === 0 ) {
+                if ( strpos( $action, 'bulk_' ) === 0 ) {
                     FrmAppHelper::remove_get_action();
                     return self::list_form();
                 }
@@ -965,27 +965,27 @@ 
 
 	public static function admin_bar_configure() {
         global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
+        if ( empty( $frm_vars['forms_loaded'] ) ) {
             return;
         }
 
         $actions = array();
         foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
+            if ( is_object( $form ) ) {
+                $actions[$form->id] = $form->name;
             }
-            unset($form);
+            unset( $form );
         }
 
-        if ( empty($actions) ) {
+        if ( empty( $actions ) ) {
             return;
         }
 
-        asort($actions);
+        asort( $actions );
 
         global $wp_admin_bar;
 
-        if ( count($actions) == 1 ) {
+        if ( count( $actions ) == 1 ) {
             $wp_admin_bar->add_menu( array(
                 'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
@@ -1006,7 +1006,7 @@ 
         		$wp_admin_bar->add_menu( array(
         			'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+        			'title'     => empty( $name ) ? __( '(no title)' ) : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
         		) );
         	}
@@ -1016,7 +1016,7 @@ 
     //formidable shortcode
 	public static function get_form_shortcode( $atts ) {
         global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+        if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
             $sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
@@ -1030,8 +1030,8 @@ 
             'id' => '', 'key' => '', 'title' => false, 'description' => false,
             'readonly' => false, 'entry_id' => false, 'fields' => array(),
             'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+        ), $atts );
+        do_action( 'formidable_shortcode_atts', $shortcode_atts, $atts );
 
         return self::show_form(
             $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
@@ -1119,51 +1119,51 @@ 
 
         $frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+        $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
         $user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
         $message = $errors = '';
 
         if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+            $errors = isset( $frm_vars['created_entries'][$form->id] ) ? $frm_vars['created_entries'][$form->id]['errors'] : array();
         }
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
         $fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
 
         if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+            do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
+            if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
+                $values = FrmEntriesHelper::setup_new_vars( $fields, $form );
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             }
             return;
         }
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+        if ( ! empty( $errors ) ) {
+            $values = $fields ? FrmEntriesHelper::setup_new_vars( $fields, $form ) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             return;
         }
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+        do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
+        if ( ! apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
             return;
         }
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
-        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
+        $values = FrmEntriesHelper::setup_new_vars( $fields, $form, true );
+        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form->id] ) ) ? $frm_vars['created_entries'][$form->id]['entry_id'] : 0;
+        $conf_method = apply_filters( 'frm_success_filter', 'message', $form, $form->options, 'create' );
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+        if ( $created && is_numeric( $created ) && $conf_method != 'message' ) {
+            do_action( 'frm_success_action', $conf_method, $form, $form->options, $created );
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
             return;
         }
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+        if ( $created && is_numeric( $created ) ) {
+            $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
             $class = 'frm_message';
         } else {
             $message = $frm_settings->failed_msg;
@@ -1174,9 +1174,9 @@ 
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+        $message = apply_filters( 'frm_main_feedback', $message, $form, $created );
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+        if ( ! isset( $form->options['show_form'] ) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
         } else {
             global $frm_vars;

Indentation +596 added lines, -596 removed lines

@@ -2,7 +2,7 @@ 
 
 class FrmFormsController {
 
-    public static function menu() {
+	public static function menu() {
 		$menu_label = __( 'Forms', 'formidable' );
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
@@ -10,7 +10,7 @@ 
 		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
-    }
+	}
 
 	public static function maybe_load_listing_hooks() {
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
@@ -24,128 +24,128 @@ 
 		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
-    public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+	public static function head() {
+		wp_enqueue_script('formidable-editinplace');
 
-        if ( wp_is_mobile() ) {
-    		wp_enqueue_script( 'jquery-touch-punch' );
-    	}
-    }
+		if ( wp_is_mobile() ) {
+			wp_enqueue_script( 'jquery-touch-punch' );
+		}
+	}
 
-    public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
-    }
+	public static function register_widgets() {
+		require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
+		register_widget('FrmShowForm');
+	}
 
-    public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+	public static function list_form() {
+		FrmAppHelper::permission_check('frm_view_forms');
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+		$errors = self::process_bulk_form_actions( array());
+		$errors = apply_filters('frm_admin_list_form_action', $errors);
 
 		return self::display_forms_list( $params, '', $errors );
-    }
+	}
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
 		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
 
 		if ( $action == 'create' ) {
-            return self::create($values);
+			return self::create($values);
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
-            $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+			$values = FrmFormsHelper::setup_new_vars($values);
+			$id = FrmForm::create( $values );
+			$form = FrmForm::getOne($id);
 
-            // add default email notification
-            $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->create($form->id);
+			// add default email notification
+			$action_control = FrmFormActionsController::get_form_actions( 'email' );
+			$action_control->create($form->id);
 
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-            $values['id'] = $id;
+			$values['id'] = $id;
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        }
-    }
+		}
+	}
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
-        if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+		global $frm_vars;
+		if ( empty( $values ) ) {
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
 		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $errors = array( 'form' => $frm_settings->admin_permission );
-        } else {
-            $errors = FrmForm::validate($values);
-        }
+		if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$errors = array( 'form' => $frm_settings->admin_permission );
+		} else {
+			$errors = FrmForm::validate($values);
+		}
 
-        if ( count($errors) > 0 ) {
-            $hide_preview = true;
+		if ( count($errors) > 0 ) {
+			$hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
-            $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+			$form = FrmForm::getOne( $id );
+			$fields = FrmField::get_all_for_form($id);
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+			$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
-            FrmForm::update( $id, $values, true );
+		} else {
+			FrmForm::update( $id, $values, true );
 			$url = admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . $id );
 			die( FrmAppHelper::js_redirect( $url ) );
-        }
-    }
+		}
+	}
 
-    public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function edit( $values = false ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
-    }
+		return self::get_edit_vars($id);
+	}
 
-    public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function settings( $id = false, $message = '' ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        if ( ! $id || ! is_numeric($id) ) {
+		if ( ! $id || ! is_numeric($id) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        }
+		}
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
-    public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function update_settings() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
-        }
+		$errors = FrmForm::validate($_POST);
+		if ( count($errors) > 0 ) {
+			return self::get_settings_vars($id, $errors);
+		}
 
-        do_action('frm_before_update_form_settings', $id);
+		do_action('frm_before_update_form_settings', $id);
 
 		FrmForm::update( $id, $_POST );
 
-        $message = __( 'Settings Successfully Updated', 'formidable' );
+		$message = __( 'Settings Successfully Updated', 'formidable' );
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
 	public static function edit_key() {
 		$values = self::edit_in_place_value( 'form_key' );
@@ -175,43 +175,43 @@ 
 
 	public static function update( $values = array() ) {
 		if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
-        $errors = FrmForm::validate( $values );
-        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
-        if ( $permission_error !== false ) {
-            $errors['form'] = $permission_error;
-        }
+		$errors = FrmForm::validate( $values );
+		$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
+		if ( $permission_error !== false ) {
+			$errors['form'] = $permission_error;
+		}
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
 		if ( count( $errors ) > 0 ) {
-            return self::get_edit_vars( $id, $errors );
+			return self::get_edit_vars( $id, $errors );
 		} else {
-            FrmForm::update( $id, $values );
-            $message = __( 'Form was Successfully Updated', 'formidable' );
-            if ( defined( 'DOING_AJAX' ) ) {
+			FrmForm::update( $id, $values );
+			$message = __( 'Form was Successfully Updated', 'formidable' );
+			if ( defined( 'DOING_AJAX' ) ) {
 				wp_die( $message );
-            }
+			}
 			return self::get_edit_vars( $id, array(), $message );
-        }
-    }
+		}
+	}
 
-    public static function bulk_create_template( $ids ) {
-        FrmAppHelper::permission_check( 'frm_edit_forms' );
+	public static function bulk_create_template( $ids ) {
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        foreach ( $ids as $id ) {
-            FrmForm::duplicate( $id, true, true );
-        }
+		foreach ( $ids as $id ) {
+			FrmForm::duplicate( $id, true, true );
+		}
 
-        return __( 'Form template was Successfully Created', 'formidable' );
-    }
+		return __( 'Form template was Successfully Created', 'formidable' );
+	}
 
 	/**
 	 * Redirect to the url for creating from a template
@@ -233,45 +233,45 @@ 
 		wp_die();
 	}
 
-    public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function duplicate() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$params = FrmForm::list_page_params();
-        $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
-        if ( $form ) {
+		$form = FrmForm::duplicate( $params['id'], $params['template'], true );
+		$message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+		if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
-        } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
-        }
-    }
+		} else {
+			return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+		}
+	}
 
-    public static function page_preview() {
+	public static function page_preview() {
 		$params = FrmForm::list_page_params();
-        if ( ! $params['form'] ) {
-            return;
-        }
-
-        $form = FrmForm::getOne( $params['form'] );
-        if ( ! $form ) {
-            return;
-        }
-        return self::show_form( $form->id, '', true, true );
-    }
-
-    public static function preview() {
-        do_action( 'frm_wp' );
-
-        global $frm_vars;
-        $frm_vars['preview'] = true;
-
-        if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
-            global $wp;
-            $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
+		if ( ! $params['form'] ) {
+			return;
+		}
+
+		$form = FrmForm::getOne( $params['form'] );
+		if ( ! $form ) {
+			return;
+		}
+		return self::show_form( $form->id, '', true, true );
+	}
+
+	public static function preview() {
+		do_action( 'frm_wp' );
+
+		global $frm_vars;
+		$frm_vars['preview'] = true;
+
+		if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
+			global $wp;
+			$root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
 			include_once( $root . '/wp-config.php' );
-            $wp->init();
-            $wp->register_globals();
-        }
+			$wp->init();
+			$wp->register_globals();
+		}
 
 		self::register_pro_scripts();
 
@@ -285,11 +285,11 @@ 
 		$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
 		if ( empty( $form ) ) {
 			$form = FrmForm::getAll( array(), '', 1 );
-        }
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function register_pro_scripts() {
 		if ( FrmAppHelper::pro_is_installed() ) {
@@ -299,22 +299,22 @@ 
 		}
 	}
 
-    public static function untrash() {
+	public static function untrash() {
 		self::change_form_status( 'untrash' );
-    }
+	}
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        $count = FrmForm::set_status( $ids, 'published' );
+		$count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
-        return $message;
-    }
+		$message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+		return $message;
+	}
 
-    public static function trash() {
+	public static function trash() {
 		self::change_form_status( 'trash' );
-    }
+	}
 
 	/**
 	 * @param string $status
@@ -352,68 +352,68 @@ 
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            if ( FrmForm::trash( $id ) ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			if ( FrmForm::trash( $id ) ) {
+				$count++;
+			}
+		}
 
-        $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$message = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action[]=' . implode( 'item-action[]=', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', '</a>' );
 
-        return $message;
-    }
+		return $message;
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_forms');
 
 		$params = FrmForm::list_page_params();
 
-        //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+		//check nonce url
+		check_admin_referer('destroy_form_' . $params['id']);
 
-        $count = 0;
-        if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
-        }
+		$count = 0;
+		if ( FrmForm::destroy( $params['id'] ) ) {
+			$count++;
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( $params, $message );
-    }
+	}
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            $d = FrmForm::destroy( $id );
-            if ( $d ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			$d = FrmForm::destroy( $id );
+			if ( $d ) {
+				$count++;
+			}
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
-        return $message;
-    }
+		return $message;
+	}
 
-    private static function delete_all() {
-        //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
-        if ( $permission_error !== false ) {
+	private static function delete_all() {
+		//check nonce url
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+		if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
-            return;
-        }
+			return;
+		}
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( array(), $message );
-    }
+	}
 
 	public static function scheduled_delete( $delete_timestamp = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::scheduled_delete' );
@@ -421,11 +421,11 @@ 
 	}
 
 	/**
-	* Inserts Formidable button
-	* Hook exists since 2.5.0
-	*
-	* @since 2.0.15
-	*/
+	 * Inserts Formidable button
+	 * Hook exists since 2.5.0
+	 *
+	 * @since 2.0.15
+	 */
 	public static function insert_form_button() {
 		if ( current_user_can('frm_view_forms') ) {
 			$menu_name = FrmAppHelper::get_menu_name();
@@ -436,49 +436,49 @@ 
 		}
 	}
 
-    public static function insert_form_popup() {
+	public static function insert_form_popup() {
 		$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
 		if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        FrmAppHelper::load_admin_wide_js();
+		FrmAppHelper::load_admin_wide_js();
 
-        $shortcodes = array(
+		$shortcodes = array(
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
-        );
+		);
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+		$shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
-    }
+	}
 
-    public static function get_shortcode_opts() {
+	public static function get_shortcode_opts() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
-            wp_die();
-        }
+		if ( empty($shortcode) ) {
+			wp_die();
+		}
 
 		echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
 		echo '<input type="radio" name="frmsc" value="' . esc_attr( $shortcode ) . '" id="sc-' . esc_attr( $shortcode ) . '" class="frm_hidden" />';
 
-        $form_id = '';
-        $opts = array();
+		$form_id = '';
+		$opts = array();
 		switch ( $shortcode ) {
-            case 'formidable':
-                $opts = array(
+			case 'formidable':
+				$opts = array(
 					'form_id'       => 'id',
-                    //'key' => ',
+					//'key' => ',
 					'title'         => array( 'val' => 1, 'label' => __( 'Display form title', 'formidable' ) ),
 					'description'   => array( 'val' => 1, 'label' => __( 'Display form description', 'formidable' ) ),
 					'minimize'      => array( 'val' => 1, 'label' => __( 'Minimize form HTML', 'formidable' ) ),
-                );
-            break;
-        }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+				);
+			break;
+		}
+		$opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -488,61 +488,61 @@ 
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
 
-        echo '</div>';
+		echo '</div>';
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function display_forms_list( $params = array(), $message = '', $errors = array(), $deprecated_errors = array() ) {
-        FrmAppHelper::permission_check( 'frm_view_forms' );
+		FrmAppHelper::permission_check( 'frm_view_forms' );
 		if ( ! empty( $deprecated_errors ) ) {
 			$errors = $deprecated_errors;
 			_deprecated_argument( 'errors', '2.0.8' );
 		}
 
-        global $wpdb, $frm_vars;
+		global $wpdb, $frm_vars;
 
 		if ( empty( $params ) ) {
 			$params = FrmForm::list_page_params();
-        }
+		}
 
-        $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
+		$wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
 
-        $pagenum = $wp_list_table->get_pagenum();
+		$pagenum = $wp_list_table->get_pagenum();
 
-        $wp_list_table->prepare_items();
+		$wp_list_table->prepare_items();
 
-        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-        if ( $pagenum > $total_pages && $total_pages > 0 ) {
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
-            die();
-        }
+			die();
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
-    }
+	}
 
 	public static function get_columns( $columns ) {
-	    $columns['cb'] = '<input type="checkbox" />';
-	    $columns['id'] = 'ID';
+		$columns['cb'] = '<input type="checkbox" />';
+		$columns['id'] = 'ID';
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
 
-        if ( 'template' == $type ) {
-            $columns['name']        = __( 'Template Name', 'formidable' );
-            $columns['type']        = __( 'Type', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-        } else {
-            $columns['name']        = __( 'Form Title', 'formidable' );
-            $columns['entries']     = __( 'Entries', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-            $columns['shortcode']   = __( 'Shortcodes', 'formidable' );
-        }
+		if ( 'template' == $type ) {
+			$columns['name']        = __( 'Template Name', 'formidable' );
+			$columns['type']        = __( 'Type', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+		} else {
+			$columns['name']        = __( 'Form Title', 'formidable' );
+			$columns['entries']     = __( 'Entries', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+			$columns['shortcode']   = __( 'Shortcodes', 'formidable' );
+		}
 
-        $columns['created_at'] = __( 'Date', 'formidable' );
+		$columns['created_at'] = __( 'Date', 'formidable' );
 
 		add_screen_option( 'per_page', array( 'label' => __( 'Forms', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_per_page' ) );
 
-        return $columns;
+		return $columns;
 	}
 
 	public static function get_sortable_columns() {
@@ -556,110 +556,110 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $return = true;
-                break;
-            }
-        }
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$return = true;
+				break;
+			}
+		}
 
-        if ( $return ) {
-            return $result;
+		if ( $return ) {
+			return $result;
 		}
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 
-        $result[] = 'created_at';
-        if ( $type == 'template' ) {
-            $result[] = 'id';
-            $result[] = 'form_key';
-        }
+		$result[] = 'created_at';
+		if ( $type == 'template' ) {
+			$result[] = 'id';
+			$result[] = 'form_key';
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function save_per_page( $save, $option, $value ) {
-        if ( $option == 'formidable_page_formidable_per_page' ) {
-            $save = (int) $value;
-        }
-        return $save;
-    }
+		if ( $option == 'formidable_page_formidable_per_page' ) {
+			$save = (int) $value;
+		}
+		return $save;
+	}
 
 	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
-        if ( ! $form ) {
-            wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
-        }
+		$form = FrmForm::getOne( $id );
+		if ( ! $form ) {
+			wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
+		}
 
-        if ( $form->parent_form_id ) {
+		if ( $form->parent_form_id ) {
 			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
-        }
+		}
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+		$fields = FrmField::get_all_for_form($form->id);
 
-        // Automatically add end section fields if they don't exist (2.0 migration)
-        $reset_fields = false;
-        FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
+		// Automatically add end section fields if they don't exist (2.0 migration)
+		$reset_fields = false;
+		FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
 
-        if ( $reset_fields ) {
-            $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
-        }
+		if ( $reset_fields ) {
+			$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
+		}
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+		unset($end_section_values, $last_order, $open, $reset_fields);
 
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+		$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 
-        $edit_message = __( 'Form was Successfully Updated', 'formidable' );
-        if ( $form->is_template && $message == $edit_message ) {
-            $message = __( 'Template was Successfully Updated', 'formidable' );
-        }
+		$edit_message = __( 'Form was Successfully Updated', 'formidable' );
+		if ( $form->is_template && $message == $edit_message ) {
+			$message = __( 'Template was Successfully Updated', 'formidable' );
+		}
 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-        if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
-            wp_die();
-        } else if ( $create_link ) {
+		if ( $form->default_template ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		} else if ( defined('DOING_AJAX') ) {
+			wp_die();
+		} else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
+		} else {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
-        }
-    }
+		}
+	}
 
 	public static function get_settings_vars( $id, $errors = array(), $message = '' ) {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
+		$form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+		$fields = FrmField::get_all_for_form($id);
+		$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        }
+		if ( isset($values['default_template']) && $values['default_template'] ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		}
 
-        $action_controls = FrmFormActionsController::get_form_actions();
+		$action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
-        $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
+		$sections = apply_filters('frm_add_form_settings_section', array(), $values);
+		$pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+		$styles = apply_filters('frm_get_style_opts', array());
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
-    }
+	}
 
-    public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
-        $linked_forms = array();
-        $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+	public static function mb_tags_box( $form_id, $class = '' ) {
+		$fields = FrmField::get_all_for_form($form_id, '', 'include');
+		$linked_forms = array();
+		$col = 'one';
+		$settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -667,7 +667,7 @@ 
 		$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
-    }
+	}
 
 	/**
 	 * Get an array of the options to display in the advanced tab
@@ -708,7 +708,7 @@ 
 			''          => '',
 			'siteurl'   => __( 'Site URL', 'formidable' ),
 			'sitename'  => __( 'Site Name', 'formidable' ),
-        );
+		);
 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			unset( $entry_shortcodes['post_id'] );
@@ -735,39 +735,39 @@ 
 		return $entry_shortcodes;
 	}
 
-    // Insert the form class setting into the form
+	// Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+		if ( isset($form->options['form_class']) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
-        }
-    }
+		}
+	}
 
-    public static function get_email_html() {
+	public static function get_email_html() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
-	        'default_email' => true,
+			'default_email' => true,
 			'plain_text'    => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
-	    ) );
-	    wp_die();
+		) );
+		wp_die();
 	}
 
-    public static function filter_content( $content, $form, $entry = false ) {
+	public static function filter_content( $content, $form, $entry = false ) {
 		self::get_entry_by_param( $entry );
-        if ( ! $entry ) {
-            return $content;
-        }
+		if ( ! $entry ) {
+			return $content;
+		}
 
-        if ( is_object( $form ) ) {
-            $form = $form->id;
-        }
+		if ( is_object( $form ) ) {
+			$form = $form->id;
+		}
 
-        $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
-        $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
+		$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
+		$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
 
-        return $content;
-    }
+		return $content;
+	}
 
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
@@ -779,287 +779,287 @@ 
 		}
 	}
 
-    public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
-    }
+	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
+		return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
+	}
 
-    public static function process_bulk_form_actions( $errors ) {
-        if ( ! $_REQUEST ) {
-            return $errors;
-        }
+	public static function process_bulk_form_actions( $errors ) {
+		if ( ! $_REQUEST ) {
+			return $errors;
+		}
 
 		$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-        if ( $bulkaction == -1 ) {
+		if ( $bulkaction == -1 ) {
 			$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-        }
-
-        if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
-            FrmAppHelper::remove_get_action();
-
-            $bulkaction = str_replace( 'bulk_', '', $bulkaction );
-        }
-
-        $ids = FrmAppHelper::get_param( 'item-action', '' );
-        if ( empty( $ids ) ) {
-            $errors[] = __( 'No forms were specified', 'formidable' );
-            return $errors;
-        }
-
-        $permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            return $errors;
-        }
-
-        if ( ! is_array( $ids ) ) {
-            $ids = explode( ',', $ids );
-        }
-
-        switch ( $bulkaction ) {
-            case 'delete':
-                $message = self::bulk_destroy( $ids );
-            break;
-            case 'trash':
-                $message = self::bulk_trash( $ids );
-            break;
-            case 'untrash':
-                $message = self::bulk_untrash( $ids );
-            break;
-            case 'create_template':
-                $message = self::bulk_create_template( $ids );
-            break;
-        }
-
-        if ( isset( $message ) && ! empty( $message ) ) {
+		}
+
+		if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
+			FrmAppHelper::remove_get_action();
+
+			$bulkaction = str_replace( 'bulk_', '', $bulkaction );
+		}
+
+		$ids = FrmAppHelper::get_param( 'item-action', '' );
+		if ( empty( $ids ) ) {
+			$errors[] = __( 'No forms were specified', 'formidable' );
+			return $errors;
+		}
+
+		$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			return $errors;
+		}
+
+		if ( ! is_array( $ids ) ) {
+			$ids = explode( ',', $ids );
+		}
+
+		switch ( $bulkaction ) {
+			case 'delete':
+				$message = self::bulk_destroy( $ids );
+			break;
+			case 'trash':
+				$message = self::bulk_trash( $ids );
+			break;
+			case 'untrash':
+				$message = self::bulk_untrash( $ids );
+			break;
+			case 'create_template':
+				$message = self::bulk_create_template( $ids );
+			break;
+		}
+
+		if ( isset( $message ) && ! empty( $message ) ) {
 			echo '<div id="message" class="updated frm_msg_padding">' . FrmAppHelper::kses( $message ) . '</div>';
-        }
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    public static function add_default_templates( $path, $default = true, $template = true ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
+	public static function add_default_templates( $path, $default = true, $template = true ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+		$path = untrailingslashit(trim($path));
 		$templates = glob( $path . '/*.php' );
 
 		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
 			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
 			$template_query = array( 'form_key' => $filename );
-            if ( $template ) {
-                $template_query['is_template'] = 1;
-            }
-            if ( $default ) {
-                $template_query['default_template'] = 1;
-            }
+			if ( $template ) {
+				$template_query['is_template'] = 1;
+			}
+			if ( $default ) {
+				$template_query['default_template'] = 1;
+			}
 			$form = FrmForm::getAll( $template_query, '', 1 );
 
-            $values = FrmFormsHelper::setup_new_vars();
-            $values['form_key'] = $filename;
-            $values['is_template'] = $template;
-            $values['status'] = 'published';
-            if ( $default ) {
-                $values['default_template'] = 1;
-            }
-
-            include( $templates[ $i ] );
-
-            //get updated form
-            if ( isset($form) && ! empty($form) ) {
-                $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
-            } else {
-                $old_id = false;
+			$values = FrmFormsHelper::setup_new_vars();
+			$values['form_key'] = $filename;
+			$values['is_template'] = $template;
+			$values['status'] = 'published';
+			if ( $default ) {
+				$values['default_template'] = 1;
+			}
+
+			include( $templates[ $i ] );
+
+			//get updated form
+			if ( isset($form) && ! empty($form) ) {
+				$old_id = $form->id;
+				$form = FrmForm::getOne($form->id);
+			} else {
+				$old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
-            }
+			}
 
-            if ( $form ) {
+			if ( $form ) {
 				do_action( 'frm_after_duplicate_form', $form->id, (array) $form, array( 'old_id' => $old_id ) );
-            }
-        }
-    }
+			}
+		}
+	}
 
-    public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-        $vars = array();
+	public static function route() {
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
-                // json decoding failed so we should return an error message
+			$json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
+			$json_vars = json_decode($json_vars, true);
+			if ( empty($json_vars) ) {
+				// json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-                if ( 'edit' == $action ) {
-                    $action = 'update';
-                }
-
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
-            } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+				if ( 'edit' == $action ) {
+					$action = 'update';
+				}
+
+				add_filter('frm_validate_form', 'FrmFormsController::json_error');
+			} else {
+				$vars = FrmAppHelper::json_to_array($json_vars);
+				$action = $vars[ $action ];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
-            }
-        } else {
+			}
+		} else {
 			$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-    		if ( isset( $_REQUEST['delete_all'] ) ) {
-                // override the action for this page
-    			$action = 'delete_all';
-            }
-        }
+			if ( isset( $_REQUEST['delete_all'] ) ) {
+				// override the action for this page
+				$action = 'delete_all';
+			}
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form' );
-
-        switch ( $action ) {
-            case 'new':
-                return self::new_form($vars);
-            case 'create':
-            case 'edit':
-            case 'update':
-            case 'duplicate':
-            case 'trash':
-            case 'untrash':
-            case 'destroy':
-            case 'delete_all':
-            case 'settings':
-            case 'update_settings':
+		FrmAppHelper::trigger_hook_load( 'form' );
+
+		switch ( $action ) {
+			case 'new':
+				return self::new_form($vars);
+			case 'create':
+			case 'edit':
+			case 'update':
+			case 'duplicate':
+			case 'trash':
+			case 'untrash':
+			case 'destroy':
+			case 'delete_all':
+			case 'settings':
+			case 'update_settings':
 				return self::$action( $vars );
-            default:
+			default:
 				do_action( 'frm_form_action_' . $action );
 				if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
-                    return;
-                }
+					return;
+				}
 
 				$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-                if ( $action == -1 ) {
+				if ( $action == -1 ) {
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-                }
+				}
 
-                if ( strpos($action, 'bulk_') === 0 ) {
-                    FrmAppHelper::remove_get_action();
-                    return self::list_form();
-                }
+				if ( strpos($action, 'bulk_') === 0 ) {
+					FrmAppHelper::remove_get_action();
+					return self::list_form();
+				}
 
-                return self::display_forms_list();
-        }
-    }
+				return self::display_forms_list();
+		}
+	}
 
-    public static function json_error( $errors ) {
-        $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
-        return $errors;
-    }
+	public static function json_error( $errors ) {
+		$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
+		return $errors;
+	}
 
 
-    /* FRONT-END FORMS */
-    public static function admin_bar_css() {
+	/* FRONT-END FORMS */
+	public static function admin_bar_css() {
 		if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
-            return;
-        }
+			return;
+		}
 
 		add_action( 'wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' );
 		FrmAppHelper::load_font_style();
 	}
 
 	public static function admin_bar_configure() {
-        global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
-            return;
-        }
-
-        $actions = array();
-        foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
-            }
-            unset($form);
-        }
-
-        if ( empty($actions) ) {
-            return;
-        }
-
-        asort($actions);
-
-        global $wp_admin_bar;
-
-        if ( count($actions) == 1 ) {
-            $wp_admin_bar->add_menu( array(
-                'title' => 'Edit Form',
+		global $frm_vars;
+		if ( empty($frm_vars['forms_loaded']) ) {
+			return;
+		}
+
+		$actions = array();
+		foreach ( $frm_vars['forms_loaded'] as $form ) {
+			if ( is_object($form) ) {
+				$actions[ $form->id ] = $form->name;
+			}
+			unset($form);
+		}
+
+		if ( empty($actions) ) {
+			return;
+		}
+
+		asort($actions);
+
+		global $wp_admin_bar;
+
+		if ( count($actions) == 1 ) {
+			$wp_admin_bar->add_menu( array(
+				'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-                'id'    => 'frm-forms',
-            ) );
-        } else {
-            $wp_admin_bar->add_menu( array(
-        		'id'    => 'frm-forms',
-        		'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
+				'id'    => 'frm-forms',
+			) );
+		} else {
+			$wp_admin_bar->add_menu( array(
+				'id'    => 'frm-forms',
+				'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-        		'meta'  => array(
+				'meta'  => array(
 					'title' => __( 'Edit Forms', 'formidable' ),
-        		),
-        	) );
+				),
+			) );
 
-        	foreach ( $actions as $form_id => $name ) {
+			foreach ( $actions as $form_id => $name ) {
 
-        		$wp_admin_bar->add_menu( array(
-        			'parent'    => 'frm-forms',
+				$wp_admin_bar->add_menu( array(
+					'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+					'title'     => empty($name) ? __( '(no title)') : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
-        		) );
-        	}
-        }
-    }
+				) );
+			}
+		}
+	}
 
-    //formidable shortcode
+	//formidable shortcode
 	public static function get_form_shortcode( $atts ) {
-        global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
-            $sc = '[formidable';
+		global $frm_vars;
+		if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+			$sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
 					$sc .= ' ' . $k . '="' . esc_attr( $v ) . '"';
 				}
 			}
 			return $sc . ']';
-        }
-
-        $shortcode_atts = shortcode_atts( array(
-            'id' => '', 'key' => '', 'title' => false, 'description' => false,
-            'readonly' => false, 'entry_id' => false, 'fields' => array(),
-            'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
-
-        return self::show_form(
-            $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
-            $shortcode_atts['description'], $atts
-        );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
-        if ( empty( $id ) ) {
-            $id = $key;
-        }
-
-        // no form id or key set
-        if ( empty( $id ) ) {
-            return __( 'Please select a valid form', 'formidable' );
-        }
-
-        $form = FrmForm::getOne( $id );
-        if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
-            return __( 'Please select a valid form', 'formidable' );
-        }
+		}
+
+		$shortcode_atts = shortcode_atts( array(
+			'id' => '', 'key' => '', 'title' => false, 'description' => false,
+			'readonly' => false, 'entry_id' => false, 'fields' => array(),
+			'exclude_fields' => array(), 'minimize' => false,
+		), $atts);
+		do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+
+		return self::show_form(
+			$shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
+			$shortcode_atts['description'], $atts
+		);
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
+		if ( empty( $id ) ) {
+			$id = $key;
+		}
+
+		// no form id or key set
+		if ( empty( $id ) ) {
+			return __( 'Please select a valid form', 'formidable' );
+		}
+
+		$form = FrmForm::getOne( $id );
+		if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
+			return __( 'Please select a valid form', 'formidable' );
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form', $form );
+		FrmAppHelper::trigger_hook_load( 'form', $form );
 
-        $form = apply_filters( 'frm_pre_display_form', $form );
+		$form = apply_filters( 'frm_pre_display_form', $form );
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( self::is_viewable_draft_form( $form ) ) {
 			// don't show a draft form on a page
@@ -1080,7 +1080,7 @@ 
 		}
 
 		return $form;
-    }
+	}
 
 	private static function is_viewable_draft_form( $form ) {
 		global $post;
@@ -1096,98 +1096,98 @@ 
 		return $form->logged_in && get_current_user_id() && isset( $form->options['logged_in_role'] ) && $form->options['logged_in_role'] != '' && ! FrmAppHelper::user_has_permission( $form->options['logged_in_role'] );
 	}
 
-    public static function get_form( $form, $title, $description, $atts = array() ) {
-        ob_start();
+	public static function get_form( $form, $title, $description, $atts = array() ) {
+		ob_start();
 
-        self::get_form_contents( $form, $title, $description, $atts );
+		self::get_form_contents( $form, $title, $description, $atts );
 		self::enqueue_scripts( FrmForm::get_params( $form ) );
 
-        $contents = ob_get_contents();
-        ob_end_clean();
+		$contents = ob_get_contents();
+		ob_end_clean();
 
 		self::maybe_minimize_form( $atts, $contents );
 
-        return $contents;
-    }
+		return $contents;
+	}
 
 	public static function enqueue_scripts( $params ) {
 		do_action( 'frm_enqueue_form_scripts', $params );
 	}
 
 	public static function get_form_contents( $form, $title, $description, $atts ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+		$submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
-        $user_ID = get_current_user_id();
+		$user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
-        $message = $errors = '';
+		$message = $errors = '';
 
-        if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
-        }
+		if ( $params['posted_form_id'] == $form->id && $_POST ) {
+			$errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+		}
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
-        $fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
+		$fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
 
-        if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+		if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
+			do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
+			if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
+				$values = FrmEntriesHelper::setup_new_vars($fields, $form);
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            }
-            return;
-        }
+			}
+			return;
+		}
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+		if ( ! empty($errors) ) {
+			$values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            return;
-        }
+			return;
+		}
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
-            return;
-        }
+		do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
+		if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+			return;
+		}
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
-        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
+		$values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
+		$created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
+		$conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+		if ( $created && is_numeric($created) && $conf_method != 'message' ) {
+			do_action('frm_success_action', $conf_method, $form, $form->options, $created);
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-            return;
-        }
+			return;
+		}
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
-            $class = 'frm_message';
-        } else {
-            $message = $frm_settings->failed_msg;
-            $class = 'frm_error_style';
-        }
+		if ( $created && is_numeric($created) ) {
+			$message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+			$class = 'frm_message';
+		} else {
+			$message = $frm_settings->failed_msg;
+			$class = 'frm_error_style';
+		}
 
 		$message = FrmFormsHelper::get_success_message( array(
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+		$message = apply_filters('frm_main_feedback', $message, $form, $created);
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+		if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-        } else {
-            global $frm_vars;
+		} else {
+			global $frm_vars;
 			self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
 
 			$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
-        }
+		}
 
 		do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-    }
+	}
 
 	public static function front_head() {
 		$version = FrmAppHelper::plugin_version();
@@ -1216,10 +1216,10 @@ 
 	}
 
 	public static function defer_script_loading( $tag, $handle ) {
-	    if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
-	        $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
+		if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
+			$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
 		}
-	    return $tag;
+		return $tag;
 	}
 
 	public static function footer_js( $location = 'footer' ) {

classes/controllers/FrmAddonsController.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
 
 		$keyed_addons = array();
 		foreach ( $addons as $addon ) {
-			$keyed_addons[ $addon['info']['slug'] ] = $addon;
+			$keyed_addons[$addon['info']['slug']] = $addon;
 		}
 
 		$plugin_order = array(
@@ -49,9 +49,9 @@ 
 		);
 		$ordered_addons = array();
 		foreach ( $plugin_order as $plugin ) {
-			if ( isset( $keyed_addons[ $plugin ] ) ) {
-				$ordered_addons[] = $keyed_addons[ $plugin ];
-				unset( $keyed_addons[ $plugin ] );
+			if ( isset( $keyed_addons[$plugin] ) ) {
+				$ordered_addons[] = $keyed_addons[$plugin];
+				unset( $keyed_addons[$plugin] );
 			}
 		}
 		$addons = $ordered_addons + $keyed_addons;
@@ -86,10 +86,10 @@ 
 	}
 
 	public static function get_licenses() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-		$license = get_option('frmpro-credentials');
+		$license = get_option( 'frmpro-credentials' );
 		if ( $license && is_array( $license ) && isset( $license['license'] ) ) {
 			$url = 'http://formidablepro.com/frm-edd-api/licenses?l=' . urlencode( base64_encode( $license['license'] ) );
 			$licenses = self::send_api_request( $url, array( 'name' => 'frm_api_licence', 'expires' => 60 * 60 * 5 ) );

classes/controllers/FrmXMLController.php

Indentation +181 added lines, -181 removed lines

@@ -2,110 +2,110 @@ 
 
 class FrmXMLController {
 
-    public static function menu() {
+	public static function menu() {
 		add_submenu_page( 'formidable', 'Formidable | ' . __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route' );
-    }
+	}
 
-    public static function add_default_templates() {
+	public static function add_default_templates() {
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
-    		// XML import is not enabled on your server
-    		return;
-    	}
+			// XML import is not enabled on your server
+			return;
+		}
 
-        $set_err = libxml_use_internal_errors(true);
-        $loader = libxml_disable_entity_loader( true );
+		$set_err = libxml_use_internal_errors(true);
+		$loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
-        foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
-        }
-        /*
+		foreach ( (array) $files as $file ) {
+			FrmXMLHelper::import_xml($file);
+			unset($file);
+		}
+		/*
         if(is_wp_error($result))
             $errors[] = $result->get_error_message();
         else if($result)
             $message = $result;
         */
 
-        unset( $files );
+		unset( $files );
 
-        libxml_use_internal_errors( $set_err );
-    	libxml_disable_entity_loader( $loader );
-    }
+		libxml_use_internal_errors( $set_err );
+		libxml_disable_entity_loader( $loader );
+	}
 
-    public static function route() {
-        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+	public static function route() {
+		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
 		if ( $action == 'import_xml' ) {
-            return self::import_xml();
+			return self::import_xml();
 		} else if ( $action == 'export_xml' ) {
-            return self::export_xml();
-        } else {
-            if ( apply_filters( 'frm_xml_route', true, $action ) ) {
-                return self::form();
-            }
-        }
-    }
-
-    public static function form( $errors = array(), $message = '' ) {
+			return self::export_xml();
+		} else {
+			if ( apply_filters( 'frm_xml_route', true, $action ) ) {
+				return self::form();
+			}
+		}
+	}
+
+	public static function form( $errors = array(), $message = '' ) {
 		$where = array(
 			'parent_form_id' => array( null, 0 ),
 			'status' => array( null, '', 'published' ),
 		);
 		$forms = FrmForm::getAll( $where, 'name' );
 
-        $export_types = apply_filters( 'frm_xml_export_types',
-            array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
-        );
+		$export_types = apply_filters( 'frm_xml_export_types',
+			array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
+		);
 
-        $export_format = apply_filters( 'frm_export_formats', array(
-            'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
+		$export_format = apply_filters( 'frm_export_formats', array(
+			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 			'csv' => array( 'name' => 'CSV', 'support' => 'items', 'count' => 'single' ),
-        ) );
+		) );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/import_form.php' );
-    }
+	}
 
-    public static function import_xml() {
-        $errors = array();
-        $message = '';
+	public static function import_xml() {
+		$errors = array();
+		$message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            self::form($errors);
-            return;
-        }
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			self::form($errors);
+			return;
+		}
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
-            $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+			$errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        $file = $_FILES['frm_import_file']['tmp_name'];
+		$file = $_FILES['frm_import_file']['tmp_name'];
 
-        if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
-            $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! is_uploaded_file( $file ) ) {
+			unset($file);
+			$errors[] = __( 'The file does not exist, please try again.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
+		//add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+		$export_format = apply_filters('frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
-            // allow other file types to be imported
+		$file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
+		if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+			// allow other file types to be imported
 			do_action( 'frm_before_import_' . $file_type );
-            return;
-        }
-        unset($file_type);
+			return;
+		}
+		unset($file_type);
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,148 +124,148 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
-    }
+		self::form($errors, $message);
+	}
 
-    public static function export_xml() {
-        $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
-            wp_die( $error );
-        }
+	public static function export_xml() {
+		$error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
+		if ( ! empty($error) ) {
+			wp_die( $error );
+		}
 
 		$ids = FrmAppHelper::get_post_param( 'frm_export_forms', array() );
 		$type = FrmAppHelper::get_post_param( 'type', array() );
 		$format = FrmAppHelper::get_post_param( 'format', 'xml', 'sanitize_title' );
 
-        if ( ! headers_sent() && ! $type ) {
-            wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
-            die();
-        }
+		if ( ! headers_sent() && ! $type ) {
+			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
+			die();
+		}
 
-        if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+		if ( $format == 'xml' ) {
+			self::generate_xml($type, compact('ids'));
 		} if ( $format == 'csv' ) {
 			self::generate_csv( compact('ids') );
-        } else {
+		} else {
 			do_action( 'frm_export_format_' . $format, compact('ids') );
-        }
+		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function generate_xml( $type, $args = array() ) {
-    	global $wpdb;
+		global $wpdb;
 
-	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
-            // make sure the form is included if there are entries
-            $type[] = 'forms';
-        }
+		$type = (array) $type;
+		if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+			// make sure the form is included if there are entries
+			$type[] = 'forms';
+		}
 
-	    if ( in_array( 'forms', $type) ) {
-            // include actions with forms
-	        $type[] = 'actions';
-	    }
+		if ( in_array( 'forms', $type) ) {
+			// include actions with forms
+			$type[] = 'actions';
+		}
 
-	    $tables = array(
+		$tables = array(
 			'items'     => $wpdb->prefix . 'frm_items',
 			'forms'     => $wpdb->prefix . 'frm_forms',
-	        'posts'     => $wpdb->posts,
-	        'styles'    => $wpdb->posts,
-	        'actions'   => $wpdb->posts,
-	    );
+			'posts'     => $wpdb->posts,
+			'styles'    => $wpdb->posts,
+			'actions'   => $wpdb->posts,
+		);
 
 		$defaults = array( 'ids' => false );
-	    $args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
-        $sitename = sanitize_key( get_bloginfo( 'name' ) );
+		$sitename = sanitize_key( get_bloginfo( 'name' ) );
 
-    	if ( ! empty( $sitename ) ) {
+		if ( ! empty( $sitename ) ) {
 			$sitename .= '.';
 		}
-    	$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
+		$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
 
-    	header( 'Content-Description: File Transfer' );
-    	header( 'Content-Disposition: attachment; filename=' . $filename );
-    	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
+		header( 'Content-Description: File Transfer' );
+		header( 'Content-Disposition: attachment; filename=' . $filename );
+		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 
-        //make sure ids are numeric
-    	if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
-	        $args['ids'] = array_filter( $args['ids'], 'is_numeric' );
-	    }
+		//make sure ids are numeric
+		if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
+			$args['ids'] = array_filter( $args['ids'], 'is_numeric' );
+		}
 
-	    $records = array();
+		$records = array();
 
 		foreach ( $type as $tb_type ) {
-            $where = array();
+			$where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+			$table = $tables[ $tb_type ];
 
 			$select = $table . '.id';
-            $query_vars = array();
+			$query_vars = array();
 
-            switch ( $tb_type ) {
-                case 'forms':
-                    //add forms
-                    if ( $args['ids'] ) {
+			switch ( $tb_type ) {
+				case 'forms':
+					//add forms
+					if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table . '.parent_form_id' => $args['ids'] );
-                	} else {
+					} else {
 						$where[ $table . '.status !' ] = 'draft';
-                	}
-                break;
-                case 'actions':
+					}
+				break;
+				case 'actions':
 					$select = $table . '.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+					if ( ! empty($args['ids']) ) {
 						$where['menu_order'] = $args['ids'];
-                    }
-                break;
-                case 'items':
-                    //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
-                    if ( $args['ids'] ) {
+					}
+				break;
+				case 'items':
+					//$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
+					if ( $args['ids'] ) {
 						$where[ $table . '.form_id' ] = $args['ids'];
-                    }
-                break;
-                case 'styles':
-                    // Loop through all exported forms and get their selected style IDs
-                    $form_ids = $args['ids'];
-                    $style_ids = array();
-                    foreach ( $form_ids as $form_id ) {
-                        $form_data = FrmForm::getOne( $form_id );
-                        // For forms that have not been updated while running 2.0, check if custom_style is set
-                        if ( isset( $form_data->options['custom_style'] ) ) {
-                            $style_ids[] = $form_data->options['custom_style'];
-                        }
-                        unset( $form_id, $form_data );
-                    }
+					}
+				break;
+				case 'styles':
+					// Loop through all exported forms and get their selected style IDs
+					$form_ids = $args['ids'];
+					$style_ids = array();
+					foreach ( $form_ids as $form_id ) {
+						$form_data = FrmForm::getOne( $form_id );
+						// For forms that have not been updated while running 2.0, check if custom_style is set
+						if ( isset( $form_data->options['custom_style'] ) ) {
+							$style_ids[] = $form_data->options['custom_style'];
+						}
+						unset( $form_id, $form_data );
+					}
 					$select = $table . '.ID';
-                    $where['post_type'] = 'frm_styles';
-
-                    // Only export selected styles
-                    if ( ! empty( $style_ids ) ) {
-                        $where['ID'] = $style_ids;
-                    }
-                break;
-                default:
+					$where['post_type'] = 'frm_styles';
+
+					// Only export selected styles
+					if ( ! empty( $style_ids ) ) {
+						$where['ID'] = $style_ids;
+					}
+				break;
+				default:
 					$select = $table . '.ID';
-                    $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
-                    $where['pm.meta_key'] = 'frm_form_id';
-
-                    if ( empty($args['ids']) ) {
-                        $where['pm.meta_value >'] = 1;
-                    } else {
-                        $where['pm.meta_value'] = $args['ids'];
-                    }
-                break;
-            }
+					$join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
+					$where['pm.meta_key'] = 'frm_form_id';
+
+					if ( empty($args['ids']) ) {
+						$where['pm.meta_value >'] = 1;
+					} else {
+						$where['pm.meta_value'] = $args['ids'];
+					}
+				break;
+			}
 
 			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
-        }
+			unset($tb_type);
+		}
 
 		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
-    }
+	}
 
 
 	public static function generate_csv( $atts ) {
@@ -336,14 +336,14 @@ 
 	}
 
 	/**
-	* Get the fields that should be included in the CSV export
-	*
-	* @since 2.0.19
-	*
-	* @param int $form_id
-	* @param object $form
-	* @return array $csv_fields
-	*/
+	 * Get the fields that should be included in the CSV export
+	 *
+	 * @since 2.0.19
+	 *
+	 * @param int $form_id
+	 * @param object $form
+	 * @return array $csv_fields
+	 */
 	private static function get_fields_for_csv_export( $form_id, $form ) {
 		// Phase frm_csv_field_ids out by 2.01.05
 		$csv_field_ids = apply_filters( 'frm_csv_field_ids', '', $form_id, array( 'form' => $form ) );
@@ -373,16 +373,16 @@ 
 	}
 
 	public static function allow_mime( $mimes ) {
-        if ( ! isset( $mimes['csv'] ) ) {
-            // allow csv files
-            $mimes['csv'] = 'text/csv';
-        }
-
-        if ( ! isset( $mimes['xml'] ) ) {
-            // allow xml
-            $mimes['xml'] = 'text/xml';
-        }
-
-        return $mimes;
-    }
+		if ( ! isset( $mimes['csv'] ) ) {
+			// allow csv files
+			$mimes['csv'] = 'text/csv';
+		}
+
+		if ( ! isset( $mimes['xml'] ) ) {
+			// allow xml
+			$mimes['xml'] = 'text/xml';
+		}
+
+		return $mimes;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -12,14 +12,14 @@ 
     		return;
     	}
 
-        $set_err = libxml_use_internal_errors(true);
+        $set_err = libxml_use_internal_errors( true );
         $loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
         foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
+            FrmXMLHelper::import_xml( $file );
+            unset( $file );
         }
         /*
         if(is_wp_error($result))
@@ -71,41 +71,41 @@ 
         $errors = array();
         $message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'import-xml', 'import-xml-nonce' );
         if ( $permission_error !== false ) {
             $errors[] = $permission_error;
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+        if ( ! isset( $_FILES ) || ! isset( $_FILES['frm_import_file'] ) || empty( $_FILES['frm_import_file']['name'] ) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
             $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         $file = $_FILES['frm_import_file']['tmp_name'];
 
         if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
+            unset( $file );
             $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+        $export_format = apply_filters( 'frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+        $file_type = strtolower( pathinfo( $_FILES['frm_import_file']['name'], PATHINFO_EXTENSION ) );
+        if ( $file_type != 'xml' && isset( $export_format[$file_type] ) ) {
             // allow other file types to be imported
 			do_action( 'frm_before_import_' . $file_type );
             return;
         }
-        unset($file_type);
+        unset( $file_type );
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,12 +124,12 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
+        self::form( $errors, $message );
     }
 
     public static function export_xml() {
         $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
+        if ( ! empty( $error ) ) {
             wp_die( $error );
         }
 
@@ -143,11 +143,11 @@ 
         }
 
         if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+            self::generate_xml( $type, compact( 'ids' ) );
 		} if ( $format == 'csv' ) {
-			self::generate_csv( compact('ids') );
+			self::generate_csv( compact( 'ids' ) );
         } else {
-			do_action( 'frm_export_format_' . $format, compact('ids') );
+			do_action( 'frm_export_format_' . $format, compact( 'ids' ) );
         }
 
         wp_die();
@@ -157,12 +157,12 @@ 
     	global $wpdb;
 
 	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+        if ( in_array( 'items', $type ) && ! in_array( 'forms', $type ) ) {
             // make sure the form is included if there are entries
             $type[] = 'forms';
         }
 
-	    if ( in_array( 'forms', $type) ) {
+	    if ( in_array( 'forms', $type ) ) {
             // include actions with forms
 	        $type[] = 'actions';
 	    }
@@ -199,7 +199,7 @@ 
 		foreach ( $type as $tb_type ) {
             $where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+            $table = $tables[$tb_type];
 
 			$select = $table . '.id';
             $query_vars = array();
@@ -210,20 +210,20 @@ 
                     if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table . '.parent_form_id' => $args['ids'] );
                 	} else {
-						$where[ $table . '.status !' ] = 'draft';
+						$where[$table . '.status !'] = 'draft';
                 	}
                 break;
                 case 'actions':
 					$select = $table . '.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+                    if ( ! empty( $args['ids'] ) ) {
 						$where['menu_order'] = $args['ids'];
                     }
                 break;
                 case 'items':
                     //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
                     if ( $args['ids'] ) {
-						$where[ $table . '.form_id' ] = $args['ids'];
+						$where[$table . '.form_id'] = $args['ids'];
                     }
                 break;
                 case 'styles':
@@ -251,7 +251,7 @@ 
                     $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
                     $where['pm.meta_key'] = 'frm_form_id';
 
-                    if ( empty($args['ids']) ) {
+                    if ( empty( $args['ids'] ) ) {
                         $where['pm.meta_value >'] = 1;
                     } else {
                         $where['pm.meta_value'] = $args['ids'];
@@ -259,11 +259,11 @@ 
                 break;
             }
 
-			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
+			$records[$tb_type] = FrmDb::get_col( $table . $join, $where, $select );
+            unset( $tb_type );
         }
 
-		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
+		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo( 'charset' ) ) . "\" ?>\n";
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
     }
 
@@ -289,11 +289,11 @@ 
 			$fid = FrmAppHelper::get_param( 'fid', '', 'get', 'sanitize_text_field' );
 		}
 
-		if ( ! ini_get('safe_mode') ) {
-			set_time_limit(0); //Remove time limit to execute this function
-			$mem_limit = str_replace('M', '', ini_get('memory_limit'));
+		if ( ! ini_get( 'safe_mode' ) ) {
+			set_time_limit( 0 ); //Remove time limit to execute this function
+			$mem_limit = str_replace( 'M', '', ini_get( 'memory_limit' ) );
 			if ( (int) $mem_limit < 256 ) {
-				ini_set('memory_limit', '256M');
+				ini_set( 'memory_limit', '256M' );
 			}
 		}
 
@@ -364,7 +364,7 @@ 
 			$no_export_fields = FrmField::no_save_fields();
 			foreach ( $csv_fields as $k => $f ) {
 				if ( in_array( $f->type, $no_export_fields ) ) {
-					unset( $csv_fields[ $k ] );
+					unset( $csv_fields[$k] );
 				}
 			}
 		}

classes/controllers/FrmAppController.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 <div class="update-nag frm-update-to-pro">
 	<?php echo FrmAppHelper::kses( $tip['tip'] ) ?>
 	<span><?php echo FrmAppHelper::kses( $tip['call'] ) ?></span>
-	<a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url('https://formidablepro.com?banner=1&tip=' . absint( $tip['num'] ) ) ) ?>" class="button">Upgrade to Pro</a>
+	<a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com?banner=1&tip=' . absint( $tip['num'] ) ) ) ?>" class="button">Upgrade to Pro</a>
 </div>
 <?php
 		}
@@ -385,7 +385,7 @@ 
     }
 
     public static function uninstall() {
-		FrmAppHelper::permission_check('administrator');
+		FrmAppHelper::permission_check( 'administrator' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$frmdb = new FrmDb();
@@ -420,7 +420,7 @@ 
     }
 
     public static function deauthorize() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         delete_option( 'frmpro-credentials' );

Indentation +134 added lines, -134 removed lines

@@ -3,14 +3,14 @@ 
 class FrmAppController {
 
 	public static function menu() {
-        FrmAppHelper::maybe_add_permissions();
-        if ( ! current_user_can( 'frm_view_forms' ) ) {
-            return;
-        }
+		FrmAppHelper::maybe_add_permissions();
+		if ( ! current_user_can( 'frm_view_forms' ) ) {
+			return;
+		}
 
 		$menu_name = FrmAppHelper::get_menu_name();
 		add_menu_page( 'Formidable', $menu_name, 'frm_view_forms', 'formidable', 'FrmFormsController::route', '', self::get_menu_position() );
-    }
+	}
 
 	private static function get_menu_position() {
 		$count = count( get_post_types( array( 'show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ) );
@@ -19,39 +19,39 @@ 
 		return $pos;
 	}
 
-    public static function load_wp_admin_style() {
-        FrmAppHelper::load_font_style();
-    }
+	public static function load_wp_admin_style() {
+		FrmAppHelper::load_font_style();
+	}
 
 	public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) {
-        global $pagenow, $frm_vars;
+		global $pagenow, $frm_vars;
 
 		$show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' );
-        if ( empty( $show_nav ) ) {
-            return;
-        }
+		if ( empty( $show_nav ) ) {
+			return;
+		}
 
 		$current_page = isset( $_GET['page'] ) ? FrmAppHelper::simple_get( 'page', 'sanitize_title' ) : FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' );
 		if ( $pagenow == 'post.php' || $pagenow == 'post-new.php' ) {
 			$current_page = 'frm_display';
 		}
 
-        if ( $form ) {
+		if ( $form ) {
 			FrmForm::maybe_get_form( $form );
 
-            if ( is_object( $form ) ) {
-                $id = $form->id;
-            }
-        }
+			if ( is_object( $form ) ) {
+				$id = $form->id;
+			}
+		}
 
-        if ( ! isset( $id ) ) {
-            $form = $id = false;
-        }
+		if ( ! isset( $id ) ) {
+			$form = $id = false;
+		}
 
 		$nav_items = self::get_form_nav_items( $id );
 
-        include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' );
-    }
+		include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' );
+	}
 
 	private static function get_form_nav_items( $id ) {
 		$nav_items = array(
@@ -82,28 +82,28 @@ 
 		return $nav_items;
 	}
 
-    // Adds a settings link to the plugins page
-    public static function settings_link( $links ) {
+	// Adds a settings link to the plugins page
+	public static function settings_link( $links ) {
 		$settings = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings' ) ) . '">' . __( 'Settings', 'formidable' ) . '</a>';
-        array_unshift( $links, $settings );
+		array_unshift( $links, $settings );
 
-        return $links;
-    }
+		return $links;
+	}
 
-    public static function pro_get_started_headline() {
+	public static function pro_get_started_headline() {
 		self::maybe_show_upgrade_bar();
 
-        // Don't display this error as we're upgrading the thing, or if the user shouldn't see the message
-        if ( 'upgrade-plugin' == FrmAppHelper::simple_get( 'action', 'sanitize_title' ) || ! current_user_can( 'update_plugins' ) ) {
-            return;
-        }
+		// Don't display this error as we're upgrading the thing, or if the user shouldn't see the message
+		if ( 'upgrade-plugin' == FrmAppHelper::simple_get( 'action', 'sanitize_title' ) || ! current_user_can( 'update_plugins' ) ) {
+			return;
+		}
 
 		if ( get_site_option( 'frmpro-authorized' ) && ! file_exists( FrmAppHelper::plugin_path() . '/pro/formidable-pro.php' ) ) {
-            FrmAppHelper::load_admin_wide_js();
+			FrmAppHelper::load_admin_wide_js();
 
-            // user is authorized, but running free version
-            $inst_install_url = 'https://formidablepro.com/knowledgebase/install-formidable-forms/';
-        ?>
+			// user is authorized, but running free version
+			$inst_install_url = 'https://formidablepro.com/knowledgebase/install-formidable-forms/';
+		?>
 <div class="error" class="frm_previous_install">
 		<?php
 		echo wp_kses_post( apply_filters( 'frm_pro_update_msg',
@@ -115,8 +115,8 @@ 
 		) ); ?>
 </div>
 <?php
-        }
-    }
+		}
+	}
 
 	private static function maybe_show_upgrade_bar() {
 		$page = FrmAppHelper::simple_get( 'page', 'sanitize_title' );
@@ -218,7 +218,7 @@ 
 		}
 	}
 
-    public static function admin_js() {
+	public static function admin_js() {
 		$version = FrmAppHelper::plugin_version();
 		FrmAppHelper::load_admin_wide_js( false );
 
@@ -229,7 +229,7 @@ 
 			'bootstrap_tooltip', 'bootstrap-multiselect',
 		), $version, true );
 		wp_register_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css', array(), $version );
-        wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' );
+		wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' );
 		wp_register_style( 'formidable-grids', FrmAppHelper::plugin_url() . '/css/frm_grids.css', array(), $version );
 		wp_register_style( 'formidable-dropzone', FrmAppHelper::plugin_url() . '/css/dropzone.css', array(), $version );
 
@@ -242,65 +242,65 @@ 
 		global $pagenow;
 		if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow == 'edit.php' && $post_type == 'frm_display' ) ) {
 
-            wp_enqueue_script( 'admin-widgets' );
-            wp_enqueue_style( 'widgets' );
-            wp_enqueue_script( 'formidable' );
-            wp_enqueue_script( 'formidable_admin' );
+			wp_enqueue_script( 'admin-widgets' );
+			wp_enqueue_style( 'widgets' );
+			wp_enqueue_script( 'formidable' );
+			wp_enqueue_script( 'formidable_admin' );
 			FrmAppHelper::localize_script( 'admin' );
 
-            wp_enqueue_style( 'formidable-admin' );
+			wp_enqueue_style( 'formidable-admin' );
 			wp_enqueue_style( 'formidable-grids' );
 			wp_enqueue_style( 'formidable-dropzone' );
-            add_thickbox();
+			add_thickbox();
 
-            wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() . '/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' );
+			wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() . '/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' );
 
-        } else if ( $pagenow == 'post.php' || ( $pagenow == 'post-new.php' && $post_type == 'frm_display' ) ) {
-            if ( isset( $_REQUEST['post_type'] ) ) {
-                $post_type = sanitize_title( $_REQUEST['post_type'] );
+		} else if ( $pagenow == 'post.php' || ( $pagenow == 'post-new.php' && $post_type == 'frm_display' ) ) {
+			if ( isset( $_REQUEST['post_type'] ) ) {
+				$post_type = sanitize_title( $_REQUEST['post_type'] );
 			} else if ( isset( $_REQUEST['post'] ) && absint( $_REQUEST['post'] ) ) {
 				$post = get_post( absint( $_REQUEST['post'] ) );
-                if ( ! $post ) {
-                    return;
-                }
-                $post_type = $post->post_type;
-            } else {
-                return;
-            }
-
-            if ( $post_type == 'frm_display' ) {
-                wp_enqueue_script( 'jquery-ui-draggable' );
-                wp_enqueue_script( 'formidable_admin' );
-                wp_enqueue_style( 'formidable-admin' );
+				if ( ! $post ) {
+					return;
+				}
+				$post_type = $post->post_type;
+			} else {
+				return;
+			}
+
+			if ( $post_type == 'frm_display' ) {
+				wp_enqueue_script( 'jquery-ui-draggable' );
+				wp_enqueue_script( 'formidable_admin' );
+				wp_enqueue_style( 'formidable-admin' );
 				FrmAppHelper::localize_script( 'admin' );
-            }
-        } else if ( $pagenow == 'widgets.php' ) {
-            FrmAppHelper::load_admin_wide_js();
-        }
-    }
-
-    public static function load_lang() {
-        load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' );
-    }
-
-    /**
-     * Filter shortcodes in text widgets
-     */
-    public static function widget_text_filter( $content ) {
-    	$regex = '/\[\s*(formidable|display-frm-data|frm-stats|frm-graph|frm-entry-links|formresults|frm-search)\s+.*\]/';
-    	return preg_replace_callback( $regex, 'FrmAppHelper::widget_text_filter_callback', $content );
-    }
-
-    public static function front_head() {
-        if ( is_multisite() ) {
-            $old_db_version = get_option( 'frm_db_version' );
-            $pro_db_version = FrmAppHelper::pro_is_installed() ? get_option( 'frmpro_db_version' ) : false;
-            if ( ( (int) $old_db_version < (int) FrmAppHelper::$db_version ) ||
-                ( FrmAppHelper::pro_is_installed() && (int) $pro_db_version < (int) FrmAppHelper::$pro_db_version ) ) {
-                self::install( $old_db_version );
-            }
-        }
-    }
+			}
+		} else if ( $pagenow == 'widgets.php' ) {
+			FrmAppHelper::load_admin_wide_js();
+		}
+	}
+
+	public static function load_lang() {
+		load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' );
+	}
+
+	/**
+	 * Filter shortcodes in text widgets
+	 */
+	public static function widget_text_filter( $content ) {
+		$regex = '/\[\s*(formidable|display-frm-data|frm-stats|frm-graph|frm-entry-links|formresults|frm-search)\s+.*\]/';
+		return preg_replace_callback( $regex, 'FrmAppHelper::widget_text_filter_callback', $content );
+	}
+
+	public static function front_head() {
+		if ( is_multisite() ) {
+			$old_db_version = get_option( 'frm_db_version' );
+			$pro_db_version = FrmAppHelper::pro_is_installed() ? get_option( 'frmpro_db_version' ) : false;
+			if ( ( (int) $old_db_version < (int) FrmAppHelper::$db_version ) ||
+				( FrmAppHelper::pro_is_installed() && (int) $pro_db_version < (int) FrmAppHelper::$pro_db_version ) ) {
+				self::install( $old_db_version );
+			}
+		}
+	}
 
 	public static function localize_script( $location ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmAppHelper::localize_script' );
@@ -355,20 +355,20 @@ 
 		wp_die();
 	}
 
-    public static function activation_install() {
-        FrmAppHelper::delete_cache_and_transient( 'frm_plugin_version' );
-        FrmFormActionsController::actions_init();
-        self::install();
-    }
+	public static function activation_install() {
+		FrmAppHelper::delete_cache_and_transient( 'frm_plugin_version' );
+		FrmFormActionsController::actions_init();
+		self::install();
+	}
 
-    public static function install( $old_db_version = false ) {
-        $frmdb = new FrmDb();
-        $frmdb->upgrade( $old_db_version );
-    }
+	public static function install( $old_db_version = false ) {
+		$frmdb = new FrmDb();
+		$frmdb->upgrade( $old_db_version );
+	}
 
-    public static function uninstall() {
+	public static function uninstall() {
 		FrmAppHelper::permission_check('administrator');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$frmdb = new FrmDb();
 		$frmdb->uninstall();
@@ -377,43 +377,43 @@ 
 		deactivate_plugins( FrmAppHelper::plugin_folder() . '/formidable.php', false, false );
 		echo esc_url_raw( admin_url( 'plugins.php?deactivate=true' ) );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function drop_tables( $tables ) {
-        global $wpdb;
-        $tables[] = $wpdb->prefix . 'frm_fields';
-        $tables[] = $wpdb->prefix . 'frm_forms';
-        $tables[] = $wpdb->prefix . 'frm_items';
-        $tables[] = $wpdb->prefix . 'frm_item_metas';
-        return $tables;
-    }
+	public static function drop_tables( $tables ) {
+		global $wpdb;
+		$tables[] = $wpdb->prefix . 'frm_fields';
+		$tables[] = $wpdb->prefix . 'frm_forms';
+		$tables[] = $wpdb->prefix . 'frm_items';
+		$tables[] = $wpdb->prefix . 'frm_item_metas';
+		return $tables;
+	}
 
-    // Routes for wordpress pages -- we're just replacing content here folks.
-    public static function page_route( $content ) {
-        global $post;
+	// Routes for wordpress pages -- we're just replacing content here folks.
+	public static function page_route( $content ) {
+		global $post;
 
-        $frm_settings = FrmAppHelper::get_settings();
-        if ( $post && $post->ID == $frm_settings->preview_page_id && isset( $_GET['form'] ) ) {
-            $content = FrmFormsController::page_preview();
-        }
+		$frm_settings = FrmAppHelper::get_settings();
+		if ( $post && $post->ID == $frm_settings->preview_page_id && isset( $_GET['form'] ) ) {
+			$content = FrmFormsController::page_preview();
+		}
 
-        return $content;
-    }
+		return $content;
+	}
 
-    public static function deauthorize() {
+	public static function deauthorize() {
 		FrmAppHelper::permission_check('frm_change_settings');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
-
-        delete_option( 'frmpro-credentials' );
-        delete_option( 'frmpro-authorized' );
-        delete_site_option( 'frmpro-credentials' );
-        delete_site_option( 'frmpro-authorized' );
-        wp_die();
-    }
-
-    public static function get_form_shortcode( $atts ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode()' );
-        return FrmFormsController::get_form_shortcode( $atts );
-    }
+		check_ajax_referer( 'frm_ajax', 'nonce' );
+
+		delete_option( 'frmpro-credentials' );
+		delete_option( 'frmpro-authorized' );
+		delete_site_option( 'frmpro-credentials' );
+		delete_site_option( 'frmpro-authorized' );
+		wp_die();
+	}
+
+	public static function get_form_shortcode( $atts ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode()' );
+		return FrmFormsController::get_form_shortcode( $atts );
+	}
 }

classes/controllers/FrmFormActionsController.php

Spacing +35 added lines, -35 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,26 +118,26 @@ 
         $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);
+        $action_control->_set( $action_key );
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
     }
 
     public static function add_form_action() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         global $frm_vars;
@@ -146,55 +146,55 @@ 
         $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' );
         wp_die();
     }
 
     public static function fill_action() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $action_key = absint( $_POST['action_id'] );
         $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' );
         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;
@@ -209,7 +209,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;
             }
@@ -291,33 +291,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 ];
+                $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;
         }
@@ -351,22 +351,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();
 			}
 		}
 	}

Indentation +216 added lines, -216 removed lines

@@ -1,109 +1,109 @@ 
 <?php
 
 class FrmFormActionsController {
-    public static $action_post_type = 'frm_form_actions';
-    public static $registered_actions;
-
-    public static function register_post_types() {
-        register_post_type( self::$action_post_type, array(
-            'label' => __( 'Form Actions', 'formidable' ),
-            'description' => '',
-            'public' => false,
-            'show_ui' => false,
-            'exclude_from_search' => true,
-            'show_in_nav_menus' => false,
-            'show_in_menu' => true,
-            'capability_type' => 'page',
-            'supports' => array(
+	public static $action_post_type = 'frm_form_actions';
+	public static $registered_actions;
+
+	public static function register_post_types() {
+		register_post_type( self::$action_post_type, array(
+			'label' => __( 'Form Actions', 'formidable' ),
+			'description' => '',
+			'public' => false,
+			'show_ui' => false,
+			'exclude_from_search' => true,
+			'show_in_nav_menus' => false,
+			'show_in_menu' => true,
+			'capability_type' => 'page',
+			'supports' => array(
 				'title', 'editor', 'excerpt', 'custom-fields',
 				'page-attributes',
-            ),
-            'has_archive' => false,
-        ) );
-
-        /**
-         * post_content: json settings
-         * menu_order: form id
-         * post_excerpt: action type
-         */
-
-        self::actions_init();
-    }
-
-    public static function actions_init() {
-        self::$registered_actions = new Frm_Form_Action_Factory();
-        self::register_actions();
-        do_action( 'frm_form_actions_init' );
-    }
-
-    public static function register_actions() {
-        $action_classes = apply_filters( 'frm_registered_form_actions', array(
-            'email'     => 'FrmEmailAction',
-            'wppost'    => 'FrmDefPostAction',
-            'register'  => 'FrmDefRegAction',
-            'paypal'    => 'FrmDefPayPalAction',
-            //'aweber'    => 'FrmDefAweberAction',
-            'mailchimp' => 'FrmDefMlcmpAction',
-            'twilio'    => 'FrmDefTwilioAction',
-            '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');
-
-        foreach ( $action_classes as $action_class ) {
-            self::$registered_actions->register($action_class);
-        }
-    }
+			),
+			'has_archive' => false,
+		) );
+
+		/**
+		 * post_content: json settings
+		 * menu_order: form id
+		 * post_excerpt: action type
+		 */
+
+		self::actions_init();
+	}
+
+	public static function actions_init() {
+		self::$registered_actions = new Frm_Form_Action_Factory();
+		self::register_actions();
+		do_action( 'frm_form_actions_init' );
+	}
+
+	public static function register_actions() {
+		$action_classes = apply_filters( 'frm_registered_form_actions', array(
+			'email'     => 'FrmEmailAction',
+			'wppost'    => 'FrmDefPostAction',
+			'register'  => 'FrmDefRegAction',
+			'paypal'    => 'FrmDefPayPalAction',
+			//'aweber'    => 'FrmDefAweberAction',
+			'mailchimp' => 'FrmDefMlcmpAction',
+			'twilio'    => 'FrmDefTwilioAction',
+			'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');
+
+		foreach ( $action_classes as $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) ) {
-            self::actions_init();
-            $temp_actions = self::$registered_actions->actions;
-        } else {
-            $temp_actions = $temp_actions->actions;
-        }
+		$temp_actions = self::$registered_actions;
+		if ( empty($temp_actions) ) {
+			self::actions_init();
+			$temp_actions = self::$registered_actions->actions;
+		} else {
+			$temp_actions = $temp_actions->actions;
+		}
 
-        $actions = array();
+		$actions = array();
 
-        foreach ( $temp_actions as $a ) {
-            if ( 'all' != $action && $a->id_base == $action ) {
-                return $a;
-            }
+		foreach ( $temp_actions as $a ) {
+			if ( 'all' != $action && $a->id_base == $action ) {
+				return $a;
+			}
 
 			$actions[ $a->id_base ] = $a;
-        }
-        unset( $temp_actions, $a );
-
-        $action_limit = 10;
-        if ( count( $actions ) <= $action_limit ) {
-            return $actions;
-        }
-
-        // remove the last few inactive icons if there are too many
-        $temp_actions = $actions;
-        arsort( $temp_actions );
-        foreach ( $temp_actions as $type => $a ) {
-            if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
+		}
+		unset( $temp_actions, $a );
+
+		$action_limit = 10;
+		if ( count( $actions ) <= $action_limit ) {
+			return $actions;
+		}
+
+		// remove the last few inactive icons if there are too many
+		$temp_actions = $actions;
+		arsort( $temp_actions );
+		foreach ( $temp_actions as $type => $a ) {
+			if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
 				unset( $actions[ $type ] );
-                if ( count( $actions ) <= $action_limit ) {
-                    break;
-                }
-            }
-            unset( $type, $a );
-        }
+				if ( count( $actions ) <= $action_limit ) {
+					break;
+				}
+			}
+			unset( $type, $a );
+		}
 
-        return $actions;
-    }
+		return $actions;
+	}
 
 	/**
 	 * @since 2.0
 	 */
-    public static function list_actions( $form, $values ) {
-        if ( empty( $form ) ) {
-            return;
-        }
+	public static function list_actions( $form, $values ) {
+		if ( empty( $form ) ) {
+			return;
+		}
 
 		/**
 		 * use this hook to migrate old settings into a new action
@@ -113,116 +113,116 @@ 
 
 		$form_actions = FrmFormAction::get_action_for_form( $form->id );
 
-        $action_controls = self::get_form_actions();
+		$action_controls = self::get_form_actions();
 
-        $action_map = array();
+		$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 ] ) ) {
-    	        // don't try and show settings if action no longer exists
-    	        continue;
-    	    }
+		foreach ( $form_actions as $action ) {
+			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);
+		$action_control->_set($action_key);
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
-    }
+	}
 
-    public static function add_form_action() {
+	public static function add_form_action() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        global $frm_vars;
+		global $frm_vars;
 
 		$action_key = absint( $_POST['list_id'] );
-        $action_type = sanitize_text_field( $_POST['type'] );
+		$action_type = sanitize_text_field( $_POST['type'] );
 
-        $action_control = self::get_form_actions( $action_type );
-        $action_control->_set($action_key);
+		$action_control = self::get_form_actions( $action_type );
+		$action_control->_set($action_key);
 
-        $form_id = absint( $_POST['form_id'] );
+		$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);
+		$values = array();
+		$form = self::fields_to_values($form_id, $values);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function fill_action() {
+	public static function fill_action() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $action_key = absint( $_POST['action_id'] );
-        $action_type = sanitize_text_field( $_POST['action_type'] );
+		$action_key = absint( $_POST['action_id'] );
+		$action_type = sanitize_text_field( $_POST['action_type'] );
 
-        $action_control = self::get_form_actions( $action_type );
-        if ( empty($action_control) ) {
-            wp_die();
-        }
+		$action_control = self::get_form_actions( $action_type );
+		if ( empty($action_control) ) {
+			wp_die();
+		}
 
-        $form_action = $action_control->get_single_action( $action_key );
+		$form_action = $action_control->get_single_action( $action_key );
 
-        $values = array();
-        $form = self::fields_to_values($form_action->menu_order, $values);
+		$values = array();
+		$form = self::fields_to_values($form_action->menu_order, $values);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_inside.php' );
-        wp_die();
-    }
+		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);
-        foreach ( $fields as $k => $f ) {
-            $f = (array) $f;
-            $opts = (array) $f['field_options'];
-            $f = array_merge($opts, $f);
-            if ( ! isset( $f['post_field'] ) ) {
-                $f['post_field'] = '';
-            }
-            $values['fields'][] = $f;
-            unset($k, $f);
-        }
-
-        return $form;
-    }
+		$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);
+			if ( ! isset( $f['post_field'] ) ) {
+				$f['post_field'] = '';
+			}
+			$values['fields'][] = $f;
+			unset($k, $f);
+		}
+
+		return $form;
+	}
 
 	public static function update_settings( $form_id ) {
-        global $wpdb;
+		global $wpdb;
 
-        $registered_actions = self::$registered_actions->actions;
+		$registered_actions = self::$registered_actions->actions;
 
 		$old_actions = FrmDb::get_col( $wpdb->posts, array( 'post_type' => self::$action_post_type, 'menu_order' => $form_id ), 'ID' );
-        $new_actions = array();
+		$new_actions = array();
 
-        foreach ( $registered_actions as $registered_action ) {
-            $action_ids = $registered_action->update_callback($form_id);
-            if ( ! empty( $action_ids ) ) {
-                $new_actions[] = $action_ids;
-            }
-        }
+		foreach ( $registered_actions as $registered_action ) {
+			$action_ids = $registered_action->update_callback($form_id);
+			if ( ! empty( $action_ids ) ) {
+				$new_actions[] = $action_ids;
+			}
+		}
 
-        //Only use array_merge if there are new actions
-        if ( ! empty( $new_actions ) ) {
-            $new_actions = call_user_func_array( 'array_merge', $new_actions );
-        }
-        $old_actions = array_diff( $old_actions, $new_actions );
+		//Only use array_merge if there are new actions
+		if ( ! empty( $new_actions ) ) {
+			$new_actions = call_user_func_array( 'array_merge', $new_actions );
+		}
+		$old_actions = array_diff( $old_actions, $new_actions );
 
 		self::delete_missing_actions( $old_actions );
-    }
+	}
 
 	public static function delete_missing_actions( $old_actions ) {
 		if ( ! empty( $old_actions ) ) {
@@ -242,36 +242,36 @@ 
 		self::trigger_actions( $event, $form_id, $entry_id, 'all', $args );
 	}
 
-    /**
-     * @param string $event
-     */
+	/**
+	 * @param string $event
+	 */
 	public static function trigger_actions( $event, $form, $entry, $type = 'all', $args = array() ) {
 		$form_actions = FrmFormAction::get_action_for_form( ( is_object( $form ) ? $form->id : $form ), $type );
 
 		if ( empty( $form_actions ) ) {
-            return;
-        }
+			return;
+		}
 
 		FrmForm::maybe_get_form( $form );
 
-        $link_settings = self::get_form_actions( $type );
-        if ( 'all' != $type ) {
-            $link_settings = array( $type => $link_settings );
-        }
+		$link_settings = self::get_form_actions( $type );
+		if ( 'all' != $type ) {
+			$link_settings = array( $type => $link_settings );
+		}
 
-        $stored_actions = $action_priority = array();
+		$stored_actions = $action_priority = array();
 
 		$importing = in_array( $event, array( 'create', 'update' ) ) && defined( 'WP_IMPORTING' ) && WP_IMPORTING;
 
-        foreach ( $form_actions as $action ) {
+		foreach ( $form_actions as $action ) {
 			$trigger_on_import = $importing && in_array( 'import', $action->post_content['event'] );
 			if ( ! in_array( $event, $action->post_content['event'] ) && ! $trigger_on_import ) {
-                continue;
-            }
+				continue;
+			}
 
-            if ( ! is_object( $entry ) ) {
-                $entry = FrmEntry::getOne( $entry, true );
-            }
+			if ( ! is_object( $entry ) ) {
+				$entry = FrmEntry::getOne( $entry, true );
+			}
 
 			if ( empty( $entry ) || ( $entry->is_draft && $event != 'draft' ) ) {
 				continue;
@@ -285,64 +285,64 @@ 
 				if ( ! $trigger_children ) {
 					continue;
 				}
-            }
+			}
 
-            // check conditional logic
+			// check conditional logic
 			$stop = FrmFormAction::action_conditions_met( $action, $entry );
-            if ( $stop ) {
-                continue;
-            }
+			if ( $stop ) {
+				continue;
+			}
 
-            // 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'];
+			// 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'];
 
-            unset($action);
-        }
+			unset($action);
+		}
 
-        if ( ! empty( $stored_actions ) ) {
-            asort($action_priority);
+		if ( ! empty( $stored_actions ) ) {
+			asort($action_priority);
 
-            // make sure hooks are loaded
-            new FrmNotification();
+			// make sure hooks are loaded
+			new FrmNotification();
 
-            foreach ( $action_priority as $action_id => $priority ) {
-                $action = $stored_actions[ $action_id ];
+			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 );
 
-                // If post is created, get updated $entry object
-                if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
-                    $entry = FrmEntry::getOne($entry->id, true);
-                }
-            }
-        }
-    }
+				// If post is created, get updated $entry object
+				if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
+					$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']) ) {
-            // continue if we know which actions to copy
-            return;
-        }
+		if ( ! isset($args['old_id']) || empty($args['old_id']) ) {
+			// continue if we know which actions to copy
+			return;
+		}
 
-        $action_controls = self::get_form_actions( );
+		$action_controls = self::get_form_actions( );
 
-        foreach ( $action_controls as $action_control ) {
-            $action_control->duplicate_form_actions( $form_id, $args['old_id'] );
-            unset( $action_control );
-        }
-    }
+		foreach ( $action_controls as $action_control ) {
+			$action_control->duplicate_form_actions( $form_id, $args['old_id'] );
+			unset( $action_control );
+		}
+	}
 
-    public static function limit_by_type( $where ) {
-        global $frm_vars, $wpdb;
+	public static function limit_by_type( $where ) {
+		global $frm_vars, $wpdb;
 
-        if ( ! isset( $frm_vars['action_type'] ) ) {
-            return $where;
-        }
+		if ( ! isset( $frm_vars['action_type'] ) ) {
+			return $where;
+		}
 
-        $where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] );
-        return $where;
-    }
+		$where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] );
+		return $where;
+	}
 }
 
 
@@ -369,7 +369,7 @@ 
 		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();
+				$this->actions[ $key ]->_register();
 			}
 		}
 	}

formidable.php

Indentation +19 added lines, -19 removed lines

@@ -23,41 +23,41 @@
 
 global $frm_vars;
 $frm_vars = array(
-    'load_css' => false, 'forms_loaded' => array(),
-    'created_entries'   => array(),
-    'pro_is_authorized' => false,
+	'load_css' => false, 'forms_loaded' => array(),
+	'created_entries'   => array(),
+	'pro_is_authorized' => false,
 );
 
 function frm_forms_autoloader( $class_name ) {
-    // Only load Frm classes here
+	// Only load Frm classes here
 	if ( ! preg_match( '/^Frm.+$/', $class_name ) ) {
-        return;
-    }
+		return;
+	}
 
-    $filepath = dirname(__FILE__);
+	$filepath = dirname(__FILE__);
 	if ( preg_match( '/^FrmPro.+$/', $class_name ) || 'FrmUpdatesController' == $class_name ) {
-        $filepath .= '/pro';
-    }
-    $filepath .= '/classes';
+		$filepath .= '/pro';
+	}
+	$filepath .= '/classes';
 
 	if ( preg_match( '/^.+Helper$/', $class_name ) ) {
-        $filepath .= '/helpers/';
+		$filepath .= '/helpers/';
 	} else if ( preg_match( '/^.+Controller$/', $class_name ) ) {
-        $filepath .= '/controllers/';
-    } else {
-        $filepath .= '/models/';
-    }
+		$filepath .= '/controllers/';
+	} else {
+		$filepath .= '/models/';
+	}
 
 	$filepath .= $class_name . '.php';
 
-    if ( file_exists($filepath) ) {
-        include($filepath);
-    }
+	if ( file_exists($filepath) ) {
+		include($filepath);
+	}
 }
 
 // if __autoload is active, put it on the spl_autoload stack
 if ( is_array(spl_autoload_functions()) && in_array( '__autoload', spl_autoload_functions()) ) {
-    spl_autoload_register('__autoload');
+	spl_autoload_register('__autoload');
 }
 
 // Add the autoloader

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
         return;
     }
 
-    $filepath = dirname(__FILE__);
+    $filepath = dirname( __FILE__ );
 	if ( preg_match( '/^FrmPro.+$/', $class_name ) || 'FrmUpdatesController' == $class_name ) {
         $filepath .= '/pro';
     }
@@ -50,25 +50,25 @@ 
 
 	$filepath .= $class_name . '.php';
 
-    if ( file_exists($filepath) ) {
-        include($filepath);
+    if ( file_exists( $filepath ) ) {
+        include( $filepath );
     }
 }
 
 // if __autoload is active, put it on the spl_autoload stack
-if ( is_array(spl_autoload_functions()) && in_array( '__autoload', spl_autoload_functions()) ) {
-    spl_autoload_register('__autoload');
+if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions() ) ) {
+    spl_autoload_register( '__autoload' );
 }
 
 // Add the autoloader
-spl_autoload_register('frm_forms_autoloader');
+spl_autoload_register( 'frm_forms_autoloader' );
 
-$frm_path = dirname(__FILE__);
-if ( file_exists($frm_path . '/pro/formidable-pro.php') ) {
+$frm_path = dirname( __FILE__ );
+if ( file_exists( $frm_path . '/pro/formidable-pro.php' ) ) {
 	include( $frm_path . '/pro/formidable-pro.php' );
 }
 
 FrmHooksController::trigger_load_hook();
 
 include_once( $frm_path . '/deprecated.php' );
-unset($frm_path);
+unset( $frm_path );

classes/views/frm-fields/radio.php

Indentation +8 added lines, -8 removed lines

@@ -1,22 +1,22 @@
 <?php
 if ( ! is_array($field['options']) ) {
-    return;
+	return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+	$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+	$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 
-    // Get string for Other text field, if needed
+	// Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+	$checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-    } else {
+	} else {
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-    }
+	}
 
-    unset($checked, $other_val);
+	unset($checked, $other_val);
 }

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-if ( ! is_array($field['options']) ) {
+if ( ! is_array( $field['options'] ) ) {
     return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+    $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+    $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 
     // Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+    $checked = ( $other_val || isset( $field['value'] ) && ( ( ! is_array( $field['value'] ) && $field['value'] == $field_val ) || ( is_array( $field['value'] ) && in_array( $field_val, $field['value'] ) ) ) ) ? ' checked="checked"' : '';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
@@ -18,5 +18,5 @@ 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
     }
 
-    unset($checked, $other_val);
+    unset( $checked, $other_val );
 }