Strategy11 / formidable-forms

classes/controllers/FrmFieldsController.php

Indentation +480 added lines, -480 removed lines

@@ -2,132 +2,132 @@ 
 
 class FrmFieldsController {
 
-    public static function load_field() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function load_field() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $fields = $_POST['field'];
-        if ( empty( $fields ) ) {
-            wp_die();
-        }
+		$fields = $_POST['field'];
+		if ( empty( $fields ) ) {
+			wp_die();
+		}
 
-        $_GET['page'] = 'formidable';
-        $fields = stripslashes_deep( $fields );
+		$_GET['page'] = 'formidable';
+		$fields = stripslashes_deep( $fields );
 
-        $ajax = true;
+		$ajax = true;
 		$values = array( 'id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ) );
-        $path = FrmAppHelper::plugin_path();
-        $field_html = array();
-
-        foreach ( $fields as $field ) {
-            $field = htmlspecialchars_decode( nl2br( $field ) );
-            $field = json_decode( $field, true );
-            if ( ! isset( $field['id'] ) ) {
-                // this field may have already been loaded
-                continue;
-            }
+		$path = FrmAppHelper::plugin_path();
+		$field_html = array();
+
+		foreach ( $fields as $field ) {
+			$field = htmlspecialchars_decode( nl2br( $field ) );
+			$field = json_decode( $field, true );
+			if ( ! isset( $field['id'] ) ) {
+				// this field may have already been loaded
+				continue;
+			}
 
-            $field_id = absint( $field['id'] );
+			$field_id = absint( $field['id'] );
 
-            if ( ! isset( $field['value'] ) ) {
-                $field['value'] = '';
-            }
+			if ( ! isset( $field['value'] ) ) {
+				$field['value'] = '';
+			}
 
-            $field_name = 'item_meta['. $field_id .']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+			$field_name = 'item_meta['. $field_id .']';
+			$html_id = FrmFieldsHelper::get_html_id($field);
 
-            ob_start();
-            include($path .'/classes/views/frm-forms/add_field.php');
-            $field_html[ $field_id ] = ob_get_contents();
-            ob_end_clean();
-        }
+			ob_start();
+			include($path .'/classes/views/frm-forms/add_field.php');
+			$field_html[ $field_id ] = ob_get_contents();
+			ob_end_clean();
+		}
 
-        unset($path);
+		unset($path);
 
-        echo json_encode($field_html);
+		echo json_encode($field_html);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function create() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function create() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_type = FrmAppHelper::get_post_param( 'field', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        $field = self::include_new_field($field_type, $form_id);
+		$field = self::include_new_field($field_type, $form_id);
 
-        // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+		// this hook will allow for multiple fields to be added at once
+		do_action('frm_after_field_created', $field, $form_id);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * @param integer $form_id
-     */
+	/**
+	 * @param integer $form_id
+	 */
 	public static function include_new_field( $field_type, $form_id ) {
-        $values = array();
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
-        }
+		$values = array();
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values['post_type'] = FrmProFormsHelper::post_type($form_id);
+		}
 
-        $field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
-        $field_id = FrmField::create( $field_values );
+		$field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
+		$field_id = FrmField::create( $field_values );
 
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+		$field = self::include_single_field($field_id, $values, $form_id);
 
-        return $field;
-    }
+		return $field;
+	}
 
-    public static function update_form_id() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function update_form_id() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        if ( ! $field_id || ! $form_id ) {
-            wp_die();
-        }
+		if ( ! $field_id || ! $form_id ) {
+			wp_die();
+		}
 
 		$updated = FrmField::update( $field_id, compact( 'form_id' ) );
 		echo absint( $updated );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function edit_name( $field = 'name', $id = '' ) {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( empty($field) ) {
-            $field = 'name';
-        }
+		if ( empty($field) ) {
+			$field = 'name';
+		}
 
-        if ( empty($id) ) {
+		if ( empty($id) ) {
 			$id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 			$id = str_replace( 'field_label_', '', $id );
-        }
+		}
 
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' );
 		$value = trim( $value );
-        if ( trim(strip_tags($value)) == '' ) {
-            // set blank value if there is no content
-            $value = '';
-        }
+		if ( trim(strip_tags($value)) == '' ) {
+			// set blank value if there is no content
+			$value = '';
+		}
 
 		FrmField::update( $id, array( $field => $value ) );
 
 		do_action( 'frm_after_update_field_' . $field, compact( 'id', 'value' ) );
 
 		echo stripslashes( wp_kses_post( $value ) );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function update_ajax_option() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function update_ajax_option() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
 		if ( ! $field_id ) {
@@ -137,151 +137,151 @@ 
 		$field = FrmField::getOne( $field_id );
 
 		foreach ( array( 'clear_on_focus', 'separate_value', 'default_blank' ) as $val ) {
-            if ( isset($_POST[ $val ]) ) {
+			if ( isset($_POST[ $val ]) ) {
 				// all three of these options are boolean
 				$new_val = FrmAppHelper::get_post_param( $val, 0, 'absint' );
 
-                if ( $val == 'separate_value' ) {
+				if ( $val == 'separate_value' ) {
 					$new_val = FrmField::is_option_true( $field, $val ) ? 0 : 1;
-                }
+				}
 
-                $field->field_options[ $val ] = $new_val;
-                unset($new_val);
-            }
-            unset($val);
-        }
+				$field->field_options[ $val ] = $new_val;
+				unset($new_val);
+			}
+			unset($val);
+		}
 
-        FrmField::update( $field_id, array(
-            'field_options' => $field->field_options,
+		FrmField::update( $field_id, array(
+			'field_options' => $field->field_options,
 			'form_id'		=> $field->form_id,
-        ) );
-        wp_die();
-    }
+		) );
+		wp_die();
+	}
 
-    public static function duplicate() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function duplicate() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        global $wpdb;
+		global $wpdb;
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
 		$copy_field = FrmField::getOne( $field_id );
-        if ( ! $copy_field ) {
-            wp_die();
-        }
+		if ( ! $copy_field ) {
+			wp_die();
+		}
 
-        do_action('frm_duplicate_field', $copy_field, $form_id);
-        do_action('frm_duplicate_field_'. $copy_field->type, $copy_field, $form_id);
+		do_action('frm_duplicate_field', $copy_field, $form_id);
+		do_action('frm_duplicate_field_'. $copy_field->type, $copy_field, $form_id);
 
-        $values = array( 'id' => $form_id );
-        FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
+		$values = array( 'id' => $form_id );
+		FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
 
 		$field_count = FrmDb::get_count( $wpdb->prefix .'frm_fields fi LEFT JOIN '. $wpdb->prefix .'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
 
-        $values['field_order'] = $field_count + 1;
+		$values['field_order'] = $field_count + 1;
 
-        if ( ! $field_id = FrmField::create($values) ) {
-            wp_die();
-        }
+		if ( ! $field_id = FrmField::create($values) ) {
+			wp_die();
+		}
 
-        self::include_single_field($field_id, $values);
+		self::include_single_field($field_id, $values);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * Load a single field in the form builder along with all needed variables
-     */
-    public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
-        $field_name = 'item_meta['. $field_id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
-        $id = $form_id ? $form_id : $field['form_id'];
-        if ( $field['type'] == 'html' ) {
-            $field['stop_filter'] = true;
-        }
+	/**
+	 * Load a single field in the form builder along with all needed variables
+	 */
+	public static function include_single_field( $field_id, $values, $form_id = 0 ) {
+		$field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
+		$field_name = 'item_meta['. $field_id .']';
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$id = $form_id ? $form_id : $field['form_id'];
+		if ( $field['type'] == 'html' ) {
+			$field['stop_filter'] = true;
+		}
 
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
+		require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
 
-        return $field;
-    }
+		return $field;
+	}
 
-    public static function destroy() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function destroy() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		FrmField::destroy( $field_id );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /* Field Options */
+	/* Field Options */
 
-    //Add Single Option or Other Option
-    public static function add_option() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	//Add Single Option or Other Option
+	public static function add_option() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$opt_type = FrmAppHelper::get_post_param( 'opt_type', '', 'sanitize_text_field' );
 
-        //Get the field
-        $field = FrmField::getOne($id);
+		//Get the field
+		$field = FrmField::getOne($id);
 
 		if ( ! empty( $field->options ) ) {
 			$keys = array_keys( $field->options );
-            $last = str_replace( 'other_', '', end( $keys ) );
-        } else {
-            $last = 0;
-        }
-        $opt_key = $last + 1;
+			$last = str_replace( 'other_', '', end( $keys ) );
+		} else {
+			$last = 0;
+		}
+		$opt_key = $last + 1;
 
-        if ( 'other' == $opt_type ) {
+		if ( 'other' == $opt_type ) {
 			$opt = esc_html__( 'Other', 'formidable' );
-            $other_val = '';
-            $opt_key = 'other_' . $opt_key;
-
-            //Update value of "other" in DB
-            $field_options = maybe_unserialize( $field->field_options );
-            $field_options['other'] = 1;
-            FrmField::update( $id, array( 'field_options' => maybe_serialize( $field_options ) ) );
-        } else {
+			$other_val = '';
+			$opt_key = 'other_' . $opt_key;
+
+			//Update value of "other" in DB
+			$field_options = maybe_unserialize( $field->field_options );
+			$field_options['other'] = 1;
+			FrmField::update( $id, array( 'field_options' => maybe_serialize( $field_options ) ) );
+		} else {
 			$first_opt = reset( $field->options );
 			$next_opt = count( $field->options );
-            if ( $first_opt != '' ) {
-                $next_opt++;
-            }
-            $opt = esc_html__( 'Option', 'formidable' ) .' '. $next_opt;
-            unset($next_opt);
-        }
-        $field_val = $opt;
+			if ( $first_opt != '' ) {
+				$next_opt++;
+			}
+			$opt = esc_html__( 'Option', 'formidable' ) .' '. $next_opt;
+			unset($next_opt);
+		}
+		$field_val = $opt;
 		$field->options[ $opt_key ] = $opt;
 
-        //Update options in DB
+		//Update options in DB
 		FrmField::update( $id, array( 'options' => $field->options ) );
 
-        $field_data = $field;
-        $field = array(
-            'type'  => $field_data->type,
-            'id'    => $id,
-            'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
-            'form_id' => $field_data->form_id,
-            'field_key' => $field_data->field_key,
-        );
-
-        $field_name = 'item_meta['. $id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
-        $checked = '';
-
-        if ( 'other' == $opt_type ) {
-            require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
-        } else {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
-        }
-        wp_die();
-    }
-
-    public static function edit_option() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		$field_data = $field;
+		$field = array(
+			'type'  => $field_data->type,
+			'id'    => $id,
+			'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
+			'form_id' => $field_data->form_id,
+			'field_key' => $field_data->field_key,
+		);
+
+		$field_name = 'item_meta['. $id .']';
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$checked = '';
+
+		if ( 'other' == $opt_type ) {
+			require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
+		} else {
+			require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
+		}
+		wp_die();
+	}
+
+	public static function edit_option() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$element_id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 		$ids = explode( '-', $element_id );
@@ -289,42 +289,42 @@ 
 
 		$orig_update_value = $update_value = trim( FrmAppHelper::get_post_param( 'update_value' ) );
 		if ( strpos( $element_id, 'key_' ) ) {
-            $new_value = $update_value;
-        } else {
-            $new_label = $update_value;
-        }
+			$new_value = $update_value;
+		} else {
+			$new_label = $update_value;
+		}
 
-        $field = FrmField::getOne($id);
-        $separate_values = FrmField::is_option_true( $field, 'separate_value' );
+		$field = FrmField::getOne($id);
+		$separate_values = FrmField::is_option_true( $field, 'separate_value' );
 
-        $this_opt_id = end($ids);
+		$this_opt_id = end($ids);
 		$this_opt = (array) $field->options[ $this_opt_id ];
-        $other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other') !== false ? true : false );
+		$other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other') !== false ? true : false );
 
-        $label = isset($this_opt['label']) ? $this_opt['label'] : reset($this_opt);
-        $value = isset($this_opt['value']) ? $this_opt['value'] : '';
+		$label = isset($this_opt['label']) ? $this_opt['label'] : reset($this_opt);
+		$value = isset($this_opt['value']) ? $this_opt['value'] : '';
 
-        if ( ! isset( $new_label ) ) {
-            $new_label = $label;
-        }
+		if ( ! isset( $new_label ) ) {
+			$new_label = $label;
+		}
 
-        if ( isset($new_value) || isset($value) ) {
-            $update_value = isset($new_value) ? $new_value : $value;
-        }
+		if ( isset($new_value) || isset($value) ) {
+			$update_value = isset($new_value) ? $new_value : $value;
+		}
 
 		if ( $update_value != $new_label && $other_opt === false && $separate_values ) {
 			$field->options[ $this_opt_id ] = array( 'value' => $update_value, 'label' => $new_label );
-        } else {
+		} else {
 			$field->options[ $this_opt_id ] = $orig_update_value;
-        }
+		}
 
 		FrmField::update( $field->id, array( 'options' => $field->options ) );
 		echo ( $orig_update_value == '' ) ? esc_html__( '(Blank)', 'formidable' ) : stripslashes( $orig_update_value );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function delete_option() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function delete_option() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$field = FrmField::getOne( $field_id );
@@ -332,339 +332,339 @@ 
 		$opt_key = FrmAppHelper::get_post_param( 'opt_key', 0, 'sanitize_title' );
 
 		$options = $field->options;
-        unset( $options[ $opt_key ] );
-        $response = array( 'other' => true );
+		unset( $options[ $opt_key ] );
+		$response = array( 'other' => true );
 
-        //If the deleted option is an "other" option
+		//If the deleted option is an "other" option
 		if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
-            //Assume all other options are gone, unless proven otherwise
-            $other = false;
+			//Assume all other options are gone, unless proven otherwise
+			$other = false;
 
-            //Check if all other options are really gone
-            foreach ( $options as $o_key => $o_val ) {
-                //If there is still an other option in the field, set other to true
+			//Check if all other options are really gone
+			foreach ( $options as $o_key => $o_val ) {
+				//If there is still an other option in the field, set other to true
 				if ( FrmFieldsHelper::is_other_opt( $o_key ) ) {
-                    $other = true;
-                    break;
-                }
-                unset( $o_key, $o_val );
-            }
-
-            //If all other options are gone
-            if ( false === $other ) {
-                $field_options = maybe_unserialize( $field->field_options );
-                $field_options['other'] = 0;
+					$other = true;
+					break;
+				}
+				unset( $o_key, $o_val );
+			}
+
+			//If all other options are gone
+			if ( false === $other ) {
+				$field_options = maybe_unserialize( $field->field_options );
+				$field_options['other'] = 0;
 				FrmField::update( $field_id, array( 'field_options' => maybe_serialize( $field_options ) ) );
-                $response = array( 'other' => false );
-            }
-        }
-        echo json_encode( $response );
+				$response = array( 'other' => false );
+			}
+		}
+		echo json_encode( $response );
 
 		FrmField::update( $field_id, array( 'options' => maybe_serialize( $options ) ) );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function import_choices() {
-        if ( ! current_user_can( 'frm_edit_forms' ) ) {
-            wp_die();
-        }
+	public static function import_choices() {
+		if ( ! current_user_can( 'frm_edit_forms' ) ) {
+			wp_die();
+		}
 
 		$field_id = absint( $_REQUEST['field_id'] );
 
-        global $current_screen, $hook_suffix;
+		global $current_screen, $hook_suffix;
 
-        // Catch plugins that include admin-header.php before admin.php completes.
-        if ( empty( $current_screen ) && function_exists( 'set_current_screen' ) ) {
-            $hook_suffix = '';
-        	set_current_screen();
-        }
+		// Catch plugins that include admin-header.php before admin.php completes.
+		if ( empty( $current_screen ) && function_exists( 'set_current_screen' ) ) {
+			$hook_suffix = '';
+			set_current_screen();
+		}
 
-        if ( function_exists( 'register_admin_color_schemes' ) ) {
-            register_admin_color_schemes();
-        }
+		if ( function_exists( 'register_admin_color_schemes' ) ) {
+			register_admin_color_schemes();
+		}
 
-        $hook_suffix = $admin_body_class = '';
+		$hook_suffix = $admin_body_class = '';
 
-        if ( get_user_setting( 'mfold' ) == 'f' ) {
-        	$admin_body_class .= ' folded';
-        }
+		if ( get_user_setting( 'mfold' ) == 'f' ) {
+			$admin_body_class .= ' folded';
+		}
 
-        if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() ) {
-        	$admin_body_class .= ' admin-bar';
-        }
+		if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() ) {
+			$admin_body_class .= ' admin-bar';
+		}
 
-        if ( is_rtl() ) {
-        	$admin_body_class .= ' rtl';
-        }
+		if ( is_rtl() ) {
+			$admin_body_class .= ' rtl';
+		}
 
-        $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-        $prepop = array();
-        FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
+		$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
+		$prepop = array();
+		FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
 
-        $field = FrmField::getOne($field_id);
+		$field = FrmField::getOne($field_id);
 
-        wp_enqueue_script( 'utils' );
-        wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url(). '/css/frm_admin.css' );
-        FrmAppHelper::load_admin_wide_js();
+		wp_enqueue_script( 'utils' );
+		wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url(). '/css/frm_admin.css' );
+		FrmAppHelper::load_admin_wide_js();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/import_choices.php');
-        wp_die();
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/import_choices.php');
+		wp_die();
+	}
 
-    public static function import_options() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function import_options() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
-            return;
-        }
+		if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
+			return;
+		}
 
 		$field_id = absint( $_POST['field_id'] );
-        $field = FrmField::getOne($field_id);
+		$field = FrmField::getOne($field_id);
 
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'select' ) ) ) {
-            return;
-        }
-
-        $field = FrmFieldsHelper::setup_edit_vars($field);
-        $opts = stripslashes_deep($_POST['opts']);
-        $opts = explode("\n", rtrim($opts, "\n"));
-        if ( $field['separate_value'] ) {
-            foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
-                    if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
-                    }
-                    unset($vals);
-                }
-                unset($opt_key, $opt);
-            }
-        }
-
-        //Keep other options after bulk update
-        if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
-            $other_array = array();
-            foreach ( $field['options'] as $opt_key => $opt ) {
-                if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
-                    $other_array[ $opt_key ] = $opt;
-                }
-                unset($opt_key, $opt);
-            }
-            if ( ! empty($other_array) ) {
-                $opts = array_merge( $opts, $other_array);
-            }
-        }
-
-        FrmField::update( $field_id, array( 'options' => maybe_serialize( $opts ) ) );
-
-        $field['options'] = $opts;
-        $field_name = $field['name'];
-
-        // Get html_id which will be used in single-option.php
-        $html_id = FrmFieldsHelper::get_html_id( $field );
-
-        if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php');
-        } else {
-            FrmFieldsHelper::show_single_option($field);
-        }
-
-        wp_die();
-    }
-
-    public static function update_order() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+			return;
+		}
+
+		$field = FrmFieldsHelper::setup_edit_vars($field);
+		$opts = stripslashes_deep($_POST['opts']);
+		$opts = explode("\n", rtrim($opts, "\n"));
+		if ( $field['separate_value'] ) {
+			foreach ( $opts as $opt_key => $opt ) {
+				if ( strpos($opt, '|') !== false ) {
+					$vals = explode('|', $opt);
+					if ( $vals[0] != $vals[1] ) {
+						$opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+					}
+					unset($vals);
+				}
+				unset($opt_key, $opt);
+			}
+		}
+
+		//Keep other options after bulk update
+		if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
+			$other_array = array();
+			foreach ( $field['options'] as $opt_key => $opt ) {
+				if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
+					$other_array[ $opt_key ] = $opt;
+				}
+				unset($opt_key, $opt);
+			}
+			if ( ! empty($other_array) ) {
+				$opts = array_merge( $opts, $other_array);
+			}
+		}
+
+		FrmField::update( $field_id, array( 'options' => maybe_serialize( $opts ) ) );
+
+		$field['options'] = $opts;
+		$field_name = $field['name'];
+
+		// Get html_id which will be used in single-option.php
+		$html_id = FrmFieldsHelper::get_html_id( $field );
+
+		if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
+			require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php');
+		} else {
+			FrmFieldsHelper::show_single_option($field);
+		}
+
+		wp_die();
+	}
+
+	public static function update_order() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 		$fields = FrmAppHelper::get_post_param( 'frm_field_id' );
 		foreach ( (array) $fields as $position => $item ) {
 			FrmField::update( absint( $item ), array( 'field_order' => absint( $position ) ) );
 		}
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function change_type( $type ) {
-        $type_switch = array(
-            'scale'     => 'radio',
-            '10radio'   => 'radio',
-            'rte'       => 'textarea',
-            'website'   => 'url',
-        );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
-        }
+		$type_switch = array(
+			'scale'     => 'radio',
+			'10radio'   => 'radio',
+			'rte'       => 'textarea',
+			'website'   => 'url',
+		);
+		if ( isset( $type_switch[ $type ] ) ) {
+			$type = $type_switch[ $type ];
+		}
 
 		$frm_field_selection = FrmField::field_selection();
-        $types = array_keys($frm_field_selection);
-        if ( ! in_array($type, $types) && $type != 'captcha' ) {
-            $type = 'text';
-        }
+		$types = array_keys($frm_field_selection);
+		if ( ! in_array($type, $types) && $type != 'captcha' ) {
+			$type = 'text';
+		}
 
-        return $type;
-    }
+		return $type;
+	}
 
 	public static function display_field_options( $display ) {
 		switch ( $display['type'] ) {
-            case 'captcha':
-                $display['required'] = false;
-                $display['invalid'] = true;
-                $display['default_blank'] = false;
+			case 'captcha':
+				$display['required'] = false;
+				$display['invalid'] = true;
+				$display['default_blank'] = false;
 				$display['captcha_size'] = true;
-            break;
-            case 'radio':
-                $display['default_blank'] = false;
-            break;
-            case 'text':
-            case 'textarea':
-                $display['size'] = true;
-                $display['clear_on_focus'] = true;
-            break;
-            case 'select':
-                $display['size'] = true;
-            break;
-            case 'url':
-            case 'website':
-            case 'email':
-                $display['size'] = true;
-                $display['clear_on_focus'] = true;
-                $display['invalid'] = true;
-        }
-
-        return $display;
-    }
-
-    public static function input_html( $field, $echo = true ) {
-        $class = array(); //$field['type'];
-        self::add_input_classes($field, $class);
-
-        $add_html = array();
-        self::add_html_size($field, $add_html);
-        self::add_html_length($field, $add_html);
-        self::add_html_placeholder($field, $add_html, $class);
+			break;
+			case 'radio':
+				$display['default_blank'] = false;
+			break;
+			case 'text':
+			case 'textarea':
+				$display['size'] = true;
+				$display['clear_on_focus'] = true;
+			break;
+			case 'select':
+				$display['size'] = true;
+			break;
+			case 'url':
+			case 'website':
+			case 'email':
+				$display['size'] = true;
+				$display['clear_on_focus'] = true;
+				$display['invalid'] = true;
+		}
+
+		return $display;
+	}
+
+	public static function input_html( $field, $echo = true ) {
+		$class = array(); //$field['type'];
+		self::add_input_classes($field, $class);
+
+		$add_html = array();
+		self::add_html_size($field, $add_html);
+		self::add_html_length($field, $add_html);
+		self::add_html_placeholder($field, $add_html, $class);
 		self::add_validation_messages( $field, $add_html );
 
-        $class = apply_filters('frm_field_classes', implode(' ', $class), $field);
+		$class = apply_filters('frm_field_classes', implode(' ', $class), $field);
 
 		FrmFormsHelper::add_html_attr( $class, 'class', $add_html );
 
-        self::add_shortcodes_to_html($field, $add_html);
+		self::add_shortcodes_to_html($field, $add_html);
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
 		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
 
-        if ( $echo ) {
-            echo $add_html;
-        }
+		if ( $echo ) {
+			echo $add_html;
+		}
 
-        return $add_html;
-    }
+		return $add_html;
+	}
 
 	private static function add_input_classes( $field, array &$class ) {
-        if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
-            $class[] = $field['input_class'];
-        }
+		if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
+			$class[] = $field['input_class'];
+		}
 
-        if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
-            return;
-        }
+		if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
+			return;
+		}
 
-        global $frm_vars;
+		global $frm_vars;
 		if ( is_admin() && ! FrmAppHelper::is_preview_page() && ! in_array( $field['type'], array( 'scale', 'radio', 'checkbox', 'data' ) ) ) {
-            $class[] = 'dyn_default_value';
-        }
+			$class[] = 'dyn_default_value';
+		}
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
-            $class[] = 'auto_width';
-        }
-    }
+		if ( isset($field['size']) && $field['size'] > 0 ) {
+			$class[] = 'auto_width';
+		}
+	}
 
 	private static function add_html_size( $field, array &$add_html ) {
 		if ( ! isset( $field['size'] ) || $field['size'] <= 0 || in_array( $field['type'], array( 'select', 'data', 'time', 'hidden' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			return;
+		}
 
-        if ( is_numeric($field['size']) ) {
-            $field['size'] .= 'px';
-        }
+		if ( is_numeric($field['size']) ) {
+			$field['size'] .= 'px';
+		}
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
-        // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
-        $add_html['style'] = 'style="width:'. esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) .'"';
+		$important = apply_filters('frm_use_important_width', 1, $field);
+		// Note: This inline styling must stay since we cannot realistically set a class for every possible field size
+		$add_html['style'] = 'style="width:'. esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) .'"';
 
-        self::add_html_cols($field, $add_html);
-    }
+		self::add_html_cols($field, $add_html);
+	}
 
 	private static function add_html_cols( $field, array &$add_html ) {
 		if ( ! in_array( $field['type'], array( 'textarea', 'rte' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        // convert to cols for textareas
-        $calc = array(
-            ''      => 9,
-            'px'    => 9,
-            'rem'   => 0.444,
-            'em'    => 0.544,
-        );
+		// convert to cols for textareas
+		$calc = array(
+			''      => 9,
+			'px'    => 9,
+			'rem'   => 0.444,
+			'em'    => 0.544,
+		);
 
-        // include "col" for valid html
-        $unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
+		// include "col" for valid html
+		$unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
 
-        if ( ! isset( $calc[ $unit ] ) ) {
-            return;
-        }
+		if ( ! isset( $calc[ $unit ] ) ) {
+			return;
+		}
 
-        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
-    }
+	}
 
 	private static function add_html_length( $field, array &$add_html ) {
-        // check for max setting and if this field accepts maxlength
+		// check for max setting and if this field accepts maxlength
 		if ( FrmField::is_option_empty( $field, 'max' ) || in_array( $field['type'], array( 'textarea', 'rte', 'hidden' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            // don't load on form builder page
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			// don't load on form builder page
+			return;
+		}
 
 		$add_html['maxlength'] = 'maxlength="' . esc_attr( $field['max'] ) . '"';
-    }
+	}
 
 	private static function add_html_placeholder( $field, array &$add_html, array &$class ) {
 		if ( empty( $field['default_value'] ) || FrmAppHelper::is_admin_page( 'formidable' ) ) {
 			return;
 		}
 
-        if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
+		if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
 			if ( is_array( $field['default_value'] ) ) {
 				$field['default_value'] = json_encode( $field['default_value'] );
 			}
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['default_value'] ) . '"';
-            return;
-        }
+			return;
+		}
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
-            // use HMTL5 placeholder with js fallback
-            $add_html['placeholder'] = 'placeholder="'. esc_attr($field['default_value']) .'"';
-            wp_enqueue_script('jquery-placeholder');
-        } else if ( ! $frm_settings->use_html ) {
+			// use HMTL5 placeholder with js fallback
+			$add_html['placeholder'] = 'placeholder="'. esc_attr($field['default_value']) .'"';
+			wp_enqueue_script('jquery-placeholder');
+		} else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( '&#039;', "'", esc_attr( $field['default_value'] ) ) ) );
-            $add_html['data-frmval'] = 'data-frmval="'. esc_attr($val) .'"';
-            $class[] = 'frm_toggle_default';
+			$add_html['data-frmval'] = 'data-frmval="'. esc_attr($val) .'"';
+			$class[] = 'frm_toggle_default';
 
-            if ( $field['value'] == $field['default_value'] ) {
-                $class[] = 'frm_default';
-            }
-        }
-    }
+			if ( $field['value'] == $field['default_value'] ) {
+				$class[] = 'frm_default';
+			}
+		}
+	}
 
 	private static function add_validation_messages( $field, array &$add_html ) {
 		if ( FrmField::is_required( $field ) ) {
@@ -685,50 +685,50 @@ 
 		}
 	}
 
-    private static function add_shortcodes_to_html( $field, array &$add_html ) {
-        if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
-            return;
-        }
-
-        foreach ( $field['shortcodes'] as $k => $v ) {
-            if ( 'opt' === $k ) {
-                continue;
-            }
-
-            if ( is_numeric($k) && strpos($v, '=') ) {
-                $add_html[] = $v;
-            } else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-                $add_html[ $k ] = str_replace( $k .'="', $k .'="'. $v, $add_html[ $k ] );
-            } else {
+	private static function add_shortcodes_to_html( $field, array &$add_html ) {
+		if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
+			return;
+		}
+
+		foreach ( $field['shortcodes'] as $k => $v ) {
+			if ( 'opt' === $k ) {
+				continue;
+			}
+
+			if ( is_numeric($k) && strpos($v, '=') ) {
+				$add_html[] = $v;
+			} else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
+				$add_html[ $k ] = str_replace( $k .'="', $k .'="'. $v, $add_html[ $k ] );
+			} else {
 				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
-            }
-
-            unset($k, $v);
-        }
-    }
-
-    public static function check_value( $opt, $opt_key, $field ) {
-        if ( is_array( $opt ) ) {
-            if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
-                $opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
-            } else {
-                $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
-            }
-        }
-        return $opt;
-    }
+			}
+
+			unset($k, $v);
+		}
+	}
+
+	public static function check_value( $opt, $opt_key, $field ) {
+		if ( is_array( $opt ) ) {
+			if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
+				$opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
+			} else {
+				$opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
+			}
+		}
+		return $opt;
+	}
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
-        }
-
-        return $opt;
-    }
-
-    public static function add_conditional_update_msg() {
-        echo '<tr><td colspan="2">';
-        FrmAppHelper::update_message( 'calculate and conditionally hide and show fields' );
-        echo '</td></tr>';
-    }
+		if ( is_array($opt) ) {
+			$opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+		}
+
+		return $opt;
+	}
+
+	public static function add_conditional_update_msg() {
+		echo '<tr><td colspan="2">';
+		FrmAppHelper::update_message( 'calculate and conditionally hide and show fields' );
+		echo '</td></tr>';
+	}
 }

Spacing +100 added lines, -100 removed lines

@@ -32,18 +32,18 @@ 
                 $field['value'] = '';
             }
 
-            $field_name = 'item_meta['. $field_id .']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+            $field_name = 'item_meta[' . $field_id . ']';
+            $html_id = FrmFieldsHelper::get_html_id( $field );
 
             ob_start();
-            include($path .'/classes/views/frm-forms/add_field.php');
-            $field_html[ $field_id ] = ob_get_contents();
+            include( $path . '/classes/views/frm-forms/add_field.php' );
+            $field_html[$field_id] = ob_get_contents();
             ob_end_clean();
         }
 
-        unset($path);
+        unset( $path );
 
-        echo json_encode($field_html);
+        echo json_encode( $field_html );
 
         wp_die();
     }
@@ -54,10 +54,10 @@ 
 		$field_type = FrmAppHelper::get_post_param( 'field', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        $field = self::include_new_field($field_type, $form_id);
+        $field = self::include_new_field( $field_type, $form_id );
 
         // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+        do_action( 'frm_after_field_created', $field, $form_id );
 
         wp_die();
     }
@@ -68,17 +68,17 @@ 
 	public static function include_new_field( $field_type, $form_id ) {
         $values = array();
         if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
+            $values['post_type'] = FrmProFormsHelper::post_type( $form_id );
         }
 
-        $field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
+        $field_values = apply_filters( 'frm_before_field_created', FrmFieldsHelper::setup_new_vars( $field_type, $form_id ) );
         $field_id = FrmField::create( $field_values );
 
         if ( ! $field_id ) {
             return false;
         }
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+        $field = self::include_single_field( $field_id, $values, $form_id );
 
         return $field;
     }
@@ -102,18 +102,18 @@ 
 	public static function edit_name( $field = 'name', $id = '' ) {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( empty($field) ) {
+        if ( empty( $field ) ) {
             $field = 'name';
         }
 
-        if ( empty($id) ) {
+        if ( empty( $id ) ) {
 			$id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 			$id = str_replace( 'field_label_', '', $id );
         }
 
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' );
 		$value = trim( $value );
-        if ( trim(strip_tags($value)) == '' ) {
+        if ( trim( strip_tags( $value ) ) == '' ) {
             // set blank value if there is no content
             $value = '';
         }
@@ -137,7 +137,7 @@ 
 		$field = FrmField::getOne( $field_id );
 
 		foreach ( array( 'clear_on_focus', 'separate_value', 'default_blank' ) as $val ) {
-            if ( isset($_POST[ $val ]) ) {
+            if ( isset( $_POST[$val] ) ) {
 				// all three of these options are boolean
 				$new_val = FrmAppHelper::get_post_param( $val, 0, 'absint' );
 
@@ -145,10 +145,10 @@ 
 					$new_val = FrmField::is_option_true( $field, $val ) ? 0 : 1;
                 }
 
-                $field->field_options[ $val ] = $new_val;
-                unset($new_val);
+                $field->field_options[$val] = $new_val;
+                unset( $new_val );
             }
-            unset($val);
+            unset( $val );
         }
 
         FrmField::update( $field_id, array(
@@ -171,21 +171,21 @@ 
             wp_die();
         }
 
-        do_action('frm_duplicate_field', $copy_field, $form_id);
-        do_action('frm_duplicate_field_'. $copy_field->type, $copy_field, $form_id);
+        do_action( 'frm_duplicate_field', $copy_field, $form_id );
+        do_action( 'frm_duplicate_field_' . $copy_field->type, $copy_field, $form_id );
 
         $values = array( 'id' => $form_id );
         FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
 
-		$field_count = FrmDb::get_count( $wpdb->prefix .'frm_fields fi LEFT JOIN '. $wpdb->prefix .'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
+		$field_count = FrmDb::get_count( $wpdb->prefix . 'frm_fields fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
 
         $values['field_order'] = $field_count + 1;
 
-        if ( ! $field_id = FrmField::create($values) ) {
+        if ( ! $field_id = FrmField::create( $values ) ) {
             wp_die();
         }
 
-        self::include_single_field($field_id, $values);
+        self::include_single_field( $field_id, $values );
 
         wp_die();
     }
@@ -194,15 +194,15 @@ 
      * Load a single field in the form builder along with all needed variables
      */
     public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
-        $field_name = 'item_meta['. $field_id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $field = FrmFieldsHelper::setup_edit_vars( FrmField::getOne( $field_id ) );
+        $field_name = 'item_meta[' . $field_id . ']';
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $id = $form_id ? $form_id : $field['form_id'];
         if ( $field['type'] == 'html' ) {
             $field['stop_filter'] = true;
         }
 
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
+        require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_field.php' );
 
         return $field;
     }
@@ -225,7 +225,7 @@ 
 		$opt_type = FrmAppHelper::get_post_param( 'opt_type', '', 'sanitize_text_field' );
 
         //Get the field
-        $field = FrmField::getOne($id);
+        $field = FrmField::getOne( $id );
 
 		if ( ! empty( $field->options ) ) {
 			$keys = array_keys( $field->options );
@@ -248,13 +248,13 @@ 
 			$first_opt = reset( $field->options );
 			$next_opt = count( $field->options );
             if ( $first_opt != '' ) {
-                $next_opt++;
+                $next_opt ++;
             }
-            $opt = esc_html__( 'Option', 'formidable' ) .' '. $next_opt;
-            unset($next_opt);
+            $opt = esc_html__( 'Option', 'formidable' ) . ' ' . $next_opt;
+            unset( $next_opt );
         }
         $field_val = $opt;
-		$field->options[ $opt_key ] = $opt;
+		$field->options[$opt_key] = $opt;
 
         //Update options in DB
 		FrmField::update( $id, array( 'options' => $field->options ) );
@@ -263,19 +263,19 @@ 
         $field = array(
             'type'  => $field_data->type,
             'id'    => $id,
-            'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
+            'separate_value' => isset( $field_data->field_options['separate_value'] ) ? $field_data->field_options['separate_value'] : 0,
             'form_id' => $field_data->form_id,
             'field_key' => $field_data->field_key,
         );
 
-        $field_name = 'item_meta['. $id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $field_name = 'item_meta[' . $id . ']';
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $checked = '';
 
         if ( 'other' == $opt_type ) {
-            require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
+            require( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
         } else {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
+            require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
         }
         wp_die();
     }
@@ -294,28 +294,28 @@ 
             $new_label = $update_value;
         }
 
-        $field = FrmField::getOne($id);
+        $field = FrmField::getOne( $id );
         $separate_values = FrmField::is_option_true( $field, 'separate_value' );
 
-        $this_opt_id = end($ids);
-		$this_opt = (array) $field->options[ $this_opt_id ];
-        $other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other') !== false ? true : false );
+        $this_opt_id = end( $ids );
+		$this_opt = (array) $field->options[$this_opt_id];
+        $other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other' ) !== false ? true : false );
 
-        $label = isset($this_opt['label']) ? $this_opt['label'] : reset($this_opt);
-        $value = isset($this_opt['value']) ? $this_opt['value'] : '';
+        $label = isset( $this_opt['label'] ) ? $this_opt['label'] : reset( $this_opt );
+        $value = isset( $this_opt['value'] ) ? $this_opt['value'] : '';
 
         if ( ! isset( $new_label ) ) {
             $new_label = $label;
         }
 
-        if ( isset($new_value) || isset($value) ) {
-            $update_value = isset($new_value) ? $new_value : $value;
+        if ( isset( $new_value ) || isset( $value ) ) {
+            $update_value = isset( $new_value ) ? $new_value : $value;
         }
 
 		if ( $update_value != $new_label && $other_opt === false && $separate_values ) {
-			$field->options[ $this_opt_id ] = array( 'value' => $update_value, 'label' => $new_label );
+			$field->options[$this_opt_id] = array( 'value' => $update_value, 'label' => $new_label );
         } else {
-			$field->options[ $this_opt_id ] = $orig_update_value;
+			$field->options[$this_opt_id] = $orig_update_value;
         }
 
 		FrmField::update( $field->id, array( 'options' => $field->options ) );
@@ -332,7 +332,7 @@ 
 		$opt_key = FrmAppHelper::get_post_param( 'opt_key', 0, 'sanitize_title' );
 
 		$options = $field->options;
-        unset( $options[ $opt_key ] );
+        unset( $options[$opt_key] );
         $response = array( 'other' => true );
 
         //If the deleted option is an "other" option
@@ -400,45 +400,45 @@ 
 
         $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
         $prepop = array();
-        FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
+        FrmFieldsHelper::get_bulk_prefilled_opts( $prepop );
 
-        $field = FrmField::getOne($field_id);
+        $field = FrmField::getOne( $field_id );
 
         wp_enqueue_script( 'utils' );
-        wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url(). '/css/frm_admin.css' );
+        wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css' );
         FrmAppHelper::load_admin_wide_js();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/import_choices.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/import_choices.php' );
         wp_die();
     }
 
     public static function import_options() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
+        if ( ! is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
             return;
         }
 
 		$field_id = absint( $_POST['field_id'] );
-        $field = FrmField::getOne($field_id);
+        $field = FrmField::getOne( $field_id );
 
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'select' ) ) ) {
             return;
         }
 
-        $field = FrmFieldsHelper::setup_edit_vars($field);
-        $opts = stripslashes_deep($_POST['opts']);
-        $opts = explode("\n", rtrim($opts, "\n"));
+        $field = FrmFieldsHelper::setup_edit_vars( $field );
+        $opts = stripslashes_deep( $_POST['opts'] );
+        $opts = explode( "\n", rtrim( $opts, "\n" ) );
         if ( $field['separate_value'] ) {
             foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
+                if ( strpos( $opt, '|' ) !== false ) {
+                    $vals = explode( '|', $opt );
                     if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+                        $opts[$opt_key] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
                     }
-                    unset($vals);
+                    unset( $vals );
                 }
-                unset($opt_key, $opt);
+                unset( $opt_key, $opt );
             }
         }
 
@@ -447,12 +447,12 @@ 
             $other_array = array();
             foreach ( $field['options'] as $opt_key => $opt ) {
                 if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
-                    $other_array[ $opt_key ] = $opt;
+                    $other_array[$opt_key] = $opt;
                 }
-                unset($opt_key, $opt);
+                unset( $opt_key, $opt );
             }
-            if ( ! empty($other_array) ) {
-                $opts = array_merge( $opts, $other_array);
+            if ( ! empty( $other_array ) ) {
+                $opts = array_merge( $opts, $other_array );
             }
         }
 
@@ -465,9 +465,9 @@ 
         $html_id = FrmFieldsHelper::get_html_id( $field );
 
         if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php');
+            require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' );
         } else {
-            FrmFieldsHelper::show_single_option($field);
+            FrmFieldsHelper::show_single_option( $field );
         }
 
         wp_die();
@@ -489,13 +489,13 @@ 
             'rte'       => 'textarea',
             'website'   => 'url',
         );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
+        if ( isset( $type_switch[$type] ) ) {
+            $type = $type_switch[$type];
         }
 
 		$frm_field_selection = FrmField::field_selection();
-        $types = array_keys($frm_field_selection);
-        if ( ! in_array($type, $types) && $type != 'captcha' ) {
+        $types = array_keys( $frm_field_selection );
+        if ( ! in_array( $type, $types ) && $type != 'captcha' ) {
             $type = 'text';
         }
 
@@ -534,19 +534,19 @@ 
 
     public static function input_html( $field, $echo = true ) {
         $class = array(); //$field['type'];
-        self::add_input_classes($field, $class);
+        self::add_input_classes( $field, $class );
 
         $add_html = array();
-        self::add_html_size($field, $add_html);
-        self::add_html_length($field, $add_html);
-        self::add_html_placeholder($field, $add_html, $class);
+        self::add_html_size( $field, $add_html );
+        self::add_html_length( $field, $add_html );
+        self::add_html_placeholder( $field, $add_html, $class );
 		self::add_validation_messages( $field, $add_html );
 
-        $class = apply_filters('frm_field_classes', implode(' ', $class), $field);
+        $class = apply_filters( 'frm_field_classes', implode( ' ', $class ), $field );
 
 		FrmFormsHelper::add_html_attr( $class, 'class', $add_html );
 
-        self::add_shortcodes_to_html($field, $add_html);
+        self::add_shortcodes_to_html( $field, $add_html );
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
 		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
@@ -559,7 +559,7 @@ 
     }
 
 	private static function add_input_classes( $field, array &$class ) {
-        if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
+        if ( isset( $field['input_class'] ) && ! empty( $field['input_class'] ) ) {
             $class[] = $field['input_class'];
         }
 
@@ -572,7 +572,7 @@ 
             $class[] = 'dyn_default_value';
         }
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
+        if ( isset( $field['size'] ) && $field['size'] > 0 ) {
             $class[] = 'auto_width';
         }
     }
@@ -582,19 +582,19 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             return;
         }
 
-        if ( is_numeric($field['size']) ) {
+        if ( is_numeric( $field['size'] ) ) {
             $field['size'] .= 'px';
         }
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
+        $important = apply_filters( 'frm_use_important_width', 1, $field );
         // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
-        $add_html['style'] = 'style="width:'. esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) .'"';
+        $add_html['style'] = 'style="width:' . esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) . '"';
 
-        self::add_html_cols($field, $add_html);
+        self::add_html_cols( $field, $add_html );
     }
 
 	private static function add_html_cols( $field, array &$add_html ) {
@@ -611,13 +611,13 @@ 
         );
 
         // include "col" for valid html
-        $unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
+        $unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
 
-        if ( ! isset( $calc[ $unit ] ) ) {
+        if ( ! isset( $calc[$unit] ) ) {
             return;
         }
 
-        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
     }
@@ -628,7 +628,7 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             // don't load on form builder page
             return;
         }
@@ -653,11 +653,11 @@ 
 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
             // use HMTL5 placeholder with js fallback
-            $add_html['placeholder'] = 'placeholder="'. esc_attr($field['default_value']) .'"';
-            wp_enqueue_script('jquery-placeholder');
+            $add_html['placeholder'] = 'placeholder="' . esc_attr( $field['default_value'] ) . '"';
+            wp_enqueue_script( 'jquery-placeholder' );
         } else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( ''', "'", esc_attr( $field['default_value'] ) ) ) );
-            $add_html['data-frmval'] = 'data-frmval="'. esc_attr($val) .'"';
+            $add_html['data-frmval'] = 'data-frmval="' . esc_attr( $val ) . '"';
             $class[] = 'frm_toggle_default';
 
             if ( $field['value'] == $field['default_value'] ) {
@@ -681,7 +681,7 @@ 
 			$format = FrmEntryValidate::phone_format( $field );
 			$format = substr( $format, 2, -2 );
 			$key = 'pattern';
-			$add_html[ $key ] = $key . '="' . esc_attr( $format ) . '"';
+			$add_html[$key] = $key . '="' . esc_attr( $format ) . '"';
 		}
 	}
 
@@ -695,15 +695,15 @@ 
                 continue;
             }
 
-            if ( is_numeric($k) && strpos($v, '=') ) {
+            if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
                 $add_html[] = $v;
-            } else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-                $add_html[ $k ] = str_replace( $k .'="', $k .'="'. $v, $add_html[ $k ] );
+            } else if ( ! empty( $k ) && isset( $add_html[$k] ) ) {
+                $add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
             } else {
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
             }
 
-            unset($k, $v);
+            unset( $k, $v );
         }
     }
 
@@ -719,8 +719,8 @@ 
     }
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+        if ( is_array( $opt ) ) {
+            $opt = ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
         }
 
         return $opt;

classes/views/styles/show.php

Indentation +2 added lines, -2 removed lines

@@ -64,8 +64,8 @@
 							<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=destroy&id=' . $style->ID ) ); ?>" id="frm_delete_style" class="submitdelete deletion" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete that style?', 'formidable' ) ?>')"><?php _e( 'Delete Style', 'formidable' ) ?></a>
 						    <?php } ?>
 						    <?php
-						    if ( $style->ID ) {
-							    echo '<span class="howto"><span>.frm_style_'. esc_attr( $style->post_name ) .'</span></span>';
+							if ( $style->ID ) {
+								echo '<span class="howto"><span>.frm_style_'. esc_attr( $style->post_name ) .'</span></span>';
 							} ?>
                             <div class="publishing-action">
                                 <input type="button" value="<?php esc_attr_e( 'Reset to Default', 'formidable' ) ?>" class="button-secondary frm_reset_style" />

Spacing +10 added lines, -10 removed lines

@@ -2,14 +2,14 @@ 
 <div class="wrap">
     <?php FrmStylesHelper::style_menu(); ?>
 
-	<?php include(FrmAppHelper::plugin_path() .'/classes/views/shared/errors.php'); ?>
+	<?php include( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
 
 	<?php do_action( 'frm_style_switcher', $style, $styles ) ?>
 
 	<form id="frm_styling_form" action="" name="frm_styling_form" method="post">
 	    <input type="hidden" name="ID" value="<?php echo esc_attr( $style->ID ) ?>" />
 		<input type="hidden" name="frm_action" value="save" />
-        <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
+        <textarea name="<?php echo esc_attr( $frm_style->get_field_name( 'custom_css' ) ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
 		<?php wp_nonce_field( 'frm_style_nonce', 'frm_style' ); ?>
 
 	<div id="nav-menus-frame">
@@ -18,7 +18,7 @@ 
 
 		<div class="styling_settings">
 		    <input type="hidden" name="style_name" value="frm_style_<?php echo esc_attr( $style->post_name ) ?>" />
-			<?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact('style', 'frm_style') ); ?>
+			<?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact( 'style', 'frm_style' ) ); ?>
 		</div>
 
 	</div><!-- /#menu-settings-column -->
@@ -31,17 +31,17 @@ 
 						<div class="major-publishing-actions">
 							<label class="menu-name-label howto open-label" for="menu-name">
 								<span><?php _e( 'Style Name', 'formidable' ) ?></span>
-								<input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name('post_title', '') ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
+								<input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name( 'post_title', '' ) ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
 							</label>
 
-							<input name="prev_menu_order" type="hidden" value="<?php echo esc_attr($style->menu_order) ?>" />
+							<input name="prev_menu_order" type="hidden" value="<?php echo esc_attr( $style->menu_order ) ?>" />
 							<label class="menu-name-label howto open-label default-style-box" for="menu_order">
 							<span>
 							<?php if ( $style->menu_order ) { ?>
-							    <input name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="hidden" value="1" />
-							    <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
+							    <input name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="hidden" value="1" />
+							    <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
 							<?php } else { ?>
-								<input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
+								<input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
 							<?php } ?>
 							    <?php _e( 'Make default style', 'formidable' ) ?></span>
 							</label>
@@ -54,7 +54,7 @@ 
 					<div id="post-body">
 						<div id="post-body-content">
 
-							<?php include( dirname(__FILE__) .'/_sample_form.php') ?>
+							<?php include( dirname( __FILE__ ) . '/_sample_form.php' ) ?>
 
 						</div><!-- /#post-body-content -->
 					</div><!-- /#post-body -->
@@ -65,7 +65,7 @@ 
 						    <?php } ?>
 						    <?php
 						    if ( $style->ID ) {
-							    echo '<span class="howto"><span>.frm_style_'. esc_attr( $style->post_name ) .'</span></span>';
+							    echo '<span class="howto"><span>.frm_style_' . esc_attr( $style->post_name ) . '</span></span>';
 							} ?>
                             <div class="publishing-action">
                                 <input type="button" value="<?php esc_attr_e( 'Reset to Default', 'formidable' ) ?>" class="button-secondary frm_reset_style" />

classes/helpers/FrmListHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {

Indentation +7 added lines, -7 removed lines

@@ -67,10 +67,10 @@ 
 	protected $modes = array();
 
 	/**
-	*
-	* @var array
-	*/
-    protected $params;
+	 *
+	 * @var array
+	 */
+	protected $params;
 
 	/**
 	 * Stores the value returned by ->get_column_info()
@@ -87,10 +87,10 @@ 
 		'single_row_columns' );
 
 	/**
-	* Construct the table object
-	*/
+	 * Construct the table object
+	 */
 	public function __construct( $args ) {
-	    $args = wp_parse_args( $args, array(
+		$args = wp_parse_args( $args, array(
 			'params' => array(),
 			'plural' => '',
 			'singular' => '',

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -104,7 +104,7 @@ 
 
 		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
-		if ( !$args['plural'] )
+		if ( ! $args['plural'] )
 			$args['plural'] = $this->screen->base;
 
 		$args['plural'] = sanitize_key( $args['plural'] );
@@ -245,7 +245,7 @@ 
 			'per_page' => 0,
 		) );
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
+		if ( ! $args['total_pages'] && $args['per_page'] > 0 )
 			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
 
 		// Redirect if page number is invalid and headers are not already sent.
@@ -284,7 +284,7 @@ 
 	 * @return bool
 	 */
 	public function has_items() {
-		return !empty( $this->items );
+		return ! empty( $this->items );
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 	 * @param string $input_id The search input id
 	 */
 	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
+		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() )
 			return;
 
 		$input_id = $input_id . '-search-input';
@@ -324,7 +324,7 @@ 
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, 'button', '', false, array('id' => 'search-submit') ); ?>
+	<?php submit_button( $text, 'button', '', false, array( 'id' => 'search-submit' ) ); ?>
 </p>
 <?php
 	}
@@ -367,7 +367,7 @@ 
 
 		echo "<ul class='subsubsub'>\n";
 		foreach ( $views as $class => $view ) {
-			$views[ $class ] = "\t<li class='$class'>$view";
+			$views[$class] = "\t<li class='$class'>$view";
 		}
 		echo implode( " |</li>\n", $views ) . "</li>\n";
 		echo "</ul>";
@@ -471,12 +471,12 @@ 
 		$action_count = count( $actions );
 		$i = 0;
 
-		if ( !$action_count )
+		if ( ! $action_count )
 			return '';
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
-			++$i;
+			++ $i;
 			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
 			$out .= "<span class='$action'>$link$sep</span>";
 		}
@@ -532,7 +532,7 @@ 
 
 		$month_count = count( $months );
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+		if ( ! $month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
 			return;
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
@@ -748,7 +748,7 @@ 
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
 		} else {
 			$page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
+				esc_url( add_query_arg( 'paged', max( 1, $current - 1 ), $current_url ) ),
 				__( 'Previous page' ),
 				'&lsaquo;'
 			);
@@ -771,7 +771,7 @@ 
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
 		} else {
 			$page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
+				esc_url( add_query_arg( 'paged', min( $total_pages, $current + 1 ), $current_url ) ),
 				__( 'Next page' ),
 				'&rsaquo;'
 			);
@@ -834,7 +834,7 @@ 
 
 		// We need a primary defined so responsive views show something,
 		// so let's fall back to the first non-checkbox column.
-		foreach( $columns as $col => $column_name ) {
+		foreach ( $columns as $col => $column_name ) {
 			if ( 'cb' === $col ) {
 				continue;
 			}
@@ -860,7 +860,7 @@ 
 
 		// If the primary column doesn't exist fall back to the
 		// first non-checkbox column.
-		if ( ! isset( $columns[ $default ] ) ) {
+		if ( ! isset( $columns[$default] ) ) {
 			$default = FrmListHelper::get_default_primary_column_name();
 		}
 
@@ -874,7 +874,7 @@ 
 		 */
 		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
 
-		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
+		if ( empty( $column ) || ! isset( $columns[$column] ) ) {
 			$column = $default;
 		}
 
@@ -896,7 +896,7 @@ 
 			// In 4.3, we added a fourth argument for primary column.
 			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
 			foreach ( $this->_column_headers as $key => $value ) {
-				$column_headers[ $key ] = $value;
+				$column_headers[$key] = $value;
 			}
 
 			return $column_headers;
@@ -924,7 +924,7 @@ 
 				continue;
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
+			if ( ! isset( $data[1] ) )
 				$data[1] = false;
 
 			$sortable[$id] = $data;
@@ -980,7 +980,7 @@ 
 			static $cb_counter = 1;
 			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
 				. '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
-			$cb_counter++;
+			$cb_counter ++;
 		}
 
 		foreach ( $columns as $column_key => $column_display_name ) {
@@ -1019,7 +1019,7 @@ 
 			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
+			if ( ! empty( $class ) )
 				$class = "class='" . join( ' ', $class ) . "'";
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";

Braces +89 added lines, -62 removed lines

@@ -104,8 +104,9 @@ 
 
 		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
-		if ( !$args['plural'] )
-			$args['plural'] = $this->screen->base;
+		if ( !$args['plural'] ) {
+					$args['plural'] = $this->screen->base;
+		}
 
 		$args['plural'] = sanitize_key( $args['plural'] );
 		$args['singular'] = sanitize_key( $args['singular'] );
@@ -245,8 +246,9 @@ 
 			'per_page' => 0,
 		) );
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
-			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		if ( !$args['total_pages'] && $args['per_page'] > 0 ) {
+					$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		}
 
 		// Redirect if page number is invalid and headers are not already sent.
 		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
@@ -268,11 +270,13 @@ 
 	 * @return int Number of items that correspond to the given pagination argument.
 	 */
 	public function get_pagination_arg( $key ) {
-		if ( 'page' == $key )
-			return $this->get_pagenum();
+		if ( 'page' == $key ) {
+					return $this->get_pagenum();
+		}
 
-		if ( isset( $this->_pagination_args[$key] ) )
-			return $this->_pagination_args[$key];
+		if ( isset( $this->_pagination_args[$key] ) ) {
+					return $this->_pagination_args[$key];
+		}
 	}
 
 	/**
@@ -307,20 +311,25 @@ 
 	 * @param string $input_id The search input id
 	 */
 	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
-			return;
+		if ( empty( $_REQUEST['s'] ) && !$this->has_items() ) {
+					return;
+		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
-			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
-			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
-?>
+		if ( ! empty( $_REQUEST['orderby'] ) ) {
+					echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['order'] ) ) {
+					echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['post_mime_type'] ) ) {
+					echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['detached'] ) ) {
+					echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+		}
+		?>
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
@@ -362,8 +371,9 @@ 
 		 */
 		$views = apply_filters( "views_{$this->screen->id}", $views );
 
-		if ( empty( $views ) )
-			return;
+		if ( empty( $views ) ) {
+					return;
+		}
 
 		echo "<ul class='subsubsub'>\n";
 		foreach ( $views as $class => $view ) {
@@ -417,8 +427,9 @@ 
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
-			return;
+		if ( empty( $this->_actions ) ) {
+					return;
+		}
 
 		echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
 		echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
@@ -445,14 +456,17 @@ 
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
-			return false;
+		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) ) {
+					return false;
+		}
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
-			return $_REQUEST['action'];
+		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
+					return $_REQUEST['action'];
+		}
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
-			return $_REQUEST['action2'];
+		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
+					return $_REQUEST['action2'];
+		}
 
 		return false;
 	}
@@ -471,8 +485,9 @@ 
 		$action_count = count( $actions );
 		$i = 0;
 
-		if ( !$action_count )
-			return '';
+		if ( !$action_count ) {
+					return '';
+		}
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
@@ -532,8 +547,9 @@ 
 
 		$month_count = count( $months );
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
-			return;
+		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
+					return;
+		}
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
@@ -542,8 +558,9 @@ 
 			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
 <?php
 		foreach ( $months as $arc_row ) {
-			if ( 0 == $arc_row->year )
-				continue;
+			if ( 0 == $arc_row->year ) {
+							continue;
+			}
 
 			$month = zeroise( $arc_row->month, 2 );
 			$year = $arc_row->year;
@@ -575,8 +592,9 @@ 
 <?php
 			foreach ( $this->modes as $mode => $title ) {
 				$classes = array( 'view-' . $mode );
-				if ( $current_mode == $mode )
-					$classes[] = 'current';
+				if ( $current_mode == $mode ) {
+									$classes[] = 'current';
+				}
 				printf(
 					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
 					esc_url( add_query_arg( 'mode', $mode ) ),
@@ -647,8 +665,9 @@ 
 	public function get_pagenum() {
 		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
-			$pagenum = $this->_pagination_args['total_pages'];
+		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] ) {
+					$pagenum = $this->_pagination_args['total_pages'];
+		}
 
 		return max( 1, $pagenum );
 	}
@@ -665,8 +684,9 @@ 
 	 */
 	protected function get_items_per_page( $option, $default = 20 ) {
 		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
-			$per_page = $default;
+		if ( empty( $per_page ) || $per_page < 1 ) {
+					$per_page = $default;
+		}
 
 		/**
 		 * Filter the number of items to be displayed on each page of the list table.
@@ -920,12 +940,14 @@ 
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
-				continue;
+			if ( empty( $data ) ) {
+							continue;
+			}
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
-				$data[1] = false;
+			if ( !isset( $data[1] ) ) {
+							$data[1] = false;
+			}
 
 			$sortable[$id] = $data;
 		}
@@ -966,15 +988,17 @@ 
 		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
 		$current_url = remove_query_arg( 'paged', $current_url );
 
-		if ( isset( $_GET['orderby'] ) )
-			$current_orderby = $_GET['orderby'];
-		else
-			$current_orderby = '';
+		if ( isset( $_GET['orderby'] ) ) {
+					$current_orderby = $_GET['orderby'];
+		} else {
+					$current_orderby = '';
+		}
 
-		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
-			$current_order = 'desc';
-		else
-			$current_order = 'asc';
+		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] ) {
+					$current_order = 'desc';
+		} else {
+					$current_order = 'asc';
+		}
 
 		if ( ! empty( $columns['cb'] ) ) {
 			static $cb_counter = 1;
@@ -990,10 +1014,11 @@ 
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' == $column_key )
-				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
-				$class[] = 'num';
+			if ( 'cb' == $column_key ) {
+							$class[] = 'check-column';
+			} elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) ) {
+							$class[] = 'num';
+			}
 
 			if ( $column_key === $primary ) {
 				$class[] = 'column-primary';
@@ -1019,8 +1044,9 @@ 
 			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
-				$class = "class='" . join( ' ', $class ) . "'";
+			if ( !empty( $class ) ) {
+							$class = "class='" . join( ' ', $class ) . "'";
+			}
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1082,9 +1108,10 @@ 
 	 * @param string $which
 	 */
 	protected function display_tablenav( $which ) {
-		if ( 'top' == $which )
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
-?>
+		if ( 'top' == $which ) {
+					wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		}
+		?>
 	<div class="tablenav <?php echo esc_attr( $which ); ?>">
 
 		<div class="alignleft actions bulkactions">