Strategy11 / formidable-forms

classes/models/fields/FrmFieldType.php

Doc Comments +4 added lines, -1 removed lines

@@ -83,7 +83,7 @@ 
 	}
 
 	/**
-	 * @param $column
+	 * @param string $column
 	 *
 	 * @return string|array
 	 */
@@ -239,6 +239,9 @@ 
 		return $this->alter_builder_classes( $classes );
 	}
 
+	/**
+	 * @param string $classes
+	 */
 	protected function alter_builder_classes( $classes ) {
 		return $classes;
 	}

Indentation +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
 
 	protected function html_id( $plus = '' ) {
 		return apply_filters( 'frm_field_get_html_id', 'field_' . $this->get_field_column('field_key') . $plus, $this->field );
-    }
+	}
 
 	public function display_field_settings() {
 		$default_settings = $this->default_field_settings();

Spacing +19 added lines, -19 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	protected function set_type( $type ) {
 		if ( empty( $this->type ) ) {
-			$this->type = $this->get_field_column('type');
+			$this->type = $this->get_field_column( 'type' );
 			if ( empty( $this->type ) && ! empty( $type ) ) {
 				$this->type = $type;
 			}
@@ -91,8 +91,8 @@ 
 		$field_val = '';
 		if ( is_object( $this->field ) ) {
 			$field_val = $this->field->{$column};
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
-			$field_val = $this->field[ $column ];
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
+			$field_val = $this->field[$column];
 		}
 		return $field_val;
 	}
@@ -177,16 +177,16 @@ 
 	}
 
 	protected function builder_text_field() {
-		return '<input type="text" name="' . esc_attr( $this->html_name() ) . '" id="' . esc_attr( $this->html_id() ) . '" value="' . esc_attr( $this->get_field_column('default_value') ) . '" class="dyn_default_value" />';
+		return '<input type="text" name="' . esc_attr( $this->html_name() ) . '" id="' . esc_attr( $this->html_id() ) . '" value="' . esc_attr( $this->get_field_column( 'default_value' ) ) . '" class="dyn_default_value" />';
 	}
 
 	protected function html_name( $name = '' ) {
 		$prefix = empty( $name ) ? 'item_meta' : $name;
-		return $prefix . '[' . $this->get_field_column('id') . ']';
+		return $prefix . '[' . $this->get_field_column( 'id' ) . ']';
 	}
 
 	protected function html_id( $plus = '' ) {
-		return apply_filters( 'frm_field_get_html_id', 'field_' . $this->get_field_column('field_key') . $plus, $this->field );
+		return apply_filters( 'frm_field_get_html_id', 'field_' . $this->get_field_column( 'field_key' ) . $plus, $this->field );
     }
 
 	public function display_field_settings() {
@@ -276,7 +276,7 @@ 
 	}
 
 	protected function default_invalid_msg() {
-		$field_name = $this->get_field_column('name');
+		$field_name = $this->get_field_column( 'name' );
 		if ( $field_name == '' ) {
 			$invalid = __( 'This field is invalid', 'formidable' );
 		} else {
@@ -292,8 +292,8 @@ 
 		$fields = FrmField::field_selection();
 		$fields = array_merge( $fields, FrmField::pro_field_selection() );
 
-		if ( isset( $fields[ $this->type ] ) ) {
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
+		if ( isset( $fields[$this->type] ) ) {
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
 		}
 
 		return $name;
@@ -387,23 +387,23 @@ 
 
 	protected function replace_input_shortcode( $args, &$html ) {
 		unset( $args['field'] );
-		preg_match_all("/\[(input)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER);
+		preg_match_all( "/\[(input)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER );
 
 		foreach ( $shortcodes[0] as $short_key => $tag ) {
 			$tag = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, array( 'conditional' => false, 'conditional_check' => false ) );
 			if ( $tag == 'input' ) {
-				$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
+				$shortcode_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][$short_key] );
 				$this->field['shortcodes'] = $this->prepare_input_shortcode_atts( $shortcode_atts );
 				$input = $this->include_front_field_input( $args, $shortcode_atts );
 
-				$html = str_replace( $shortcodes[0][ $short_key ], $input, $html );
+				$html = str_replace( $shortcodes[0][$short_key], $input, $html );
 			}
 		}
 	}
 
 	protected function prepare_input_shortcode_atts( $shortcode_atts ) {
 		if ( isset( $shortcode_atts['opt'] ) ) {
-			$shortcode_atts['opt']--;
+			$shortcode_atts['opt'] --;
 		}
 
 		$this->field['input_class'] = isset( $shortcode_atts['class'] ) ? $shortcode_atts['class'] : '';
@@ -466,8 +466,8 @@ 
 
 	protected function fill_display_field_values( $args = array() ) {
 		$defaults = array(
-			'field_name'    => 'item_meta[' . $this->get_field_column('id') . ']',
-			'field_id'      => $this->get_field_column('id'),
+			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
+			'field_id'      => $this->get_field_column( 'id' ),
 			'field_plus_id' => '',
 			'section_id'    => '',
 		);
@@ -504,8 +504,8 @@ 
 		$value = $this->prepare_display_value( $value, $atts );
 
 		if ( is_array( $value ) ) {
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
-				$value = $value[ $atts['show'] ];
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
+				$value = $value[$atts['show']];
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
 				$sep = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 				$value = implode( $sep, $value );
@@ -564,8 +564,8 @@ 
 		$saved_entries = $atts['ids'];
 		$new_value = array();
 		foreach ( (array) $value as $old_child_id ) {
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
-				$new_value[] = $saved_entries[ $old_child_id ];
+			if ( isset( $saved_entries[$old_child_id] ) ) {
+				$new_value[] = $saved_entries[$old_child_id];
 			}
 		}
 

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' );
 		}
 
@@ -170,13 +170,13 @@ 
 	private function get_ftp_creds( $type ) {
 		$credentials = get_option( 'ftp_credentials', array( 'hostname' => '', '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

formidable.php

Indentation +7 added lines, -7 removed lines

@@ -25,9 +25,9 @@ 
 function load_formidable_forms() {
 	global $frm_vars;
 	$frm_vars = array(
-    	'load_css' => false, 'forms_loaded' => array(),
-    	'created_entries'   => array(),
-    	'pro_is_authorized' => false,
+		'load_css' => false, 'forms_loaded' => array(),
+		'created_entries'   => array(),
+		'pro_is_authorized' => false,
 	);
 
 	require_once( dirname( __FILE__ ) . '/classes/controllers/FrmHooksController.php' );
@@ -42,17 +42,17 @@ 
 
 // if __autoload is active, put it on the spl_autoload stack
 if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions() ) ) {
-    spl_autoload_register('__autoload');
+	spl_autoload_register('__autoload');
 }
 
 // Add the autoloader
 spl_autoload_register('frm_forms_autoloader');
 
 function frm_forms_autoloader( $class_name ) {
-    // Only load Frm classes here
+	// Only load Frm classes here
 	if ( ! preg_match( '/^Frm.+$/', $class_name ) || preg_match( '/^FrmPro.+$/', $class_name ) ) {
-        return;
-    }
+		return;
+	}
 
 	FrmHooksController::autoloader( $class_name, dirname( __FILE__ ) );
 }

Spacing +4 added lines, -4 removed lines

@@ -32,8 +32,8 @@ 
 
 	require_once( dirname( __FILE__ ) . '/classes/controllers/FrmHooksController.php' );
 
-	$frm_path = dirname(__FILE__);
-	if ( file_exists($frm_path . '/pro/formidable-pro.php') ) {
+	$frm_path = dirname( __FILE__ );
+	if ( file_exists( $frm_path . '/pro/formidable-pro.php' ) ) {
 		include( $frm_path . '/pro/formidable-pro.php' );
 	}
 
@@ -42,11 +42,11 @@ 
 
 // if __autoload is active, put it on the spl_autoload stack
 if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions() ) ) {
-    spl_autoload_register('__autoload');
+    spl_autoload_register( '__autoload' );
 }
 
 // Add the autoloader
-spl_autoload_register('frm_forms_autoloader');
+spl_autoload_register( 'frm_forms_autoloader' );
 
 function frm_forms_autoloader( $class_name ) {
     // Only load Frm classes here

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/views/frm-fields/back-end/field-multiple.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 	do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
 } else {
-    do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+	do_action( 'frm_add_multiple_opts_labels', $field ); ?>
     <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
 		<?php FrmFieldsHelper::show_single_option( $field ); ?>
     </ul>

classes/views/frm-fields/back-end/dropdown-field.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( isset($field['post_field']) && $field['post_field'] == 'post_category' && FrmAppHelper::pro_is_installed() ) {
+if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' && FrmAppHelper::pro_is_installed() ) {
 	echo FrmProPost::get_category_dropdown( $field, array( 'name' => $field_name, 'id' => 'placeholder_id', 'location' => 'form_builder' ) );
 } else { ?>
 	<select id="frm_dropdown_<?php echo esc_attr( $field['id'] ) ?>"
@@ -27,9 +27,9 @@ 
 	<?php
 
 	if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) { ?>
-		<?php do_action('frm_add_multiple_opts_labels', $field); ?>
-		<ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count($field['options']) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
-			<?php FrmFieldsHelper::show_single_option($field); ?>
+		<?php do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+		<ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
+			<?php FrmFieldsHelper::show_single_option( $field ); ?>
 		</ul>
 		<?php
 	} ?>

classes/views/frm-fields/back-end/field-captcha.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 $frm_settings = FrmAppHelper::get_settings();
 if ( empty( $frm_settings->pubkey ) ) { ?>
-    <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Secret Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
+    <div class="howto frm_no_captcha_text"><?php printf( __( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Secret Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>' ) ?></div>
 <?php
 } ?>
 <img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>

classes/views/frm-forms/add_field.php

Indentation +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! isset( $values['doing_ajax'] ) ) {
-    $li_classes .= ' ui-state-default widgets-holder-wrap'; ?>
+	$li_classes .= ' ui-state-default widgets-holder-wrap'; ?>
 <li id="frm_field_id_<?php echo esc_attr( $field['id'] ); ?>" class="<?php echo esc_attr( $li_classes ) ?>" data-fid="<?php echo esc_attr( $field['id'] ) ?>" data-formid="<?php echo esc_attr( 'divider' == $field['type'] ? $field['form_select'] : $field['form_id'] ); ?>" data-ftype="<?php echo esc_attr( $display['type'] ) ?>">
 <?php
 }
@@ -23,7 +23,7 @@ 
     </span>
     <?php }
 
-    ?>
+	?>
     <label class="<?php echo ( $field['type'] == 'end_divider' ) ? '' : 'frm_ipe_field_label'; ?> frm_primary_label <?php echo ( $field['type'] == 'break' ) ? 'button': ''; ?>" id="field_label_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['name'] == '' ) ? __( '(no label)', 'formidable' ) : force_balance_tags( $field['name'] ); ?></label>
 
 
@@ -71,7 +71,7 @@ 
 if ( in_array( $field['type'], array( 'select', 'radio', 'checkbox' ) ) ) { ?>
     <div class="frm-show-click frm_small_top_margin"><?php
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		echo '<p class="howto">' . FrmFieldsHelper::get_term_link( $field['taxonomy'] ) . '</p>';
 	} else if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) {
 ?>
@@ -83,16 +83,16 @@ 
 				<a href="javascript:void(0);" id="other_button_<?php echo esc_attr( $field['id'] ); ?>" data-opttype="other" data-ftype="<?php echo esc_attr( $field['type'] ) ?>" class="button frm_cb_button frm_add_opt<?php echo ( in_array( $field['type'], array( 'radio', 'select' ) ) && $field['other'] == true ? ' frm_hidden' : '' ); ?>"><?php _e( 'Add "Other"', 'formidable' ) ?></a>
                 <input type="hidden" value="<?php echo esc_attr( $field['other'] ); ?>" id="other_input_<?php echo esc_attr( $field['id'] ); ?>" name="field_options[other_<?php echo esc_attr( $field['id'] ); ?>]">
             <?php
-            }
+			}
 
-            if ( ! isset($field['post_field']) || $field['post_field'] != 'post_category' ) { ?>
+			if ( ! isset($field['post_field']) || $field['post_field'] != 'post_category' ) { ?>
 			<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=frm_import_choices&field_id=' . $field['id'] . '&TB_iframe=1' ) ) ?>" title="<?php echo esc_attr( FrmAppHelper::truncate( strip_tags( str_replace( '"', '&quot;', $field['name'] ) ), 20 ) . ' ' . __( 'Field Choices', 'formidable' ) ); ?>" class="thickbox frm_orange">
 				<?php _e( 'Bulk Edit Options', 'formidable' ) ?>
 			</a>
             <?php } ?>
         </div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
@@ -127,31 +127,31 @@ 
 						<?php _e( 'Required', 'formidable' ) ?>
 					</label>
                 <?php
-                }
+				}
 
 				if ( $display['unique'] ) {
-                    if ( ! isset( $field['unique'] ) ) {
-                        $field['unique'] = false;
-                    }
-                ?>
+					if ( ! isset( $field['unique'] ) ) {
+						$field['unique'] = false;
+					}
+				?>
                 <label for="frm_uniq_field_<?php echo esc_attr( $field['id'] ) ?>" class="frm_inline_label frm_help" title="<?php esc_attr_e( 'Unique: Do not allow the same response multiple times. For example, if one user enters \'Joe\', then no one else will be allowed to enter the same name.', 'formidable' ) ?>"><input type="checkbox" name="field_options[unique_<?php echo esc_attr( $field['id'] ) ?>]" id="frm_uniq_field_<?php echo esc_attr( $field['id'] ) ?>" value="1" <?php checked( $field['unique'], 1 ); ?> class="frm_mark_unique" /> <?php _e( 'Unique', 'formidable' ) ?></label>
                 <?php
-                }
+				}
 
 				if ( $display['read_only'] ) {
-                    if ( ! isset( $field['read_only'] ) ) {
-                        $field['read_only'] = false;
+					if ( ! isset( $field['read_only'] ) ) {
+						$field['read_only'] = false;
 					}
-                ?>
+				?>
 				<label for="frm_read_only_field_<?php echo esc_attr( $field['id'] ) ?>" class="frm_inline_label frm_help" title="<?php esc_attr_e( 'Read Only: Show this field but do not allow the field value to be edited from the front-end.', 'formidable' ) ?>" >
 					<input type="checkbox" id="frm_read_only_field_<?php echo esc_attr( $field['id'] ) ?>" name="field_options[read_only_<?php echo esc_attr( $field['id'] ) ?>]" value="1" <?php checked( $field['read_only'], 1 ) ?>/>
 					<?php _e( 'Read Only', 'formidable' ) ?>
 				</label>
                 <?php }
 
-                do_action('frm_field_options_form_top', $field, $display, $values);
+				do_action('frm_field_options_form_top', $field, $display, $values);
 
-                ?>
+				?>
                 <?php
 				if ( $display['required'] ) { ?>
                 <div class="frm_required_details<?php echo esc_attr( $field['id'] . ( $field['required'] ? '' : ' frm_hidden' ) ); ?>">
@@ -255,7 +255,7 @@ 
 				do_action( 'frm_' . $field['type'] . '_field_options_form', $field, $display, $values );
 				do_action( 'frm_field_options_form', $field, $display, $values );
 
-                if ( $display['required'] || $display['invalid'] || $display['unique'] || $display['conf_field'] ) { ?>
+				if ( $display['required'] || $display['invalid'] || $display['unique'] || $display['conf_field'] ) { ?>
 					<tr class="frm_validation_msg <?php echo ($display['invalid'] || $field['required'] || FrmField::is_option_true( $field, 'unique' ) || FrmField::is_option_true( $field, 'conf_field' ) ) ? '' : 'frm_hidden'; ?>">
 					<td colspan="2">
                     <div class="menu-settings">
@@ -268,7 +268,7 @@ 
                             <input type="text" name="field_options[blank_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['blank'] ); ?>" />
                         </p>
                         <?php
-                        }
+						}
 
 						if ( $display['invalid'] ) { ?>
                             <p><label><?php _e( 'Invalid Format', 'formidable' ) ?></label>
@@ -283,7 +283,7 @@ 
                             <input type="text" name="field_options[unique_msg_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['unique_msg'] ); ?>" />
                         </p>
                         <?php
-                        }
+						}
 
 						if ( $display['conf_field'] ) { ?>
                         <p class="frm_conf_details<?php echo esc_attr( $field['id'] . ( $field['conf_field'] ? '' : ' frm_hidden' ) ); ?>">
@@ -291,7 +291,7 @@ 
                             <input type="text" name="field_options[conf_msg_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['conf_msg'] ); ?>" />
                         </p>
                         <?php
-                        } ?>
+						} ?>
                     </div>
                     </div>
                     </td>

Spacing +15 added lines, -15 removed lines

@@ -15,8 +15,8 @@ 
     <a href="javascript:void(0);" class="frm_bstooltip alignright frm-show-hover frm-move frm-hover-icon frm_icon_font frm_move_icon" title="<?php esc_attr_e( 'Move Field', 'formidable' ) ?>"> </a>
     <a href="#" class="frm_bstooltip alignright frm-show-hover frm-hover-icon frm_icon_font frm_delete_icon frm_delete_field" title="<?php esc_attr_e( 'Delete Field', 'formidable' ) ?>"> </a>
     <a href="#" class="frm_bstooltip alignright frm-show-hover frm-hover-icon frm_icon_font frm_duplicate_icon" title="<?php ( $field['type'] == 'divider' ) ? esc_attr_e( 'Duplicate Section', 'formidable' ) : esc_attr_e( 'Duplicate Field', 'formidable' ) ?>"> </a>
-    <input type="hidden" name="frm_fields_submitted[]" value="<?php echo esc_attr($field['id']) ?>" />
-    <?php do_action('frm_extra_field_actions', $field['id']); ?>
+    <input type="hidden" name="frm_fields_submitted[]" value="<?php echo esc_attr( $field['id'] ) ?>" />
+    <?php do_action( 'frm_extra_field_actions', $field['id'] ); ?>
     <?php if ( $display['required'] ) { ?>
     <span id="require_field_<?php echo esc_attr( $field['id'] ); ?>">
 		<a href="javascript:void(0);" class="frm_req_field frm_action_icon frm_required_icon frm_icon_font alignleft frm_required<?php echo (int) $field['required'] ?>" id="req_field_<?php echo esc_attr( $field['id'] ); ?>" title="Click to Mark as <?php echo FrmField::is_required( $field ) ? 'not ' : ''; ?>Required"></a>
@@ -24,7 +24,7 @@ 
     <?php }
 
     ?>
-    <label class="<?php echo ( $field['type'] == 'end_divider' ) ? '' : 'frm_ipe_field_label'; ?> frm_primary_label <?php echo ( $field['type'] == 'break' ) ? 'button': ''; ?>" id="field_label_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['name'] == '' ) ? __( '(no label)', 'formidable' ) : force_balance_tags( $field['name'] ); ?></label>
+    <label class="<?php echo ( $field['type'] == 'end_divider' ) ? '' : 'frm_ipe_field_label'; ?> frm_primary_label <?php echo ( $field['type'] == 'break' ) ? 'button' : ''; ?>" id="field_label_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['name'] == '' ) ? __( '(no label)', 'formidable' ) : force_balance_tags( $field['name'] ); ?></label>
 
 
 <div id="field_<?php echo esc_attr( $field['id'] ) ?>_inner_container" class="frm_inner_field_container">
@@ -43,7 +43,7 @@ 
 </div>
 <?php
 if ( $display['description'] ) { ?>
-    <div class="frm_ipe_field_desc description <?php echo ($field['description'] == '') ? 'frm-show-click' : '' ?>" id="field_description_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ($field['description'] == '') ? __( '(Click to add description)', 'formidable' ) : force_balance_tags( $field['description'] ); ?></div>
+    <div class="frm_ipe_field_desc description <?php echo ( $field['description'] == '' ) ? 'frm-show-click' : '' ?>" id="field_description_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['description'] == '' ) ? __( '(Click to add description)', 'formidable' ) : force_balance_tags( $field['description'] ); ?></div>
     <input type="hidden" name="field_options[description_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['description'] ); ?>" />
 
 <?php } ?>
@@ -55,8 +55,8 @@ 
 		<div class="frm_form_fields">
 			<input type="text" id="conf_field_<?php echo esc_attr( $field['field_key'] ) ?>" name="field_options[conf_input_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['conf_input'] ); ?>" class="dyn_default_value" />
 		</div>
-    	<div id="conf_field_description_<?php echo esc_attr( $field['id'] ) ?>" class="frm_ipe_field_conf_desc description <?php echo ($field['conf_desc'] == '') ? 'frm-show-click' : '' ?>"><?php
-			echo ($field['conf_desc'] == '') ? __( '(Click to add description)', 'formidable' ) : force_balance_tags($field['conf_desc']); ?></div>
+    	<div id="conf_field_description_<?php echo esc_attr( $field['id'] ) ?>" class="frm_ipe_field_conf_desc description <?php echo ( $field['conf_desc'] == '' ) ? 'frm-show-click' : '' ?>"><?php
+			echo ( $field['conf_desc'] == '' ) ? __( '(Click to add description)', 'formidable' ) : force_balance_tags( $field['conf_desc'] ); ?></div>
     	<input type="hidden" name="field_options[conf_desc_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['conf_desc'] ); ?>" />
 </div>
 	<?php if ( $display['clear_on_focus'] ) { ?>
@@ -71,7 +71,7 @@ 
 if ( in_array( $field['type'], array( 'select', 'radio', 'checkbox' ) ) ) { ?>
     <div class="frm-show-click frm_small_top_margin"><?php
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		echo '<p class="howto">' . FrmFieldsHelper::get_term_link( $field['taxonomy'] ) . '</p>';
 	} else if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) {
 ?>
@@ -85,7 +85,7 @@ 
             <?php
             }
 
-            if ( ! isset($field['post_field']) || $field['post_field'] != 'post_category' ) { ?>
+            if ( ! isset( $field['post_field'] ) || $field['post_field'] != 'post_category' ) { ?>
 			<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=frm_import_choices&field_id=' . $field['id'] . '&TB_iframe=1' ) ) ?>" title="<?php echo esc_attr( FrmAppHelper::truncate( strip_tags( str_replace( '"', '&quot;', $field['name'] ) ), 20 ) . ' ' . __( 'Field Choices', 'formidable' ) ); ?>" class="thickbox frm_orange">
 				<?php _e( 'Bulk Edit Options', 'formidable' ) ?>
 			</a>
@@ -98,7 +98,7 @@ 
 <?php
 }
 
-do_action('frm_before_field_options', $field);
+do_action( 'frm_before_field_options', $field );
 
 if ( $display['options'] ) { ?>
     <div class="widget">
@@ -108,13 +108,13 @@ 
         </div>
     	<div class="widget-inside">
             <table class="form-table frm_clear_none">
-                <?php $field_types = FrmFieldsHelper::get_field_types($field['type']); ?>
+                <?php $field_types = FrmFieldsHelper::get_field_types( $field['type'] ); ?>
 				<tr><td class="frm_150_width"><label><?php _e( 'Field Type', 'formidable' ) ?></label></td>
                     <td>
-                <select <?php if ( count($field_types) == 1 ) { ?>disabled="disabled"<?php } else { ?>name="field_options[type_<?php echo esc_attr( $field['id'] ) ?>]"<?php } ?>>
+                <select <?php if ( count( $field_types ) == 1 ) { ?>disabled="disabled"<?php } else { ?>name="field_options[type_<?php echo esc_attr( $field['id'] ) ?>]"<?php } ?>>
                     <?php
 					foreach ( $field_types as $fkey => $ftype ) { ?>
-                        <option value="<?php echo esc_attr( $fkey ) ?>" <?php echo ( $fkey == $field['type'] ) ? ' selected="selected"' : ''; ?> <?php echo array_key_exists($fkey, $disabled_fields ) ? 'disabled="disabled"' : '';  ?>><?php echo is_array($ftype) ? $ftype['name'] : $ftype ?> </option>
+                        <option value="<?php echo esc_attr( $fkey ) ?>" <?php echo ( $fkey == $field['type'] ) ? ' selected="selected"' : ''; ?> <?php echo array_key_exists( $fkey, $disabled_fields ) ? 'disabled="disabled"' : ''; ?>><?php echo is_array( $ftype ) ? $ftype['name'] : $ftype ?> </option>
                     <?php
 						unset( $fkey, $ftype );
 					} ?>
@@ -149,7 +149,7 @@ 
 				</label>
                 <?php }
 
-                do_action('frm_field_options_form_top', $field, $display, $values);
+                do_action( 'frm_field_options_form_top', $field, $display, $values );
 
                 ?>
                 <?php
@@ -188,7 +188,7 @@ 
 						<td class="frm_150_width"><label><?php _e( 'Label Position', 'formidable' ) ?></label></td>
 						<td>
 							<select name="field_options[label_<?php echo esc_attr( $field['id'] ) ?>]">
-								<option value=""<?php selected($field['label'], ''); ?>>
+								<option value=""<?php selected( $field['label'], '' ); ?>>
 									<?php _e( 'Default', 'formidable' ) ?>
 								</option>
 								<?php foreach ( FrmStylesHelper::get_sigle_label_postitions() as $pos => $pos_label ) { ?>
@@ -256,7 +256,7 @@ 
 				do_action( 'frm_field_options_form', $field, $display, $values );
 
                 if ( $display['required'] || $display['invalid'] || $display['unique'] || $display['conf_field'] ) { ?>
-					<tr class="frm_validation_msg <?php echo ($display['invalid'] || $field['required'] || FrmField::is_option_true( $field, 'unique' ) || FrmField::is_option_true( $field, 'conf_field' ) ) ? '' : 'frm_hidden'; ?>">
+					<tr class="frm_validation_msg <?php echo ( $display['invalid'] || $field['required'] || FrmField::is_option_true( $field, 'unique' ) || FrmField::is_option_true( $field, 'conf_field' ) ) ? '' : 'frm_hidden'; ?>">
 					<td colspan="2">
                     <div class="menu-settings">
                     <h3 class="frm_no_bg"><?php _e( 'Validation', 'formidable' ) ?></h3>