Strategy11 / formidable-forms

classes/models/FrmAddon.php

Indentation +3 added lines, -3 removed lines

@@ -275,7 +275,7 @@
 		return $message;
 	}
 
-    public function manually_queue_update() {
-        set_site_transient( 'update_plugins', null );
-    }
+	public function manually_queue_update() {
+		set_site_transient( 'update_plugins', null );
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -38,15 +38,15 @@ 
 	}
 
 	public function insert_installed_addon( $plugins ) {
-		$plugins[ $this->plugin_slug ] = $this;
+		$plugins[$this->plugin_slug] = $this;
 		return $plugins;
 	}
 
 	public static function get_addon( $plugin_slug ) {
 		$plugins = apply_filters( 'frm_installed_addons', array() );
 		$plugin = false;
-		if ( isset( $plugins[ $plugin_slug ] ) ) {
-			$plugin = $plugins[ $plugin_slug ];
+		if ( isset( $plugins[$plugin_slug] ) ) {
+			$plugin = $plugins[$plugin_slug];
 		}
 		return $plugin;
 	}
@@ -98,7 +98,7 @@ 
 	public function show_license_message( $file, $plugin ) {
 		$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
 		echo '<tr class="plugin-update-tr active"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message">';
-		echo sprintf( __( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), $this->plugin_name, '<a href="' . esc_url( admin_url('admin.php?page=formidable-settings&t=licenses_settings' ) ) . '">', '</a>' );
+		echo sprintf( __( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), $this->plugin_name, '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings&t=licenses_settings' ) ) . '">', '</a>' );
 		$id = sanitize_title( $plugin['Name'] );
 		echo '<script type="text/javascript">var d = document.getElementById("' . esc_attr( $id ) . '");if ( d !== null ){ d.className = d.className + " update"; }</script>';
 		echo '</div></td></tr>';
@@ -111,14 +111,14 @@ 
 
 		if ( $this->is_current_version( $transient ) ) {
 			//make sure it doesn't show there is an update if plugin is up-to-date
-			if ( isset( $transient->response[ $this->plugin_folder ] ) ) {
-				unset( $transient->response[ $this->plugin_folder ] );
+			if ( isset( $transient->response[$this->plugin_folder] ) ) {
+				unset( $transient->response[$this->plugin_folder] );
 			}
-		} else if ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) {
+		} else if ( isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) ) {
 			$cache_key = 'edd_plugin_' . md5( sanitize_key( $this->license . $this->version ) . '_get_version' );
 			$version_info = get_transient( $cache_key );
 			if ( $version_info !== false && version_compare( $version_info->new_version, $this->version, '>' ) ) {
-				$transient->response[ $this->plugin_folder ] = $version_info;
+				$transient->response[$this->plugin_folder] = $version_info;
 			} else {
 				delete_transient( $cache_key );
 				if ( ! $this->has_been_cleared() ) {
@@ -127,7 +127,7 @@ 
 					$this->manually_queue_update();
 				}
 
-				unset( $transient->response[ $this->plugin_folder ] );
+				unset( $transient->response[$this->plugin_folder] );
 			}
 		}
 
@@ -135,7 +135,7 @@ 
 	}
 
 	private function is_current_version( $transient ) {
-		if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) {
+		if ( empty( $transient->checked ) || ! isset( $transient->checked[$this->plugin_folder] ) ) {
 			return false;
 		}
 
@@ -144,20 +144,20 @@ 
 			return true;
 		}
 
-		return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] == $transient->response[ $this->plugin_folder ]->new_version;
+		return isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) && $transient->checked[$this->plugin_folder] == $transient->response[$this->plugin_folder]->new_version;
 	}
 
 	private function has_been_cleared() {
 		$last_cleared = get_option( 'frm_last_cleared' );
-		return ( $last_cleared && $last_cleared > date( 'Y-m-d H:i:s', strtotime('-5 minutes') ) );
+		return ( $last_cleared && $last_cleared > date( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) ) );
 	}
 
 	private function cleared_plugins() {
-		update_option( 'frm_last_cleared', date('Y-m-d H:i:s') );
+		update_option( 'frm_last_cleared', date( 'Y-m-d H:i:s' ) );
 	}
 
 	public static function activate() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
 	 	check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		if ( ! isset( $_POST['license'] ) || empty( $_POST['license'] ) ) {
@@ -205,7 +205,7 @@ 
 	}
 
 	public static function deactivate() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$plugin_slug = sanitize_text_field( $_POST['plugin'] );
@@ -255,9 +255,9 @@ 
 
 		$message = __( 'Your License Key was invalid', 'formidable' );
 		if ( is_wp_error( $resp ) ) {
-			$message = sprintf( __( 'You had an error communicating with Formidable Pro\'s API. %1$sClick here%2$s for more information.', 'formidable' ), '<a href="http://formidablepro.com/knowledgebase/why-cant-i-activate-formidable-pro/" target="_blank">', '</a>');
+			$message = sprintf( __( 'You had an error communicating with Formidable Pro\'s API. %1$sClick here%2$s for more information.', 'formidable' ), '<a href="http://formidablepro.com/knowledgebase/why-cant-i-activate-formidable-pro/" target="_blank">', '</a>' );
 			if ( is_wp_error( $resp ) ) {
-				$message .= ' '. $resp->get_error_message();
+				$message .= ' ' . $resp->get_error_message();
 			}
 		} else if ( $body == 'error' || is_wp_error( $body ) ) {
 			$message = __( 'You had an HTTP error connecting to Formidable Pro\'s API', 'formidable' );
@@ -270,7 +270,7 @@ 
 					$message = $json_res;
 				}
 			} else if ( isset( $resp['response'] ) && isset( $resp['response']['code'] ) ) {
-				$message = sprintf( __( 'There was a %1$s error: %2$s', 'formidable' ), $resp['response']['code'], $resp['response']['message'] .' '. $resp['body'] );
+				$message = sprintf( __( 'There was a %1$s error: %2$s', 'formidable' ), $resp['response']['code'], $resp['response']['message'] . ' ' . $resp['body'] );
 			}
 		}
 

classes/views/styles/_form-description.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="field-group clearfix frm-half frm-first-row">
     <label><?php _e( 'Size', 'formidable' ) ?></label>
-    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('form_desc_size') ) ?>" id="frm_form_desc_size" value="<?php echo esc_attr( $style->post_content['form_desc_size'] ) ?>" />
+    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'form_desc_size' ) ) ?>" id="frm_form_desc_size" value="<?php echo esc_attr( $style->post_content['form_desc_size'] ) ?>" />
 </div>
 
 <div class="field-group clearfix frm-half frm-first-row">
     <label><?php _e( 'Color', 'formidable' ) ?></label>
-    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('form_desc_color') ) ?>" id="frm_form_desc_color" class="hex" value="<?php echo esc_attr( $style->post_content['form_desc_color'] ) ?>" />
+    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'form_desc_color' ) ) ?>" id="frm_form_desc_color" class="hex" value="<?php echo esc_attr( $style->post_content['form_desc_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-half">
     <label><?php _e( 'Margin Top', 'formidable' ) ?></label>
-    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('form_desc_margin_top') ) ?>" id="frm_form_desc_margin_top" value="<?php echo esc_attr( $style->post_content['form_desc_margin_top'] ) ?>" size="4" />
+    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'form_desc_margin_top' ) ) ?>" id="frm_form_desc_margin_top" value="<?php echo esc_attr( $style->post_content['form_desc_margin_top'] ) ?>" size="4" />
 </div>
 <div class="field-group clearfix frm-half">
     <label><?php _e( 'Margin Bottom', 'formidable' ) ?></label>
-    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('form_desc_margin_bottom') ) ?>" id="frm_form_desc_margin_bottom" value="<?php echo esc_attr( $style->post_content['form_desc_margin_bottom'] ) ?>" size="4" />
+    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'form_desc_margin_bottom' ) ) ?>" id="frm_form_desc_margin_bottom" value="<?php echo esc_attr( $style->post_content['form_desc_margin_bottom'] ) ?>" size="4" />
 </div>

classes/views/styles/_form-title.php

Spacing +4 added lines, -4 removed lines

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

classes/helpers/FrmFormsListHelper.php

Indentation +187 added lines, -187 removed lines

@@ -4,7 +4,7 @@ 
 }
 
 class FrmFormsListHelper extends FrmListHelper {
-    var $status = '';
+	var $status = '';
 
 	public function __construct( $args ) {
 		$this->status = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
@@ -13,14 +13,14 @@ 
 	}
 
 	public function prepare_items() {
-	    global $wpdb, $per_page, $mode;
+		global $wpdb, $per_page, $mode;
 
-	    $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
 
 		$default_orderby = 'name';
 		$default_order = 'ASC';
 
-        $orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : $default_orderby;
+		$orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : $default_orderby;
 		$order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : $default_order;
 
 		$page = $this->get_pagenum();
@@ -28,40 +28,40 @@ 
 
 		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : (( $page - 1 ) * $per_page);
 
-        $s_query = array();
-        $s_query[] = array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 1 );
+		$s_query = array();
+		$s_query[] = array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 1 );
 		switch ( $this->status ) {
-		    case 'template':
-                $s_query['is_template'] = 1;
-                $s_query['status !'] = 'trash';
-		        break;
-		    case 'draft':
-                $s_query['is_template'] = 0;
-                $s_query['status'] = 'draft';
-		        break;
-		    case 'trash':
-                $s_query['status'] = 'trash';
-		        break;
-		    default:
-                $s_query['is_template'] = 0;
-                $s_query['status !'] = 'trash';
-		        break;
+			case 'template':
+				$s_query['is_template'] = 1;
+				$s_query['status !'] = 'trash';
+				break;
+			case 'draft':
+				$s_query['is_template'] = 0;
+				$s_query['status'] = 'draft';
+				break;
+			case 'trash':
+				$s_query['status'] = 'trash';
+				break;
+			default:
+				$s_query['is_template'] = 0;
+				$s_query['status !'] = 'trash';
+				break;
 		}
 
-        $s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
-	    if ( $s != '' ) {
-	        preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
-		    $search_terms = array_map('trim', $matches[0]);
-	        foreach ( (array) $search_terms as $term ) {
-                $s_query[] = array(
-                    'or'    => true, 'name LIKE' => $term, 'description LIKE' => $term, 'created_at LIKE' => $term,
-                );
-	            unset($term);
-            }
-	    }
-
-        $this->items = FrmForm::getAll($s_query, $orderby .' '. $order, $start .','. $per_page);
-        $total_items = FrmDb::get_count( 'frm_forms', $s_query );
+		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+		if ( $s != '' ) {
+			preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
+			$search_terms = array_map('trim', $matches[0]);
+			foreach ( (array) $search_terms as $term ) {
+				$s_query[] = array(
+					'or'    => true, 'name LIKE' => $term, 'description LIKE' => $term, 'created_at LIKE' => $term,
+				);
+				unset($term);
+			}
+		}
+
+		$this->items = FrmForm::getAll($s_query, $orderby .' '. $order, $start .','. $per_page);
+		$total_items = FrmDb::get_count( 'frm_forms', $s_query );
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -70,69 +70,69 @@ 
 	}
 
 	public function no_items() {
-	    if ( 'template' == $this->status ) {
-            _e( 'No Templates Found.', 'formidable' ) ?>
+		if ( 'template' == $this->status ) {
+			_e( 'No Templates Found.', 'formidable' ) ?>
             <br/><br/><?php _e( 'To add a new template:', 'formidable' ) ?>
             <ol><li><?php printf( __( 'Create a new %1$sform%2$s.', 'formidable' ), '<a href="'. esc_url( admin_url( 'admin?page=formidable&frm_action=new' ) ) . '"', '</a>' ) ?></li>
                 <li><?php printf(__( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>') ?></li>
                 <li><?php _e( 'Place your mouse over the name of the form you just created, and click the "Create Template" link.', 'formidable' ) ?></li>
             </ol>
 <?php   } else {
-            _e( 'No Forms Found.', 'formidable' ) ?>
+			_e( 'No Forms Found.', 'formidable' ) ?>
             <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable&frm_action=new' ) ) ?>"><?php _e( 'Add New', 'formidable' ); ?></a>
 <?php   }
 	}
 
 	public function get_bulk_actions() {
-	    $actions = array();
+		$actions = array();
 
 		if ( in_array( $this->status, array( '', 'published' ) ) ) {
-	        $actions['bulk_create_template'] = __( 'Create Template', 'formidable' );
-	    }
-
-	    if ( 'trash' == $this->status ) {
-	        if ( current_user_can('frm_edit_forms') ) {
-	            $actions['bulk_untrash'] = __( 'Restore', 'formidable' );
-	        }
-
-	        if ( current_user_can('frm_delete_forms') ) {
-	            $actions['bulk_delete'] = __( 'Delete Permanently', 'formidable' );
-	        }
-	    } else if ( EMPTY_TRASH_DAYS && current_user_can('frm_delete_forms') ) {
-	        $actions['bulk_trash'] = __( 'Move to Trash', 'formidable' );
-	    } else if ( current_user_can('frm_delete_forms') ) {
-	        $actions['bulk_delete'] = __( 'Delete');
-	    }
-
-        return $actions;
-    }
+			$actions['bulk_create_template'] = __( 'Create Template', 'formidable' );
+		}
+
+		if ( 'trash' == $this->status ) {
+			if ( current_user_can('frm_edit_forms') ) {
+				$actions['bulk_untrash'] = __( 'Restore', 'formidable' );
+			}
+
+			if ( current_user_can('frm_delete_forms') ) {
+				$actions['bulk_delete'] = __( 'Delete Permanently', 'formidable' );
+			}
+		} else if ( EMPTY_TRASH_DAYS && current_user_can('frm_delete_forms') ) {
+			$actions['bulk_trash'] = __( 'Move to Trash', 'formidable' );
+		} else if ( current_user_can('frm_delete_forms') ) {
+			$actions['bulk_delete'] = __( 'Delete');
+		}
+
+		return $actions;
+	}
 
 	public function extra_tablenav( $which ) {
-        if ( 'top' != $which ) {
-            return;
-        }
+		if ( 'top' != $which ) {
+			return;
+		}
 
-        if ( 'trash' == $this->status && current_user_can('frm_delete_forms') ) {
+		if ( 'trash' == $this->status && current_user_can('frm_delete_forms') ) {
 ?>
             <div class="alignleft actions frm_visible_overflow">
 			<?php submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false ); ?>
             </div>
 <?php
-            return;
-        }
+			return;
+		}
 
-        if ( 'template' != $this->status ) {
-            return;
-        }
+		if ( 'template' != $this->status ) {
+			return;
+		}
 
 		$where = apply_filters( 'frm_forms_dropdown', array(), '' );
 		$forms = FrmForm::get_published_forms( $where );
 
-        $base = admin_url('admin.php?page=formidable&form_type=template');
-        $args = array(
-            'frm_action'    => 'duplicate',
-            'template'      => true,
-        );
+		$base = admin_url('admin.php?page=formidable&form_type=template');
+		$args = array(
+			'frm_action'    => 'duplicate',
+			'template'      => true,
+		);
 
 ?>
     <div class="alignleft actions frm_visible_overflow">
@@ -140,18 +140,18 @@ 
         <a href="#" id="frm-templateDrop" class="frm-dropdown-toggle button" data-toggle="dropdown"><?php _e( 'Create New Template', 'formidable' ) ?> <b class="caret"></b></a>
 		<ul class="frm-dropdown-menu" role="menu" aria-labelledby="frm-templateDrop">
 		<?php
-        if ( empty( $forms ) ) { ?>
+		if ( empty( $forms ) ) { ?>
             <li class="frm_dropdown_li"><?php _e( 'You have not created any forms yet. <br/>You must create a form before you can make a template.', 'formidable' ) ?></li>
         <?php
-        } else {
-            foreach ( $forms as $form ) {
-		        $args['id'] = $form->id; ?>
+		} else {
+			foreach ( $forms as $form ) {
+				$args['id'] = $form->id; ?>
 			<li><a href="<?php echo esc_url( add_query_arg( $args, $base ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 33 ) ); ?></a></li>
 			<?php
-			    unset($form);
+				unset($form);
 			}
-        }
-        ?>
+		}
+		?>
 		</ul>
 	</div>
 	</div>
@@ -161,30 +161,30 @@ 
 	public function get_views() {
 
 		$statuses = array(
-		    'published' => __( 'My Forms', 'formidable' ),
-		    'template'  => __( 'Templates', 'formidable' ),
-		    'draft'     => __( 'Drafts', 'formidable' ),
-		    'trash'     => __( 'Trash', 'formidable' ),
+			'published' => __( 'My Forms', 'formidable' ),
+			'template'  => __( 'Templates', 'formidable' ),
+			'draft'     => __( 'Drafts', 'formidable' ),
+			'trash'     => __( 'Trash', 'formidable' ),
 		);
 
-	    $links = array();
-	    $counts = FrmForm::get_count();
-        $form_type = isset( $_REQUEST['form_type'] ) ? sanitize_text_field( $_REQUEST['form_type'] ) : 'published';
+		$links = array();
+		$counts = FrmForm::get_count();
+		$form_type = isset( $_REQUEST['form_type'] ) ? sanitize_text_field( $_REQUEST['form_type'] ) : 'published';
 
-	    foreach ( $statuses as $status => $name ) {
+		foreach ( $statuses as $status => $name ) {
 
-	        if ( $status == $form_type ) {
-    			$class = ' class="current"';
-    		} else {
-    		    $class = '';
-    		}
+			if ( $status == $form_type ) {
+				$class = ' class="current"';
+			} else {
+				$class = '';
+			}
 
-    		if ( $counts->{$status} || 'published' == $status ) {
+			if ( $counts->{$status} || 'published' == $status ) {
 				$links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
-		    }
+			}
 
-		    unset($status, $name);
-	    }
+			unset($status, $name);
+		}
 
 		return $links;
 	}
@@ -200,16 +200,16 @@ 
 	}
 
 	public function single_row( $item, $style = '' ) {
-	    global $frm_vars, $mode;
+		global $frm_vars, $mode;
 
 		// Set up the hover actions for this user
 		$actions = array();
-        $edit_link = '?page=formidable&frm_action=edit&id='. $item->id;
-	    $duplicate_link = '?page=formidable&frm_action=duplicate&id='. $item->id;
+		$edit_link = '?page=formidable&frm_action=edit&id='. $item->id;
+		$duplicate_link = '?page=formidable&frm_action=duplicate&id='. $item->id;
 
-        $this->get_actions($actions, $item, $edit_link, $duplicate_link);
+		$this->get_actions($actions, $item, $edit_link, $duplicate_link);
 
-        $action_links = $this->row_actions( $actions );
+		$action_links = $this->row_actions( $actions );
 
 		// Set up the checkbox ( because the user is editable, otherwise its empty )
 		$checkbox = '<input type="checkbox" name="item-action[]" id="cb-item-action-' . absint( $item->id ) . '" value="' . esc_attr( $item->id ) . '" />';
@@ -218,17 +218,17 @@ 
 
 		list( $columns, $hidden ) = $this->get_column_info();
 
-        $format = 'Y/m/d';
-        if ( 'list' != $mode ) {
-            $format .= ' \<\b\r \/\> g:i:s a';
+		$format = 'Y/m/d';
+		if ( 'list' != $mode ) {
+			$format .= ' \<\b\r \/\> g:i:s a';
 		}
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-            $class = $column_name .' column-'. $column_name . ( ('name' == $column_name) ? ' post-title page-title column-title' : '' );
+			$class = $column_name .' column-'. $column_name . ( ('name' == $column_name) ? ' post-title page-title column-title' : '' );
 
 			$style = '';
 			if ( in_array( $column_name, $hidden ) ) {
-                $class .= ' frm_hidden';
+				$class .= ' frm_hidden';
 			}
 
 			$class = 'class="' . esc_attr( $class ) . '"';
@@ -241,41 +241,41 @@ 
 					break;
 				case 'id':
 				case 'form_key':
-				    $val = $item->{$column_name};
-				    break;
+					$val = $item->{$column_name};
+					break;
 				case 'name':
-				    $val = $this->get_form_name( $item, $actions, $edit_link, $mode );
-			        $val .= $action_links;
+					$val = $this->get_form_name( $item, $actions, $edit_link, $mode );
+					$val .= $action_links;
 
-				    break;
+					break;
 				case 'created_at':
-				    $date = date($format, strtotime($item->created_at));
+					$date = date($format, strtotime($item->created_at));
 					$val = '<abbr title="' . esc_attr( date( 'Y/m/d g:i:s A', strtotime( $item->created_at ) ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'shortcode':
 					$val = '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable id=' . $item->id .']' ) . '" /><br/>';
-				    if ( 'excerpt' == $mode ) {
+					if ( 'excerpt' == $mode ) {
 						$val .= '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable key=' . $item->form_key . ']' ) . '" />';
-				    }
-			        break;
-			    case 'entries':
+					}
+					break;
+				case 'entries':
 					if ( isset( $item->options['no_save'] ) && $item->options['no_save'] ) {
-			            $val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="'. esc_attr('Entries are not being saved', 'formidable' ) .'"></i>';
-			        } else {
-			            $text = FrmEntry::getRecordCount($item->id);
+						$val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="'. esc_attr('Entries are not being saved', 'formidable' ) .'"></i>';
+					} else {
+						$text = FrmEntry::getRecordCount($item->id);
 						$val = current_user_can('frm_view_entries') ? '<a href="'. esc_url( admin_url( 'admin.php?page=formidable-entries&form='. $item->id ) ) . '">' . $text . '</a>' : $text;
-                        unset($text);
-                    }
-			        break;
-                case 'type':
-                    $val = ( $item->is_template && $item->default_template ) ? __( 'Default', 'formidable' ) : __( 'Custom', 'formidable' );
-                    break;
+						unset($text);
+					}
+					break;
+				case 'type':
+					$val = ( $item->is_template && $item->default_template ) ? __( 'Default', 'formidable' ) : __( 'Custom', 'formidable' );
+					break;
 			}
 
 			if ( isset($val) ) {
-			    $r .= "<td $attributes>";
-			    $r .= $val;
-			    $r .= '</td>';
+				$r .= "<td $attributes>";
+				$r .= $val;
+				$r .= '</td>';
 			}
 			unset($val);
 		}
@@ -284,37 +284,37 @@ 
 		return $r;
 	}
 
-    /**
-     * @param string $edit_link
-     * @param string $duplicate_link
-     */
-    private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
+	/**
+	 * @param string $edit_link
+	 * @param string $duplicate_link
+	 */
+	private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
 		if ( 'trash' == $this->status ) {
 			if ( current_user_can('frm_edit_forms') ) {
 				$actions['restore'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 			}
 
-		    if ( current_user_can('frm_delete_forms') ) {
-    		    $actions['trash'] = '<a href="' . esc_url(wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id='. $item->id, 'destroy_form_'. $item->id )) .'" class="submitdelete"  onclick="return confirm(\''. __( 'Are you sure you want to permanently delete that?', 'formidable' ) .'\')">' . __( 'Delete Permanently' ) . '</a>';
-    		}
-            return;
+			if ( current_user_can('frm_delete_forms') ) {
+				$actions['trash'] = '<a href="' . esc_url(wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id='. $item->id, 'destroy_form_'. $item->id )) .'" class="submitdelete"  onclick="return confirm(\''. __( 'Are you sure you want to permanently delete that?', 'formidable' ) .'\')">' . __( 'Delete Permanently' ) . '</a>';
+			}
+			return;
 		}
 
 		if ( current_user_can('frm_edit_forms') ) {
-            if ( ! $item->is_template || ! $item->default_template ) {
-		        $actions['frm_edit'] = '<a href="'. esc_url( $edit_link ) . '">'. __( 'Edit') .'</a>';
-            }
+			if ( ! $item->is_template || ! $item->default_template ) {
+				$actions['frm_edit'] = '<a href="'. esc_url( $edit_link ) . '">'. __( 'Edit') .'</a>';
+			}
 
-		    if ( $item->is_template ) {
+			if ( $item->is_template ) {
 				$actions['frm_duplicate'] = '<a href="'. esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Create Form from Template', 'formidable' ) . '</a>';
-            } else {
-    		    $actions['frm_settings'] = '<a href="'. esc_url('?page=formidable&frm_action=settings&id='. $item->id ) . '">'. __( 'Settings', 'formidable' ) .'</a>';
+			} else {
+				$actions['frm_settings'] = '<a href="'. esc_url('?page=formidable&frm_action=settings&id='. $item->id ) . '">'. __( 'Settings', 'formidable' ) .'</a>';
 
-    		    if ( FrmAppHelper::pro_is_installed() ) {
+				if ( FrmAppHelper::pro_is_installed() ) {
 					$actions['duplicate'] = '<a href="' . esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Duplicate', 'formidable' ) . '</a>';
-        	    }
-        	}
-        }
+				}
+			}
+		}
 
 		$actions['trash'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 		if ( empty( $actions['trash'] ) ) {
@@ -323,52 +323,52 @@ 
 		}
 
 		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview') . '</a>';
-    }
+	}
 
-    /**
-     * @param string $edit_link
-     */
+	/**
+	 * @param string $edit_link
+	 */
 	private function get_form_name( $item, $actions, $edit_link, $mode = 'list' ) {
-        $form_name = $item->name;
-        if ( trim($form_name) == '' ) {
-            $form_name = __( '(no title)');
-        }
+		$form_name = $item->name;
+		if ( trim($form_name) == '' ) {
+			$form_name = __( '(no title)');
+		}
 		$form_name = FrmAppHelper::kses( $form_name );
 		if ( 'excerpt' != $mode ) {
 			$form_name = FrmAppHelper::truncate( $form_name, 50 );
 		}
 
-        $val = '<strong>';
-        if ( 'trash' == $this->status ) {
-            $val .= $form_name;
-        } else {
+		$val = '<strong>';
+		if ( 'trash' == $this->status ) {
+			$val .= $form_name;
+		} else {
 			$val .= '<a href="' . esc_url( isset( $actions['frm_edit'] ) ? $edit_link : FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" class="row-title">' . FrmAppHelper::kses( $form_name ) . '</a> ';
-        }
-
-        $this->add_draft_label( $item, $val );
-        $val .= '</strong>';
-
-        $this->add_form_description( $item, $val );
-
-        return $val;
-    }
-
-    /**
-     * @param string $val
-     */
-    private function add_draft_label( $item, &$val ) {
-        if ( 'draft' == $item->status && 'draft' != $this->status ) {
-            $val .= ' - <span class="post-state">'. __( 'Draft', 'formidable' ) .'</span>';
-        }
-    }
-
-    /**
-     * @param string $val
-     */
-    private function add_form_description( $item, &$val ) {
-        global $mode;
-        if ( 'excerpt' == $mode ) {
-            $val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
-        }
-    }
+		}
+
+		$this->add_draft_label( $item, $val );
+		$val .= '</strong>';
+
+		$this->add_form_description( $item, $val );
+
+		return $val;
+	}
+
+	/**
+	 * @param string $val
+	 */
+	private function add_draft_label( $item, &$val ) {
+		if ( 'draft' == $item->status && 'draft' != $this->status ) {
+			$val .= ' - <span class="post-state">'. __( 'Draft', 'formidable' ) .'</span>';
+		}
+	}
+
+	/**
+	 * @param string $val
+	 */
+	private function add_form_description( $item, &$val ) {
+		global $mode;
+		if ( 'excerpt' == $mode ) {
+			$val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
+		}
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -26,7 +26,7 @@ 
 		$page = $this->get_pagenum();
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_per_page' );
 
-		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : (( $page - 1 ) * $per_page);
+		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : ( ( $page - 1 ) * $per_page );
 
         $s_query = array();
         $s_query[] = array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 1 );
@@ -48,19 +48,19 @@ 
 		        break;
 		}
 
-        $s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+        $s = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
 	    if ( $s != '' ) {
-	        preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
-		    $search_terms = array_map('trim', $matches[0]);
+	        preg_match_all( '/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches );
+		    $search_terms = array_map( 'trim', $matches[0] );
 	        foreach ( (array) $search_terms as $term ) {
                 $s_query[] = array(
                     'or'    => true, 'name LIKE' => $term, 'description LIKE' => $term, 'created_at LIKE' => $term,
                 );
-	            unset($term);
+	            unset( $term );
             }
 	    }
 
-        $this->items = FrmForm::getAll($s_query, $orderby .' '. $order, $start .','. $per_page);
+        $this->items = FrmForm::getAll( $s_query, $orderby . ' ' . $order, $start . ',' . $per_page );
         $total_items = FrmDb::get_count( 'frm_forms', $s_query );
 
 		$this->set_pagination_args( array(
@@ -73,8 +73,8 @@ 
 	    if ( 'template' == $this->status ) {
             _e( 'No Templates Found.', 'formidable' ) ?>
             <br/><br/><?php _e( 'To add a new template:', 'formidable' ) ?>
-            <ol><li><?php printf( __( 'Create a new %1$sform%2$s.', 'formidable' ), '<a href="'. esc_url( admin_url( 'admin?page=formidable&frm_action=new' ) ) . '"', '</a>' ) ?></li>
-                <li><?php printf(__( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>') ?></li>
+            <ol><li><?php printf( __( 'Create a new %1$sform%2$s.', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin?page=formidable&frm_action=new' ) ) . '"', '</a>' ) ?></li>
+                <li><?php printf( __( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>' ) ?></li>
                 <li><?php _e( 'Place your mouse over the name of the form you just created, and click the "Create Template" link.', 'formidable' ) ?></li>
             </ol>
 <?php   } else {
@@ -91,17 +91,17 @@ 
 	    }
 
 	    if ( 'trash' == $this->status ) {
-	        if ( current_user_can('frm_edit_forms') ) {
+	        if ( current_user_can( 'frm_edit_forms' ) ) {
 	            $actions['bulk_untrash'] = __( 'Restore', 'formidable' );
 	        }
 
-	        if ( current_user_can('frm_delete_forms') ) {
+	        if ( current_user_can( 'frm_delete_forms' ) ) {
 	            $actions['bulk_delete'] = __( 'Delete Permanently', 'formidable' );
 	        }
-	    } else if ( EMPTY_TRASH_DAYS && current_user_can('frm_delete_forms') ) {
+	    } else if ( EMPTY_TRASH_DAYS && current_user_can( 'frm_delete_forms' ) ) {
 	        $actions['bulk_trash'] = __( 'Move to Trash', 'formidable' );
-	    } else if ( current_user_can('frm_delete_forms') ) {
-	        $actions['bulk_delete'] = __( 'Delete');
+	    } else if ( current_user_can( 'frm_delete_forms' ) ) {
+	        $actions['bulk_delete'] = __( 'Delete' );
 	    }
 
         return $actions;
@@ -112,7 +112,7 @@ 
             return;
         }
 
-        if ( 'trash' == $this->status && current_user_can('frm_delete_forms') ) {
+        if ( 'trash' == $this->status && current_user_can( 'frm_delete_forms' ) ) {
 ?>
             <div class="alignleft actions frm_visible_overflow">
 			<?php submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false ); ?>
@@ -128,7 +128,7 @@ 
 		$where = apply_filters( 'frm_forms_dropdown', array(), '' );
 		$forms = FrmForm::get_published_forms( $where );
 
-        $base = admin_url('admin.php?page=formidable&form_type=template');
+        $base = admin_url( 'admin.php?page=formidable&form_type=template' );
         $args = array(
             'frm_action'    => 'duplicate',
             'template'      => true,
@@ -148,7 +148,7 @@ 
 		        $args['id'] = $form->id; ?>
 			<li><a href="<?php echo esc_url( add_query_arg( $args, $base ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 33 ) ); ?></a></li>
 			<?php
-			    unset($form);
+			    unset( $form );
 			}
         }
         ?>
@@ -180,10 +180,10 @@ 
     		}
 
     		if ( $counts->{$status} || 'published' == $status ) {
-				$links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
+				$links[$status] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
 		    }
 
-		    unset($status, $name);
+		    unset( $status, $name );
 	    }
 
 		return $links;
@@ -204,10 +204,10 @@ 
 
 		// Set up the hover actions for this user
 		$actions = array();
-        $edit_link = '?page=formidable&frm_action=edit&id='. $item->id;
-	    $duplicate_link = '?page=formidable&frm_action=duplicate&id='. $item->id;
+        $edit_link = '?page=formidable&frm_action=edit&id=' . $item->id;
+	    $duplicate_link = '?page=formidable&frm_action=duplicate&id=' . $item->id;
 
-        $this->get_actions($actions, $item, $edit_link, $duplicate_link);
+        $this->get_actions( $actions, $item, $edit_link, $duplicate_link );
 
         $action_links = $this->row_actions( $actions );
 
@@ -224,7 +224,7 @@ 
 		}
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-            $class = $column_name .' column-'. $column_name . ( ('name' == $column_name) ? ' post-title page-title column-title' : '' );
+            $class = $column_name . ' column-' . $column_name . ( ( 'name' == $column_name ) ? ' post-title page-title column-title' : '' );
 
 			$style = '';
 			if ( in_array( $column_name, $hidden ) ) {
@@ -237,7 +237,7 @@ 
 
 			switch ( $column_name ) {
 				case 'cb':
-					$r .= '<th scope="row" class="check-column">'. $checkbox .'</th>';
+					$r .= '<th scope="row" class="check-column">' . $checkbox . '</th>';
 					break;
 				case 'id':
 				case 'form_key':
@@ -249,22 +249,22 @@ 
 
 				    break;
 				case 'created_at':
-				    $date = date($format, strtotime($item->created_at));
+				    $date = date( $format, strtotime( $item->created_at ) );
 					$val = '<abbr title="' . esc_attr( date( 'Y/m/d g:i:s A', strtotime( $item->created_at ) ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'shortcode':
-					$val = '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable id=' . $item->id .']' ) . '" /><br/>';
+					$val = '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable id=' . $item->id . ']' ) . '" /><br/>';
 				    if ( 'excerpt' == $mode ) {
 						$val .= '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable key=' . $item->form_key . ']' ) . '" />';
 				    }
 			        break;
 			    case 'entries':
 					if ( isset( $item->options['no_save'] ) && $item->options['no_save'] ) {
-			            $val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="'. esc_attr('Entries are not being saved', 'formidable' ) .'"></i>';
+			            $val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="' . esc_attr( 'Entries are not being saved', 'formidable' ) . '"></i>';
 			        } else {
-			            $text = FrmEntry::getRecordCount($item->id);
-						$val = current_user_can('frm_view_entries') ? '<a href="'. esc_url( admin_url( 'admin.php?page=formidable-entries&form='. $item->id ) ) . '">' . $text . '</a>' : $text;
-                        unset($text);
+			            $text = FrmEntry::getRecordCount( $item->id );
+						$val = current_user_can( 'frm_view_entries' ) ? '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&form=' . $item->id ) ) . '">' . $text . '</a>' : $text;
+                        unset( $text );
                     }
 			        break;
                 case 'type':
@@ -272,12 +272,12 @@ 
                     break;
 			}
 
-			if ( isset($val) ) {
+			if ( isset( $val ) ) {
 			    $r .= "<td $attributes>";
 			    $r .= $val;
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -290,25 +290,25 @@ 
      */
     private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
 		if ( 'trash' == $this->status ) {
-			if ( current_user_can('frm_edit_forms') ) {
+			if ( current_user_can( 'frm_edit_forms' ) ) {
 				$actions['restore'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 			}
 
-		    if ( current_user_can('frm_delete_forms') ) {
-    		    $actions['trash'] = '<a href="' . esc_url(wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id='. $item->id, 'destroy_form_'. $item->id )) .'" class="submitdelete"  onclick="return confirm(\''. __( 'Are you sure you want to permanently delete that?', 'formidable' ) .'\')">' . __( 'Delete Permanently' ) . '</a>';
+		    if ( current_user_can( 'frm_delete_forms' ) ) {
+    		    $actions['trash'] = '<a href="' . esc_url( wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id=' . $item->id, 'destroy_form_' . $item->id ) ) . '" class="submitdelete"  onclick="return confirm(\'' . __( 'Are you sure you want to permanently delete that?', 'formidable' ) . '\')">' . __( 'Delete Permanently' ) . '</a>';
     		}
             return;
 		}
 
-		if ( current_user_can('frm_edit_forms') ) {
+		if ( current_user_can( 'frm_edit_forms' ) ) {
             if ( ! $item->is_template || ! $item->default_template ) {
-		        $actions['frm_edit'] = '<a href="'. esc_url( $edit_link ) . '">'. __( 'Edit') .'</a>';
+		        $actions['frm_edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit' ) . '</a>';
             }
 
 		    if ( $item->is_template ) {
-				$actions['frm_duplicate'] = '<a href="'. esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Create Form from Template', 'formidable' ) . '</a>';
+				$actions['frm_duplicate'] = '<a href="' . esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Create Form from Template', 'formidable' ) . '</a>';
             } else {
-    		    $actions['frm_settings'] = '<a href="'. esc_url('?page=formidable&frm_action=settings&id='. $item->id ) . '">'. __( 'Settings', 'formidable' ) .'</a>';
+    		    $actions['frm_settings'] = '<a href="' . esc_url( '?page=formidable&frm_action=settings&id=' . $item->id ) . '">' . __( 'Settings', 'formidable' ) . '</a>';
 
     		    if ( FrmAppHelper::pro_is_installed() ) {
 					$actions['duplicate'] = '<a href="' . esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Duplicate', 'formidable' ) . '</a>';
@@ -322,7 +322,7 @@ 
 			unset( $actions['trash'] );
 		}
 
-		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview') . '</a>';
+		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview' ) . '</a>';
     }
 
     /**
@@ -330,8 +330,8 @@ 
      */
 	private function get_form_name( $item, $actions, $edit_link, $mode = 'list' ) {
         $form_name = $item->name;
-        if ( trim($form_name) == '' ) {
-            $form_name = __( '(no title)');
+        if ( trim( $form_name ) == '' ) {
+            $form_name = __( '(no title)' );
         }
 		$form_name = FrmAppHelper::kses( $form_name );
 		if ( 'excerpt' != $mode ) {
@@ -358,7 +358,7 @@ 
      */
     private function add_draft_label( $item, &$val ) {
         if ( 'draft' == $item->status && 'draft' != $this->status ) {
-            $val .= ' - <span class="post-state">'. __( 'Draft', 'formidable' ) .'</span>';
+            $val .= ' - <span class="post-state">' . __( 'Draft', 'formidable' ) . '</span>';
         }
     }
 
@@ -368,7 +368,7 @@ 
     private function add_form_description( $item, &$val ) {
         global $mode;
         if ( 'excerpt' == $mode ) {
-            $val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
+            $val .= FrmAppHelper::truncate( strip_tags( $item->description ), 50 );
         }
     }
 }

classes/controllers/FrmAddonsController.php

Spacing +9 added lines, -9 removed lines

@@ -3,11 +3,11 @@ 
 class FrmAddonsController {
 
 	public static function menu() {
-		add_submenu_page( 'formidable', 'Formidable | '. __( 'AddOns', 'formidable' ), __( 'AddOns', 'formidable' ), 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' );
+		add_submenu_page( 'formidable', 'Formidable | ' . __( 'AddOns', 'formidable' ), __( 'AddOns', 'formidable' ), 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' );
 
 		$affiliate = FrmAppHelper::get_affiliate();
 		if ( ! empty( $affiliate ) && ! FrmAppHelper::pro_is_installed() ) {
-			add_submenu_page( 'formidable', 'Formidable | '. __( 'Upgrade to Pro', 'formidable' ), __( 'Upgrade to Pro', 'formidable' ), 'frm_view_forms', 'formidable-pro-upgrade', 'FrmAddonsController::upgrade_to_pro' );
+			add_submenu_page( 'formidable', 'Formidable | ' . __( 'Upgrade to Pro', 'formidable' ), __( 'Upgrade to Pro', 'formidable' ), 'frm_view_forms', 'formidable-pro-upgrade', 'FrmAddonsController::upgrade_to_pro' );
 		}
 	}
 
@@ -39,7 +39,7 @@ 
 
 		$keyed_addons = array();
 		foreach ( $addons as $addon ) {
-			$keyed_addons[ $addon['info']['slug'] ] = $addon;
+			$keyed_addons[$addon['info']['slug']] = $addon;
 		}
 
 		$plugin_order = array(
@@ -48,9 +48,9 @@ 
 		);
 		$ordered_addons = array();
 		foreach ( $plugin_order as $plugin ) {
-			if ( isset( $keyed_addons[ $plugin ] ) ) {
-				$ordered_addons[] = $keyed_addons[ $plugin ];
-				unset( $keyed_addons[ $plugin ] );
+			if ( isset( $keyed_addons[$plugin] ) ) {
+				$ordered_addons[] = $keyed_addons[$plugin];
+				unset( $keyed_addons[$plugin] );
 			}
 		}
 		$addons = $ordered_addons + $keyed_addons;
@@ -85,12 +85,12 @@ 
 	}
 
 	public static function get_licenses() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-		$license = get_option('frmpro-credentials');
+		$license = get_option( 'frmpro-credentials' );
 		if ( $license && is_array( $license ) && isset( $license['license'] ) ) {
-			$url = 'http://formidablepro.com/frm-edd-api/licenses?l='. urlencode( base64_encode( $license['license'] ) );
+			$url = 'http://formidablepro.com/frm-edd-api/licenses?l=' . urlencode( base64_encode( $license['license'] ) );
 			$licenses = self::send_api_request( $url, array( 'name' => 'frm_api_licence', 'expires' => 60 * 60 * 5 ) );
 			echo json_encode( $licenses );
 		}

classes/controllers/FrmFieldsController.php

Indentation +470 added lines, -470 removed lines

@@ -2,137 +2,137 @@ 
 
 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);
+			$field_name = 'item_meta['. $field_id .']';
+			$html_id = FrmFieldsHelper::get_html_id($field);
 
-            ob_start();
-            include($path .'/classes/views/frm-forms/add_field.php');
-            $field_html[ $field_id ] = ob_get_contents();
-            ob_end_clean();
-        }
+			ob_start();
+			include($path .'/classes/views/frm-forms/add_field.php');
+			$field_html[ $field_id ] = ob_get_contents();
+			ob_end_clean();
+		}
 
-        unset($path);
+		unset($path);
 
-        echo json_encode($field_html);
+		echo json_encode($field_html);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function create() {
+	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', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        $field = self::include_new_field($field_type, $form_id);
+		$field = self::include_new_field($field_type, $form_id);
 
-        // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+		// this hook will allow for multiple fields to be added at once
+		do_action('frm_after_field_created', $field, $form_id);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * @param integer $form_id
-     */
+	/**
+	 * @param integer $form_id
+	 */
 	public static function include_new_field( $field_type, $form_id ) {
-        $values = array();
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
-        }
+		$values = array();
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values['post_type'] = FrmProFormsHelper::post_type($form_id);
+		}
 
-        $field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
-        $field_id = FrmField::create( $field_values );
+		$field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
+		$field_id = FrmField::create( $field_values );
 
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+		$field = self::include_single_field($field_id, $values, $form_id);
 
-        return $field;
-    }
+		return $field;
+	}
 
-    public static function update_form_id() {
+	public static function update_form_id() {
 		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' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        if ( ! $field_id || ! $form_id ) {
-            wp_die();
-        }
+		if ( ! $field_id || ! $form_id ) {
+			wp_die();
+		}
 
 		$updated = FrmField::update( $field_id, compact( 'form_id' ) );
 		echo absint( $updated );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function edit_name( $field = 'name', $id = '' ) {
 		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 ) {
@@ -142,155 +142,155 @@ 
 		$field = FrmField::getOne( $field_id );
 
 		foreach ( array( 'clear_on_focus', 'separate_value', 'default_blank' ) as $val ) {
-            if ( isset($_POST[ $val ]) ) {
+			if ( isset($_POST[ $val ]) ) {
 				// all three of these options are boolean
 				$new_val = FrmAppHelper::get_post_param( $val, 0, 'absint' );
 
-                if ( $val == 'separate_value' ) {
+				if ( $val == 'separate_value' ) {
 					$new_val = FrmField::is_option_true( $field, $val ) ? 0 : 1;
-                }
+				}
 
-                $field->field_options[ $val ] = $new_val;
-                unset($new_val);
-            }
-            unset($val);
-        }
+				$field->field_options[ $val ] = $new_val;
+				unset($new_val);
+			}
+			unset($val);
+		}
 
-        FrmField::update( $field_id, array(
-            'field_options' => $field->field_options,
+		FrmField::update( $field_id, array(
+			'field_options' => $field->field_options,
 			'form_id'		=> $field->form_id,
-        ) );
-        wp_die();
-    }
+		) );
+		wp_die();
+	}
 
-    public static function duplicate() {
+	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);
+		do_action('frm_duplicate_field', $copy_field, $form_id);
+		do_action('frm_duplicate_field_'. $copy_field->type, $copy_field, $form_id);
 
-        $values = array( 'id' => $form_id );
-        FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
+		$values = array( 'id' => $form_id );
+		FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
 
 		$field_count = FrmDb::get_count( $wpdb->prefix .'frm_fields fi LEFT JOIN '. $wpdb->prefix .'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
 
-        $values['field_order'] = $field_count + 1;
+		$values['field_order'] = $field_count + 1;
 
-        if ( ! $field_id = FrmField::create($values) ) {
-            wp_die();
-        }
+		if ( ! $field_id = FrmField::create($values) ) {
+			wp_die();
+		}
 
-        self::include_single_field($field_id, $values);
+		self::include_single_field($field_id, $values);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * Load a single field in the form builder along with all needed variables
-     */
-    public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
-        $field_name = 'item_meta['. $field_id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
-        $id = $form_id ? $form_id : $field['form_id'];
-        if ( $field['type'] == 'html' ) {
-            $field['stop_filter'] = true;
-        }
+	/**
+	 * Load a single field in the form builder along with all needed variables
+	 */
+	public static function include_single_field( $field_id, $values, $form_id = 0 ) {
+		$field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
+		$field_name = 'item_meta['. $field_id .']';
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$id = $form_id ? $form_id : $field['form_id'];
+		if ( $field['type'] == 'html' ) {
+			$field['stop_filter'] = true;
+		}
 
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
+		require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
 
-        return $field;
-    }
+		return $field;
+	}
 
-    public static function destroy() {
+	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++;
-            }
-            $opt = esc_html__( 'Option', 'formidable' ) .' '. $next_opt;
-            unset($next_opt);
-        }
-        $field_val = $opt;
+			if ( $first_opt != '' ) {
+				$next_opt++;
+			}
+			$opt = esc_html__( 'Option', 'formidable' ) .' '. $next_opt;
+			unset($next_opt);
+		}
+		$field_val = $opt;
 		$field->options[ $opt_key ] = $opt;
 
-        //Update options in DB
+		//Update options in DB
 		FrmField::update( $id, array( 'options' => $field->options ) );
 
-        $field_data = $field;
-        $field = array(
-            'type'  => $field_data->type,
-            'id'    => $id,
-            'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
-            'form_id' => $field_data->form_id,
-            'field_key' => $field_data->field_key,
-        );
-
-        $field_name = 'item_meta['. $id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
-        $checked = '';
-
-        if ( 'other' == $opt_type ) {
-            require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
-        } else {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
-        }
-        wp_die();
-    }
-
-    public static function edit_option() {
+		$field_data = $field;
+		$field = array(
+			'type'  => $field_data->type,
+			'id'    => $id,
+			'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
+			'form_id' => $field_data->form_id,
+			'field_key' => $field_data->field_key,
+		);
+
+		$field_name = 'item_meta['. $id .']';
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$checked = '';
+
+		if ( 'other' == $opt_type ) {
+			require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
+		} else {
+			require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
+		}
+		wp_die();
+	}
+
+	public static function edit_option() {
 		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 );
@@ -298,43 +298,43 @@ 
 
 		$orig_update_value = $update_value = trim( FrmAppHelper::get_post_param( 'update_value' ) );
 		if ( strpos( $element_id, 'key_' ) ) {
-            $new_value = $update_value;
-        } else {
-            $new_label = $update_value;
-        }
+			$new_value = $update_value;
+		} else {
+			$new_label = $update_value;
+		}
 
-        $field = FrmField::getOne($id);
-        $separate_values = FrmField::is_option_true( $field, 'separate_value' );
+		$field = FrmField::getOne($id);
+		$separate_values = FrmField::is_option_true( $field, 'separate_value' );
 
-        $this_opt_id = end($ids);
+		$this_opt_id = end($ids);
 		$this_opt = (array) $field->options[ $this_opt_id ];
 		$other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other') !== false );
 
-        $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 );
@@ -342,340 +342,340 @@ 
 		$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_style( 'formidable-admin', FrmAppHelper::plugin_url(). '/css/frm_admin.css' );
-        FrmAppHelper::load_admin_wide_js();
+		wp_enqueue_script( 'utils' );
+		wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url(). '/css/frm_admin.css' );
+		FrmAppHelper::load_admin_wide_js();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/import_choices.php');
-        wp_die();
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/import_choices.php');
+		wp_die();
+	}
 
-    public static function import_options() {
+	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;
-        }
-
-        $field = FrmFieldsHelper::setup_edit_vars($field);
-        $opts = stripslashes_deep($_POST['opts']);
-        $opts = explode("\n", rtrim($opts, "\n"));
-        if ( $field['separate_value'] ) {
-            foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
-                    if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
-                    }
-                    unset($vals);
-                }
-                unset($opt_key, $opt);
-            }
-        }
-
-        //Keep other options after bulk update
-        if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
-            $other_array = array();
-            foreach ( $field['options'] as $opt_key => $opt ) {
-                if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
-                    $other_array[ $opt_key ] = $opt;
-                }
-                unset($opt_key, $opt);
-            }
-            if ( ! empty($other_array) ) {
-                $opts = array_merge( $opts, $other_array);
-            }
-        }
-
-        FrmField::update( $field_id, array( 'options' => maybe_serialize( $opts ) ) );
-
-        $field['options'] = $opts;
-        $field_name = $field['name'];
-
-        // Get html_id which will be used in single-option.php
-        $html_id = FrmFieldsHelper::get_html_id( $field );
-
-        if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php');
-        } else {
-            FrmFieldsHelper::show_single_option($field);
-        }
-
-        wp_die();
-    }
-
-    public static function update_order() {
+			return;
+		}
+
+		$field = FrmFieldsHelper::setup_edit_vars($field);
+		$opts = stripslashes_deep($_POST['opts']);
+		$opts = explode("\n", rtrim($opts, "\n"));
+		if ( $field['separate_value'] ) {
+			foreach ( $opts as $opt_key => $opt ) {
+				if ( strpos($opt, '|') !== false ) {
+					$vals = explode('|', $opt);
+					if ( $vals[0] != $vals[1] ) {
+						$opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+					}
+					unset($vals);
+				}
+				unset($opt_key, $opt);
+			}
+		}
+
+		//Keep other options after bulk update
+		if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
+			$other_array = array();
+			foreach ( $field['options'] as $opt_key => $opt ) {
+				if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
+					$other_array[ $opt_key ] = $opt;
+				}
+				unset($opt_key, $opt);
+			}
+			if ( ! empty($other_array) ) {
+				$opts = array_merge( $opts, $other_array);
+			}
+		}
+
+		FrmField::update( $field_id, array( 'options' => maybe_serialize( $opts ) ) );
+
+		$field['options'] = $opts;
+		$field_name = $field['name'];
+
+		// Get html_id which will be used in single-option.php
+		$html_id = FrmFieldsHelper::get_html_id( $field );
+
+		if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
+			require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php');
+		} else {
+			FrmFieldsHelper::show_single_option($field);
+		}
+
+		wp_die();
+	}
+
+	public static function update_order() {
 		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 ); uncomment this when the js validation is complete
 
-        $class = apply_filters('frm_field_classes', implode(' ', $class), $field);
+		$class = apply_filters('frm_field_classes', implode(' ', $class), $field);
 
 		FrmFormsHelper::add_html_attr( $class, 'class', $add_html );
 
-        self::add_shortcodes_to_html($field, $add_html);
+		self::add_shortcodes_to_html($field, $add_html);
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
 		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
 
-        if ( $echo ) {
-            echo $add_html;
-        }
+		if ( $echo ) {
+			echo $add_html;
+		}
 
-        return $add_html;
-    }
+		return $add_html;
+	}
 
 	private static function add_input_classes( $field, array &$class ) {
-        if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
-            $class[] = $field['input_class'];
-        }
+		if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
+			$class[] = $field['input_class'];
+		}
 
-        if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
-            return;
-        }
+		if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
+			return;
+		}
 
-        global $frm_vars;
+		global $frm_vars;
 		if ( is_admin() && ! FrmAppHelper::is_preview_page() && ! in_array( $field['type'], array( 'scale', 'radio', 'checkbox', 'data' ) ) ) {
-            $class[] = 'dyn_default_value';
-        }
+			$class[] = 'dyn_default_value';
+		}
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
-            $class[] = 'auto_width';
-        }
-    }
+		if ( isset($field['size']) && $field['size'] > 0 ) {
+			$class[] = 'auto_width';
+		}
+	}
 
 	private static function add_html_size( $field, array &$add_html ) {
 		if ( ! isset( $field['size'] ) || $field['size'] <= 0 || in_array( $field['type'], array( 'select', 'data', 'time', 'hidden' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			return;
+		}
 
-        if ( is_numeric($field['size']) ) {
-            $field['size'] .= 'px';
-        }
+		if ( is_numeric($field['size']) ) {
+			$field['size'] .= 'px';
+		}
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
-        // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
-        $add_html['style'] = 'style="width:'. esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) .'"';
+		$important = apply_filters('frm_use_important_width', 1, $field);
+		// Note: This inline styling must stay since we cannot realistically set a class for every possible field size
+		$add_html['style'] = 'style="width:'. esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) .'"';
 
-        self::add_html_cols($field, $add_html);
-    }
+		self::add_html_cols($field, $add_html);
+	}
 
 	private static function add_html_cols( $field, array &$add_html ) {
 		if ( ! in_array( $field['type'], array( 'textarea', 'rte' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        // convert to cols for textareas
-        $calc = array(
-            ''      => 9,
-            'px'    => 9,
-            'rem'   => 0.444,
-            'em'    => 0.544,
-        );
+		// convert to cols for textareas
+		$calc = array(
+			''      => 9,
+			'px'    => 9,
+			'rem'   => 0.444,
+			'em'    => 0.544,
+		);
 
-        // include "col" for valid html
-        $unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
+		// include "col" for valid html
+		$unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
 
-        if ( ! isset( $calc[ $unit ] ) ) {
-            return;
-        }
+		if ( ! isset( $calc[ $unit ] ) ) {
+			return;
+		}
 
-        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
-    }
+	}
 
 	private static function add_html_length( $field, array &$add_html ) {
-        // check for max setting and if this field accepts maxlength
+		// check for max setting and if this field accepts maxlength
 		if ( FrmField::is_option_empty( $field, 'max' ) || in_array( $field['type'], array( 'textarea', 'rte', 'hidden' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            // don't load on form builder page
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			// don't load on form builder page
+			return;
+		}
 
 		$add_html['maxlength'] = 'maxlength="' . esc_attr( $field['max'] ) . '"';
-    }
+	}
 
 	private static function add_html_placeholder( $field, array &$add_html, array &$class ) {
 		if ( empty( $field['default_value'] ) || FrmAppHelper::is_admin_page( 'formidable' ) ) {
 			return;
 		}
 
-        if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
+		if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
 			if ( is_array( $field['default_value'] ) ) {
 				$field['default_value'] = json_encode( $field['default_value'] );
 			}
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['default_value'] ) . '"';
-            return;
-        }
+			return;
+		}
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
-            // use HMTL5 placeholder with js fallback
-            $add_html['placeholder'] = 'placeholder="'. esc_attr($field['default_value']) .'"';
-            wp_enqueue_script('jquery-placeholder');
-        } else if ( ! $frm_settings->use_html ) {
+			// use HMTL5 placeholder with js fallback
+			$add_html['placeholder'] = 'placeholder="'. esc_attr($field['default_value']) .'"';
+			wp_enqueue_script('jquery-placeholder');
+		} else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( '&#039;', "'", esc_attr( $field['default_value'] ) ) ) );
-            $add_html['data-frmval'] = 'data-frmval="'. esc_attr($val) .'"';
-            $class[] = 'frm_toggle_default';
+			$add_html['data-frmval'] = 'data-frmval="'. esc_attr($val) .'"';
+			$class[] = 'frm_toggle_default';
 
-            if ( $field['value'] == $field['default_value'] ) {
-                $class[] = 'frm_default';
-            }
-        }
-    }
+			if ( $field['value'] == $field['default_value'] ) {
+				$class[] = 'frm_default';
+			}
+		}
+	}
 
 	private static function add_validation_messages( $field, array &$add_html ) {
 		if ( FrmField::is_required( $field ) ) {
@@ -696,44 +696,44 @@ 
 		}
 	}
 
-    private static function add_shortcodes_to_html( $field, array &$add_html ) {
-        if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
-            return;
-        }
-
-        foreach ( $field['shortcodes'] as $k => $v ) {
-            if ( 'opt' === $k ) {
-                continue;
-            }
-
-            if ( is_numeric($k) && strpos($v, '=') ) {
-                $add_html[] = $v;
-            } else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-                $add_html[ $k ] = str_replace( $k .'="', $k .'="'. $v, $add_html[ $k ] );
-            } else {
+	private static function add_shortcodes_to_html( $field, array &$add_html ) {
+		if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
+			return;
+		}
+
+		foreach ( $field['shortcodes'] as $k => $v ) {
+			if ( 'opt' === $k ) {
+				continue;
+			}
+
+			if ( is_numeric($k) && strpos($v, '=') ) {
+				$add_html[] = $v;
+			} else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
+				$add_html[ $k ] = str_replace( $k .'="', $k .'="'. $v, $add_html[ $k ] );
+			} else {
 				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
-            }
-
-            unset($k, $v);
-        }
-    }
-
-    public static function check_value( $opt, $opt_key, $field ) {
-        if ( is_array( $opt ) ) {
-            if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
-                $opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
-            } else {
-                $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
-            }
-        }
-        return $opt;
-    }
+			}
+
+			unset($k, $v);
+		}
+	}
+
+	public static function check_value( $opt, $opt_key, $field ) {
+		if ( is_array( $opt ) ) {
+			if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
+				$opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
+			} else {
+				$opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
+			}
+		}
+		return $opt;
+	}
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
-        }
+		if ( is_array($opt) ) {
+			$opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+		}
 
-        return $opt;
-    }
+		return $opt;
+	}
 }

Spacing +112 added lines, -112 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'];
@@ -33,33 +33,33 @@ 
                 $field['value'] = '';
             }
 
-            $field_name = 'item_meta['. $field_id .']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+            $field_name = 'item_meta[' . $field_id . ']';
+            $html_id = FrmFieldsHelper::get_html_id( $field );
 
             ob_start();
-            include($path .'/classes/views/frm-forms/add_field.php');
-            $field_html[ $field_id ] = ob_get_contents();
+            include( $path . '/classes/views/frm-forms/add_field.php' );
+            $field_html[$field_id] = ob_get_contents();
             ob_end_clean();
         }
 
-        unset($path);
+        unset( $path );
 
-        echo json_encode($field_html);
+        echo json_encode( $field_html );
 
         wp_die();
     }
 
     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', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        $field = self::include_new_field($field_type, $form_id);
+        $field = self::include_new_field( $field_type, $form_id );
 
         // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+        do_action( 'frm_after_field_created', $field, $form_id );
 
         wp_die();
     }
@@ -70,23 +70,23 @@ 
 	public static function include_new_field( $field_type, $form_id ) {
         $values = array();
         if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
+            $values['post_type'] = FrmProFormsHelper::post_type( $form_id );
         }
 
-        $field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
+        $field_values = apply_filters( 'frm_before_field_created', FrmFieldsHelper::setup_new_vars( $field_type, $form_id ) );
         $field_id = FrmField::create( $field_values );
 
         if ( ! $field_id ) {
             return false;
         }
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+        $field = self::include_single_field( $field_id, $values, $form_id );
 
         return $field;
     }
 
     public static function update_form_id() {
-		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' );
@@ -103,21 +103,21 @@ 
     }
 
 	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 = '';
         }
@@ -131,7 +131,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' );
@@ -142,7 +142,7 @@ 
 		$field = FrmField::getOne( $field_id );
 
 		foreach ( array( 'clear_on_focus', 'separate_value', 'default_blank' ) as $val ) {
-            if ( isset($_POST[ $val ]) ) {
+            if ( isset( $_POST[$val] ) ) {
 				// all three of these options are boolean
 				$new_val = FrmAppHelper::get_post_param( $val, 0, 'absint' );
 
@@ -150,10 +150,10 @@ 
 					$new_val = FrmField::is_option_true( $field, $val ) ? 0 : 1;
                 }
 
-                $field->field_options[ $val ] = $new_val;
-                unset($new_val);
+                $field->field_options[$val] = $new_val;
+                unset( $new_val );
             }
-            unset($val);
+            unset( $val );
         }
 
         FrmField::update( $field_id, array(
@@ -164,7 +164,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;
@@ -177,21 +177,21 @@ 
             wp_die();
         }
 
-        do_action('frm_duplicate_field', $copy_field, $form_id);
-        do_action('frm_duplicate_field_'. $copy_field->type, $copy_field, $form_id);
+        do_action( 'frm_duplicate_field', $copy_field, $form_id );
+        do_action( 'frm_duplicate_field_' . $copy_field->type, $copy_field, $form_id );
 
         $values = array( 'id' => $form_id );
         FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
 
-		$field_count = FrmDb::get_count( $wpdb->prefix .'frm_fields fi LEFT JOIN '. $wpdb->prefix .'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
+		$field_count = FrmDb::get_count( $wpdb->prefix . 'frm_fields fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
 
         $values['field_order'] = $field_count + 1;
 
-        if ( ! $field_id = FrmField::create($values) ) {
+        if ( ! $field_id = FrmField::create( $values ) ) {
             wp_die();
         }
 
-        self::include_single_field($field_id, $values);
+        self::include_single_field( $field_id, $values );
 
         wp_die();
     }
@@ -200,21 +200,21 @@ 
      * Load a single field in the form builder along with all needed variables
      */
     public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
-        $field_name = 'item_meta['. $field_id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $field = FrmFieldsHelper::setup_edit_vars( FrmField::getOne( $field_id ) );
+        $field_name = 'item_meta[' . $field_id . ']';
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $id = $form_id ? $form_id : $field['form_id'];
         if ( $field['type'] == 'html' ) {
             $field['stop_filter'] = true;
         }
 
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
+        require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_field.php' );
 
         return $field;
     }
 
     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' );
@@ -226,14 +226,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 );
@@ -256,13 +256,13 @@ 
 			$first_opt = reset( $field->options );
 			$next_opt = count( $field->options );
             if ( $first_opt != '' ) {
-                $next_opt++;
+                $next_opt ++;
             }
-            $opt = esc_html__( 'Option', 'formidable' ) .' '. $next_opt;
-            unset($next_opt);
+            $opt = esc_html__( 'Option', 'formidable' ) . ' ' . $next_opt;
+            unset( $next_opt );
         }
         $field_val = $opt;
-		$field->options[ $opt_key ] = $opt;
+		$field->options[$opt_key] = $opt;
 
         //Update options in DB
 		FrmField::update( $id, array( 'options' => $field->options ) );
@@ -271,25 +271,25 @@ 
         $field = array(
             'type'  => $field_data->type,
             'id'    => $id,
-            'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
+            'separate_value' => isset( $field_data->field_options['separate_value'] ) ? $field_data->field_options['separate_value'] : 0,
             'form_id' => $field_data->form_id,
             'field_key' => $field_data->field_key,
         );
 
-        $field_name = 'item_meta['. $id .']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $field_name = 'item_meta[' . $id . ']';
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $checked = '';
 
         if ( 'other' == $opt_type ) {
-            require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
+            require( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
         } else {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
+            require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
         }
         wp_die();
     }
 
     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' );
@@ -303,28 +303,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 ) );
@@ -333,7 +333,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' );
@@ -342,7 +342,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
@@ -408,46 +408,46 @@ 
 
         $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
         $prepop = array();
-        FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
+        FrmFieldsHelper::get_bulk_prefilled_opts( $prepop );
 
-        $field = FrmField::getOne($field_id);
+        $field = FrmField::getOne( $field_id );
 
         wp_enqueue_script( 'utils' );
-        wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url(). '/css/frm_admin.css' );
+        wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css' );
         FrmAppHelper::load_admin_wide_js();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/import_choices.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/import_choices.php' );
         wp_die();
     }
 
     public static function import_options() {
-		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);
-        $opts = stripslashes_deep($_POST['opts']);
-        $opts = explode("\n", rtrim($opts, "\n"));
+        $field = FrmFieldsHelper::setup_edit_vars( $field );
+        $opts = stripslashes_deep( $_POST['opts'] );
+        $opts = explode( "\n", rtrim( $opts, "\n" ) );
         if ( $field['separate_value'] ) {
             foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
+                if ( strpos( $opt, '|' ) !== false ) {
+                    $vals = explode( '|', $opt );
                     if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+                        $opts[$opt_key] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
                     }
-                    unset($vals);
+                    unset( $vals );
                 }
-                unset($opt_key, $opt);
+                unset( $opt_key, $opt );
             }
         }
 
@@ -456,12 +456,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 );
             }
         }
 
@@ -474,16 +474,16 @@ 
         $html_id = FrmFieldsHelper::get_html_id( $field );
 
         if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-            require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php');
+            require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' );
         } else {
-            FrmFieldsHelper::show_single_option($field);
+            FrmFieldsHelper::show_single_option( $field );
         }
 
         wp_die();
     }
 
     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' );
@@ -500,13 +500,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';
         }
 
@@ -545,19 +545,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 ); uncomment this when the js validation is complete
 
-        $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 ) . '  ';
@@ -570,7 +570,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'];
         }
 
@@ -583,7 +583,7 @@ 
             $class[] = 'dyn_default_value';
         }
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
+        if ( isset( $field['size'] ) && $field['size'] > 0 ) {
             $class[] = 'auto_width';
         }
     }
@@ -593,19 +593,19 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             return;
         }
 
-        if ( is_numeric($field['size']) ) {
+        if ( is_numeric( $field['size'] ) ) {
             $field['size'] .= 'px';
         }
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
+        $important = apply_filters( 'frm_use_important_width', 1, $field );
         // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
-        $add_html['style'] = 'style="width:'. esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) .'"';
+        $add_html['style'] = 'style="width:' . esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) . '"';
 
-        self::add_html_cols($field, $add_html);
+        self::add_html_cols( $field, $add_html );
     }
 
 	private static function add_html_cols( $field, array &$add_html ) {
@@ -622,13 +622,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 ) . '"';
     }
@@ -639,7 +639,7 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             // don't load on form builder page
             return;
         }
@@ -664,11 +664,11 @@ 
 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
             // use HMTL5 placeholder with js fallback
-            $add_html['placeholder'] = 'placeholder="'. esc_attr($field['default_value']) .'"';
-            wp_enqueue_script('jquery-placeholder');
+            $add_html['placeholder'] = 'placeholder="' . esc_attr( $field['default_value'] ) . '"';
+            wp_enqueue_script( 'jquery-placeholder' );
         } else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( ''', "'", esc_attr( $field['default_value'] ) ) ) );
-            $add_html['data-frmval'] = 'data-frmval="'. esc_attr($val) .'"';
+            $add_html['data-frmval'] = 'data-frmval="' . esc_attr( $val ) . '"';
             $class[] = 'frm_toggle_default';
 
             if ( $field['value'] == $field['default_value'] ) {
@@ -692,7 +692,7 @@ 
 			$format = FrmEntryValidate::phone_format( $field );
 			$format = substr( $format, 2, -2 );
 			$key = 'pattern';
-			$add_html[ $key ] = $key . '="' . esc_attr( $format ) . '"';
+			$add_html[$key] = $key . '="' . esc_attr( $format ) . '"';
 		}
 	}
 
@@ -706,15 +706,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 );
         }
     }
 
@@ -730,8 +730,8 @@ 
     }
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+        if ( is_array( $opt ) ) {
+            $opt = ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
         }
 
         return $opt;

classes/controllers/FrmAppController.php

Indentation +156 added lines, -156 removed lines

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

Spacing +3 added lines, -3 removed lines

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

classes/controllers/FrmFormActionsController.php

Indentation +223 added lines, -223 removed lines

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

Spacing +40 added lines, -40 removed lines

@@ -48,17 +48,17 @@ 
             'highrise'  => 'FrmDefHrsAction',
         ) );
 
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php');
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php');
+        include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php' );
+        include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php' );
 
         foreach ( $action_classes as $action_class ) {
-            self::$registered_actions->register($action_class);
+            self::$registered_actions->register( $action_class );
         }
     }
 
 	public static function get_form_actions( $action = 'all' ) {
         $temp_actions = self::$registered_actions;
-        if ( empty($temp_actions) ) {
+        if ( empty( $temp_actions ) ) {
             self::actions_init();
             $temp_actions = self::$registered_actions->actions;
         } else {
@@ -72,7 +72,7 @@ 
                 return $a;
             }
 
-			$actions[ $a->id_base ] = $a;
+			$actions[$a->id_base] = $a;
         }
         unset( $temp_actions, $a );
 
@@ -86,7 +86,7 @@ 
         arsort( $temp_actions );
         foreach ( $temp_actions as $type => $a ) {
             if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
-				unset( $actions[ $type ] );
+				unset( $actions[$type] );
                 if ( count( $actions ) <= $action_limit ) {
                     break;
                 }
@@ -118,26 +118,26 @@ 
         $action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-            $action_map[ $control->id_base ] = $key;
+            $action_map[$control->id_base] = $key;
         }
 
     	foreach ( $form_actions as $action ) {
-    	    if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+    	    if ( ! isset( $action_map[$action->post_excerpt] ) ) {
     	        // don't try and show settings if action no longer exists
     	        continue;
     	    }
 
-    		self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+    		self::action_control( $action, $form, $action->ID, $action_controls[$action_map[$action->post_excerpt]], $values );
     	}
     }
 
 	public static function action_control( $form_action, $form, $action_key, $action_control, $values ) {
-        $action_control->_set($action_key);
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+        $action_control->_set( $action_key );
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
     }
 
     public static function add_form_action() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         global $frm_vars;
@@ -146,55 +146,55 @@ 
         $action_type = sanitize_text_field( $_POST['type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        $action_control->_set($action_key);
+        $action_control->_set( $action_key );
 
         $form_id = absint( $_POST['form_id'] );
 
-        $form_action = $action_control->prepare_new($form_id);
+        $form_action = $action_control->prepare_new( $form_id );
 
         $values = array();
-        $form = self::fields_to_values($form_id, $values);
+        $form = self::fields_to_values( $form_id, $values );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
         wp_die();
     }
 
     public static function fill_action() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $action_key = absint( $_POST['action_id'] );
         $action_type = sanitize_text_field( $_POST['action_type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        if ( empty($action_control) ) {
+        if ( empty( $action_control ) ) {
             wp_die();
         }
 
         $form_action = $action_control->get_single_action( $action_key );
 
         $values = array();
-        $form = self::fields_to_values($form_action->menu_order, $values);
+        $form = self::fields_to_values( $form_action->menu_order, $values );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_action_inside.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_inside.php' );
         wp_die();
     }
 
 	private static function fields_to_values( $form_id, array &$values ) {
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
 
 		$values = array( 'fields' => array(), 'id' => $form->id );
 
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
         foreach ( $fields as $k => $f ) {
             $f = (array) $f;
             $opts = (array) $f['field_options'];
-            $f = array_merge($opts, $f);
+            $f = array_merge( $opts, $f );
             if ( ! isset( $f['post_field'] ) ) {
                 $f['post_field'] = '';
             }
             $values['fields'][] = $f;
-            unset($k, $f);
+            unset( $k, $f );
         }
 
         return $form;
@@ -209,7 +209,7 @@ 
         $new_actions = array();
 
         foreach ( $registered_actions as $registered_action ) {
-            $action_ids = $registered_action->update_callback($form_id);
+            $action_ids = $registered_action->update_callback( $form_id );
             if ( ! empty( $action_ids ) ) {
                 $new_actions[] = $action_ids;
             }
@@ -286,33 +286,33 @@ 
             }
 
             // store actions so they can be triggered with the correct priority
-            $stored_actions[ $action->ID ] = $action;
-            $action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+            $stored_actions[$action->ID] = $action;
+            $action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
 
-            unset($action);
+            unset( $action );
         }
 
         if ( ! empty( $stored_actions ) ) {
-            asort($action_priority);
+            asort( $action_priority );
 
             // make sure hooks are loaded
             new FrmNotification();
 
             foreach ( $action_priority as $action_id => $priority ) {
-                $action = $stored_actions[ $action_id ];
-                do_action('frm_trigger_'. $action->post_excerpt .'_action', $action, $entry, $form, $event);
-                do_action('frm_trigger_'. $action->post_excerpt .'_'. $event .'_action', $action, $entry, $form);
+                $action = $stored_actions[$action_id];
+                do_action( 'frm_trigger_' . $action->post_excerpt . '_action', $action, $entry, $form, $event );
+                do_action( 'frm_trigger_' . $action->post_excerpt . '_' . $event . '_action', $action, $entry, $form );
 
                 // If post is created, get updated $entry object
                 if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
-                    $entry = FrmEntry::getOne($entry->id, true);
+                    $entry = FrmEntry::getOne( $entry->id, true );
                 }
             }
         }
     }
 
 	public static function duplicate_form_actions( $form_id, $values, $args = array() ) {
-        if ( ! isset($args['old_id']) || empty($args['old_id']) ) {
+        if ( ! isset( $args['old_id'] ) || empty( $args['old_id'] ) ) {
             // continue if we know which actions to copy
             return;
         }
@@ -346,22 +346,22 @@ 
 	}
 
 	public function register( $action_class ) {
-		$this->actions[ $action_class ] = new $action_class();
+		$this->actions[$action_class] = new $action_class();
 	}
 
 	public function unregister( $action_class ) {
-		if ( isset( $this->actions[ $action_class ] ) ) {
-			unset($this->actions[ $action_class ]);
+		if ( isset( $this->actions[$action_class] ) ) {
+			unset( $this->actions[$action_class] );
 		}
 	}
 
 	public function _register_actions() {
-		$keys = array_keys($this->actions);
+		$keys = array_keys( $this->actions );
 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
-			if ( ! isset( $this->actions[ $key ] ) ) {
-			    $this->actions[ $key ]->_register();
+			if ( ! isset( $this->actions[$key] ) ) {
+			    $this->actions[$key]->_register();
 			}
 		}
 	}

classes/helpers/FrmTipsHelper.php

Spacing +2 added lines, -2 removed lines

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