Strategy11 / formidable-forms

classes/models/FrmCreateFile.php

Spacing +7 added lines, -7 removed lines

@@ -18,8 +18,8 @@ 
 		$this->file_name = $atts['file_name'];
 		$this->error_message = isset( $atts['error_message'] ) ? $atts['error_message'] : '';
 		$this->uploads = wp_upload_dir();
-		$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 );
 	}
 
 	public function create_file( $file_content ) {
@@ -85,13 +85,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

classes/views/frm-fields/single-option.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <li id="frm_delete_field_<?php echo esc_attr( $field['id'] ); ?>-<?php echo esc_attr( $opt_key ) ?>_container" class="frm_single_option">
     <a href="javascript:void(0)" class="frm_single_visible_hover frm_icon_font frm_delete_icon" data-fid="<?php echo esc_attr( $field['id'] ); ?>"> </a>
     <?php if ( $field['type'] != 'select' ) { ?>
-        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name ) ?><?php echo ( $field['type'] == 'checkbox' ) ? '[]' : ''; ?>" value="<?php echo esc_attr($field_val) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
+        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name ) ?><?php echo ( $field['type'] == 'checkbox' ) ? '[]' : ''; ?>" value="<?php echo esc_attr( $field_val ) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
     <?php } ?>
-	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo esc_attr( $field['separate_value'] ? 'frm_with_key' : '' ); ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ($opt == '') ? __( '(Blank)', 'formidable' ) : $opt ?></label>
+	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo esc_attr( $field['separate_value'] ? 'frm_with_key' : '' ); ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ( $opt == '' ) ? __( '(Blank)', 'formidable' ) : $opt ?></label>
     <span class="frm_option_key field_<?php echo esc_attr( $field['id'] ) ?>_option_key<?php echo esc_attr( $field['separate_value'] ? '' : ' frm_hidden' ); ?>">
 		<label class="frm-show-click frm_ipe_field_option_key" id="field_key_<?php echo esc_attr( $field['id'] . '-' . $opt_key ) ?>"><?php echo ( $field_val == '' ) ? esc_html__( '(Blank)', 'formidable' ) : $field_val ?></label>
     </span>
 </li>
 <?php
-unset($field_val, $opt, $opt_key);
+unset( $field_val, $opt, $opt_key );

classes/views/styles/_field-labels.php

Spacing +12 added lines, -12 removed lines

@@ -1,10 +1,10 @@ 
 <div class="field-group field-group-background clearfix frm-first-row">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('label_color') ) ?>" id="frm_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['label_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'label_color' ) ) ?>" id="frm_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['label_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('weight') ) ?>" id="frm_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'weight' ) ) ?>" id="frm_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 		<?php } ?>
@@ -12,45 +12,45 @@ 
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('font_size') ) ?>" id="frm_font_size" value="<?php echo esc_attr($style->post_content['font_size']) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'font_size' ) ) ?>" id="frm_font_size" value="<?php echo esc_attr( $style->post_content['font_size'] ) ?>"  size="3" />
 </div>
 
 <div class="field-group clearfix frm_clear">
 	<label><?php _e( 'Position', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('position') ) ?>" id="frm_position">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'position' ) ) ?>" id="frm_position">
 	    <?php foreach ( array( 'none' => __( 'top', 'formidable' ), 'left' => __( 'left', 'formidable' ), 'right' => __( 'right', 'formidable' ), 'no_label' => __( 'none', 'formidable' ) ) as $pos => $pos_label ) { ?>
-	        <option value="<?php echo esc_attr( $pos ) ?>" <?php selected($style->post_content['position'], $pos) ?>><?php echo esc_html( $pos_label ) ?></option>
+	        <option value="<?php echo esc_attr( $pos ) ?>" <?php selected( $style->post_content['position'], $pos ) ?>><?php echo esc_html( $pos_label ) ?></option>
 	    <?php } ?>
 	</select>
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('align') ) ?>" id="frm_align">
-		<option value="left" <?php selected($style->post_content['align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-		<option value="right" <?php selected($style->post_content['align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'align' ) ) ?>" id="frm_align">
+		<option value="left" <?php selected( $style->post_content['align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+		<option value="right" <?php selected( $style->post_content['align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Width', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('width') ) ?>" id="frm_width" value="<?php echo esc_attr( $style->post_content['width'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'width' ) ) ?>" id="frm_width" value="<?php echo esc_attr( $style->post_content['width'] ) ?>" />
 </div>
 
 <div class="field-group clearfix frm_clear">
 	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('label_padding') ) ?>" id="frm_label_padding" value="<?php echo esc_attr( $style->post_content['label_padding'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'label_padding' ) ) ?>" id="frm_label_padding" value="<?php echo esc_attr( $style->post_content['label_padding'] ) ?>" />
 </div>
 
 <div class="clear"></div>
 <h3><?php _e( 'Required Indicator', 'formidable' ) ?></h3>
 <div class="field-group field-group-border clearfix after-h3">
 	<label class="background"><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('required_color') ) ?>" id="frm_required_color" class="hex" value="<?php echo esc_attr( $style->post_content['required_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'required_color' ) ) ?>" id="frm_required_color" class="hex" value="<?php echo esc_attr( $style->post_content['required_color'] ) ?>" />
 </div>
 <div class="field-group clearfix after-h3">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('required_weight') ) ?>" id="frm_required_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'required_weight' ) ) ?>" id="frm_required_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['required_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 		<?php } ?>

classes/views/styles/_buttons.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <p class="frm_no_top_margin">
 	<label for="frm_submit_style">
-		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('submit_style') ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
+		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_style' ) ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
 		<?php esc_html_e( 'Disable submit button styling', 'formidable' ); ?>
 		<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Note: If disabled, you may not see the change take effect until you make 2 more styling changes or click "Update Options".', 'formidable' ) ?>"></span>
 	</label>
@@ -9,10 +9,10 @@ 
 <div class="posttypediv">
 	<ul class="posttype-tabs add-menu-item-tabs">
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-button-default') ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-button-default' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
     	</li>
 		<li <?php echo ( 'button-hover' == $current_tab ? ' class="tabs"' : '' ); ?>>
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=button-hover#page-button-hover') ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=button-hover#page-button-hover' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
 		</li>
 		<li <?php echo ( 'button-click' == $current_tab ? ' class="tabs"' : '' ); ?>>
 			<a href="?page=formidable-styles&page-tab=button-click#tabs-panel-button-click" class="nav-tab-link" data-type="tabs-panel-button-click"><?php _e( 'Click', 'formidable' ) ?></a>
@@ -24,22 +24,22 @@ 
 	?>">
 	    <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_font_size') ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_font_size' ) ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Width', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_width') ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_width' ) ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Height', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_height') ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_height' ) ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('submit_weight') ) ?>" id="frm_submit_weight">
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_weight' ) ) ?>" id="frm_submit_weight">
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['submit_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 				<?php } ?>
@@ -48,48 +48,48 @@ 
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Corners', 'formidable' ) ?></label>
-        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_radius') ) ?>" id="frm_submit_border_radius" size="4"/>
+        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_radius' ) ) ?>" id="frm_submit_border_radius" size="4"/>
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_color') ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_color' ) ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_text_color') ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_text_color' ) ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_color') ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_color' ) ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_width') ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_width' ) ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Shadow', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_shadow_color') ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_shadow_color' ) ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
         </div>
 
         <div class="clear"></div>
         <div class="field-group field-group-border frm-full">
         	<label><?php _e( 'BG Image', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_img') ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_img' ) ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Margin', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_margin') ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_margin' ) ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_padding') ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_padding' ) ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
         </div>
         <div class="clear"></div>
 	</div><!-- /.tabs-panel -->
@@ -99,17 +99,17 @@ 
 	?>">
 	    <div class="field-group clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_bg_color') ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_bg_color' ) ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_color') ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_color' ) ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_border_color') ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_border_color' ) ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
         </div>
 
 	    <div class="clear"></div>
@@ -120,17 +120,17 @@ 
 	?>">
 	    <div class="field-group clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_bg_color') ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_bg_color' ) ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_color') ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_color' ) ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_border_color') ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_border_color' ) ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
         </div>
 
 	    <div class="clear"></div>

classes/controllers/FrmSettingsController.php

Indentation +44 added lines, -44 removed lines

@@ -2,26 +2,26 @@ 
 
 class FrmSettingsController {
 
-    public static function menu() {
+	public static function menu() {
 		// Make sure admins can see the menu items
 		FrmAppHelper::force_capability( 'frm_change_settings' );
 
-        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route' );
-    }
+		add_submenu_page( 'formidable', 'Formidable | ' . __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route' );
+	}
 
-    public static function license_box() {
+	public static function license_box() {
 		$a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' );
-        include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php' );
-    }
+		include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php' );
+	}
 
-    public static function display_form( $errors = array(), $message = '' ) {
-        global $frm_vars;
+	public static function display_form( $errors = array(), $message = '' ) {
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
-        $frm_roles = FrmAppHelper::frm_capabilities();
+		$frm_settings = FrmAppHelper::get_settings();
+		$frm_roles = FrmAppHelper::frm_capabilities();
 
-        $uploads = wp_upload_dir();
-        $target_path = $uploads['basedir'] . '/formidable/css';
+		$uploads = wp_upload_dir();
+		$target_path = $uploads['basedir'] . '/formidable/css';
 
 		$sections = array();
 		if ( apply_filters( 'frm_include_addon_page', false ) ) {
@@ -30,53 +30,53 @@ 
 				'name' => __( 'Plugin Licenses', 'formidable' ),
 			);
 		}
-        $sections = apply_filters( 'frm_add_settings_section', $sections );
+		$sections = apply_filters( 'frm_add_settings_section', $sections );
 
-        $captcha_lang = FrmAppHelper::locales( 'captcha' );
+		$captcha_lang = FrmAppHelper::locales( 'captcha' );
 
-        require( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/form.php' );
-    }
+		require( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/form.php' );
+	}
 
-    public static function process_form( $stop_load = false ) {
-        global $frm_vars;
+	public static function process_form( $stop_load = false ) {
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		$process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
 		if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
-            wp_die( $frm_settings->admin_permission );
-        }
+			wp_die( $frm_settings->admin_permission );
+		}
 
-        $errors = array();
-        $message = '';
+		$errors = array();
+		$message = '';
 
-        if ( ! isset( $frm_vars['settings_routed'] ) || ! $frm_vars['settings_routed'] ) {
-            //$errors = $frm_settings->validate($_POST,array());
-            $frm_settings->update( stripslashes_deep( $_POST ) );
+		if ( ! isset( $frm_vars['settings_routed'] ) || ! $frm_vars['settings_routed'] ) {
+			//$errors = $frm_settings->validate($_POST,array());
+			$frm_settings->update( stripslashes_deep( $_POST ) );
 
-            if ( empty( $errors ) ) {
-                $frm_settings->store();
-                $message = __( 'Settings Saved', 'formidable' );
-            }
-        } else {
-            $message = __( 'Settings Saved', 'formidable' );
-        }
+			if ( empty( $errors ) ) {
+				$frm_settings->store();
+				$message = __( 'Settings Saved', 'formidable' );
+			}
+		} else {
+			$message = __( 'Settings Saved', 'formidable' );
+		}
 
 		if ( $stop_load == 'stop_load' ) {
-            $frm_vars['settings_routed'] = true;
-            return;
-        }
+			$frm_vars['settings_routed'] = true;
+			return;
+		}
 
-        self::display_form( $errors, $message );
-    }
+		self::display_form( $errors, $message );
+	}
 
-    public static function route( $stop_load = false ) {
-        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+	public static function route( $stop_load = false ) {
+		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-        if ( $action == 'process-form' ) {
+		if ( $action == 'process-form' ) {
 			self::process_form( $stop_load );
-        } else if ( $stop_load != 'stop_load' ) {
+		} else if ( $stop_load != 'stop_load' ) {
 			self::display_form();
-        }
-    }
+		}
+	}
 }

classes/views/styles/_field-description.php

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <div class="field-group field-group-background clearfix frm-first-row">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_color') ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_color' ) ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_weight') ) ?>" id="frm_description_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_weight' ) ) ?>" id="frm_description_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['description_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 		<?php } ?>
@@ -12,25 +12,25 @@ 
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Style', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_style') ) ?>" id="frm_description_style">
-		<option value="normal" <?php selected($style->post_content['description_style'], 'normal') ?>><?php _e( 'normal', 'formidable' ) ?></option>
-		<option value="italic" <?php selected($style->post_content['description_style'], 'italic') ?>><?php _e( 'italic', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_style' ) ) ?>" id="frm_description_style">
+		<option value="normal" <?php selected( $style->post_content['description_style'], 'normal' ) ?>><?php _e( 'normal', 'formidable' ) ?></option>
+		<option value="italic" <?php selected( $style->post_content['description_style'], 'italic' ) ?>><?php _e( 'italic', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_font_size') ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_font_size' ) ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_align') ) ?>" id="frm_description_align">
-		<option value="left" <?php selected($style->post_content['description_align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-		<option value="right" <?php selected($style->post_content['description_align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_align' ) ) ?>" id="frm_description_align">
+		<option value="left" <?php selected( $style->post_content['description_align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+		<option value="right" <?php selected( $style->post_content['description_align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
 	</select>
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Margin', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_margin') ) ?>" id="frm_description_margin" value="<?php echo esc_attr( $style->post_content['description_margin'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_margin' ) ) ?>" id="frm_description_margin" value="<?php echo esc_attr( $style->post_content['description_margin'] ) ?>"  size="3" />
 </div>
 <div class="clear"></div>

classes/models/FrmDb.php

Doc Comments +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
 	 *
 	 * @since 2.02.05
 	 * @param string $key
-	 * @param int|string $value
+	 * @param string $value
 	 * @param string $where
 	 */
     private static function add_query_placeholder( $key, $value, &$where ) {

Spacing +50 added lines, -50 removed lines

@@ -7,8 +7,8 @@ 
     var $entry_metas;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
         global $wpdb;
@@ -24,7 +24,7 @@ 
         $frm_db_version = FrmAppHelper::$db_version;
         $old_db_version = (float) $old_db_version;
         if ( ! $old_db_version ) {
-            $old_db_version = get_option('frm_db_version');
+            $old_db_version = get_option( 'frm_db_version' );
         }
 
         if ( $frm_db_version != $old_db_version ) {
@@ -34,16 +34,16 @@ 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
             $this->create_tables();
-            $this->migrate_data($frm_db_version, $old_db_version);
+            $this->migrate_data( $frm_db_version, $old_db_version );
 
             /***** SAVE DB VERSION *****/
-            update_option('frm_db_version', $frm_db_version);
+            update_option( 'frm_db_version', $frm_db_version );
 
             /**** ADD/UPDATE DEFAULT TEMPLATES ****/
             FrmXMLController::add_default_templates();
         }
 
-        do_action('frm_after_install');
+        do_action( 'frm_after_install' );
 
         /**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
@@ -153,7 +153,7 @@ 
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
+            unset( $q );
         }
     }
 
@@ -178,7 +178,7 @@ 
 	 * @param string $starts_with
      */
     public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+        if ( empty( $args ) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
@@ -238,8 +238,8 @@ 
     private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
-        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
-            $k = explode(' ', $key);
+        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
+            $k = explode( ' ', $key );
             $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
             $values[] = '%Y-%m-%d %H:%i:%s';
         } else {
@@ -252,7 +252,7 @@ 
         if ( is_array( $value ) ) {
             // translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
-				$where = preg_replace('/' . $key . '$/', '', $where);
+				$where = preg_replace( '/' . $key . '$/', '', $where );
 				$where .= '(';
 				$start = true;
 				foreach ( $value as $v ) {
@@ -403,8 +403,8 @@ 
 		);
 
 		$where_is = strtolower( $where_is );
-		if ( isset( $switch_to[ $where_is ] ) ) {
-			return ' ' . $switch_to[ $where_is ];
+		if ( isset( $switch_to[$where_is] ) ) {
+			return ' ' . $switch_to[$where_is];
 		}
 
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -426,8 +426,8 @@ 
     private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
+        $table_parts = explode( ' ', $table );
+        $group = reset( $table_parts );
         $group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
@@ -442,7 +442,7 @@ 
     }
 
     private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+        if ( ! is_array( $args ) ) {
 			$args = array( 'order_by' => $args );
         }
 
@@ -457,16 +457,16 @@ 
         $temp_args = $args;
         foreach ( $temp_args as $k => $v ) {
             if ( $v == '' ) {
-				unset( $args[ $k ] );
+				unset( $args[$k] );
                 continue;
             }
 
             if ( $k == 'limit' ) {
-				$args[ $k ] = FrmAppHelper::esc_limit( $v );
+				$args[$k] = FrmAppHelper::esc_limit( $v );
             }
             $db_name = strtoupper( str_replace( '_', ' ', $k ) );
             if ( strpos( $v, $db_name ) === false ) {
-				$args[ $k ] = $db_name . ' ' . $v;
+				$args[$k] = $db_name . ' ' . $v;
             }
         }
 
@@ -493,7 +493,7 @@ 
 
 		$query = self::generate_query_string_from_pieces( $columns, $table, $where );
 
-		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A' , ' WHERE' ) );
+		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A', ' WHERE' ) );
 		$results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_associative_results' );
 
 		return $results;
@@ -532,7 +532,7 @@ 
     public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
             $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
+            wp_die( $frm_settings->admin_permission );
         }
 
         global $wpdb, $wp_roles;
@@ -542,8 +542,8 @@ 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+        delete_option( 'frm_options' );
+        delete_option( 'frm_db_version' );
 
         //delete roles
         $frm_roles = FrmAppHelper::frm_capabilities();
@@ -551,11 +551,11 @@ 
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
             foreach ( $roles as $role => $details ) {
                 $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
+                unset( $role, $details );
     		}
-    		unset($frm_role, $frm_role_description);
+    		unset( $frm_role, $frm_role_description );
 		}
-		unset($roles, $frm_roles);
+		unset( $roles, $frm_roles );
 
 		// delete actions, views, and styles
 
@@ -577,7 +577,7 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
+        do_action( 'frm_after_uninstall' );
         return true;
     }
 
@@ -634,8 +634,8 @@ 
 
         $updated = 0;
         foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+            $f->field_options = maybe_unserialize( $f->field_options );
+            if ( empty( $f->field_options['size'] ) || ! is_numeric( $f->field_options['size'] ) ) {
                 continue;
             }
 
@@ -643,27 +643,27 @@ 
             $f->field_options['size'] .= 'px';
             $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
             if ( $u ) {
-                $updated++;
+                $updated ++;
             }
-            unset($f);
+            unset( $f );
         }
 
         // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
+        $widgets = get_option( 'widget_frm_show_form' );
+        if ( empty( $widgets ) ) {
             return;
         }
 
-        $widgets = maybe_unserialize($widgets);
+        $widgets = maybe_unserialize( $widgets );
         foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
+            if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) {
                 continue;
             }
 			$size = round( $pixel_conversion * (int) $widget['size'] );
             $size .= 'px';
-			$widgets[ $k ]['size'] = $size;
+			$widgets[$k]['size'] = $size;
         }
-        update_option('widget_frm_show_form', $widgets);
+        update_option( 'widget_frm_show_form', $widgets );
     }
 
     /**
@@ -712,7 +712,7 @@ 
 			}
 
             // Format form options
-            $form_options = maybe_unserialize($form->options);
+            $form_options = maybe_unserialize( $form->options );
 
             // Migrate settings to actions
             FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
@@ -722,7 +722,7 @@ 
     private function migrate_to_11() {
         global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+        $forms = FrmDb::get_results( $this->forms, array(), 'id, options' );
 
         $sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
@@ -733,13 +733,13 @@ 
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+        unset( $sending, $img );
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
+        $new_default_html = FrmFormsHelper::get_default_html( 'submit' );
         $draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+            $form->options = maybe_unserialize( $form->options );
+            if ( ! isset( $form->options['submit_html'] ) || empty( $form->options['submit_html'] ) ) {
                 continue;
             }
 
@@ -750,9 +750,9 @@ 
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
             }
-            unset($form);
+            unset( $form );
         }
-        unset($forms);
+        unset( $forms );
     }
 
     private function migrate_to_6() {
@@ -781,16 +781,16 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
+        $new_default_html = FrmFieldsHelper::get_default_html( 'text' );
         foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+            $field->field_options = maybe_unserialize( $field->field_options );
 			if ( ! FrmField::is_option_empty( $field, 'custom_html' ) || $field->field_options['custom_html'] == $default_html || $field->field_options['custom_html'] == $old_default_html ) {
                 $field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
             }
-            unset($field);
+            unset( $field );
         }
-        unset($default_html, $old_default_html, $fields);
+        unset( $default_html, $old_default_html, $fields );
     }
 
     private function migrate_to_4() {
@@ -808,6 +808,6 @@ 
 
 	public static function get_records( $table, $args = array(), $order_by = '', $limit = '', $fields = '*' ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_results' );
-		return self::get_results( $table, $args, $fields, compact('order_by', 'limit') );
+		return self::get_results( $table, $args, $fields, compact( 'order_by', 'limit' ) );
 	}
 }

Indentation +338 added lines, -338 removed lines

@@ -1,64 +1,64 @@ 
 <?php
 
 class FrmDb {
-    var $fields;
-    var $forms;
-    var $entries;
-    var $entry_metas;
-
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
-
-        global $wpdb;
-        $this->fields         = $wpdb->prefix . 'frm_fields';
-        $this->forms          = $wpdb->prefix . 'frm_forms';
-        $this->entries        = $wpdb->prefix . 'frm_items';
-        $this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
-    }
-
-    public function upgrade( $old_db_version = false ) {
-        global $wpdb;
-        //$frm_db_version is the version of the database we're moving to
-        $frm_db_version = FrmAppHelper::$db_version;
-        $old_db_version = (float) $old_db_version;
-        if ( ! $old_db_version ) {
-            $old_db_version = get_option('frm_db_version');
-        }
-
-        if ( $frm_db_version != $old_db_version ) {
+	var $fields;
+	var $forms;
+	var $entries;
+	var $entry_metas;
+
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
+
+		global $wpdb;
+		$this->fields         = $wpdb->prefix . 'frm_fields';
+		$this->forms          = $wpdb->prefix . 'frm_forms';
+		$this->entries        = $wpdb->prefix . 'frm_items';
+		$this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
+	}
+
+	public function upgrade( $old_db_version = false ) {
+		global $wpdb;
+		//$frm_db_version is the version of the database we're moving to
+		$frm_db_version = FrmAppHelper::$db_version;
+		$old_db_version = (float) $old_db_version;
+		if ( ! $old_db_version ) {
+			$old_db_version = get_option('frm_db_version');
+		}
+
+		if ( $frm_db_version != $old_db_version ) {
 			// update rewrite rules for views and other custom post types
 			flush_rewrite_rules();
 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-            $this->create_tables();
-            $this->migrate_data($frm_db_version, $old_db_version);
+			$this->create_tables();
+			$this->migrate_data($frm_db_version, $old_db_version);
 
-            /***** SAVE DB VERSION *****/
-            update_option('frm_db_version', $frm_db_version);
+			/***** SAVE DB VERSION *****/
+			update_option('frm_db_version', $frm_db_version);
 
-            /**** ADD/UPDATE DEFAULT TEMPLATES ****/
-            FrmXMLController::add_default_templates();
-        }
+			/**** ADD/UPDATE DEFAULT TEMPLATES ****/
+			FrmXMLController::add_default_templates();
+		}
 
-        do_action('frm_after_install');
+		do_action('frm_after_install');
 
-        /**** update the styling settings ****/
+		/**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
 			$frm_style = new FrmStyle();
 			$frm_style->update( 'default' );
 		}
-    }
+	}
 
-    public function collation() {
-        global $wpdb;
-        if ( ! $wpdb->has_cap( 'collation' ) ) {
-            return '';
-        }
+	public function collation() {
+		global $wpdb;
+		if ( ! $wpdb->has_cap( 'collation' ) ) {
+			return '';
+		}
 
-        $charset_collate = '';
+		$charset_collate = '';
 		if ( ! empty( $wpdb->charset ) ) {
 			$charset_collate .= ' DEFAULT CHARACTER SET ' . $wpdb->charset;
 		}
@@ -67,14 +67,14 @@ 
 			$charset_collate .= ' COLLATE ' . $wpdb->collate;
 		}
 
-        return $charset_collate;
-    }
+		return $charset_collate;
+	}
 
-    private function create_tables() {
-        $charset_collate = $this->collation();
-        $sql = array();
+	private function create_tables() {
+		$charset_collate = $this->collation();
+		$sql = array();
 
-        /* Create/Upgrade Fields Table */
+		/* Create/Upgrade Fields Table */
 		$sql[] = 'CREATE TABLE ' . $this->fields . ' (
                 id int(11) NOT NULL auto_increment,
 				field_key varchar(100) default NULL,
@@ -93,7 +93,7 @@ 
                 UNIQUE KEY field_key (field_key)
         )';
 
-        /* Create/Upgrade Forms Table */
+		/* Create/Upgrade Forms Table */
 		$sql[] = 'CREATE TABLE ' . $this->forms . ' (
                 id int(11) NOT NULL auto_increment,
 				form_key varchar(100) default NULL,
@@ -111,7 +111,7 @@ 
                 UNIQUE KEY form_key (form_key)
         )';
 
-        /* Create/Upgrade Items Table */
+		/* Create/Upgrade Items Table */
 		$sql[] = 'CREATE TABLE ' . $this->entries . ' (
                 id int(11) NOT NULL auto_increment,
 				item_key varchar(100) default NULL,
@@ -134,7 +134,7 @@ 
                 UNIQUE KEY item_key (item_key)
         )';
 
-        /* Create/Upgrade Meta Table */
+		/* Create/Upgrade Meta Table */
 		$sql[] = 'CREATE TABLE ' . $this->entry_metas . ' (
                 id int(11) NOT NULL auto_increment,
                 meta_value longtext default NULL,
@@ -146,43 +146,43 @@ 
                 KEY item_id (item_id)
         )';
 
-        foreach ( $sql as $q ) {
+		foreach ( $sql as $q ) {
 			if ( function_exists( 'dbDelta' ) ) {
 				dbDelta( $q . $charset_collate . ';' );
 			} else {
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
-        }
-    }
+			unset($q);
+		}
+	}
 
-    /**
-     * @param integer $frm_db_version
+	/**
+	 * @param integer $frm_db_version
 	 * @param int $old_db_version
-     */
+	 */
 	private function migrate_data( $frm_db_version, $old_db_version ) {
 		$migrations = array( 4, 6, 11, 16, 17, 23, 25 );
-        foreach ( $migrations as $migration ) {
-            if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
+		foreach ( $migrations as $migration ) {
+			if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
 				$function_name = 'migrate_to_' . $migration;
-                $this->$function_name();
-            }
-        }
-    }
+				$this->$function_name();
+			}
+		}
+	}
 
-    /**
-     * Change array into format $wpdb->prepare can use
+	/**
+	 * Change array into format $wpdb->prepare can use
 	 *
 	 * @param array $args
 	 * @param string $starts_with
-     */
-    public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+	 */
+	public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
+		if ( empty($args) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
-        }
+		}
 
 		$where = '';
 		$values = array();
@@ -193,64 +193,64 @@ 
 		}
 
 		$args = compact( 'where', 'values' );
-    }
+	}
 
-    /**
+	/**
 	 * @param array $args
-     * @param string $base_where
-     * @param string $where
+	 * @param string $base_where
+	 * @param string $where
 	 * @param array $values
-     */
-    public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
-        $condition = ' AND';
-        if ( isset( $args['or'] ) ) {
-            $condition = ' OR';
-            unset( $args['or'] );
-        }
-
-        foreach ( $args as $key => $value ) {
-            $where .= empty( $where ) ? $base_where : $condition;
-            $array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
-            if ( is_numeric( $key ) || $array_inc_null ) {
-                $where .= ' ( ';
-                $nested_where = '';
-                if ( $array_inc_null ) {
-                    foreach ( $value as $val ) {
-                        self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
-                    }
-                } else {
-                    self::parse_where_from_array( $value, '', $nested_where, $values );
-                }
-                $where .= $nested_where;
-                $where .= ' ) ';
-            } else {
-                self::interpret_array_to_sql( $key, $value, $where, $values );
-            }
-        }
-    }
-
-    /**
-     * @param string $key
+	 */
+	public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
+		$condition = ' AND';
+		if ( isset( $args['or'] ) ) {
+			$condition = ' OR';
+			unset( $args['or'] );
+		}
+
+		foreach ( $args as $key => $value ) {
+			$where .= empty( $where ) ? $base_where : $condition;
+			$array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
+			if ( is_numeric( $key ) || $array_inc_null ) {
+				$where .= ' ( ';
+				$nested_where = '';
+				if ( $array_inc_null ) {
+					foreach ( $value as $val ) {
+						self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
+					}
+				} else {
+					self::parse_where_from_array( $value, '', $nested_where, $values );
+				}
+				$where .= $nested_where;
+				$where .= ' ) ';
+			} else {
+				self::interpret_array_to_sql( $key, $value, $where, $values );
+			}
+		}
+	}
+
+	/**
+	 * @param string $key
 	 * @param string|array $value
-     * @param string $where
+	 * @param string $where
 	 * @param array $values
-     */
-    private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
+	 */
+	private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
-        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
-            $k = explode(' ', $key);
-            $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
-            $values[] = '%Y-%m-%d %H:%i:%s';
-        } else {
+		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
+			$k = explode(' ', $key);
+			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
+			$values[] = '%Y-%m-%d %H:%i:%s';
+		} else {
 			$where .= ' ' . $key;
-        }
+		}
 
 		$lowercase_key = explode( ' ', strtolower( $key ) );
 		$lowercase_key = end( $lowercase_key );
 
-        if ( is_array( $value ) ) {
-            // translate array of values to "in"
+		if ( is_array( $value ) ) {
+			// translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
 				$where = preg_replace('/' . $key . '$/', '', $where);
 				$where .= '(';
@@ -268,7 +268,7 @@ 
 				$where .= ' in (' . FrmAppHelper::prepare_array_values( $value, '%s' ) . ')';
 				$values = array_merge( $values, $value );
 			}
-        } else if ( strpos( $lowercase_key, 'like' ) !== false ) {
+		} else if ( strpos( $lowercase_key, 'like' ) !== false ) {
 			/**
 			 * Allow string to start or end with the value
 			 * If the key is like% then skip the first % for starts with
@@ -287,9 +287,9 @@ 
 			$where .= ' %s';
 			$values[] = $start . FrmAppHelper::esc_like( $value ) . $end;
 
-        } else if ( $value === null ) {
-            $where .= ' IS NULL';
-        } else {
+		} else if ( $value === null ) {
+			$where .= ' IS NULL';
+		} else {
 			// allow a - to prevent = from being added
 			if ( substr( $key, -1 ) == '-' ) {
 				$where = rtrim( $where, '-' );
@@ -299,9 +299,9 @@ 
 
 			self::add_query_placeholder( $key, $value, $where );
 
-            $values[] = $value;
-        }
-    }
+			$values[] = $value;
+		}
+	}
 
 	/**
 	 * Add %d, or %s to query
@@ -311,7 +311,7 @@ 
 	 * @param int|string $value
 	 * @param string $where
 	 */
-    private static function add_query_placeholder( $key, $value, &$where ) {
+	private static function add_query_placeholder( $key, $value, &$where ) {
 		if ( is_numeric( $value ) && strpos( $key, 'meta_value' ) === false ) {
 			$where .= '%d';
 		} else {
@@ -319,16 +319,16 @@ 
 		}
 	}
 
-    /**
-     * @param string $table
+	/**
+	 * @param string $table
 	 * @param array $where
 	 * @param array $args
 	 * @return int
-     */
-    public static function get_count( $table, $where = array(), $args = array() ) {
-        $count = self::get_var( $table, $where, 'COUNT(*)', $args );
-        return $count;
-    }
+	 */
+	public static function get_count( $table, $where = array(), $args = array() ) {
+		$count = self::get_var( $table, $where, 'COUNT(*)', $args );
+		return $count;
+	}
 
 	/**
 	 * @param string $table
@@ -339,56 +339,56 @@ 
 	 * @param string $type
 	 * @return array|null|string|object
 	 */
-    public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
-        $group = '';
-        self::get_group_and_table_name( $table, $group );
+	public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
+		$group = '';
+		self::get_group_and_table_name( $table, $group );
 		self::convert_options_to_array( $args, '', $limit );
 
 		$query = self::generate_query_string_from_pieces( $field, $table, $where, $args );
 
 		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . implode( '_', $args ) . $field . '_' . $type, ' WHERE' ) );
 		$results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_' . $type );
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * @param string $table
-     * @param array $where
+	/**
+	 * @param string $table
+	 * @param array $where
 	 * @param string $field
 	 * @param array $args
 	 * @param string $limit
 	 * @return mixed
-     */
-    public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
-        return self::get_var( $table, $where, $field, $args, $limit, 'col' );
-    }
-
-    /**
-     * @since 2.0
-     * @param string $table
+	 */
+	public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
+		return self::get_var( $table, $where, $field, $args, $limit, 'col' );
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
-        $args['limit'] = 1;
-        return self::get_var( $table, $where, $fields, $args, '', 'row' );
-    }
-
-    /**
-     * Prepare a key/value array before DB call
+	 */
+	public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
+		$args['limit'] = 1;
+		return self::get_var( $table, $where, $fields, $args, '', 'row' );
+	}
+
+	/**
+	 * Prepare a key/value array before DB call
 	 *
-     * @since 2.0
-     * @param string $table
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
-        return self::get_var( $table, $where, $fields, $args, '', 'results' );
-    }
+	 */
+	public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
+		return self::get_var( $table, $where, $fields, $args, '', 'results' );
+	}
 
 	/**
 	 * Check for like, not like, in, not in, =, !=, >, <, <=, >=
@@ -425,59 +425,59 @@ 
 		return '';
 	}
 
-    /**
-     * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
-     * Also add the wpdb->prefix to the table if it's missing
-     *
-     * @param string $table
-     * @param string $group
-     */
-    private static function get_group_and_table_name( &$table, &$group ) {
+	/**
+	 * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
+	 * Also add the wpdb->prefix to the table if it's missing
+	 *
+	 * @param string $table
+	 * @param string $group
+	 */
+	private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
-        $group = str_replace( $wpdb->prefix, '', $group );
+		$table_parts = explode(' ', $table);
+		$group = reset($table_parts);
+		$group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
 		$group = str_replace( $prefix, '', $group );
 
-        if ( $group == $table ) {
-            $table = $wpdb->prefix . $table;
-        }
+		if ( $group == $table ) {
+			$table = $wpdb->prefix . $table;
+		}
 
 		// switch to singular group name
 		$group = rtrim( $group, 's' );
-    }
+	}
 
-    private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+	private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
+		if ( ! is_array($args) ) {
 			$args = array( 'order_by' => $args );
-        }
+		}
 
-        if ( ! empty( $order_by ) ) {
-            $args['order_by'] = $order_by;
-        }
+		if ( ! empty( $order_by ) ) {
+			$args['order_by'] = $order_by;
+		}
 
-        if ( ! empty( $limit ) ) {
-            $args['limit'] = $limit;
-        }
+		if ( ! empty( $limit ) ) {
+			$args['limit'] = $limit;
+		}
 
-        $temp_args = $args;
-        foreach ( $temp_args as $k => $v ) {
-            if ( $v == '' ) {
+		$temp_args = $args;
+		foreach ( $temp_args as $k => $v ) {
+			if ( $v == '' ) {
 				unset( $args[ $k ] );
-                continue;
-            }
+				continue;
+			}
 
-            if ( $k == 'limit' ) {
+			if ( $k == 'limit' ) {
 				$args[ $k ] = FrmAppHelper::esc_limit( $v );
-            }
-            $db_name = strtoupper( str_replace( '_', ' ', $k ) );
-            if ( strpos( $v, $db_name ) === false ) {
+			}
+			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
+			if ( strpos( $v, $db_name ) === false ) {
 				$args[ $k ] = $db_name . ' ' . $v;
-            }
-        }
+			}
+		}
 
 		// Make sure LIMIT is the last argument
 		if ( isset( $args['order_by'] ) && isset( $args['limit'] ) ) {
@@ -485,7 +485,7 @@ 
 			unset( $args['limit'] );
 			$args['limit'] = $temp_limit;
 		}
-    }
+	}
 
 	/**
 	 * Get the associative array results for the given columns, table, and where query
@@ -538,31 +538,31 @@ 
 		return $query;
 	}
 
-    public function uninstall() {
+	public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die($frm_settings->admin_permission);
+		}
 
-        global $wpdb, $wp_roles;
+		global $wpdb, $wp_roles;
 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->fields );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->forms );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+		delete_option('frm_options');
+		delete_option('frm_db_version');
 
-        //delete roles
-        $frm_roles = FrmAppHelper::frm_capabilities();
-        $roles = get_editable_roles();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            foreach ( $roles as $role => $details ) {
-                $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
-    		}
-    		unset($frm_role, $frm_role_description);
+		//delete roles
+		$frm_roles = FrmAppHelper::frm_capabilities();
+		$roles = get_editable_roles();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			foreach ( $roles as $role => $details ) {
+				$wp_roles->remove_cap( $role, $frm_role );
+				unset($role, $details);
+			}
+			unset($frm_role, $frm_role_description);
 		}
 		unset($roles, $frm_roles);
 
@@ -586,9 +586,9 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
-        return true;
-    }
+		do_action('frm_after_uninstall');
+		return true;
+	}
 
 	/**
 	 * Migrate old styling settings. If sites are using the old
@@ -627,150 +627,150 @@ 
 		}
 	}
 
-    /**
-     * Change field size from character to pixel -- Multiply by 9
-     */
-    private function migrate_to_17() {
-        global $wpdb;
+	/**
+	 * Change field size from character to pixel -- Multiply by 9
+	 */
+	private function migrate_to_17() {
+		global $wpdb;
 		$pixel_conversion = 9;
 
-        // Get query arguments
+		// Get query arguments
 		$field_types = array( 'textarea', 'text', 'number', 'email', 'url', 'rte', 'date', 'phone', 'password', 'image', 'tag', 'file' );
 		$query = array( 'type' => $field_types, 'field_options like' => 's:4:"size";', 'field_options not like' => 's:4:"size";s:0:' );
 
-        // Get results
+		// Get results
 		$fields = FrmDb::get_results( $this->fields, $query, 'id, field_options' );
 
-        $updated = 0;
-        foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
-                continue;
-            }
+		$updated = 0;
+		foreach ( $fields as $f ) {
+			$f->field_options = maybe_unserialize($f->field_options);
+			if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+				continue;
+			}
 
 			$f->field_options['size'] = round( $pixel_conversion * (int) $f->field_options['size'] );
-            $f->field_options['size'] .= 'px';
-            $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
-            if ( $u ) {
-                $updated++;
-            }
-            unset($f);
-        }
-
-        // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
-            return;
-        }
-
-        $widgets = maybe_unserialize($widgets);
-        foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
-                continue;
-            }
+			$f->field_options['size'] .= 'px';
+			$u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
+			if ( $u ) {
+				$updated++;
+			}
+			unset($f);
+		}
+
+		// Change the characters in widgets to pixels
+		$widgets = get_option('widget_frm_show_form');
+		if ( empty($widgets) ) {
+			return;
+		}
+
+		$widgets = maybe_unserialize($widgets);
+		foreach ( $widgets as $k => $widget ) {
+			if ( ! is_array($widget) || ! isset($widget['size']) ) {
+				continue;
+			}
 			$size = round( $pixel_conversion * (int) $widget['size'] );
-            $size .= 'px';
+			$size .= 'px';
 			$widgets[ $k ]['size'] = $size;
-        }
-        update_option('widget_frm_show_form', $widgets);
-    }
-
-    /**
-     * Migrate post and email notification settings into actions
-     */
-    private function migrate_to_16() {
-        global $wpdb;
-
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
-
-        /**
-        * Old email settings format:
-        * email_to: Email or field id
-        * also_email_to: array of fields ids
-        * reply_to: Email, field id, 'custom'
-        * cust_reply_to: string
-        * reply_to_name: field id, 'custom'
-        * cust_reply_to_name: string
-        * plain_text: 0|1
-        * email_message: string or ''
-        * email_subject: string or ''
-        * inc_user_info: 0|1
-        * update_email: 0, 1, 2
-        *
-        * Old autoresponder settings format:
-        * auto_responder: 0|1
-        * ar_email_message: string or ''
-        * ar_email_to: field id
-        * ar_plain_text: 0|1
-        * ar_reply_to_name: string
-        * ar_reply_to: string
-        * ar_email_subject: string
-        * ar_update_email: 0, 1, 2
-        *
-        * New email settings:
-        * post_content: json settings
-        * post_title: form id
-        * post_excerpt: message
-        *
-        */
-
-        foreach ( $forms as $form ) {
+		}
+		update_option('widget_frm_show_form', $widgets);
+	}
+
+	/**
+	 * Migrate post and email notification settings into actions
+	 */
+	private function migrate_to_16() {
+		global $wpdb;
+
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
+
+		/**
+		 * Old email settings format:
+		 * email_to: Email or field id
+		 * also_email_to: array of fields ids
+		 * reply_to: Email, field id, 'custom'
+		 * cust_reply_to: string
+		 * reply_to_name: field id, 'custom'
+		 * cust_reply_to_name: string
+		 * plain_text: 0|1
+		 * email_message: string or ''
+		 * email_subject: string or ''
+		 * inc_user_info: 0|1
+		 * update_email: 0, 1, 2
+		 *
+		 * Old autoresponder settings format:
+		 * auto_responder: 0|1
+		 * ar_email_message: string or ''
+		 * ar_email_to: field id
+		 * ar_plain_text: 0|1
+		 * ar_reply_to_name: string
+		 * ar_reply_to: string
+		 * ar_email_subject: string
+		 * ar_update_email: 0, 1, 2
+		 *
+		 * New email settings:
+		 * post_content: json settings
+		 * post_title: form id
+		 * post_excerpt: message
+		 *
+		 */
+
+		foreach ( $forms as $form ) {
 			if ( $form->is_template && $form->default_template ) {
 				// don't migrate the default templates since the email will be added anyway
 				continue;
 			}
 
-            // Format form options
-            $form_options = maybe_unserialize($form->options);
+			// Format form options
+			$form_options = maybe_unserialize($form->options);
 
-            // Migrate settings to actions
-            FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
-        }
-    }
+			// Migrate settings to actions
+			FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
+		}
+	}
 
-    private function migrate_to_11() {
-        global $wpdb;
+	private function migrate_to_11() {
+		global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options');
 
-        $sending = __( 'Sending', 'formidable' );
+		$sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div class="frm_submit">
 [if back_button]<input type="submit" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" [back_hook] />[/if back_button]
 <input type="submit" value="[button_label]" [button_action] />
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+		unset($sending, $img);
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
-        $draft_link = FrmFormsHelper::get_draft_link();
+		$new_default_html = FrmFormsHelper::get_default_html('submit');
+		$draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
-                continue;
-            }
+			$form->options = maybe_unserialize($form->options);
+			if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+				continue;
+			}
 
-            if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
-                $form->options['submit_html'] = $new_default_html;
+			if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
+				$form->options['submit_html'] = $new_default_html;
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
 			} else if ( ! strpos( $form->options['submit_html'], 'save_draft' ) ) {
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
-            }
-            unset($form);
-        }
-        unset($forms);
-    }
+			}
+			unset($form);
+		}
+		unset($forms);
+	}
 
-    private function migrate_to_6() {
-        global $wpdb;
+	private function migrate_to_6() {
+		global $wpdb;
 
 		$no_save = array_merge( FrmField::no_save_fields(), array( 'form', 'hidden', 'user_id' ) );
 		$fields = FrmDb::get_results( $this->fields, array( 'type NOT' => $no_save ), 'id, field_options' );
 
-        $default_html = <<<DEFAULT_HTML
+		$default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -780,7 +780,7 @@ 
 </div>
 DEFAULT_HTML;
 
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -790,25 +790,25 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
-        foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+		$new_default_html = FrmFieldsHelper::get_default_html('text');
+		foreach ( $fields as $field ) {
+			$field->field_options = maybe_unserialize($field->field_options);
 			if ( ! FrmField::is_option_empty( $field, 'custom_html' ) || $field->field_options['custom_html'] == $default_html || $field->field_options['custom_html'] == $old_default_html ) {
-                $field->field_options['custom_html'] = $new_default_html;
+				$field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
-            }
-            unset($field);
-        }
-        unset($default_html, $old_default_html, $fields);
-    }
-
-    private function migrate_to_4() {
-        global $wpdb;
+			}
+			unset($field);
+		}
+		unset($default_html, $old_default_html, $fields);
+	}
+
+	private function migrate_to_4() {
+		global $wpdb;
 		$user_ids = FrmEntryMeta::getAll( array( 'fi.type' => 'user_id' ) );
-        foreach ( $user_ids as $user_id ) {
+		foreach ( $user_ids as $user_id ) {
 			$wpdb->update( $this->entries, array( 'user_id' => $user_id->meta_value ), array( 'id' => $user_id->item_id ) );
-        }
-    }
+		}
+	}
 
 	public static function get_one_record( $table, $args = array(), $fields = '*', $order_by = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_row' );

classes/controllers/FrmFieldsController.php

Spacing +86 added lines, -86 removed lines

@@ -3,7 +3,7 @@ 
 class FrmFieldsController {
 
     public static function load_field() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $fields = $_POST['field'];
@@ -34,17 +34,17 @@ 
             }
 
 			$field_name = 'item_meta[' . $field_id . ']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+            $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();
+            $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();
     }
@@ -53,7 +53,7 @@ 
 	 * Create a new field with ajax
 	 */
     public static function create() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_type = FrmAppHelper::get_post_param( 'field_type', '', 'sanitize_text_field' );
@@ -62,7 +62,7 @@ 
 		$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();
     }
@@ -77,7 +77,7 @@ 
 	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 = FrmFieldsHelper::setup_new_vars( $field_type, $form_id );
@@ -89,27 +89,27 @@ 
             return false;
         }
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+        $field = self::include_single_field( $field_id, $values, $form_id );
 
         return $field;
     }
 
 	public static function edit_name( $field = 'name', $id = '' ) {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         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 = '';
         }
@@ -123,7 +123,7 @@ 
     }
 
     public static function update_ajax_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
@@ -136,7 +136,7 @@ 
 		if ( isset( $_POST['separate_value'] ) ) {
 			$new_val = FrmField::is_option_true( $field, 'separate_value' ) ? 0 : 1;
 			$field->field_options['separate_value'] = $new_val;
-			unset($new_val);
+			unset( $new_val );
 		}
 
         FrmField::update( $field_id, array(
@@ -147,7 +147,7 @@ 
     }
 
     public static function duplicate() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         global $wpdb;
@@ -172,11 +172,11 @@ 
 
 	    $values = apply_filters( 'frm_prepare_single_field_for_duplication', $values );
 
-        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();
     }
@@ -185,9 +185,9 @@ 
      * 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 = FrmFieldsHelper::setup_edit_vars( FrmField::getOne( $field_id ) );
 		$field_name = 'item_meta[' . $field_id . ']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $id = $form_id ? $form_id : $field['form_id'];
         if ( $field['type'] == 'html' ) {
             $field['stop_filter'] = true;
@@ -199,7 +199,7 @@ 
     }
 
     public static function destroy() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
@@ -211,14 +211,14 @@ 
 
     //Add Single Option or Other Option
     public static function add_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         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);
+        $field = FrmField::getOne( $id );
 
 		if ( ! empty( $field->options ) ) {
 			$keys = array_keys( $field->options );
@@ -241,13 +241,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);
+            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 ) );
@@ -256,13 +256,13 @@ 
         $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);
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $checked = '';
 
         if ( 'other' == $opt_type ) {
@@ -274,7 +274,7 @@ 
     }
 
     public static function edit_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$element_id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
@@ -288,28 +288,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 );
+        $this_opt_id = end( $ids );
+		$this_opt = (array) $field->options[$this_opt_id];
+		$other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other' ) !== 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 ) );
@@ -318,7 +318,7 @@ 
     }
 
     public static function delete_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
@@ -327,7 +327,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
@@ -393,9 +393,9 @@ 
 
         $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' );
@@ -406,35 +406,35 @@ 
     }
 
     public static function import_options() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         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);
+        $field = FrmFieldsHelper::setup_edit_vars( $field );
 		$opts = FrmAppHelper::get_param( 'opts', '', 'post', 'wp_kses_post' );
 		$opts = explode( "\n", rtrim( $opts, "\n" ) );
 		$opts = array_map( 'trim', $opts );
 
         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 );
             }
         }
 
@@ -443,12 +443,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 );
             }
         }
 
@@ -463,14 +463,14 @@ 
         if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' );
         } else {
-            FrmFieldsHelper::show_single_option($field);
+            FrmFieldsHelper::show_single_option( $field );
         }
 
         wp_die();
     }
 
     public static function update_order() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$fields = FrmAppHelper::get_post_param( 'frm_field_id' );
@@ -487,13 +487,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';
         }
 
@@ -532,19 +532,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 ) . '  ';
@@ -557,7 +557,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'];
         }
 
@@ -571,7 +571,7 @@ 
             $class[] = 'dyn_default_value';
         }
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
+        if ( isset( $field['size'] ) && $field['size'] > 0 ) {
             $class[] = 'auto_width';
         }
     }
@@ -581,19 +581,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' : '' ) . '"';
 
-        self::add_html_cols($field, $add_html);
+        self::add_html_cols( $field, $add_html );
     }
 
 	private static function add_html_cols( $field, array &$add_html ) {
@@ -610,13 +610,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 ) . '"';
     }
@@ -627,7 +627,7 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             // don't load on form builder page
             return;
         }
@@ -659,7 +659,7 @@ 
 		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');
+            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 ) . '"';
@@ -693,15 +693,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 );
         }
     }
 
@@ -717,8 +717,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;

Indentation +428 added lines, -428 removed lines

@@ -2,129 +2,129 @@ 
 
 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 );
 
-        $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);
+			$html_id = FrmFieldsHelper::get_html_id($field);
 
-            ob_start();
+			ob_start();
 			include( $path . '/classes/views/frm-forms/add_field.php' );
-            $field_html[ $field_id ] = ob_get_contents();
-            ob_end_clean();
-        }
+			$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();
+	}
 
 	/**
 	 * 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' );
 
 		$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();
+	}
 
-    /**
-     * 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() ) {
-            $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 = 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::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 edit_name( $field = 'name', $id = '' ) {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        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() {
+	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 ) {
@@ -139,143 +139,143 @@ 
 			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' );
 
-        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 );
 
 		$values = array();
-        FrmFieldsHelper::fill_field( $values, $copy_field, $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;
 
-	    $values = apply_filters( 'frm_prepare_single_field_for_duplication', $values );
+		$values = apply_filters( 'frm_prepare_single_field_for_duplication', $values );
 
-        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));
+	/**
+	 * 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;
-        }
+		$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' );
 
-        return $field;
-    }
+		return $field;
+	}
 
-    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' );
 
-        //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++;
-            }
+			if ( $first_opt != '' ) {
+				$next_opt++;
+			}
 			$opt = esc_html__( 'Option', 'formidable' ) . ' ' . $next_opt;
-            unset($next_opt);
-        }
-        $field_val = $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_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 = '';
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$checked = '';
 
-        if ( 'other' == $opt_type ) {
+		if ( 'other' == $opt_type ) {
 			require( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-        } else {
+		} else {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-        }
-        wp_die();
-    }
+		}
+		wp_die();
+	}
 
-    public static function edit_option() {
+	public static function edit_option() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$element_id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 		$ids = explode( '-', $element_id );
@@ -283,43 +283,43 @@ 
 
 		$orig_update_value = $update_value = trim( FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' ) );
 		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 );
 
-        $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() {
+	public static function delete_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_id', 0, 'absint' );
 		$field = FrmField::getOne( $field_id );
@@ -327,307 +327,307 @@ 
 		$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() {
-        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 = '';
+		$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_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() {
+	public static function import_options() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		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;
-        }
+			return;
+		}
 
-        $field = FrmFieldsHelper::setup_edit_vars($field);
+		$field = FrmFieldsHelper::setup_edit_vars($field);
 		$opts = FrmAppHelper::get_param( 'opts', '', 'post', 'wp_kses_post' );
 		$opts = explode( "\n", rtrim( $opts, "\n" ) );
 		$opts = array_map( 'trim', $opts );
 
-        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' ) {
+		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);
-        }
+		} else {
+			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',
-            '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;
+		}
 
-        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', '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';
-        }
+		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
+		$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', 'file' ) ) ) {
-            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' ) ) {
@@ -635,35 +635,35 @@ 
 		}
 
 		$default_value_array = is_array( $field['default_value'] );
-        if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
+		if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
 			if ( $default_value_array ) {
 				$field['default_value'] = json_encode( $field['default_value'] );
 			}
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['default_value'] ) . '"';
-            return;
-        }
+			return;
+		}
 
 		if ( $default_value_array ) {
 			// don't include a json placeholder
 			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
+			// 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 ) {
+			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';
+			$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 ) ) {
@@ -677,44 +677,44 @@ 
 		}
 	}
 
-    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 ] ) ) {
+			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 {
+			} 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));
-        }
+		if ( is_array($opt) ) {
+			$opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+		}
 
-        return $opt;
-    }
+		return $opt;
+	}
 }

classes/controllers/FrmFormsController.php

Doc Comments +11 added lines

@@ -159,6 +159,9 @@ 
 		wp_die();
 	}
 
+	/**
+	 * @param string $field
+	 */
 	private static function edit_in_place_value( $field ) {
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 		FrmAppHelper::permission_check('frm_edit_forms', 'hide');
@@ -203,6 +206,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     public static function bulk_create_template( $ids ) {
         FrmAppHelper::permission_check( 'frm_edit_forms' );
 
@@ -698,6 +704,7 @@ 
 	/**
 	 * Get an array of the helper shortcodes to display in the customization panel
 	 * @since 2.0.6
+	 * @param boolean $settings_tab
 	 */
 	private static function get_shortcode_helpers( $settings_tab ) {
 		$entry_shortcodes = array(
@@ -771,6 +778,9 @@ 
         return $content;
     }
 
+	/**
+	 * @param boolean $entry
+	 */
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
 			if ( ! $entry || ! is_numeric( $entry ) ) {
@@ -1237,6 +1247,7 @@ 
 
 	/**
 	 * @since 2.0.8
+	 * @param string $content
 	 */
 	private static function maybe_minimize_form( $atts, &$content ) {
 		// check if minimizing is turned on

Indentation +596 added lines, -596 removed lines

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

Spacing +120 added lines, -120 removed lines

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