Strategy11 / formidable-forms

classes/models/fields/FrmFieldEmail.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	protected function field_settings_for_type() {
 		return array(
 			'size'           => true,
-            'clear_on_focus' => true,
+			'clear_on_focus' => true,
 			'invalid'        => true,
 		);
 	}

Spacing +1 added lines, -1 removed lines

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

classes/views/frm-entries/form.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
     </div>
 </div>
 <?php
-    return;
+	return;
 }
 
 global $frm_vars;
@@ -54,8 +54,8 @@ 
 
 // close open collapsible toggle div
 if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
-    echo "</div>\n";
-    unset($frm_vars['collapse_div']);
+	echo "</div>\n";
+	unset($frm_vars['collapse_div']);
 }
 
 echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( empty($values) || ! isset($values['fields']) || empty($values['fields']) ) { ?>
-<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class($form); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
+if ( empty( $values ) || ! isset( $values['fields'] ) || empty( $values['fields'] ) ) { ?>
+<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class( $form ); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
 	<div class="frm_error_style"><strong><?php esc_html_e( 'Oops!', 'formidable' ) ?></strong> <?php printf( esc_html__( 'You did not add any fields to your form. %1$sGo back%2$s and add some.', 'formidable' ), '<a href="' . esc_url( admin_url( '?page=formidable&frm_action=edit&id=' . $form->id ) ) . '">', '</a>' ) ?>
     </div>
 </div>
@@ -19,15 +19,15 @@ 
 <fieldset>
 <?php echo FrmFormsHelper::replace_shortcodes( $values['before_html'], $form, $title, $description ); ?>
 <div <?php echo wp_strip_all_tags( apply_filters( 'frm_fields_container_class', 'class="frm_fields_container"' ) ); ?>>
-<?php do_action( 'frm_after_title', compact('form') ) ?>
-<input type="hidden" name="frm_action" value="<?php echo esc_attr($form_action) ?>" />
-<input type="hidden" name="form_id" value="<?php echo esc_attr($form->id) ?>" />
-<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr($frm_hide_fields) ?>" />
-<input type="hidden" name="form_key" value="<?php echo esc_attr($form->form_key) ?>" />
+<?php do_action( 'frm_after_title', compact( 'form' ) ) ?>
+<input type="hidden" name="frm_action" value="<?php echo esc_attr( $form_action ) ?>" />
+<input type="hidden" name="form_id" value="<?php echo esc_attr( $form->id ) ?>" />
+<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr( $frm_hide_fields ) ?>" />
+<input type="hidden" name="form_key" value="<?php echo esc_attr( $form->form_key ) ?>" />
 <input type="hidden" name="item_meta[0]" value="" />
 <?php wp_nonce_field( 'frm_submit_entry_nonce', 'frm_submit_entry_' . $form->id ); ?>
 <label for="frm_verify_<?php echo esc_attr( $form->id ) ?>" class="frm_screen_reader frm_hidden"><?php esc_html_e( 'If you are human, leave this field blank.', 'formidable' ) ?></label>
-<input type="text" class="frm_hidden frm_verify" id="frm_verify_<?php echo esc_attr( $form->id ) ?>" name="frm_verify" value="<?php echo esc_attr( FrmAppHelper::get_param('frm_verify', '', 'get', 'wp_kses_post' ) ) ?>" <?php FrmFormsHelper::maybe_hide_inline() ?> />
+<input type="text" class="frm_hidden frm_verify" id="frm_verify_<?php echo esc_attr( $form->id ) ?>" name="frm_verify" value="<?php echo esc_attr( FrmAppHelper::get_param( 'frm_verify', '', 'get', 'wp_kses_post' ) ) ?>" <?php FrmFormsHelper::maybe_hide_inline() ?> />
 <?php if ( isset( $id ) ) { ?>
 <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
 <?php } ?>
@@ -41,14 +41,14 @@ 
 ?>
 <div class="frm_form_field form-field">
 <label class="frm_primary_label"><?php esc_html_e( 'Entry Key', 'formidable' ) ?></label>
-<input type="text" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="text" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 </div>
 <?php } else { ?>
-<input type="hidden" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="hidden" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 <?php
 }
 
-do_action('frm_entry_form', $form, $form_action, $errors);
+do_action( 'frm_entry_form', $form, $form_action, $errors );
 
 global $frm_vars;
 // close open section div
@@ -58,12 +58,12 @@ 
 }
 
 // close open collapsible toggle div
-if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
+if ( isset( $frm_vars['collapse_div'] ) && $frm_vars['collapse_div'] ) {
     echo "</div>\n";
-    unset($frm_vars['collapse_div']);
+    unset( $frm_vars['collapse_div'] );
 }
 
-echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);
+echo FrmFormsHelper::replace_shortcodes( $values['after_html'], $form );
 
 if ( FrmForm::show_submit( $form ) ) {
 
@@ -76,6 +76,6 @@ 
 </div>
 </fieldset>
 </div>
-<?php if ( has_action('frm_entries_footer_scripts') ) { ?>
+<?php if ( has_action( 'frm_entries_footer_scripts' ) ) { ?>
 <script type="text/javascript"><?php do_action( 'frm_entries_footer_scripts', $values['fields'], $form ); ?></script>
 <?php } ?>

classes/models/FrmCreateFile.php

Doc Comments +3 added lines, -1 removed lines

@@ -75,7 +75,6 @@ 
 	 * @since 3.0
 	 *
 	 * @param array $file_names And array of file paths
-	 * @param string $new_location The path for the file to be saved
 	 */
 	public function combine_files( $file_names ) {
 		if ( $this->has_permission ) {
@@ -125,6 +124,9 @@ 
 		}
 	}
 
+	/**
+	 * @param boolean $dirs_exist
+	 */
 	private function create_directories( &$dirs_exist ) {
 		global $wp_filesystem;
 

Spacing +8 added lines, -8 removed lines

@@ -21,8 +21,8 @@ 
 		$this->error_message = isset( $atts['error_message'] ) ? $atts['error_message'] : '';
 		$this->uploads = wp_upload_dir();
 		$this->set_new_file_path( $atts );
-		$this->chmod_dir = defined('FS_CHMOD_DIR') ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
-		$this->chmod_file = defined('FS_CHMOD_FILE') ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
+		$this->chmod_dir = defined( 'FS_CHMOD_DIR' ) ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
+		$this->chmod_file = defined( 'FS_CHMOD_FILE' ) ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
 
 		$this->check_permission();
 	}
@@ -154,7 +154,7 @@ 
 	}
 
 	private function get_creds() {
-		if ( ! function_exists('get_filesystem_method') ) {
+		if ( ! function_exists( 'get_filesystem_method' ) ) {
 			include_once( ABSPATH . 'wp-admin/includes/file.php' );
 		}
 
@@ -173,13 +173,13 @@ 
 			'username' => '',
 		) );
 
-		$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : $credentials['hostname'];
-		$credentials['username'] = defined('FTP_USER') ? FTP_USER : $credentials['username'];
-		$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : '';
+		$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : $credentials['hostname'];
+		$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : $credentials['username'];
+		$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : '';
 
 		// Check to see if we are setting the public/private keys for ssh
-		$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : '';
-		$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : '';
+		$credentials['public_key'] = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : '';
+		$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : '';
 
 		// Sanitize the hostname, Some people might pass in odd-data:
 		$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] ); //Strip any schemes off

classes/views/frm-fields/front-end/checkbox-field.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
 			}
 
-			?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
+			?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action( 'frm_field_input_html', $field ) ?> /><?php
 
 			if ( ! isset( $shortcode_atts ) || ! isset( $shortcode_atts['label'] ) || $shortcode_atts['label'] ) {
 				echo ' ' . $opt . '</label>';

classes/views/frm-fields/front-end/radio-field.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
 			if ( ! isset( $shortcode_atts ) || ! isset( $shortcode_atts['label'] ) || $shortcode_atts['label'] ) {
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
 			}
-			$checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
+			$checked = FrmAppHelper::check_selected( $field['value'], $field_val ) ? 'checked="checked" ' : ' ';
 
 			$other_opt = false;
 			$other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
 			?>
 			<input type="radio" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php
 			echo $checked;
-			do_action('frm_field_input_html', $field);
+			do_action( 'frm_field_input_html', $field );
 			?>/><?php
 
 			if ( ! isset( $shortcode_atts ) || ! isset( $shortcode_atts['label'] ) || $shortcode_atts['label'] ) {

classes/factories/FrmFieldFactory.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 			'captcha'  => 'FrmFieldCaptcha',
 		);
 
-		$class = isset( $type_classes[ $field_type ] ) ? $type_classes[ $field_type ] : '';
+		$class = isset( $type_classes[$field_type] ) ? $type_classes[$field_type] : '';
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
 	}
 

Doc Comments +2 added lines, -1 removed lines

@@ -55,7 +55,7 @@ 
 	 * @since 3.0
 	 *
 	 * @param string $field_type
-	 * @param int|array|object $field
+	 * @param integer $field
 	 *
 	 * @return stdClass
 	 */
@@ -111,6 +111,7 @@ 
 
 	/**
 	 * @since 3.0
+	 * @param string $property
 	 */
 	public static function field_has_property( $type, $property ) {
 		$field = self::get_field_type( $type );

classes/models/fields/FrmFieldRadio.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	}
 
 	protected function extra_field_opts() {
-		$form_id = $this->get_field_column('form_id');
+		$form_id = $this->get_field_column( 'form_id' );
 		return array(
 			'align' => FrmStylesController::get_style_val( 'radio_align', ( empty( $form_id ) ? 'default' : $form_id ) ),
 		);

classes/models/fields/FrmFieldCheckbox.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	}
 
 	protected function extra_field_opts() {
-		$form_id = $this->get_field_column('form_id');
+		$form_id = $this->get_field_column( 'form_id' );
 		return array(
 			'align' => FrmStylesController::get_style_val( 'check_align', ( empty( $form_id ) ? 'default' : $form_id ) ),
 		);

classes/controllers/FrmFieldsController.php

Doc Comments +1 added lines

@@ -246,6 +246,7 @@
 
 	/**
 	 * @since 3.0
+	 * @param stdClass $field_info
 	 */
 	private static function get_classes_for_builder_field( $field, $display, $field_info ) {
 		$li_classes = $field_info->form_builder_classes( $display['type'] );

Indentation +180 added lines, -180 removed lines

@@ -2,25 +2,25 @@ 
 
 class FrmFieldsController {
 
-    public static function load_field() {
+	public static function load_field() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		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 );
 
 		$values = array(
 			'id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
 			'doing_ajax' => true,
 		);
-        $field_html = array();
+		$field_html = array();
 
-        foreach ( $fields as $field ) {
+		foreach ( $fields as $field ) {
 			$field = htmlspecialchars_decode( nl2br( $field ) );
 			$field = json_decode( $field );
 			if ( ! isset( $field->id ) || ! is_numeric( $field->id ) ) {
@@ -38,19 +38,19 @@ 
 			self::load_single_field( $field, $values );
 			$field_html[ absint( $field->id ) ] = ob_get_contents();
 			ob_end_clean();
-        }
+		}
 
 		echo json_encode( $field_html );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	/**
 	 * Create a new field with ajax
 	 */
-    public static function create() {
+	public static function create() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_type = FrmAppHelper::get_post_param( 'field_type', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
@@ -60,16 +60,16 @@ 
 		// 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();
+	}
 
-    /**
-     * Set up and create a new field
-     *
-     * @param string $field_type
-     * @param integer $form_id
-     * @return array|bool
-     */
+	/**
+	 * Set up and create a new field
+	 *
+	 * @param string $field_type
+	 * @param integer $form_id
+	 * @return array|bool
+	 */
 	public static function include_new_field( $field_type, $form_id ) {
 		$values = array();
 		if ( FrmAppHelper::pro_is_installed() ) {
@@ -77,19 +77,19 @@ 
 		}
 
 		$field_values = FrmFieldsHelper::setup_new_vars( $field_type, $form_id );
-        $field_values = apply_filters( 'frm_before_field_created', $field_values );
+		$field_values = apply_filters( 'frm_before_field_created', $field_values );
 
-        $field_id = FrmField::create( $field_values );
+		$field_id = FrmField::create( $field_values );
 
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
 		$field = self::get_field_array_from_id( $field_id );
 		self::load_single_field( $field, $values, $form_id );
 
-        return $field;
-    }
+		return $field;
+	}
 
 	public static function edit_name( $field = 'name', $id = '' ) {
 		_deprecated_function( __FUNCTION__, '3.0' );
@@ -101,29 +101,29 @@ 
 			$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() {
+	public static function update_ajax_option() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
 		if ( ! $field_id ) {
@@ -138,24 +138,24 @@ 
 			unset( $new_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() {
+	public static function duplicate() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$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 );
@@ -169,8 +169,8 @@ 
 			self::load_single_field( $field_id, $values );
 		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	/**
 	 * Load a single field in the form builder along with all needed variables
@@ -255,21 +255,21 @@ 
 		return $li_classes;
 	}
 
-    public static function destroy() {
+	public static function destroy() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		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() {
+	//Add Single Option or Other Option
+	public static function add_option() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		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' );
@@ -294,61 +294,61 @@ 
 		FrmFieldsHelper::show_single_option( $field );
 
 		wp_die();
-    }
+	}
 
-    public static function edit_option() {
+	public static function edit_option() {
 		_deprecated_function( __FUNCTION__, '2.3' );
-    }
+	}
 
-    public static function delete_option() {
+	public static function delete_option() {
 		_deprecated_function( __FUNCTION__, '2.3' );
-    }
+	}
 
-    public static function import_choices() {
-        FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
+	public static function import_choices() {
+		FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
 
 		$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 = '';
 
-        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();
+		$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 );
 
-        wp_enqueue_script( 'utils' );
+		wp_enqueue_script( 'utils' );
 		wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css' );
-        FrmAppHelper::load_admin_wide_js();
+		FrmAppHelper::load_admin_wide_js();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/import_choices.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function import_options() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
@@ -362,8 +362,8 @@ 
 		$field = FrmField::getOne( $field_id );
 
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'select' ) ) ) {
-            return;
-        }
+			return;
+		}
 
 		$field = FrmFieldsHelper::setup_edit_vars( $field );
 		$opts = FrmAppHelper::get_param( 'opts', '', 'post', 'wp_kses_post' );
@@ -386,10 +386,10 @@ 
 			}
 		}
 
-        //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 ) {
+		//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 ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 					$other_array[ $opt_key ] = $opt;
 				}
@@ -400,36 +400,36 @@ 
 			}
 		}
 
-        $field['options'] = $opts;
+		$field['options'] = $opts;
 
 		FrmFieldsHelper::show_single_option( $field );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function update_order() {
+	public static function update_order() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		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',
+		$type_switch = array(
+			'scale'     => 'radio',
 			'star'      => 'radio',
-            '10radio'   => 'radio',
-            'rte'       => 'textarea',
-            'website'   => 'url',
+			'10radio'   => 'radio',
+			'rte'       => 'textarea',
+			'website'   => 'url',
 			'image'     => 'url',
-        );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
-        }
+		);
+		if ( isset( $type_switch[ $type ] ) ) {
+			$type = $type_switch[ $type ];
+		}
 
 		$pro_fields = FrmField::pro_field_selection();
 		$types = array_keys( $pro_fields );
@@ -437,8 +437,8 @@ 
 			$type = 'text';
 		}
 
-        return $type;
-    }
+		return $type;
+	}
 
 	/**
 	 * @param array $settings
@@ -453,7 +453,7 @@ 
 		}
 
 		return apply_filters( 'frm_display_field_options', $settings );
-    }
+	}
 
 	/**
 	 * Display the format option
@@ -465,8 +465,8 @@ 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/value-format.php' );
 	}
 
-    public static function input_html( $field, $echo = true ) {
-        $class = array(); //$field['type'];
+	public static function input_html( $field, $echo = true ) {
+		$class = array(); //$field['type'];
 		self::add_input_classes( $field, $class );
 
 		$add_html = array();
@@ -485,85 +485,85 @@ 
 		$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 ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
-            return;
-        }
+		if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
+			return;
+		}
 
 		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', 'file', 'lookup' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			return;
+		}
 
 		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
+		// 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 );
-    }
+	}
 
 	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'] ) );
 
-        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', 'file' ) ) ) {
-            return;
-        }
+			return;
+		}
 
 		if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
-            // don't load on form builder page
-            return;
-        }
+			// 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 ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
@@ -665,27 +665,27 @@ 
 		}
 	}
 
-    private static function add_shortcodes_to_html( $field, array &$add_html ) {
-        if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
-            return;
-        }
+	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;
-            }
+		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[] = $v;
+			} else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
 				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
-            } else {
+			} else {
 				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
-            }
+			}
 
 			unset( $k, $v );
-        }
-    }
+		}
+	}
 
 	/**
 	 * Add pattern attribute
@@ -709,16 +709,16 @@ 
 		}
 	}
 
-    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_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 ) ) {

Spacing +11 added lines, -11 removed lines

@@ -36,7 +36,7 @@ 
 
 			ob_start();
 			self::load_single_field( $field, $values );
-			$field_html[ absint( $field->id ) ] = ob_get_contents();
+			$field_html[absint( $field->id )] = ob_get_contents();
 			ob_end_clean();
         }
 
@@ -375,7 +375,7 @@ 
 				if ( strpos( $opt, '|' ) !== false ) {
 					$vals = explode( '|', $opt );
 					if ( $vals[0] != $vals[1] ) {
-						$opts[ $opt_key ] = array(
+						$opts[$opt_key] = array(
 							'label' => trim( $vals[0] ),
 							'value' => trim( $vals[1] ),
 						);
@@ -391,7 +391,7 @@ 
             $other_array = array();
             foreach ( $field['options'] as $opt_key => $opt ) {
 				if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
-					$other_array[ $opt_key ] = $opt;
+					$other_array[$opt_key] = $opt;
 				}
 				unset( $opt_key, $opt );
 			}
@@ -427,8 +427,8 @@ 
             'website'   => 'url',
 			'image'     => 'url',
         );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
+        if ( isset( $type_switch[$type] ) ) {
+            $type = $type_switch[$type];
         }
 
 		$pro_fields = FrmField::pro_field_selection();
@@ -511,7 +511,7 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             return;
         }
 
@@ -542,11 +542,11 @@ 
 		// include "col" for valid html
 		$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 ) . '"';
     }
@@ -677,10 +677,10 @@ 
 
 			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 );