Strategy11 / formidable-forms

classes/views/styles/manage.php

Indentation +9 added lines, -9 removed lines

@@ -19,14 +19,14 @@ 
 
 			<tbody class="menu-locations">
 			    <?php
-			    if ( $forms ) {
-			        foreach ( $forms as $form ) {
-			            $this_style = isset($form->options['custom_style']) ? (int) $form->options['custom_style'] : 1;
-			            if ( 1 == $this_style ) {
-			                // use the default style
-			                $this_style = $default_style->ID;
-			            }
-			        ?>
+				if ( $forms ) {
+					foreach ( $forms as $form ) {
+						$this_style = isset($form->options['custom_style']) ? (int) $form->options['custom_style'] : 1;
+						if ( 1 == $this_style ) {
+							// use the default style
+							$this_style = $default_style->ID;
+						}
+					?>
 				<tr id="menu-locations-row">
 					<td class="menu-location-title"><strong><?php echo empty($form->name) ? __( '(no title)') : $form->name ?></strong></td>
 					<td class="menu-location-menus">
@@ -41,7 +41,7 @@ 
 					</td><!-- .menu-location-menus -->
 				</tr><!-- #menu-locations-row -->
 				<?php
-				    }
+					}
 				} else {
 				?>
 				<tr>

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <div class="nav-menus-php">
 <div class="wrap">
-    <?php FrmStylesHelper::style_menu('manage'); ?>
+    <?php FrmStylesHelper::style_menu( 'manage' ); ?>
 
-	<p><?php printf(__( 'Easily change which template your forms are using by making changes below.', 'formidable' ), '<a href="?page=formidable-styles&frm_action=new_style">', '</a>'); ?></p>
+	<p><?php printf( __( 'Easily change which template your forms are using by making changes below.', 'formidable' ), '<a href="?page=formidable-styles&frm_action=new_style">', '</a>' ); ?></p>
 
 	<?php include( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
 
@@ -21,14 +21,14 @@ 
 			    <?php
 			    if ( $forms ) {
 			        foreach ( $forms as $form ) {
-			            $this_style = isset($form->options['custom_style']) ? (int) $form->options['custom_style'] : 1;
+			            $this_style = isset( $form->options['custom_style'] ) ? (int) $form->options['custom_style'] : 1;
 			            if ( 1 == $this_style ) {
 			                // use the default style
 			                $this_style = $default_style->ID;
 			            }
 			        ?>
 				<tr id="menu-locations-row">
-					<td class="menu-location-title"><strong><?php echo empty($form->name) ? __( '(no title)') : $form->name ?></strong></td>
+					<td class="menu-location-title"><strong><?php echo empty( $form->name ) ? __( '(no title)' ) : $form->name ?></strong></td>
 					<td class="menu-location-menus">
 					    <input type="hidden" name="prev_style[<?php echo esc_attr( $form->id ) ?>]" value="<?php echo esc_attr( $this_style ) ?>" />
 					    <select name="style[<?php echo esc_attr( $form->id ) ?>]">
@@ -37,7 +37,7 @@ 
 									<?php echo esc_html( $s->post_title . ( empty( $s->menu_order ) ? '' : ' (' . __( 'default', 'formidable' ) . ')' ) ) ?>
 								</option>
          		            <?php } ?>
-         		            <option value="" <?php selected(0, $this_style) ?>><?php _e( 'Styling disabled', 'formidable' ) ?></option>
+         		            <option value="" <?php selected( 0, $this_style ) ?>><?php _e( 'Styling disabled', 'formidable' ) ?></option>
          		        </select>
 
 					</td><!-- .menu-location-menus -->

classes/views/xml/forms_xml.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! $item_ids ) {
-    return;
+	return;
 }
 
 // fetch 20 posts at a time rather than loading the entire table into memory
@@ -45,6 +45,6 @@ 
 <?php	} ?>
 	</form>
 <?php
-    	unset( $fields );
+		unset( $fields );
 	}
 }

Spacing +12 added lines, -12 removed lines

@@ -13,16 +13,16 @@ 
 ?>
 	<form>
 		<id><?php echo $form->id ?></id>
-		<form_key><?php echo FrmXMLHelper::cdata($form->form_key) ?></form_key>
-		<name><?php echo FrmXMLHelper::cdata($form->name) ?></name>
-		<description><?php echo FrmXMLHelper::cdata($form->description) ?></description>
+		<form_key><?php echo FrmXMLHelper::cdata( $form->form_key ) ?></form_key>
+		<name><?php echo FrmXMLHelper::cdata( $form->name ) ?></name>
+		<description><?php echo FrmXMLHelper::cdata( $form->description ) ?></description>
 		<created_at><?php echo $form->created_at ?></created_at>
 		<logged_in><?php echo $form->logged_in ?></logged_in>
 		<is_template><?php echo $form->is_template ?></is_template>
 		<default_template><?php echo $form->default_template ?></default_template>
 		<editable><?php echo $form->editable ?></editable>
-		<options><?php echo FrmXMLHelper::prepare_form_options_for_export($form->options) ?></options>
-		<status><?php echo FrmXMLHelper::cdata($form->status) ?></status>
+		<options><?php echo FrmXMLHelper::prepare_form_options_for_export( $form->options ) ?></options>
+		<status><?php echo FrmXMLHelper::cdata( $form->status ) ?></status>
         <parent_form_id><?php echo $form->parent_form_id ?></parent_form_id>
 <?php
 
@@ -31,16 +31,16 @@ 
 		foreach ( $fields as $field ) { ?>
 		<field>
 		    <id><?php echo $field->id ?></id>
-            <field_key><?php echo FrmXMLHelper::cdata($field->field_key) ?></field_key>
-            <name><?php echo FrmXMLHelper::cdata($field->name) ?></name>
-            <description><?php echo FrmXMLHelper::cdata($field->description) ?></description>
-            <type><?php echo FrmXMLHelper::cdata($field->type) ?></type>
-            <default_value><?php echo FrmXMLHelper::cdata($field->default_value) ?></default_value>
+            <field_key><?php echo FrmXMLHelper::cdata( $field->field_key ) ?></field_key>
+            <name><?php echo FrmXMLHelper::cdata( $field->name ) ?></name>
+            <description><?php echo FrmXMLHelper::cdata( $field->description ) ?></description>
+            <type><?php echo FrmXMLHelper::cdata( $field->type ) ?></type>
+            <default_value><?php echo FrmXMLHelper::cdata( $field->default_value ) ?></default_value>
             <field_order><?php echo $field->field_order ?></field_order>
             <form_id><?php echo $field->form_id ?></form_id>
             <required><?php echo (bool) $field->required ?></required>
-            <options><?php echo FrmXMLHelper::cdata($field->options) ?></options>
-            <field_options><?php echo FrmXMLHelper::cdata($field->field_options) ?></field_options>
+            <options><?php echo FrmXMLHelper::cdata( $field->options ) ?></options>
+            <field_options><?php echo FrmXMLHelper::cdata( $field->field_options ) ?></field_options>
 		</field>
 <?php	} ?>
 	</form>

classes/views/xml/posts_xml.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 	}
 
     $frm_inc_tax[] = $term->term_id;
-    $label = ($term->taxonomy == 'category' || $term->taxonomy == 'tag') ? $term->taxonomy : 'term'; ?>
+    $label = ( $term->taxonomy == 'category' || $term->taxonomy == 'tag' ) ? $term->taxonomy : 'term'; ?>
 	<term><term_id><?php echo $term->term_id ?></term_id><term_taxonomy><?php echo $term->taxonomy; ?></term_taxonomy><?php
     if ( ! empty( $term->name ) ) {
         echo '<term_name>' . FrmXMLHelper::cdata( $term->name ) . '</term_name>';

Indentation +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! $item_ids ) {
-    return;
+	return;
 }
 
 global $wp_query;
@@ -65,7 +65,7 @@ 
 }
 
 if ( empty( $taxonomies ) ) {
-    return;
+	return;
 }
 
 global $frm_inc_tax;
@@ -75,18 +75,18 @@ 
 
 foreach ( (array) $terms as $term ) {
 	if ( in_array( $term->term_id, $frm_inc_tax ) ) {
-        return;
+		return;
 	}
 
-    $frm_inc_tax[] = $term->term_id;
-    $label = ($term->taxonomy == 'category' || $term->taxonomy == 'tag') ? $term->taxonomy : 'term'; ?>
+	$frm_inc_tax[] = $term->term_id;
+	$label = ($term->taxonomy == 'category' || $term->taxonomy == 'tag') ? $term->taxonomy : 'term'; ?>
 	<term><term_id><?php echo esc_html( $term->term_id ) ?></term_id><term_taxonomy><?php echo esc_html( $term->taxonomy ); ?></term_taxonomy><?php
-    if ( ! empty( $term->name ) ) {
-        echo '<term_name>' . FrmXMLHelper::cdata( $term->name ) . '</term_name>';
-    }
-    if ( ! empty( $term->description ) ) {
-    ?><term_description><?php echo FrmXMLHelper::cdata( $term->description ) ?></term_description><?php
-    }
-    ?><term_slug><?php echo esc_html( $term->slug ); ?></term_slug></term>
+	if ( ! empty( $term->name ) ) {
+		echo '<term_name>' . FrmXMLHelper::cdata( $term->name ) . '</term_name>';
+	}
+	if ( ! empty( $term->description ) ) {
+	?><term_description><?php echo FrmXMLHelper::cdata( $term->description ) ?></term_description><?php
+	}
+	?><term_slug><?php echo esc_html( $term->slug ); ?></term_slug></term>
 <?php
 }

classes/widgets/FrmShowForm.php

Indentation +13 added lines, -13 removed lines

@@ -8,14 +8,14 @@ 
 	}
 
 	public function widget( $args, $instance ) {
-        if ( empty($instance['title']) ) {
-            $title = FrmForm::getName( $instance['form'] );
-        } else {
-            $title = $instance['title'];
-        }
-        $title = apply_filters('widget_title', $title);
+		if ( empty($instance['title']) ) {
+			$title = FrmForm::getName( $instance['form'] );
+		} else {
+			$title = $instance['title'];
+		}
+		$title = apply_filters('widget_title', $title);
 
-        $instance['description'] = isset($instance['description']) ? $instance['description'] : false;
+		$instance['description'] = isset($instance['description']) ? $instance['description'] : false;
 
 		echo $args['before_widget'];
 
@@ -35,9 +35,9 @@ 
 	}
 
 	public function form( $instance ) {
-	    //Defaults
+		//Defaults
 		$instance = wp_parse_args( (array) $instance, array(
-		    'title' => false, 'form' => false, 'description' => false,
+			'title' => false, 'form' => false, 'description' => false,
 		) );
 ?>
 	<p><label for="<?php echo esc_attr( $this->get_field_id('title') ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
@@ -45,10 +45,10 @@ 
 
 	<p><label for="<?php echo esc_attr( $this->get_field_id('form') ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
 <?php
-	    FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
-	        'blank' => false, 'field_id' => $this->get_field_id('form'),
-            'class' => 'widefat',
-	    ) );
+		FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
+			'blank' => false, 'field_id' => $this->get_field_id('form'),
+			'class' => 'widefat',
+		) );
 ?>
 	</p>
 

Spacing +12 added lines, -12 removed lines

@@ -4,27 +4,27 @@ 
 
 	public function __construct() {
 		$widget_ops = array( 'description' => __( 'Display a Formidable Form', 'formidable' ) );
-		parent::__construct('frm_show_form', __( 'Formidable Form', 'formidable' ), $widget_ops);
+		parent::__construct( 'frm_show_form', __( 'Formidable Form', 'formidable' ), $widget_ops );
 	}
 
 	public function widget( $args, $instance ) {
-        if ( empty($instance['title']) ) {
+        if ( empty( $instance['title'] ) ) {
             $title = FrmForm::getName( $instance['form'] );
         } else {
             $title = $instance['title'];
         }
-        $title = apply_filters('widget_title', $title);
+        $title = apply_filters( 'widget_title', $title );
 
-        $instance['description'] = isset($instance['description']) ? $instance['description'] : false;
+        $instance['description'] = isset( $instance['description'] ) ? $instance['description'] : false;
 
 		echo $args['before_widget'];
 
 		echo '<div class="frm_form_widget">';
 		if ( $title ) {
-			echo $args['before_title'] . stripslashes($title) . $args['after_title'];
+			echo $args['before_title'] . stripslashes( $title ) . $args['after_title'];
 		}
 
-		echo FrmFormsController::show_form($instance['form'], '', false, $instance['description']);
+		echo FrmFormsController::show_form( $instance['form'], '', false, $instance['description'] );
 
 		echo '</div>';
 		echo $args['after_widget'];
@@ -40,19 +40,19 @@ 
 		    'title' => false, 'form' => false, 'description' => false,
 		) );
 ?>
-	<p><label for="<?php echo esc_attr( $this->get_field_id('title') ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
-	<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id('title') ); ?>" name="<?php echo esc_attr( $this->get_field_name('title') ); ?>" value="<?php echo esc_attr( stripslashes($instance['title']) ); ?>" /></p>
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
+	<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" value="<?php echo esc_attr( stripslashes( $instance['title'] ) ); ?>" /></p>
 
-	<p><label for="<?php echo esc_attr( $this->get_field_id('form') ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'form' ) ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
 <?php
-	    FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
-	        'blank' => false, 'field_id' => $this->get_field_id('form'),
+	    FrmFormsHelper::forms_dropdown( $this->get_field_name( 'form' ), $instance['form'], array(
+	        'blank' => false, 'field_id' => $this->get_field_id( 'form' ),
             'class' => 'widefat',
 	    ) );
 ?>
 	</p>
 
-	<p><label for="<?php echo esc_attr( $this->get_field_id('description') ); ?>"><input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo esc_attr( $this->get_field_id('description') ); ?>" name="<?php echo esc_attr( $this->get_field_name('description') ); ?>" value="1" />
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'description' ) ); ?>"><input class="checkbox" type="checkbox" <?php checked( $instance['description'], true ) ?> id="<?php echo esc_attr( $this->get_field_id( 'description' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'description' ) ); ?>" value="1" />
 	<?php _e( 'Show Description', 'formidable' ) ?></label></p>
 <?php
 	}

deprecated.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 // 2.0
 if ( ! isset($frm_vars['pro_is_installed']) ) {
-    $frm_vars['pro_is_installed'] = false;
+	$frm_vars['pro_is_installed'] = false;
 }
 
 // Instansiate Models

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 // 2.0
-if ( ! isset($frm_vars['pro_is_installed']) ) {
+if ( ! isset( $frm_vars['pro_is_installed'] ) ) {
     $frm_vars['pro_is_installed'] = false;
 }
 

classes/helpers/FrmFormActionsHelper.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 

classes/helpers/FrmFormsHelper.php

Doc Comments +3 added lines

@@ -375,6 +375,9 @@
         $reset_fields = true;
     }
 
+    /**
+     * @return string
+     */
     public static function replace_shortcodes( $html, $form, $title = false, $description = false, $values = array() ) {
 		foreach ( array( 'form_name' => $title, 'form_description' => $description, 'entry_key' => true ) as $code => $show ) {
             if ( $code == 'form_name' ) {

Spacing +63 added lines, -63 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -12,7 +12,7 @@ 
 
 	public static function get_direct_link( $key, $form = false ) {
 		$target_url = esc_url( admin_url( 'admin-ajax.php?action=frm_forms_preview&form=' . $key ) );
-        $target_url = apply_filters('frm_direct_link', $target_url, $key, $form);
+        $target_url = apply_filters( 'frm_direct_link', $target_url, $key, $form );
 
         return $target_url;
     }
@@ -37,7 +37,7 @@ 
 			$query['id !'] = $args['exclude'];
         }
 
-        $where = apply_filters('frm_forms_dropdown', $query, $field_name);
+        $where = apply_filters( 'frm_forms_dropdown', $query, $field_name );
 		$forms = FrmForm::get_published_forms( $where, 999, $args['inc_children'] );
 		$add_html = array();
 		self::add_html_attr( $args['onchange'], 'onchange', $add_html );
@@ -50,7 +50,7 @@ 
 		<?php } ?>
 		<?php foreach ( $forms as $form ) { ?>
 			<option value="<?php echo esc_attr( $form->id ); ?>" <?php selected( $field_value, $form->id ); ?>><?php
-				echo ( '' == $form->name ) ? esc_html__( '(no title)', 'formidable' ) : esc_html( FrmAppHelper::truncate( $form->name, 50 ) ) . ( $form->parent_form_id ? esc_html__( ' (child)', 'formidable' ) : '' ) ;
+				echo ( '' == $form->name ) ? esc_html__( '(no title)', 'formidable' ) : esc_html( FrmAppHelper::truncate( $form->name, 50 ) ) . ( $form->parent_form_id ? esc_html__( ' (child)', 'formidable' ) : '' );
 			?></option>
 		<?php } ?>
         </select>
@@ -66,7 +66,7 @@ 
 	 */
 	public static function add_html_attr( $class, $param, &$add_html ) {
 		if ( ! empty( $class ) ) {
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
 		}
 	}
 
@@ -77,7 +77,7 @@ 
 		$args = array( 'id' => 0, 'form' => 0 );
 		if ( isset( $_GET['id'] ) && ! isset( $_GET['form'] ) ) {
 			unset( $args['form'] );
-		} else if ( isset( $_GET['form']) && ! isset( $_GET['id'] ) ) {
+		} else if ( isset( $_GET['form'] ) && ! isset( $_GET['id'] ) ) {
 			unset( $args['id'] );
         }
 
@@ -85,11 +85,11 @@ 
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $frm_action, array( 'edit', 'show', 'destroy_all' ) ) ) {
             $args['frm_action'] = 'list';
             $args['form'] = 0;
-		} else if ( FrmAppHelper::is_admin_page('formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
+		} else if ( FrmAppHelper::is_admin_page( 'formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
             $args['frm_action'] = 'edit';
 		} else if ( isset( $_GET['post'] ) ) {
             $args['form'] = 0;
-            $base = admin_url('edit.php?post_type=frm_display');
+            $base = admin_url( 'edit.php?post_type=frm_display' );
         }
 
         ?>
@@ -105,7 +105,7 @@ 
 			        $args['form'] = $form->id;
 				}
                 ?>
-				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)') : FrmAppHelper::truncate( $form->name, 60 ) ); ?></a></li>
+				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 60 ) ); ?></a></li>
 			<?php
 				unset( $form );
 			} ?>
@@ -115,8 +115,8 @@ 
     }
 
 	public static function get_sortable_classes( $col, $sort_col, $sort_dir ) {
-        echo ($sort_col == $col) ? 'sorted' : 'sortable';
-        echo ($sort_col == $col && $sort_dir == 'desc') ? ' asc' : ' desc';
+        echo ( $sort_col == $col ) ? 'sorted' : 'sortable';
+        echo ( $sort_col == $col && $sort_dir == 'desc' ) ? ' asc' : ' desc';
     }
 
 	public static function get_success_message( $atts ) {
@@ -136,20 +136,20 @@ 
             $post_values = $values;
         } else {
             $values = array();
-            $post_values = isset($_POST) ? $_POST : array();
+            $post_values = isset( $_POST ) ? $_POST : array();
         }
 
 		foreach ( array( 'name' => '', 'description' => '' ) as $var => $default ) {
-			if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+			if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default );
             }
         }
 
-        $values['description'] = FrmAppHelper::use_wpautop($values['description']);
+        $values['description'] = FrmAppHelper::use_wpautop( $values['description'] );
 
 		foreach ( array( 'form_id' => '', 'logged_in' => '', 'editable' => '', 'default_template' => 0, 'is_template' => 0, 'status' => 'draft', 'parent_form_id' => 0 ) as $var => $default ) {
-            if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+            if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default );
             }
         }
 
@@ -157,16 +157,16 @@ 
 			$values['form_key'] = ( $post_values && isset( $post_values['form_key'] ) ) ? $post_values['form_key'] : FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_forms', 'form_key' );
         }
 
-        $values = self::fill_default_opts($values, false, $post_values);
+        $values = self::fill_default_opts( $values, false, $post_values );
 
-        if ( $post_values && isset($post_values['options']['custom_style']) ) {
+        if ( $post_values && isset( $post_values['options']['custom_style'] ) ) {
             $values['custom_style'] = $post_values['options']['custom_style'];
         } else {
             $frm_settings = FrmAppHelper::get_settings();
             $values['custom_style'] = ( $frm_settings->load_style != 'none' );
         }
 
-        return apply_filters('frm_setup_new_form_vars', $values);
+        return apply_filters( 'frm_setup_new_form_vars', $values );
     }
 
     /**
@@ -177,42 +177,42 @@ 
 			$post_values = stripslashes_deep( $_POST );
 		}
 
-        $values['form_key'] = isset($post_values['form_key']) ? $post_values['form_key'] : $record->form_key;
-        $values['default_template'] = isset($post_values['default_template']) ? $post_values['default_template'] : $record->default_template;
-        $values['is_template'] = isset($post_values['is_template']) ? $post_values['is_template'] : $record->is_template;
+        $values['form_key'] = isset( $post_values['form_key'] ) ? $post_values['form_key'] : $record->form_key;
+        $values['default_template'] = isset( $post_values['default_template'] ) ? $post_values['default_template'] : $record->default_template;
+        $values['is_template'] = isset( $post_values['is_template'] ) ? $post_values['is_template'] : $record->is_template;
         $values['status'] = $record->status;
 
-        $values = self::fill_default_opts($values, $record, $post_values);
+        $values = self::fill_default_opts( $values, $record, $post_values );
 
-        return apply_filters('frm_setup_edit_form_vars', $values);
+        return apply_filters( 'frm_setup_edit_form_vars', $values );
     }
 
 	public static function fill_default_opts( $values, $record, $post_values ) {
 
         $defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-            if ( is_array($default) ) {
-                if ( ! isset( $values[ $var ] ) ) {
-					$values[ $var ] = ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : array();
+            if ( is_array( $default ) ) {
+                if ( ! isset( $values[$var] ) ) {
+					$values[$var] = ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : array();
                 }
 
                 foreach ( $default as $k => $v ) {
-					$values[ $var ][ $k ] = ( $post_values && isset( $post_values[ $var ][ $k ] ) ) ? $post_values[ $var ][ $k ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ) ? $record->options[ $var ][ $k ] : $v);
+					$values[$var][$k] = ( $post_values && isset( $post_values[$var][$k] ) ) ? $post_values[$var][$k] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) ) ? $record->options[$var][$k] : $v );
 
                     if ( is_array( $v ) ) {
                         foreach ( $v as $k1 => $v1 ) {
-							$values[ $var ][ $k ][ $k1 ] = ( $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ) ? $post_values[ $var ][ $k ][ $k1 ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
+							$values[$var][$k][$k1] = ( $post_values && isset( $post_values[$var][$k][$k1] ) ) ? $post_values[$var][$k][$k1] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) && isset( $record->options[$var][$k][$k1] ) ) ? $record->options[$var][$k][$k1] : $v1 );
                             unset( $k1, $v1 );
                         }
                     }
 
-                    unset($k, $v);
+                    unset( $k, $v );
                 }
             } else {
-				$values[ $var ] = ( $post_values && isset( $post_values['options'][ $var ] ) ) ? $post_values['options'][ $var ] : ( ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : $default );
+				$values[$var] = ( $post_values && isset( $post_values['options'][$var] ) ) ? $post_values['options'][$var] : ( ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : $default );
             }
 
-            unset($var, $default);
+            unset( $var, $default );
         }
 
         return $values;
@@ -225,9 +225,9 @@ 
             'submit_value' => $frm_settings->submit_value, 'success_action' => 'message',
             'success_msg' => $frm_settings->success_msg, 'show_form' => 0, 'akismet' => '',
             'no_save' => 0, 'ajax_load' => 0, 'form_class' => '', 'custom_style' => 1,
-            'before_html' => self::get_default_html('before'),
+            'before_html' => self::get_default_html( 'before' ),
             'after_html' => '',
-            'submit_html' => self::get_default_html('submit'),
+            'submit_html' => self::get_default_html( 'submit' ),
         );
     }
 
@@ -239,7 +239,7 @@ 
 	public static function fill_form_options( &$options, $values ) {
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
 			unset( $var, $default );
 		}
 	}
@@ -279,21 +279,21 @@ 
     }
 
 	public static function get_custom_submit( $html, $form, $submit, $form_action, $values ) {
-        $button = self::replace_shortcodes($html, $form, $submit, $form_action, $values);
-        if ( ! strpos($button, '[button_action]') ) {
+        $button = self::replace_shortcodes( $html, $form, $submit, $form_action, $values );
+        if ( ! strpos( $button, '[button_action]' ) ) {
             return;
         }
 
-        $button_parts = explode('[button_action]', $button);
+        $button_parts = explode( '[button_action]', $button );
         echo $button_parts[0];
         //echo ' id="frm_submit_"';
 
-        $classes = apply_filters('frm_submit_button_class', array(), $form);
-        if ( ! empty($classes) ) {
+        $classes = apply_filters( 'frm_submit_button_class', array(), $form );
+        if ( ! empty( $classes ) ) {
 			echo ' class="' . esc_attr( implode( ' ', $classes ) ) . '"';
         }
 
-        do_action('frm_submit_button_action', $form, $form_action);
+        do_action( 'frm_submit_button_action', $form, $form_action );
         echo $button_parts[1];
     }
 
@@ -314,7 +314,7 @@ 
 		$last_field = false;
         foreach ( $fields as $field ) {
 			if ( $prev_order === $field->field_order ) {
-				$add_order++;
+				$add_order ++;
 			}
 
 			if ( $add_order ) {
@@ -381,21 +381,21 @@ 
             if ( $code == 'form_name' ) {
                 $replace_with = $form->name;
             } else if ( $code == 'form_description' ) {
-                $replace_with = FrmAppHelper::use_wpautop($form->description);
-            } else if ( $code == 'entry_key' && isset($_GET) && isset($_GET['entry']) ) {
+                $replace_with = FrmAppHelper::use_wpautop( $form->description );
+            } else if ( $code == 'entry_key' && isset( $_GET ) && isset( $_GET['entry'] ) ) {
                 $replace_with = FrmAppHelper::simple_get( 'entry' );
             } else {
                 $replace_with = '';
             }
 
-            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true($show) && $replace_with != '' ), $code, $replace_with, $html );
+            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true( $show ) && $replace_with != '' ), $code, $replace_with, $html );
         }
 
         //replace [form_key]
-        $html = str_replace('[form_key]', $form->form_key, $html);
+        $html = str_replace( '[form_key]', $form->form_key, $html );
 
         //replace [frmurl]
-        $html = str_replace('[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html);
+        $html = str_replace( '[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html );
 
 		if ( strpos( $html, '[button_label]' ) ) {
 			add_filter( 'frm_submit_button', 'FrmFormsHelper::submit_button_label', 1 );
@@ -403,7 +403,7 @@ 
 			$html = str_replace( '[button_label]', $replace_with, $html );
         }
 
-        $html = apply_filters('frm_form_replace_shortcodes', $html, $form, $values);
+        $html = apply_filters( 'frm_form_replace_shortcodes', $html, $form, $values );
 
 		if ( strpos( $html, '[if back_button]' ) ) {
 			$html = preg_replace( '/(\[if\s+back_button\])(.*?)(\[\/if\s+back_button\])/mis', '', $html );
@@ -421,7 +421,7 @@ 
     }
 
 	public static function submit_button_label( $submit ) {
-        if ( ! $submit || empty($submit) ) {
+        if ( ! $submit || empty( $submit ) ) {
             $frm_settings = FrmAppHelper::get_settings();
             $submit = $frm_settings->submit_value;
         }
@@ -430,11 +430,11 @@ 
     }
 
 	public static function get_form_style_class( $form = false ) {
-        $style = self::get_form_style($form);
+        $style = self::get_form_style( $form );
         $class = ' with_frm_style';
 
-        if ( empty($style) ) {
-            if ( FrmAppHelper::is_admin_page('formidable-entries') ) {
+        if ( empty( $style ) ) {
+            if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) ) {
                 return $class;
             } else {
                 return;
@@ -442,7 +442,7 @@ 
         }
 
         //If submit button needs to be inline or centered
-        if ( is_object($form) ) {
+        if ( is_object( $form ) ) {
 			$form = $form->options;
 		}
 
@@ -454,7 +454,7 @@ 
 			$class .= ' frm_center_submit';
 		}
 
-        $class = apply_filters('frm_add_form_style_class', $class, $style);
+        $class = apply_filters( 'frm_add_form_style_class', $class, $style );
 
         return $class;
     }
@@ -542,12 +542,12 @@ 
     }
 
 	public static function edit_form_link( $form_id ) {
-        if ( is_object($form_id) ) {
+        if ( is_object( $form_id ) ) {
             $form = $form_id;
             $name = $form->name;
             $form_id = $form->id;
         } else {
-            $name = FrmForm::getName($form_id);
+            $name = FrmForm::getName( $form_id );
         }
 
         if ( $form_id ) {
@@ -579,12 +579,12 @@ 
         $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$base_url = '?page=formidable&form_type=' . $current_page . '&id=' . $id;
         if ( 'trash' == $status ) {
-			$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][ $length ] . '</a>';
-        } else if ( current_user_can('frm_delete_forms') ) {
+			$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][$length] . '</a>';
+        } else if ( current_user_can( 'frm_delete_forms' ) ) {
             if ( EMPTY_TRASH_DAYS ) {
-				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][ $length ] . '</a>';
+				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][$length] . '</a>';
             } else {
-				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][ $length ] . '</a>';
+				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][$length] . '</a>';
             }
         }
 
@@ -598,11 +598,11 @@ 
             'publish'   => __( 'Published', 'formidable' ),
         );
 
-        if ( ! in_array($status, array_keys($nice_names)) ) {
+        if ( ! in_array( $status, array_keys( $nice_names ) ) ) {
             $status = 'publish';
         }
 
-		$name = $nice_names[ $status ];
+		$name = $nice_names[$status];
 
         return $name;
     }

Indentation +273 added lines, -273 removed lines

@@ -12,38 +12,38 @@ 
 
 	public static function get_direct_link( $key, $form = false ) {
 		$target_url = esc_url( admin_url( 'admin-ajax.php?action=frm_forms_preview&form=' . $key ) );
-        $target_url = apply_filters('frm_direct_link', $target_url, $key, $form);
-
-        return $target_url;
-    }
-
-    public static function forms_dropdown( $field_name, $field_value = '', $args = array() ) {
-        $defaults = array(
-            'blank'     => true,
-            'field_id'  => false,
-            'onchange'  => false,
-            'exclude'   => false,
-            'class'     => '',
+		$target_url = apply_filters('frm_direct_link', $target_url, $key, $form);
+
+		return $target_url;
+	}
+
+	public static function forms_dropdown( $field_name, $field_value = '', $args = array() ) {
+		$defaults = array(
+			'blank'     => true,
+			'field_id'  => false,
+			'onchange'  => false,
+			'exclude'   => false,
+			'class'     => '',
 			'inc_children' => 'exclude',
-        );
-        $args = wp_parse_args( $args, $defaults );
+		);
+		$args = wp_parse_args( $args, $defaults );
 
-        if ( ! $args['field_id'] ) {
-            $args['field_id'] = $field_name;
-        }
+		if ( ! $args['field_id'] ) {
+			$args['field_id'] = $field_name;
+		}
 
 		$query = array();
-        if ( $args['exclude'] ) {
+		if ( $args['exclude'] ) {
 			$query['id !'] = $args['exclude'];
-        }
+		}
 
-        $where = apply_filters('frm_forms_dropdown', $query, $field_name);
+		$where = apply_filters('frm_forms_dropdown', $query, $field_name);
 		$forms = FrmForm::get_published_forms( $where, 999, $args['inc_children'] );
 		$add_html = array();
 		self::add_html_attr( $args['onchange'], 'onchange', $add_html );
 		self::add_html_attr( $args['class'], 'class', $add_html );
 
-        ?>
+		?>
 		<select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $args['field_id'] ) ?>" <?php echo implode( ' ', $add_html ); ?>>
 		<?php if ( $args['blank'] ) { ?>
 			<option value=""><?php echo ( $args['blank'] == 1 ) ? ' ' : '- ' . esc_attr( $args['blank'] ) . ' -'; ?></option>
@@ -55,7 +55,7 @@ 
 		<?php } ?>
         </select>
         <?php
-    }
+	}
 
 	/**
 	 * @param string $class
@@ -70,7 +70,7 @@ 
 		}
 	}
 
-    public static function form_switcher() {
+	public static function form_switcher() {
 		$where = apply_filters( 'frm_forms_dropdown', array(), '' );
 		$forms = FrmForm::get_published_forms( $where );
 
@@ -79,32 +79,32 @@ 
 			unset( $args['form'] );
 		} else if ( isset( $_GET['form']) && ! isset( $_GET['id'] ) ) {
 			unset( $args['id'] );
-        }
+		}
 
 		$frm_action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $frm_action, array( 'edit', 'show', 'destroy_all' ) ) ) {
-            $args['frm_action'] = 'list';
-            $args['form'] = 0;
+			$args['frm_action'] = 'list';
+			$args['form'] = 0;
 		} else if ( FrmAppHelper::is_admin_page('formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
-            $args['frm_action'] = 'edit';
+			$args['frm_action'] = 'edit';
 		} else if ( isset( $_GET['post'] ) ) {
-            $args['form'] = 0;
-            $base = admin_url('edit.php?post_type=frm_display');
-        }
+			$args['form'] = 0;
+			$base = admin_url('edit.php?post_type=frm_display');
+		}
 
-        ?>
+		?>
 		<li class="dropdown last" id="frm_bs_dropdown">
 			<a href="#" id="frm-navbarDrop" class="frm-dropdown-toggle" data-toggle="dropdown"><?php _e( 'Switch Form', 'formidable' ) ?> <b class="caret"></b></a>
 		    <ul class="frm-dropdown-menu frm-on-top" role="menu" aria-labelledby="frm-navbarDrop">
 			<?php
 			foreach ( $forms as $form ) {
 				if ( isset( $args['id'] ) ) {
-			        $args['id'] = $form->id;
+					$args['id'] = $form->id;
 				}
-			    if ( isset( $args['form'] ) ) {
-			        $args['form'] = $form->id;
+				if ( isset( $args['form'] ) ) {
+					$args['form'] = $form->id;
 				}
-                ?>
+				?>
 				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)') : FrmAppHelper::truncate( $form->name, 60 ) ); ?></a></li>
 			<?php
 				unset( $form );
@@ -112,12 +112,12 @@ 
 			</ul>
 		</li>
         <?php
-    }
+	}
 
 	public static function get_sortable_classes( $col, $sort_col, $sort_dir ) {
-        echo ($sort_col == $col) ? 'sorted' : 'sortable';
-        echo ($sort_col == $col && $sort_dir == 'desc') ? ' asc' : ' desc';
-    }
+		echo ($sort_col == $col) ? 'sorted' : 'sortable';
+		echo ($sort_col == $col && $sort_dir == 'desc') ? ' asc' : ' desc';
+	}
 
 	public static function get_success_message( $atts ) {
 		$message = apply_filters( 'frm_content', $atts['message'], $atts['form'], $atts['entry_id'] );
@@ -126,110 +126,110 @@ 
 		return $message;
 	}
 
-    /**
-     * Used when a form is created
-     */
-    public static function setup_new_vars( $values = array() ) {
-        global $wpdb;
+	/**
+	 * Used when a form is created
+	 */
+	public static function setup_new_vars( $values = array() ) {
+		global $wpdb;
 
-        if ( ! empty( $values ) ) {
-            $post_values = $values;
-        } else {
-            $values = array();
-            $post_values = isset($_POST) ? $_POST : array();
-        }
+		if ( ! empty( $values ) ) {
+			$post_values = $values;
+		} else {
+			$values = array();
+			$post_values = isset($_POST) ? $_POST : array();
+		}
 
 		foreach ( array( 'name' => '', 'description' => '' ) as $var => $default ) {
 			if ( ! isset( $values[ $var ] ) ) {
 				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
-            }
-        }
+			}
+		}
 
-        $values['description'] = FrmAppHelper::use_wpautop($values['description']);
+		$values['description'] = FrmAppHelper::use_wpautop($values['description']);
 
 		foreach ( array( 'form_id' => '', 'logged_in' => '', 'editable' => '', 'default_template' => 0, 'is_template' => 0, 'status' => 'draft', 'parent_form_id' => 0 ) as $var => $default ) {
-            if ( ! isset( $values[ $var ] ) ) {
+			if ( ! isset( $values[ $var ] ) ) {
 				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
-            }
-        }
+			}
+		}
 
-        if ( ! isset( $values['form_key'] ) ) {
+		if ( ! isset( $values['form_key'] ) ) {
 			$values['form_key'] = ( $post_values && isset( $post_values['form_key'] ) ) ? $post_values['form_key'] : FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_forms', 'form_key' );
-        }
+		}
 
-        $values = self::fill_default_opts($values, false, $post_values);
+		$values = self::fill_default_opts($values, false, $post_values);
 
-        if ( $post_values && isset($post_values['options']['custom_style']) ) {
-            $values['custom_style'] = $post_values['options']['custom_style'];
-        } else {
-            $frm_settings = FrmAppHelper::get_settings();
-            $values['custom_style'] = ( $frm_settings->load_style != 'none' );
-        }
+		if ( $post_values && isset($post_values['options']['custom_style']) ) {
+			$values['custom_style'] = $post_values['options']['custom_style'];
+		} else {
+			$frm_settings = FrmAppHelper::get_settings();
+			$values['custom_style'] = ( $frm_settings->load_style != 'none' );
+		}
 
-        return apply_filters('frm_setup_new_form_vars', $values);
-    }
+		return apply_filters('frm_setup_new_form_vars', $values);
+	}
 
-    /**
-     * Used when editing a form
-     */
-    public static function setup_edit_vars( $values, $record, $post_values = array() ) {
+	/**
+	 * Used when editing a form
+	 */
+	public static function setup_edit_vars( $values, $record, $post_values = array() ) {
 		if ( empty( $post_values ) ) {
 			$post_values = stripslashes_deep( $_POST );
 		}
 
-        $values['form_key'] = isset($post_values['form_key']) ? $post_values['form_key'] : $record->form_key;
-        $values['default_template'] = isset($post_values['default_template']) ? $post_values['default_template'] : $record->default_template;
-        $values['is_template'] = isset($post_values['is_template']) ? $post_values['is_template'] : $record->is_template;
-        $values['status'] = $record->status;
+		$values['form_key'] = isset($post_values['form_key']) ? $post_values['form_key'] : $record->form_key;
+		$values['default_template'] = isset($post_values['default_template']) ? $post_values['default_template'] : $record->default_template;
+		$values['is_template'] = isset($post_values['is_template']) ? $post_values['is_template'] : $record->is_template;
+		$values['status'] = $record->status;
 
-        $values = self::fill_default_opts($values, $record, $post_values);
+		$values = self::fill_default_opts($values, $record, $post_values);
 
-        return apply_filters('frm_setup_edit_form_vars', $values);
-    }
+		return apply_filters('frm_setup_edit_form_vars', $values);
+	}
 
 	public static function fill_default_opts( $values, $record, $post_values ) {
 
-        $defaults = self::get_default_opts();
+		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-            if ( is_array($default) ) {
-                if ( ! isset( $values[ $var ] ) ) {
+			if ( is_array($default) ) {
+				if ( ! isset( $values[ $var ] ) ) {
 					$values[ $var ] = ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : array();
-                }
+				}
 
-                foreach ( $default as $k => $v ) {
+				foreach ( $default as $k => $v ) {
 					$values[ $var ][ $k ] = ( $post_values && isset( $post_values[ $var ][ $k ] ) ) ? $post_values[ $var ][ $k ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ) ? $record->options[ $var ][ $k ] : $v);
 
-                    if ( is_array( $v ) ) {
-                        foreach ( $v as $k1 => $v1 ) {
+					if ( is_array( $v ) ) {
+						foreach ( $v as $k1 => $v1 ) {
 							$values[ $var ][ $k ][ $k1 ] = ( $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ) ? $post_values[ $var ][ $k ][ $k1 ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
-                            unset( $k1, $v1 );
-                        }
-                    }
+							unset( $k1, $v1 );
+						}
+					}
 
-                    unset($k, $v);
-                }
-            } else {
+					unset($k, $v);
+				}
+			} else {
 				$values[ $var ] = ( $post_values && isset( $post_values['options'][ $var ] ) ) ? $post_values['options'][ $var ] : ( ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : $default );
-            }
+			}
 
-            unset($var, $default);
-        }
+			unset($var, $default);
+		}
 
-        return $values;
-    }
+		return $values;
+	}
 
-    public static function get_default_opts() {
-        $frm_settings = FrmAppHelper::get_settings();
+	public static function get_default_opts() {
+		$frm_settings = FrmAppHelper::get_settings();
 
-        return array(
-            'submit_value' => $frm_settings->submit_value, 'success_action' => 'message',
-            'success_msg' => $frm_settings->success_msg, 'show_form' => 0, 'akismet' => '',
-            'no_save' => 0, 'ajax_load' => 0, 'form_class' => '', 'custom_style' => 1,
-            'before_html' => self::get_default_html('before'),
-            'after_html' => '',
-            'submit_html' => self::get_default_html('submit'),
-        );
-    }
+		return array(
+			'submit_value' => $frm_settings->submit_value, 'success_action' => 'message',
+			'success_msg' => $frm_settings->success_msg, 'show_form' => 0, 'akismet' => '',
+			'no_save' => 0, 'ajax_load' => 0, 'form_class' => '', 'custom_style' => 1,
+			'before_html' => self::get_default_html('before'),
+			'after_html' => '',
+			'submit_html' => self::get_default_html('submit'),
+		);
+	}
 
 	/**
 	 * @param array $options
@@ -244,15 +244,15 @@ 
 		}
 	}
 
-    /**
-     * @param string $loc
-     */
+	/**
+	 * @param string $loc
+	 */
 	public static function get_default_html( $loc ) {
 		if ( $loc == 'submit' ) {
-            $sending = __( 'Sending', 'formidable' );
-            $draft_link = self::get_draft_link();
-            $img = '[frmurl]/images/ajax_loader.gif';
-            $default_html = <<<SUBMIT_HTML
+			$sending = __( 'Sending', 'formidable' );
+			$draft_link = self::get_draft_link();
+			$img = '[frmurl]/images/ajax_loader.gif';
+			$default_html = <<<SUBMIT_HTML
 <div class="frm_submit">
 [if back_button]<input type="button" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" class="frm_prev_page" [back_hook] />[/if back_button]
 <input type="submit" value="[button_label]" [button_action] />
@@ -261,49 +261,49 @@ 
 </div>
 SUBMIT_HTML;
 		} else if ( $loc == 'before' ) {
-            $default_html = <<<BEFORE_HTML
+			$default_html = <<<BEFORE_HTML
 <legend class="frm_hidden">[form_name]</legend>
 [if form_name]<h3 class="frm_form_title">[form_name]</h3>[/if form_name]
 [if form_description]<div class="frm_description">[form_description]</div>[/if form_description]
 BEFORE_HTML;
 		} else {
-            $default_html = '';
-        }
+			$default_html = '';
+		}
 
-        return $default_html;
-    }
+		return $default_html;
+	}
 
-    public static function get_draft_link() {
-        $link = '[if save_draft]<a href="#" class="frm_save_draft" [draft_hook]>[draft_label]</a>[/if save_draft]';
-        return $link;
-    }
+	public static function get_draft_link() {
+		$link = '[if save_draft]<a href="#" class="frm_save_draft" [draft_hook]>[draft_label]</a>[/if save_draft]';
+		return $link;
+	}
 
 	public static function get_custom_submit( $html, $form, $submit, $form_action, $values ) {
-        $button = self::replace_shortcodes($html, $form, $submit, $form_action, $values);
-        if ( ! strpos($button, '[button_action]') ) {
-            return;
-        }
+		$button = self::replace_shortcodes($html, $form, $submit, $form_action, $values);
+		if ( ! strpos($button, '[button_action]') ) {
+			return;
+		}
 
-        $button_parts = explode('[button_action]', $button);
-        echo $button_parts[0];
-        //echo ' id="frm_submit_"';
+		$button_parts = explode('[button_action]', $button);
+		echo $button_parts[0];
+		//echo ' id="frm_submit_"';
 
-        $classes = apply_filters('frm_submit_button_class', array(), $form);
-        if ( ! empty($classes) ) {
+		$classes = apply_filters('frm_submit_button_class', array(), $form);
+		if ( ! empty($classes) ) {
 			echo ' class="' . esc_attr( implode( ' ', $classes ) ) . '"';
-        }
-
-        do_action('frm_submit_button_action', $form, $form_action);
-        echo $button_parts[1];
-    }
-
-    /**
-     * Automatically add end section fields if they don't exist (2.0 migration)
-     * @since 2.0
-     *
-     * @param boolean $reset_fields
-     */
-    public static function auto_add_end_section_fields( $form, $fields, &$reset_fields ) {
+		}
+
+		do_action('frm_submit_button_action', $form, $form_action);
+		echo $button_parts[1];
+	}
+
+	/**
+	 * Automatically add end section fields if they don't exist (2.0 migration)
+	 * @since 2.0
+	 *
+	 * @param boolean $reset_fields
+	 */
+	public static function auto_add_end_section_fields( $form, $fields, &$reset_fields ) {
 		if ( empty( $fields ) ) {
 			return;
 		}
@@ -312,7 +312,7 @@ 
 		$open = $prev_order = false;
 		$add_order = 0;
 		$last_field = false;
-        foreach ( $fields as $field ) {
+		foreach ( $fields as $field ) {
 			if ( $prev_order === $field->field_order ) {
 				$add_order++;
 			}
@@ -323,48 +323,48 @@ 
 				FrmField::update( $field->id, array( 'field_order' => $field->field_order ) );
 			}
 
-            switch ( $field->type ) {
-                case 'divider':
-                    // create an end section if open
+			switch ( $field->type ) {
+				case 'divider':
+					// create an end section if open
 					self::maybe_create_end_section( $open, $reset_fields, $add_order, $end_section_values, $field, 'move' );
 
-                    // mark it open for the next end section
-                    $open = true;
-                break;
-                case 'break';
+					// mark it open for the next end section
+					$open = true;
+				break;
+				case 'break';
 					self::maybe_create_end_section( $open, $reset_fields, $add_order, $end_section_values, $field, 'move' );
-                break;
-                case 'end_divider':
-                    if ( ! $open ) {
-                        // the section isn't open, so this is an extra field that needs to be removed
-                        FrmField::destroy( $field->id );
-                        $reset_fields = true;
-                    }
-
-                    // There is already an end section here, so there is no need to create one
-                    $open = false;
-            }
+				break;
+				case 'end_divider':
+					if ( ! $open ) {
+						// the section isn't open, so this is an extra field that needs to be removed
+						FrmField::destroy( $field->id );
+						$reset_fields = true;
+					}
+
+					// There is already an end section here, so there is no need to create one
+					$open = false;
+			}
 			$prev_order = $field->field_order;
 
 			$last_field = $field;
 			unset( $field );
-        }
+		}
 
 		self::maybe_create_end_section( $open, $reset_fields, $add_order, $end_section_values, $last_field );
-    }
+	}
 
 	/**
 	 * Create end section field if it doesn't exist. This is for migration from < 2.0
 	 * Fix any ordering that may be messed up
 	 */
 	public static function maybe_create_end_section( &$open, &$reset_fields, &$add_order, $end_section_values, $field, $move = 'no' ) {
-        if ( ! $open ) {
-            return;
-        }
+		if ( ! $open ) {
+			return;
+		}
 
 		$end_section_values['field_order'] = $field->field_order + 1;
 
-        FrmField::create( $end_section_values );
+		FrmField::create( $end_section_values );
 
 		if ( $move == 'move' ) {
 			// bump the order of current field unless we're at the end of the form
@@ -372,39 +372,39 @@ 
 		}
 
 		$add_order += 2;
-        $open = false;
-        $reset_fields = true;
-    }
+		$open = false;
+		$reset_fields = true;
+	}
 
-    public static function replace_shortcodes( $html, $form, $title = false, $description = false, $values = array() ) {
+	public static function replace_shortcodes( $html, $form, $title = false, $description = false, $values = array() ) {
 		foreach ( array( 'form_name' => $title, 'form_description' => $description, 'entry_key' => true ) as $code => $show ) {
-            if ( $code == 'form_name' ) {
-                $replace_with = $form->name;
-            } else if ( $code == 'form_description' ) {
-                $replace_with = FrmAppHelper::use_wpautop($form->description);
-            } else if ( $code == 'entry_key' && isset($_GET) && isset($_GET['entry']) ) {
-                $replace_with = FrmAppHelper::simple_get( 'entry' );
-            } else {
-                $replace_with = '';
-            }
+			if ( $code == 'form_name' ) {
+				$replace_with = $form->name;
+			} else if ( $code == 'form_description' ) {
+				$replace_with = FrmAppHelper::use_wpautop($form->description);
+			} else if ( $code == 'entry_key' && isset($_GET) && isset($_GET['entry']) ) {
+				$replace_with = FrmAppHelper::simple_get( 'entry' );
+			} else {
+				$replace_with = '';
+			}
 
-            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true($show) && $replace_with != '' ), $code, $replace_with, $html );
-        }
+			FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true($show) && $replace_with != '' ), $code, $replace_with, $html );
+		}
 
-        //replace [form_key]
-        $html = str_replace('[form_key]', $form->form_key, $html);
+		//replace [form_key]
+		$html = str_replace('[form_key]', $form->form_key, $html);
 
-        //replace [frmurl]
-        $html = str_replace('[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html);
+		//replace [frmurl]
+		$html = str_replace('[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html);
 
 		if ( strpos( $html, '[button_label]' ) ) {
 			add_filter( 'frm_submit_button', 'FrmFormsHelper::submit_button_label', 1 );
 			$submit_label = apply_filters( 'frm_submit_button', $title, $form );
 			$submit_label = esc_attr( do_shortcode( $submit_label ) );
 			$html = str_replace( '[button_label]', $submit_label, $html );
-        }
+		}
 
-        $html = apply_filters('frm_form_replace_shortcodes', $html, $form, $values);
+		$html = apply_filters('frm_form_replace_shortcodes', $html, $form, $values);
 
 		if ( strpos( $html, '[if back_button]' ) ) {
 			$html = preg_replace( '/(\[if\s+back_button\])(.*?)(\[\/if\s+back_button\])/mis', '', $html );
@@ -418,32 +418,32 @@ 
 			$html = do_shortcode( $html );
 		}
 
-        return $html;
-    }
+		return $html;
+	}
 
 	public static function submit_button_label( $submit ) {
-        if ( ! $submit || empty($submit) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $submit = $frm_settings->submit_value;
-        }
+		if ( ! $submit || empty($submit) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$submit = $frm_settings->submit_value;
+		}
 
-        return $submit;
-    }
+		return $submit;
+	}
 
 	public static function get_form_style_class( $form = false ) {
-        $style = self::get_form_style($form);
-        $class = ' with_frm_style';
-
-        if ( empty($style) ) {
-            if ( FrmAppHelper::is_admin_page('formidable-entries') ) {
-                return $class;
-            } else {
-                return;
-            }
-        }
-
-        //If submit button needs to be inline or centered
-        if ( is_object($form) ) {
+		$style = self::get_form_style($form);
+		$class = ' with_frm_style';
+
+		if ( empty($style) ) {
+			if ( FrmAppHelper::is_admin_page('formidable-entries') ) {
+				return $class;
+			} else {
+				return;
+			}
+		}
+
+		//If submit button needs to be inline or centered
+		if ( is_object($form) ) {
 			$form = $form->options;
 		}
 
@@ -455,17 +455,17 @@ 
 			$class .= ' frm_center_submit';
 		}
 
-        $class = apply_filters('frm_add_form_style_class', $class, $style);
+		$class = apply_filters('frm_add_form_style_class', $class, $style);
 
-        return $class;
-    }
+		return $class;
+	}
 
-    /**
-     * @param string|boolean $form
-     *
-     * @return string
-     */
-    public static function get_form_style( $form ) {
+	/**
+	 * @param string|boolean $form
+	 *
+	 * @return string
+	 */
+	public static function get_form_style( $form ) {
 		$style = 1;
 		if ( empty( $form ) || 'default' == 'form' ) {
 			return $style;
@@ -485,7 +485,7 @@ 
 		$style = ( $form && is_object( $form ) && isset( $form->options['custom_style'] ) ) ? $form->options['custom_style'] : $style;
 
 		return $style;
-    }
+	}
 
 	/**
 	 * Display the validation error messages when an entry is submitted
@@ -539,74 +539,74 @@ 
 	}
 
 	public static function get_scroll_js( $form_id ) {
-        ?><script type="text/javascript">document.addEventListener('DOMContentLoaded',function(){frmFrontForm.scrollMsg(<?php echo (int) $form_id ?>);})</script><?php
-    }
+		?><script type="text/javascript">document.addEventListener('DOMContentLoaded',function(){frmFrontForm.scrollMsg(<?php echo (int) $form_id ?>);})</script><?php
+	}
 
 	public static function edit_form_link( $form_id ) {
-        if ( is_object($form_id) ) {
-            $form = $form_id;
-            $name = $form->name;
-            $form_id = $form->id;
-        } else {
-            $name = FrmForm::getName($form_id);
-        }
-
-        if ( $form_id ) {
+		if ( is_object($form_id) ) {
+			$form = $form_id;
+			$name = $form->name;
+			$form_id = $form->id;
+		} else {
+			$name = FrmForm::getName($form_id);
+		}
+
+		if ( $form_id ) {
 			$val = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ) ) . '">' . ( '' == $name ? __( '(no title)' ) : FrmAppHelper::truncate( $name, 40 ) ) . '</a>';
-	    } else {
-	        $val = '';
-	    }
+		} else {
+			$val = '';
+		}
 
-	    return $val;
+		return $val;
 	}
 
 	public static function delete_trash_link( $id, $status, $length = 'long' ) {
-        $link = '';
-        $labels = array(
-            'restore' => array(
-                'long'  => __( 'Restore from Trash', 'formidable' ),
-                'short' => __( 'Restore', 'formidable' ),
-            ),
-            'trash' => array(
-                'long'  => __( 'Move to Trash', 'formidable' ),
-                'short' => __( 'Trash', 'formidable' ),
-            ),
-            'delete' => array(
-                'long'  => __( 'Delete Permanently', 'formidable' ),
-                'short' => __( 'Delete', 'formidable' ),
-            ),
-        );
-
-        $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$link = '';
+		$labels = array(
+			'restore' => array(
+				'long'  => __( 'Restore from Trash', 'formidable' ),
+				'short' => __( 'Restore', 'formidable' ),
+			),
+			'trash' => array(
+				'long'  => __( 'Move to Trash', 'formidable' ),
+				'short' => __( 'Trash', 'formidable' ),
+			),
+			'delete' => array(
+				'long'  => __( 'Delete Permanently', 'formidable' ),
+				'short' => __( 'Delete', 'formidable' ),
+			),
+		);
+
+		$current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$base_url = '?page=formidable&form_type=' . $current_page . '&id=' . $id;
-        if ( 'trash' == $status ) {
+		if ( 'trash' == $status ) {
 			$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][ $length ] . '</a>';
-        } else if ( current_user_can('frm_delete_forms') ) {
-            if ( EMPTY_TRASH_DAYS ) {
+		} else if ( current_user_can('frm_delete_forms') ) {
+			if ( EMPTY_TRASH_DAYS ) {
 				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][ $length ] . '</a>';
-            } else {
+			} else {
 				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][ $length ] . '</a>';
-            }
-        }
+			}
+		}
 
-        return $link;
-    }
+		return $link;
+	}
 
 	public static function status_nice_name( $status ) {
-        $nice_names = array(
-            'draft'     => __( 'Draft', 'formidable' ),
-            'trash'     => __( 'Trash', 'formidable' ),
-            'publish'   => __( 'Published', 'formidable' ),
-        );
-
-        if ( ! in_array($status, array_keys($nice_names)) ) {
-            $status = 'publish';
-        }
+		$nice_names = array(
+			'draft'     => __( 'Draft', 'formidable' ),
+			'trash'     => __( 'Trash', 'formidable' ),
+			'publish'   => __( 'Published', 'formidable' ),
+		);
+
+		if ( ! in_array($status, array_keys($nice_names)) ) {
+			$status = 'publish';
+		}
 
 		$name = $nice_names[ $status ];
 
-        return $name;
-    }
+		return $name;
+	}
 
 	public static function get_params() {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::list_page_params' );

classes/helpers/FrmListHelper.php

Indentation +7 added lines, -7 removed lines

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

Doc Comments +6 added lines

@@ -253,6 +253,9 @@ 
 <?php
 	}
 
+	/**
+	 * @param string $param_name
+	 */
 	private function hidden_search_inputs( $param_name ) {
 		if ( ! empty( $_REQUEST[ $param_name ] ) ) {
 			echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $_REQUEST[ $param_name ] ) . '" />';
@@ -389,6 +392,9 @@ 
 		return $action;
 	}
 
+	/**
+	 * @param string $action_name
+	 */
 	private static function get_bulk_action( $action_name ) {
 		$action = false;
 		if ( isset( $_REQUEST[ $action_name ] ) && -1 != sanitize_text_field( $_REQUEST[ $action_name ] ) ) {

Spacing +16 added lines, -16 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -197,8 +197,8 @@ 
 			return $this->get_pagenum();
 		}
 
-		if ( isset( $this->_pagination_args[ $key ] ) ) {
-			return $this->_pagination_args[ $key ];
+		if ( isset( $this->_pagination_args[$key] ) ) {
+			return $this->_pagination_args[$key];
 		}
 	}
 
@@ -253,8 +253,8 @@ 
 	}
 
 	private function hidden_search_inputs( $param_name ) {
-		if ( ! empty( $_REQUEST[ $param_name ] ) ) {
-			echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $_REQUEST[ $param_name ] ) . '" />';
+		if ( ! empty( $_REQUEST[$param_name] ) ) {
+			echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $_REQUEST[$param_name] ) . '" />';
 		}
 	}
 
@@ -297,7 +297,7 @@ 
 
 		echo "<ul class='subsubsub'>\n";
 		foreach ( $views as $class => $view ) {
-			$views[ $class ] = "\t<li class='$class'>$view";
+			$views[$class] = "\t<li class='$class'>$view";
 		}
 		echo implode( " |</li>\n", $views ) . "</li>\n";
 		echo '</ul>';
@@ -390,8 +390,8 @@ 
 
 	private static function get_bulk_action( $action_name ) {
 		$action = false;
-		if ( isset( $_REQUEST[ $action_name ] ) && -1 != sanitize_text_field( $_REQUEST[ $action_name ] ) ) {
-			$action = sanitize_text_field( $_REQUEST[ $action_name ] );
+		if ( isset( $_REQUEST[$action_name] ) && -1 != sanitize_text_field( $_REQUEST[$action_name] ) ) {
+			$action = sanitize_text_field( $_REQUEST[$action_name] );
 		}
 		return $action;
 	}
@@ -416,7 +416,7 @@ 
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
-			++$i;
+			++ $i;
 			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
 			$out .= "<span class='$action'>$link$sep</span>";
 		}
@@ -684,7 +684,7 @@ 
 
 		// If the primary column doesn't exist fall back to the
 		// first non-checkbox column.
-		if ( ! isset( $columns[ $default ] ) ) {
+		if ( ! isset( $columns[$default] ) ) {
 			$default = FrmListHelper::get_default_primary_column_name();
 		}
 
@@ -698,7 +698,7 @@ 
 		 */
 		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
 
-		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
+		if ( empty( $column ) || ! isset( $columns[$column] ) ) {
 			$column = $default;
 		}
 
@@ -720,7 +720,7 @@ 
 			// In 4.3, we added a fourth argument for primary column.
 			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
 			foreach ( $this->_column_headers as $key => $value ) {
-				$column_headers[ $key ] = $value;
+				$column_headers[$key] = $value;
 			}
 
 			return $column_headers;
@@ -753,7 +753,7 @@ 
 				$data[1] = false;
 			}
 
-			$sortable[ $id ] = $data;
+			$sortable[$id] = $data;
 		}
 
 		$primary = $this->get_primary_column_name();
@@ -808,7 +808,7 @@ 
 			static $cb_counter = 1;
 			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
 				. '<input id="cb-select-all-' . esc_attr( $cb_counter ) . '" type="checkbox" />';
-			$cb_counter++;
+			$cb_counter ++;
 		}
 
 		foreach ( $columns as $column_key => $column_display_name ) {
@@ -828,8 +828,8 @@ 
 				$class[] = 'column-primary';
 			}
 
-			if ( isset( $sortable[ $column_key ] ) ) {
-				list( $orderby, $desc_first ) = $sortable[ $column_key ];
+			if ( isset( $sortable[$column_key] ) ) {
+				list( $orderby, $desc_first ) = $sortable[$column_key];
 
 				if ( $current_orderby == $orderby ) {
 					$order = 'asc' == $current_order ? 'desc' : 'asc';

classes/models/FrmEDD_SL_Plugin_Updater.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      * @uses api_request()
      *
      * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
+     * @return stdClass Modified update array with custom plugin data.
      */
     public function check_update( $_transient_data ) {
 

Indentation +155 added lines, -155 removed lines

@@ -15,23 +15,23 @@ 
  * @version 1.6.3
  */
 class FrmEDD_SL_Plugin_Updater {
-    private $api_url   = '';
-    private $api_data  = array();
-    private $name      = '';
-    private $slug      = '';
-    private $version   = '';
-
-    /**
-     * Class constructor.
-     *
-     * @uses plugin_basename()
-     * @uses hook()
-     *
-     * @param string  $_api_url     The URL pointing to the custom API endpoint.
-     * @param string  $_plugin_file Path to the plugin file.
-     * @param array   $_api_data    Optional data to send with API calls.
-     */
-    public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+	private $api_url   = '';
+	private $api_data  = array();
+	private $name      = '';
+	private $slug      = '';
+	private $version   = '';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @uses plugin_basename()
+	 * @uses hook()
+	 *
+	 * @param string  $_api_url     The URL pointing to the custom API endpoint.
+	 * @param string  $_plugin_file Path to the plugin file.
+	 * @param array   $_api_data    Optional data to send with API calls.
+	 */
+	public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
 		global $frm_edd_plugin_data;
 
 		$this->api_url  = trailingslashit( $_api_url );
@@ -44,159 +44,159 @@ 
 
 		// Set up hooks.
 		$this->init();
-    }
-
-    /**
-     * Set up WordPress filters to hook into WP's update process.
-     *
-     * @uses add_filter()
-     *
-     * @return void
-     */
-    public function init() {
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+	}
+
+	/**
+	 * Set up WordPress filters to hook into WP's update process.
+	 *
+	 * @uses add_filter()
+	 *
+	 * @return void
+	 */
+	public function init() {
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
 		add_action( 'admin_init', array( $this, 'show_changelog' ) );
-    }
-
-    /**
-     * Check for Updates at the defined API endpoint and modify the update array.
-     *
-     * This function dives into the update API just when WordPress creates its update array,
-     * then adds a custom API call and injects the custom plugin data retrieved from the API.
-     * It is reassembled from parts of the native WordPress plugin update code.
-     * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
-     *
-     * @uses api_request()
-     *
-     * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
-     */
-    public function check_update( $_transient_data ) {
-
-        global $pagenow;
-
-        if ( ! is_object( $_transient_data ) ) {
-            $_transient_data = new stdClass;
-        }
+	}
+
+	/**
+	 * Check for Updates at the defined API endpoint and modify the update array.
+	 *
+	 * This function dives into the update API just when WordPress creates its update array,
+	 * then adds a custom API call and injects the custom plugin data retrieved from the API.
+	 * It is reassembled from parts of the native WordPress plugin update code.
+	 * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param array   $_transient_data Update array build by WordPress.
+	 * @return array Modified update array with custom plugin data.
+	 */
+	public function check_update( $_transient_data ) {
+
+		global $pagenow;
+
+		if ( ! is_object( $_transient_data ) ) {
+			$_transient_data = new stdClass;
+		}
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
 
-                if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
 					if ( empty( $version_info->plugin ) ) {
 						$version_info->plugin = $this->name;
 					}
 
-                    $_transient_data->response[ $this->name ] = $version_info;
-
-                }
-
-                $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
-
-            }
-        }
-
-        return $_transient_data;
-    }
-
-    /**
-     * Updates information on the "View version x.x details" page with custom data.
-     *
-     * @uses api_request()
-     *
-     * @param mixed   $_data
-     * @param string  $_action
-     * @param object  $_args
-     * @return object $_data
-     */
-    public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
-
-        if ( $_action != 'plugin_information' ) {
+					$_transient_data->response[ $this->name ] = $version_info;
 
-            return $_data;
+				}
 
-        }
+				$_transient_data->last_checked = time();
+				$_transient_data->checked[ $this->name ] = $this->version;
 
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+			}
+		}
 
-            return $_data;
+		return $_transient_data;
+	}
 
-        }
+	/**
+	 * Updates information on the "View version x.x details" page with custom data.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param mixed   $_data
+	 * @param string  $_action
+	 * @param object  $_args
+	 * @return object $_data
+	 */
+	public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
 
-        $to_send = array(
-            'slug'   => $this->slug,
-            'is_ssl' => is_ssl(),
-            'fields' => array(
-                'banners' => false, // These will be supported soon hopefully
-                'reviews' => false,
-            ),
-        );
+		if ( $_action != 'plugin_information' ) {
 
-        $api_response = $this->api_request( 'plugin_information', $to_send );
+			return $_data;
 
-        if ( false !== $api_response ) {
-            $_data = $api_response;
-        }
+		}
 
-        return $_data;
-    }
+		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
 
+			return $_data;
 
-    /**
-     * Disable SSL verification in order to prevent download update failures
-     *
-     * @param array   $args
-     * @param string  $url
-     * @return object $array
-     */
-    public function http_request_args( $args, $url ) {
-        // If it is an https request and we are performing a package download, disable ssl verification
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
-            $args['sslverify'] = false;
-        }
-        return $args;
-    }
+		}
 
-    /**
-     * Calls the API and, if successfull, returns the object delivered by the API.
-     *
-     * @uses get_bloginfo()
-     * @uses wp_remote_post()
-     * @uses is_wp_error()
-     *
-     * @param string  $_action The requested action.
-     * @param array   $_data   Parameters for the API action.
-     * @return false|object
-     */
-    private function api_request( $_action, $_data ) {
+		$to_send = array(
+			'slug'   => $this->slug,
+			'is_ssl' => is_ssl(),
+			'fields' => array(
+				'banners' => false, // These will be supported soon hopefully
+				'reviews' => false,
+			),
+		);
 
-        global $wp_version;
+		$api_response = $this->api_request( 'plugin_information', $to_send );
 
-        $data = array_merge( $this->api_data, $_data );
+		if ( false !== $api_response ) {
+			$_data = $api_response;
+		}
 
-        if ( $data['slug'] != $this->slug ) {
-            return;
+		return $_data;
+	}
+
+
+	/**
+	 * Disable SSL verification in order to prevent download update failures
+	 *
+	 * @param array   $args
+	 * @param string  $url
+	 * @return object $array
+	 */
+	public function http_request_args( $args, $url ) {
+		// If it is an https request and we are performing a package download, disable ssl verification
+		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+			$args['sslverify'] = false;
+		}
+		return $args;
+	}
+
+	/**
+	 * Calls the API and, if successfull, returns the object delivered by the API.
+	 *
+	 * @uses get_bloginfo()
+	 * @uses wp_remote_post()
+	 * @uses is_wp_error()
+	 *
+	 * @param string  $_action The requested action.
+	 * @param array   $_data   Parameters for the API action.
+	 * @return false|object
+	 */
+	private function api_request( $_action, $_data ) {
+
+		global $wp_version;
+
+		$data = array_merge( $this->api_data, $_data );
+
+		if ( $data['slug'] != $this->slug ) {
+			return;
 		}
 
-        if ( $this->api_url == home_url() ) {
-            return false; // Don't allow a plugin to ping itself
-        }
+		if ( $this->api_url == home_url() ) {
+			return false; // Don't allow a plugin to ping itself
+		}
 
-        $api_params = array(
-            'edd_action' => 'get_version',
-            'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
-            'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-            'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
-            'slug'       => $data['slug'],
-            'author'     => $data['author'],
-            'url'        => home_url(),
-        );
+		$api_params = array(
+			'edd_action' => 'get_version',
+			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
+			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
+			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'slug'       => $data['slug'],
+			'author'     => $data['author'],
+			'url'        => home_url(),
+		);
 
 		$cache_key = 'edd_plugin_' . md5( sanitize_key( $api_params['license'] . $this->version ) . '_' . $api_params['edd_action'] );
 		$cached_response = get_transient( $cache_key );
@@ -205,24 +205,24 @@ 
 			return $cached_response;
 		}
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
-        }
+		if ( ! is_wp_error( $request ) ) {
+			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		}
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
+		if ( $request && isset( $request->sections ) ) {
+			$request->sections = maybe_unserialize( $request->sections );
 			set_transient( $cache_key, $request, DAY_IN_SECONDS );
-        } else {
-            $request = false;
+		} else {
+			$request = false;
 			set_transient( $cache_key, 0, DAY_IN_SECONDS );
-        }
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    public function show_changelog() {
+	public function show_changelog() {
 
 		global $frm_edd_plugin_data;
 
@@ -278,5 +278,5 @@ 
 		}
 
 		exit;
-    }
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
 		$this->slug     = basename( $_plugin_file, '.php' );
 		$this->version  = $_api_data['version'];
 
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
 
 		// Set up hooks.
 		$this->init();
@@ -80,7 +80,7 @@ 
             $_transient_data = new stdClass;
         }
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[$this->name] ) ) {
 
             $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
@@ -92,12 +92,12 @@ 
 						$version_info->plugin = $this->name;
 					}
 
-                    $_transient_data->response[ $this->name ] = $version_info;
+                    $_transient_data->response[$this->name] = $version_info;
 
                 }
 
                 $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
+                $_transient_data->checked[$this->name] = $this->version;
 
             }
         }
@@ -242,7 +242,7 @@ 
 			wp_die( __( 'You do not have permission to install plugin updates', 'formidable' ), __( 'Error', 'formidable' ), array( 'response' => 403 ) );
 		}
 
-		$data         = $frm_edd_plugin_data[ $_REQUEST['slug'] ];
+		$data         = $frm_edd_plugin_data[$_REQUEST['slug']];
 		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_version_info' );
 		$version_info = get_transient( $cache_key );