gravityview / GravityView

gravityview.php

Indentation +33 added lines, -33 removed lines

@@ -312,11 +312,11 @@ 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
 
 
-        /**
-         * When an entry is created, check if we need to update the custom slug meta
-         * todo: move this to its own class..
-         */
-        add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
+		/**
+		 * When an entry is created, check if we need to update the custom slug meta
+		 * todo: move this to its own class..
+		 */
+		add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
 
 		/**
 		 * @action `gravityview_include_frontend_actions` Triggered after all GravityView frontend files are loaded
@@ -347,34 +347,34 @@ 
 
 	/** DEBUG */
 
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
-     * @param mixed $data Additional data to display
-     * @return void
-     */
-    public static function log_debug( $message, $data = null ){
-	    /**
-	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
-	     * @param string $message Message to display
-	     * @param mixed $data Supporting data to print alongside it
-	     */
-    	do_action( 'gravityview_log_debug', $message, $data );
-    }
-
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
-     * @return void
-     */
-    public static function log_error( $message, $data = null ){
-	    /**
-	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
-	     * @param string $message Error message to display
-	     * @param mixed $data Supporting data to print alongside it
-	     */
-    	do_action( 'gravityview_log_error', $message, $data );
-    }
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
+	 * @param mixed $data Additional data to display
+	 * @return void
+	 */
+	public static function log_debug( $message, $data = null ){
+		/**
+		 * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
+		 * @param string $message Message to display
+		 * @param mixed $data Supporting data to print alongside it
+		 */
+		do_action( 'gravityview_log_debug', $message, $data );
+	}
+
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
+	 * @return void
+	 */
+	public static function log_error( $message, $data = null ){
+		/**
+		 * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
+		 * @param string $message Error message to display
+		 * @param mixed $data Supporting data to print alongside it
+		 */
+		do_action( 'gravityview_log_error', $message, $data );
+	}
 
 } // end class GravityView_Plugin
 

Spacing +28 added lines, -28 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -83,7 +83,7 @@ 
 
 		self::require_files();
 
-		if( ! GravityView_Compatibility::is_valid() ) {
+		if ( ! GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -98,14 +98,14 @@ 
 	 */
 	private static function require_files() {
 		require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
-		require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
+		require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' );
+		require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' );
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
-		require_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
-		require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
+		require_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' );
+		require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' );
+		require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' );
 	}
 
 	/**
@@ -138,22 +138,22 @@ 
 		}
 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval-status.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-approval.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval.php' );
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' );
 
 		// Load Extensions
 		// @todo: Convert to a scan of the directory or a method where this all lives
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/entry-notes/class-gravityview-field-notes.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/entry-notes/class-gravityview-field-notes.php' );
 
 		// Load WordPress Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' );
 
 		// Load GravityView Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' );
 
 		// Add oEmbed
 		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
@@ -166,7 +166,7 @@ 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
 		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -181,7 +181,7 @@ 
 	 * @return bool
 	 */
 	public static function is_network_activated() {
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
+		return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
 	}
 
 
@@ -246,7 +246,7 @@ 
 	 * @since 1.7.5.1
 	 */
 	public static function include_widget_class() {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
 	}
 
 
@@ -268,7 +268,7 @@ 
 		}
 		if ( ! $loaded ) {
 			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
+			$mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo';
 			load_textdomain( 'gravityview', $mofile );
 		}
 
@@ -299,12 +299,12 @@ 
 	 */
 	public function frontend_actions( $force = false ) {
 
-		if( self::is_admin() && ! $force ) { return; }
+		if ( self::is_admin() && ! $force ) { return; }
 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
 
 
@@ -329,8 +329,8 @@ 
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
 		);
 
 		/**
@@ -348,7 +348,7 @@ 
      * @param mixed $data Additional data to display
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Message to display
@@ -362,7 +362,7 @@ 
      * @param  string $message log message
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Error message to display
@@ -373,4 +373,4 @@ 
 
 } // end class GravityView_Plugin
 
-add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1);
+add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 );

includes/admin/field-types/type_hidden.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 			return;
 		}
 
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		$class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
 
 	function render_input( $override_input = null ) {
 
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
 
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+        $class = ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />

includes/admin/metaboxes/class-gravityview-admin-metaboxes.php

Indentation +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
 		if( !GravityView_Compatibility::is_valid() ) { return; }
 
-        self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
+		self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
 
 		include_once self::$metaboxes_dir . 'class-gravityview-metabox-tab.php';
 
@@ -228,13 +228,13 @@ 
 		$get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL;
 
 		if( isset( $form['id'] ) ) {
-		    $form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
+			$form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
 
-		    // The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
-		    $_GET['id'] = $form['id'];
+			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
+			$_GET['id'] = $form['id'];
 
 		} else {
-		    $form_script = 'var form = new Form();';
+			$form_script = 'var form = new Form();';
 		}
 
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>';

Spacing +24 added lines, -24 removed lines

@@ -17,7 +17,7 @@ 
 	 */
 	function __construct() {
 
-		if( !GravityView_Compatibility::is_valid() ) { return; }
+		if ( ! GravityView_Compatibility::is_valid() ) { return; }
 
         self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
 
@@ -35,9 +35,9 @@ 
 	 */
 	function initialize() {
 
-		add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ));
+		add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ) );
 
-		add_action( 'add_meta_boxes_gravityview' , array( $this, 'update_priority' ) );
+		add_action( 'add_meta_boxes_gravityview', array( $this, 'update_priority' ) );
 
 		// information box
 		add_action( 'post_submitbox_misc_actions', array( $this, 'render_shortcode_hint' ) );
@@ -51,13 +51,13 @@ 
 	function update_priority() {
 		global $wp_meta_boxes;
 
-		if( ! empty( $wp_meta_boxes['gravityview'] ) ) {
-			foreach( array( 'high', 'core', 'low' ) as $position ) {
-				if( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
-					foreach( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
-						if( ! preg_match( '/^gravityview_/ism', $key ) ) {
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
+			foreach ( array( 'high', 'core', 'low' ) as $position ) {
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
+						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
 						}
 					}
 				}
@@ -69,7 +69,7 @@ 
 		global $post;
 
 		// On Comment Edit, for example, $post isn't set.
-		if( empty( $post ) || !is_object( $post ) || !isset( $post->ID ) ) {
+		if ( empty( $post ) || ! is_object( $post ) || ! isset( $post->ID ) ) {
 			return;
 		}
 
@@ -152,9 +152,9 @@ 
 		 */
 		$metaboxes = apply_filters( 'gravityview/metaboxes/default', $metaboxes );
 
-		foreach( $metaboxes as $m ) {
+		foreach ( $metaboxes as $m ) {
 
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
 
 			GravityView_Metabox_Tabs::add( $tab );
 
@@ -180,8 +180,8 @@ 
 
 		$links = GravityView_Admin_Views::get_connected_form_links( $current_form, false );
 
-		if( !empty( $links ) ) {
-			$links = '<span class="alignright gv-form-links">'. $links .'</span>';
+		if ( ! empty( $links ) ) {
+			$links = '<span class="alignright gv-form-links">' . $links . '</span>';
 		}
 
 		return __( 'Data Source', 'gravityview' ) . $links;
@@ -220,28 +220,28 @@ 
 	 */
 	public static function render_merge_tags_scripts( $curr_form ) {
 
-		if( empty( $curr_form )) {
+		if ( empty( $curr_form ) ) {
 			return NULL;
 		}
 
 		$form = gravityview_get_form( $curr_form );
 
-		$get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL;
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : NULL;
 
-		if( isset( $form['id'] ) ) {
-		    $form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
+		if ( isset( $form[ 'id' ] ) ) {
+		    $form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
 
 		    // The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
-		    $_GET['id'] = $form['id'];
+		    $_GET[ 'id' ] = $form[ 'id' ];
 
 		} else {
 		    $form_script = 'var form = new Form();';
 		}
 
-		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>';
+		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
 
 		// Restore previous $_GET setting
-		$_GET['id'] = $get_id_backup;
+		$_GET[ 'id' ] = $get_id_backup;
 
 		return $output;
 	}
@@ -297,10 +297,10 @@ 
 		global $post;
 
 		// Only show this on GravityView post types.
-		if( false === gravityview_is_admin_page() ) { return; }
+		if ( false === gravityview_is_admin_page() ) { return; }
 
 		// If the View hasn't been configured yet, don't show embed shortcode
-		if( !gravityview_get_directory_fields( $post->ID ) ) { return; }
+		if ( ! gravityview_get_directory_fields( $post->ID ) ) { return; }
 
 		include self::$metaboxes_dir . 'views/shortcode-hint.php';
 	}

includes/class-ajax.php

Indentation +28 added lines, -28 removed lines

@@ -136,7 +136,7 @@ 
 
 		// template areas
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
+		$template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
 
 		// widget areas
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
@@ -328,40 +328,40 @@ 
 		// load file
 		$xmlstr = file_get_contents( $form_file );
 
-        $options = array(
-            "page" => array("unserialize_as_array" => true),
-            "form"=> array("unserialize_as_array" => true),
-            "field"=> array("unserialize_as_array" => true),
-            "rule"=> array("unserialize_as_array" => true),
-            "choice"=> array("unserialize_as_array" => true),
-            "input"=> array("unserialize_as_array" => true),
-            "routing_item"=> array("unserialize_as_array" => true),
-            "creditCard"=> array("unserialize_as_array" => true),
-            "routin"=> array("unserialize_as_array" => true),
-            "confirmation" => array("unserialize_as_array" => true),
-            "notification" => array("unserialize_as_array" => true)
-        );
+		$options = array(
+			"page" => array("unserialize_as_array" => true),
+			"form"=> array("unserialize_as_array" => true),
+			"field"=> array("unserialize_as_array" => true),
+			"rule"=> array("unserialize_as_array" => true),
+			"choice"=> array("unserialize_as_array" => true),
+			"input"=> array("unserialize_as_array" => true),
+			"routing_item"=> array("unserialize_as_array" => true),
+			"creditCard"=> array("unserialize_as_array" => true),
+			"routin"=> array("unserialize_as_array" => true),
+			"confirmation" => array("unserialize_as_array" => true),
+			"notification" => array("unserialize_as_array" => true)
+		);
 
 		$xml = new RGXML($options);
-        $forms = $xml->unserialize($xmlstr);
+		$forms = $xml->unserialize($xmlstr);
 
-        if( !$forms ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
-        	return false;
-        }
+		if( !$forms ) {
+			do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
+			return false;
+		}
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
-        	$form = $forms[0];
-        }
+		if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
+			$form = $forms[0];
+		}
 
-        if( empty( $form ) ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
-        	return false;
-        }
+		if( empty( $form ) ) {
+			do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
+			return false;
+		}
 
-        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
+		do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
 
-        return $form;
+		return $form;
 
 	}
 

Spacing +74 added lines, -74 removed lines

@@ -36,7 +36,7 @@ 
 		 * Don't exit if we're running test suite.
 		 * @since 1.15
 		 */
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
 			return $mixed;
 		}
 
@@ -50,7 +50,7 @@ 
 	 * @return void
 	 */
 	function check_ajax_nonce() {
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
 			$this->_exit( false );
 		}
 	}
@@ -67,14 +67,14 @@ 
 		//check nonce
 		$this->check_ajax_nonce();
 
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
+		$context = isset( $_POST[ 'context' ] ) ? esc_attr( $_POST[ 'context' ] ) : 'directory';
 
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
-		if( !empty( $_POST['form_id'] ) ) {
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
+			do_action( 'gravityview_render_available_fields', (int)$_POST[ 'form_id' ], $context );
 			$this->_exit();
-		} elseif( !empty( $_POST['template_id'] ) ) {
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			do_action( 'gravityview_render_available_fields', $form, $context );
 			$this->_exit();
 		}
@@ -94,17 +94,17 @@ 
 	function get_active_areas() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			$this->_exit( false );
 		}
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
-		$response['directory'] = ob_get_clean();
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'directory', '', true );
+		$response[ 'directory' ] = ob_get_clean();
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
-		$response['single'] = ob_get_clean();
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
+		$response[ 'single' ] = ob_get_clean();
 
 		$response = array_map( 'gravityview_strip_whitespace', $response );
 
@@ -119,20 +119,20 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			$this->_exit( false );
 		}
 
 		// get the fields xml config file for this specific preset
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
+		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST[ 'template_id' ] );
 		// import fields
-		if( !empty( $preset_fields_path ) ) {
+		if ( ! empty( $preset_fields_path ) ) {
 			$presets = $this->import_fields( $preset_fields_path );
 		} else {
 			$presets = array( 'widgets' => array(), 'fields' => array() );
 		}
 
-		$template_id = esc_attr( $_POST['template_id'] );
+		$template_id = esc_attr( $_POST[ 'template_id' ] );
 
 		// template areas
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
@@ -142,20 +142,20 @@ 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
-		$response['header'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets[ 'widgets' ] );
+		$response[ 'header' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
-		$response['footer'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets[ 'widgets' ] );
+		$response[ 'footer' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
-		$response['directory'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets[ 'fields' ] );
+		$response[ 'directory' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
-		$response['single'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets[ 'fields' ] );
+		$response[ 'single' ] = ob_get_clean();
 
 		$response = array_map( 'gravityview_strip_whitespace', $response );
 
@@ -173,26 +173,26 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			do_action( 'gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.' );
 			$this->_exit( false );
 		}
 
 		// get the xml for this specific template_id
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
+		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST[ 'template_id' ] );
 
 		// import form
 		$form = $this->import_form( $preset_form_xml_path );
 
 		// get the form ID
-		if( false === $form ) {
+		if ( false === $form ) {
 			// send error to user
-			do_action( 'gravityview_log_error', '[create_preset_form] Error importing form for template id: ' . (int) $_POST['template_id'] );
+			do_action( 'gravityview_log_error', '[create_preset_form] Error importing form for template id: ' . (int)$_POST[ 'template_id' ] );
 
 			$this->_exit( false );
 		}
 
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
+		$this->_exit( '<option value="' . esc_attr( $form[ 'id' ] ) . '" selected="selected">' . esc_html( $form[ 'title' ] ) . '</option>' );
 
 	}
 
@@ -206,7 +206,7 @@ 
 
 		do_action( 'gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path );
 
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
 			do_action( 'gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path );
 			return false;
 		}
@@ -218,13 +218,13 @@ 
 		do_action( 'gravityview_log_debug', '[import_form] Importing form (Result)', $count );
 		do_action( 'gravityview_log_debug', '[import_form] Importing form (Form) ', $forms );
 
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[import_form] Form Import Failed!' );
 			return false;
 		}
 
 		// import success - return form id
-		return $forms[0];
+		return $forms[ 0 ];
 	}
 
 
@@ -238,7 +238,7 @@ 
 	function get_field_options() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
 			do_action( 'gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ' );
 			$this->_exit( false );
 		}
@@ -250,10 +250,10 @@ 
 		$_post = array_map( 'esc_attr', $_post );
 
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
+		$input_type = isset( $_post[ 'input_type' ] ) ? esc_attr( $_post[ 'input_type' ] ) : NULL;
+		$context = isset( $_post[ 'context' ] ) ? esc_attr( $_post[ 'context' ] ) : NULL;
 
-		$response = GravityView_Render_Settings::render_field_options( $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
+		$response = GravityView_Render_Settings::render_field_options( $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
 
 		$response = gravityview_strip_whitespace( $response );
 
@@ -274,15 +274,15 @@ 
 		$form = '';
 
 		// if form id is set, use it, else, get form from preset
-		if( !empty( $_POST['form_id'] ) ) {
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
 
-			$form = (int) $_POST['form_id'];
+			$form = (int)$_POST[ 'form_id' ];
 
 		}
 		// get form from preset
-		elseif( !empty( $_POST['template_id'] ) ) {
+		elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -298,27 +298,27 @@ 
 	 * @param  string $template_id Preset template
 	 *
 	 */
-	static function pre_get_form_fields( $template_id = '') {
+	static function pre_get_form_fields( $template_id = '' ) {
 
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Template ID not set.' );
 			return false;
 		} else {
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
-			if( !file_exists( $form_file )  ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' - Importing Form Fields for preset ['. $template_id .']. File not found. file: ' . $form_file );
+			if ( ! file_exists( $form_file ) ) {
+				do_action( 'gravityview_log_error', __METHOD__ . ' - Importing Form Fields for preset [' . $template_id . ']. File not found. file: ' . $form_file );
 				return false;
 			}
 		}
 
 		// Load xml parser (from GravityForms)
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
 		} else {
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
 		}
 
-		if( file_exists( $xml_parser ) ) {
+		if ( file_exists( $xml_parser ) ) {
 			require_once( $xml_parser );
 		} else {
 			do_action( 'gravityview_log_debug', __METHOD__ . ' - Gravity Forms XML Parser not found.', $xml_parser );
@@ -329,37 +329,37 @@ 
 		$xmlstr = file_get_contents( $form_file );
 
         $options = array(
-            "page" => array("unserialize_as_array" => true),
-            "form"=> array("unserialize_as_array" => true),
-            "field"=> array("unserialize_as_array" => true),
-            "rule"=> array("unserialize_as_array" => true),
-            "choice"=> array("unserialize_as_array" => true),
-            "input"=> array("unserialize_as_array" => true),
-            "routing_item"=> array("unserialize_as_array" => true),
-            "creditCard"=> array("unserialize_as_array" => true),
-            "routin"=> array("unserialize_as_array" => true),
-            "confirmation" => array("unserialize_as_array" => true),
-            "notification" => array("unserialize_as_array" => true)
+            "page" => array( "unserialize_as_array" => true ),
+            "form"=> array( "unserialize_as_array" => true ),
+            "field"=> array( "unserialize_as_array" => true ),
+            "rule"=> array( "unserialize_as_array" => true ),
+            "choice"=> array( "unserialize_as_array" => true ),
+            "input"=> array( "unserialize_as_array" => true ),
+            "routing_item"=> array( "unserialize_as_array" => true ),
+            "creditCard"=> array( "unserialize_as_array" => true ),
+            "routin"=> array( "unserialize_as_array" => true ),
+            "confirmation" => array( "unserialize_as_array" => true ),
+            "notification" => array( "unserialize_as_array" => true )
         );
 
-		$xml = new RGXML($options);
-        $forms = $xml->unserialize($xmlstr);
+		$xml = new RGXML( $options );
+        $forms = $xml->unserialize( $xmlstr );
 
-        if( !$forms ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
+        if ( ! $forms ) {
+        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset [' . $template_id . ']. Error importing file. (File)', $form_file );
         	return false;
         }
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
-        	$form = $forms[0];
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
+        	$form = $forms[ 0 ];
         }
 
-        if( empty( $form ) ) {
+        if ( empty( $form ) ) {
         	do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
         	return false;
         }
 
-        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
+        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset [' . $template_id . ']. (Form)', $form );
 
         return $form;
 
@@ -373,38 +373,38 @@ 
 	 */
 	function import_fields( $file ) {
 
-		if( empty( $file ) || !file_exists(  $file ) ) {
+		if ( empty( $file ) || ! file_exists( $file ) ) {
 			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file );
 			return false;
 		}
 
-		if( !class_exists('WXR_Parser') ) {
+		if ( ! class_exists( 'WXR_Parser' ) ) {
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
 		}
 
 		$parser = new WXR_Parser();
 		$presets = $parser->parse( $file );
 
-		if(is_wp_error( $presets )) {
+		if ( is_wp_error( $presets ) ) {
 			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets );
 			return false;
 		}
 
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
 			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file );
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta'] );
+		do_action( 'gravityview_log_debug', '[import_fields] postmeta', $presets[ 'posts' ][ 0 ][ 'postmeta' ] );
 
 		$fields = $widgets = array();
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
-			switch ($meta['key']) {
+		foreach ( $presets[ 'posts' ][ 0 ][ 'postmeta' ] as $meta ) {
+			switch ( $meta[ 'key' ] ) {
 				case '_gravityview_directory_fields':
-					$fields = maybe_unserialize( $meta['value'] );
+					$fields = maybe_unserialize( $meta[ 'value' ] );
 					break;
 				case '_gravityview_directory_widgets':
-					$widgets = maybe_unserialize( $meta['value'] );
+					$widgets = maybe_unserialize( $meta[ 'value' ] );
 					break;
 			}
 		}

includes/class-gravityview-compatibility.php

Indentation +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 			self::$notices['wp_version'] = array(
 				'class' => 'error',
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ),
-			    'cap' => 'update_core',
+				'cap' => 'update_core',
 				'dismiss' => 'wp_version',
 			);
 

Spacing +38 added lines, -38 removed lines

@@ -76,7 +76,7 @@ 
 	 * @return GravityView_Compatibility
 	 */
 	public static function getInstance() {
-		if( self::$instance ) {
+		if ( self::$instance ) {
 			return self::$instance;
 		}
 		return new self;
@@ -123,10 +123,10 @@ 
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
 		// show the notice, but not load any post types or process shortcodes.
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
-		if( ! self::is_valid() ) {
+		if ( ! self::is_valid() ) {
 
 			// If the plugin's not loaded, might as well hide the shortcode for people.
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
 
 		}
 	}
@@ -152,15 +152,15 @@ 
 	 */
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
 
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
 			return null;
 		}
 
 		$notices = self::get_notices();
 
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
-		foreach( (array)$notices as $notice ) {
-			$message .= wpautop( $notice['message'] );
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>';
+		foreach ( (array)$notices as $notice ) {
+			$message .= wpautop( $notice[ 'message' ] );
 		}
 		$message .= '</div>';
 
@@ -178,11 +178,11 @@ 
 	 */
 	public static function check_php() {
 
-		if( false === version_compare( phpversion(), GV_MIN_PHP_VERSION , '>=' ) ) {
+		if ( false === version_compare( phpversion(), GV_MIN_PHP_VERSION, '>=' ) ) {
 
-			self::$notices['php_version'] = array(
+			self::$notices[ 'php_version' ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => 'php_version',
 			);
@@ -190,14 +190,14 @@ 
 			return false;
 		}
 
-		if( false === version_compare( phpversion(), GV_FUTURE_MIN_PHP_VERSION , '>=' ) ) {
+		if ( false === version_compare( phpversion(), GV_FUTURE_MIN_PHP_VERSION, '>=' ) ) {
 
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
 
 			self::$notices[ $key ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => $key,
 			);
@@ -216,11 +216,11 @@ 
 	public static function check_wordpress() {
 		global $wp_version;
 
-		if( version_compare( $wp_version, GV_MIN_WP_VERSION ) <= 0 ) {
+		if ( version_compare( $wp_version, GV_MIN_WP_VERSION ) <= 0 ) {
 
-			self::$notices['wp_version'] = array(
+			self::$notices[ 'wp_version' ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ),
+				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
 			    'cap' => 'update_core',
 				'dismiss' => 'wp_version',
 			);
@@ -243,17 +243,17 @@ 
 	public static function check_gravityforms() {
 
 		// Bypass other checks: if the class exists
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 
 			// and the version's right, we're good.
-			if( true === version_compare( GFCommon::$version, GV_MIN_GF_VERSION, ">=" ) ) {
+			if ( true === version_compare( GFCommon::$version, GV_MIN_GF_VERSION, ">=" ) ) {
 				return true;
 			}
 
 			// Or the version's wrong
-			self::$notices['gf_version'] = array(
+			self::$notices[ 'gf_version' ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview' ), '<h3>', GV_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>', "\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+				'message' => sprintf( __( "%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview' ), '<h3>', GV_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>', "\n\n" . '<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
 				'cap' => 'update_plugins',
 				'dismiss' => 'gf_version',
 			);
@@ -268,42 +268,42 @@ 
 		 * OR
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
 		 */
-		if( true === $gf_status || is_network_admin() ) {
+		if ( true === $gf_status || is_network_admin() ) {
 			return true;
 		}
 
 		// If GFCommon doesn't exist, assume GF not active
 		$return = false;
 
-		switch( $gf_status ) {
+		switch ( $gf_status ) {
 			case 'inactive':
 
 				// Required for multisite
-				if( ! function_exists('wp_create_nonce') ) {
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
 					require_once ABSPATH . WPINC . '/pluggable.php';
 				}
 
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
-				if( is_multisite() ) {
+				if ( is_multisite() ) {
 					wp_cookie_constants();
 				}
 
 				$return = false;
 
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
+				$button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">';
 
-				self::$notices['gf_inactive'] = array(
+				self::$notices[ 'gf_inactive' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ),
 					'cap' => 'activate_plugins',
 					'dismiss' => 'gf_inactive',
 				);
 
 				break;
 			default:
-				self::$notices['gf_installed'] = array(
+				self::$notices[ 'gf_installed' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
 					'cap' => 'install_plugins',
 					'dismiss' => 'gf_installed',
 				);
@@ -320,10 +320,10 @@ 
 	 */
 	private static function check_gf_directory() {
 
-		if( class_exists( 'GFDirectory' ) ) {
-			self::$notices['gf_directory'] = array(
+		if ( class_exists( 'GFDirectory' ) ) {
+			self::$notices[ 'gf_directory' ] = array(
 				'class' => 'error is-dismissible',
-				'title' => __('Potential Conflict', 'gravityview' ),
+				'title' => __( 'Potential Conflict', 'gravityview' ),
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
 				'dismiss' => 'gf_directory',
 				'cap' => 'activate_plugins',
@@ -342,21 +342,21 @@ 
 	 */
 	public static function get_plugin_status( $location = '' ) {
 
-		if( ! function_exists('is_plugin_active') ) {
+		if ( ! function_exists( 'is_plugin_active' ) ) {
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
 		}
 
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
 			return true;
 		}
 
-		if( !is_network_admin() && is_plugin_active( $location ) ) {
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
 			return true;
 		}
 
-		if(
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
+		if (
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
 		) {
 			return false;
 		}

includes/class-gravityview-extension.php

Indentation +7 added lines, -7 removed lines

@@ -244,13 +244,13 @@
 			$this->_remote_update_url,
 			$this->_path,
 			array(
-            	'version'	=> $this->_version, // current version number
-            	'license'	=> $license['license'],
-	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
-            	'author' 	=> strip_tags( $this->_author )  // author of this plugin
-          	)
-        );
+				'version'	=> $this->_version, // current version number
+				'license'	=> $license['license'],
+				'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
+				'item_name' => $this->_title,  // name of this plugin
+				'author' 	=> strip_tags( $this->_author )  // author of this plugin
+		  	)
+		);
 	}
 
 	/**

Spacing +33 added lines, -33 removed lines

@@ -71,13 +71,13 @@ 
 
 		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
 
-		add_action( 'admin_init', array( $this, 'settings') );
+		add_action( 'admin_init', array( $this, 'settings' ) );
 
 		add_action( 'admin_notices', array( $this, 'admin_notice' ), 100 );
 
 		add_action( 'gravityview/metaboxes/before_render', array( $this, 'add_metabox_tab' ) );
 
-		if( false === $this->is_extension_supported() ) {
+		if ( false === $this->is_extension_supported() ) {
 			return;
 		}
 
@@ -116,7 +116,7 @@ 
 		$tab_settings = $this->tab_settings();
 
 		// Don't add a tab if it's empty.
-		if( empty( $tab_settings ) ) {
+		if ( empty( $tab_settings ) ) {
 			return;
 		}
 
@@ -134,17 +134,17 @@ 
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
 
 		// Force the screen to be GravityView
-		$tab['screen'] = 'gravityview';
+		$tab[ 'screen' ] = 'gravityview';
 
-		if( class_exists('GravityView_Metabox_Tab') ) {
+		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
 
-			$metabox = new GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
+			$metabox = new GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
 
 			GravityView_Metabox_Tabs::add( $metabox );
 
 		} else {
 
-			add_meta_box( 'gravityview_'.$tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
 
 		}
 	}
@@ -160,7 +160,7 @@ 
 	 */
 	public function load_plugin_textdomain() {
 
-		if( empty( $this->_text_domain ) ) {
+		if ( empty( $this->_text_domain ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': Extension translation cannot be loaded; the `_text_domain` variable is not defined', $this );
 			return;
 		}
@@ -172,7 +172,7 @@ 
 		$lang_dir = dirname( plugin_basename( $path ) ) . '/languages/';
 
 		// Traditional WordPress plugin locale filter
-		$locale = apply_filters( 'plugin_locale',  get_locale(), $this->_text_domain );
+		$locale = apply_filters( 'plugin_locale', get_locale(), $this->_text_domain );
 
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
 
@@ -202,11 +202,11 @@ 
 	 */
 	protected function get_license() {
 
-		if( !class_exists( 'GravityView_Settings' ) ) {
+		if ( ! class_exists( 'GravityView_Settings' ) ) {
 			return false;
 		}
 
-		$license = GravityView_Settings::getSetting('license');
+		$license = GravityView_Settings::getSetting( 'license' );
 
 		return $license;
 	}
@@ -219,16 +219,16 @@ 
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
 			return;
 		}
 
-		if( !class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+		if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
 
 			$file_path = plugin_dir_path( __FILE__ ) . 'lib/EDD_SL_Plugin_Updater.php';
 
 			// This file may be in the lib/ directory already
-			if( ! file_exists( $file_path ) ) {
+			if ( ! file_exists( $file_path ) ) {
 				$file_path = plugin_dir_path( __FILE__ ) . '/EDD_SL_Plugin_Updater.php';
 			}
 
@@ -238,16 +238,16 @@ 
 		$license = $this->get_license();
 
 		// Don't update if invalid license.
-		if( false === $license || empty( $license['status'] ) || strtolower( $license['status'] ) !== 'valid' ) { return; }
+		if ( false === $license || empty( $license[ 'status' ] ) || strtolower( $license[ 'status' ] ) !== 'valid' ) { return; }
 
 		new EDD_SL_Plugin_Updater(
 			$this->_remote_update_url,
 			$this->_path,
 			array(
             	'version'	=> $this->_version, // current version number
-            	'license'	=> $license['license'],
+            	'license'	=> $license[ 'license' ],
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
+            	'item_name' => $this->_title, // name of this plugin
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
           	)
         );
@@ -260,14 +260,14 @@ 
 	 */
 	public function admin_notice() {
 
-		if( empty( self::$admin_notices ) ) {
+		if ( empty( self::$admin_notices ) ) {
 			return;
 		}
 
-		foreach( self::$admin_notices as $key => $notice ) {
+		foreach ( self::$admin_notices as $key => $notice ) {
 
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
-			echo wpautop( $notice['message'] );
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
+			echo wpautop( $notice[ 'message' ] );
 			echo '<div class="clear"></div>';
 			echo '</div>';
 		}
@@ -282,16 +282,16 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if( is_array( $notice ) && !isset( $notice['message'] ) ) {
-			do_action( 'gravityview_log_error', __CLASS__.'[add_notice] Notice not set', $notice );
+		if ( is_array( $notice ) && ! isset( $notice[ 'message' ] ) ) {
+			do_action( 'gravityview_log_error', __CLASS__ . '[add_notice] Notice not set', $notice );
 			return;
-		} else if( is_string( $notice ) ) {
+		} else if ( is_string( $notice ) ) {
 			$notice = array( 'message' => $notice );
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices[] = $notice;
+		self::$admin_notices[ ] = $notice;
 	}
 
 	/**
@@ -346,17 +346,17 @@ 
 
 		$message = '';
 
-		if( !class_exists( 'GravityView_Plugin' ) ) {
+		if ( ! class_exists( 'GravityView_Plugin' ) ) {
 
-			$message = sprintf( __('Could not activate the %s Extension; GravityView is not active.', 'gravityview'), $this->_title );
+			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), $this->_title );
 
-		} else if( false === version_compare(GravityView_Plugin::version, $this->_min_gravityview_version , ">=") ) {
+		} else if ( false === version_compare( GravityView_Plugin::version, $this->_min_gravityview_version, ">=" ) ) {
 
-			$message = sprintf( __('The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), $this->_title, '<tt>'.$this->_min_gravityview_version.'</tt>' );
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), $this->_title, '<tt>' . $this->_min_gravityview_version . '</tt>' );
 
-		} else if( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=") ) {
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
 
-			$message = sprintf( __('The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), $this->_title, '<tt>'.$this->_min_php_version.'</tt>' );
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), $this->_title, '<tt>' . $this->_min_php_version . '</tt>' );
 
 		} else {
 
@@ -368,7 +368,7 @@ 
 
 			self::add_notice( $message );
 
-			do_action( 'gravityview_log_error', __METHOD__. ' ' . $message );
+			do_action( 'gravityview_log_error', __METHOD__ . ' ' . $message );
 
 			self::$is_compatible = false;
 		}

includes/class-gravityview-image.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	var $style = NULL;
 
 	/**
- 	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
+	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
 	 * @var string
 	 */
 	var $size = NULL;

Spacing +18 added lines, -18 removed lines

@@ -65,11 +65,11 @@ 
 
 		$atts = wp_parse_args( $atts, $defaults );
 
-		foreach( $atts as $key => $val ) {
+		foreach ( $atts as $key => $val ) {
 			$this->{$key} = $val;
 		}
 
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
+		$this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
 
 		$this->set_image_size();
 
@@ -85,7 +85,7 @@ 
 	 */
 	function validate_image_src() {
 
-		if ( !$this->validate_src ) { return true; }
+		if ( ! $this->validate_src ) { return true; }
 
 		$info = pathinfo( $this->src );
 
@@ -93,9 +93,9 @@ 
 		 * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag
 		 * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']`
 		 */
-		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ));
+		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ) );
 
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
+		return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts );
 	}
 
 	/**
@@ -111,11 +111,11 @@ 
 
 			// And there is no string size passed
 			// 		And we want to get the image size using PHP
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
+			if ( empty( $string ) && ! empty( $this->getimagesize ) ) {
 
 				$image_size = getimagesize( $this->src );
 
-				if ( !empty( $image_size ) ) {
+				if ( ! empty( $image_size ) ) {
 					list( $width, $height ) = $image_size;
 				}
 
@@ -128,33 +128,33 @@ 
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
 				 */
 				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
-					'tiny' => array('width' => 40, 'height' => 30),
-					'small' => array('width' => 100, 'height' => 75),
-					'medium' => array('width' => 250, 'height' => 188),
-					'large' => array('width' => 448, 'height' => 336),
+					'tiny' => array( 'width' => 40, 'height' => 30 ),
+					'small' => array( 'width' => 100, 'height' => 75 ),
+					'medium' => array( 'width' => 250, 'height' => 188 ),
+					'large' => array( 'width' => 448, 'height' => 336 ),
 				) );
 
-				switch( $this->size ) {
+				switch ( $this->size ) {
 					case 'tiny':
-						extract($image_sizes['tiny']);
+						extract( $image_sizes[ 'tiny' ] );
 						break;
 					case 'small':
 					case 's':
 					case 'thumb':
-						extract($image_sizes['small']);
+						extract( $image_sizes[ 'small' ] );
 						break;
 					case 'm':
 					case 'medium':
-						extract($image_sizes['medium']);
+						extract( $image_sizes[ 'medium' ] );
 						break;
 					case 'large':
 					case 'l':
-						extract($image_sizes['large']);
+						extract( $image_sizes[ 'large' ] );
 						break;
 					default:
 						// Verify that the passed sizes are integers.
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
+						$width = ! empty( $width ) ? intval( $width ) : intval( $this->width );
+						$height = ! empty( $height ) ? intval( $height ) : intval( $this->height );
 				}
 
 			}

includes/class-gravityview-logging.php

Indentation +9 added lines, -9 removed lines

@@ -12,10 +12,10 @@ 
 		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
 
 		// Enable debug with Gravity Forms Logging Add-on
-	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
+		add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
 
-	    // Load Debug Bar integration
-	    add_filter( 'debug_bar_panels', array( $this, 'add_debug_bar' ) );
+		// Load Debug Bar integration
+		add_filter( 'debug_bar_panels', array( $this, 'add_debug_bar' ) );
 
 	}
 
@@ -44,8 +44,8 @@ 
 	 * @param array $supported_plugins List of plugins
 	 */
 	public function enable_gform_logging( $supported_plugins ) {
-	    $supported_plugins['gravityview'] = 'GravityView';
-	    return $supported_plugins;
+		$supported_plugins['gravityview'] = 'GravityView';
+		return $supported_plugins;
 	}
 
 	/**
@@ -97,8 +97,8 @@ 
 
 		if ( class_exists("GFLogging") ) {
 			GFLogging::include_logger();
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
-	    }
+			GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
+		}
 	}
 
 	static function log_error( $message = '', $data = null  ) {
@@ -116,8 +116,8 @@ 
 		}
 
 		if ( class_exists("GFLogging") ) {
-		    GFLogging::include_logger();
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
+			GFLogging::include_logger();
+			GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
 		}
 	}
 

Spacing +16 added lines, -16 removed lines

@@ -7,9 +7,9 @@ 
 
 	function __construct() {
 
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
+		add_action( 'gravityview_log_error', array( $this, 'log_error' ), 10, 2 );
 
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
+		add_action( 'gravityview_log_debug', array( $this, 'log_debug' ), 10, 2 );
 
 		// Enable debug with Gravity Forms Logging Add-on
 	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
@@ -34,7 +34,7 @@ 
 			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
 		}
 
-		$panels[] = new GravityView_Debug_Bar;
+		$panels[ ] = new GravityView_Debug_Bar;
 
 		return $panels;
 	}
@@ -44,7 +44,7 @@ 
 	 * @param array $supported_plugins List of plugins
 	 */
 	public function enable_gform_logging( $supported_plugins ) {
-	    $supported_plugins['gravityview'] = 'GravityView';
+	    $supported_plugins[ 'gravityview' ] = 'GravityView';
 	    return $supported_plugins;
 	}
 
@@ -72,7 +72,7 @@ 
 	 * @return string "print_r" or "var_export"
 	 */
 	static function get_print_function() {
-		if( ob_get_level() > 0 ) {
+		if ( ob_get_level() > 0 ) {
 			$function = 'var_export';
 		} else {
 			$function = 'print_r';
@@ -88,36 +88,36 @@ 
 		$notice = array(
 			'message' => $function( $message, true ),
 			'data' => $data,
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
+			'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
 		);
 
-		if( !in_array( $notice, self::$notices ) ) {
-			self::$notices[] = $notice;
+		if ( ! in_array( $notice, self::$notices ) ) {
+			self::$notices[ ] = $notice;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if ( class_exists( "GFLogging" ) ) {
 			GFLogging::include_logger();
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
+	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::DEBUG );
 	    }
 	}
 
-	static function log_error( $message = '', $data = null  ) {
+	static function log_error( $message = '', $data = null ) {
 
 		$function = self::get_print_function();
 
 		$error = array(
 			'message' => $message,
 			'data' => $data,
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
+			'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
 		);
 
-		if( !in_array( $error, self::$errors ) ) {
-			self::$errors[] = $error;
+		if ( ! in_array( $error, self::$errors ) ) {
+			self::$errors[ ] = $error;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if ( class_exists( "GFLogging" ) ) {
 		    GFLogging::include_logger();
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
+		    GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::ERROR );
 		}
 	}
 

includes/class-gravityview-migrate.php

Indentation +2 added lines, -2 removed lines

@@ -180,8 +180,8 @@
 
 					// check widget settings:
 					//  [search_free] => 1
-			        //  [search_date] => 1
-			        $search_generic = array();
+					//  [search_date] => 1
+					$search_generic = array();
 					if( !empty( $widget['search_free'] ) ) {
 						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}

Spacing +42 added lines, -42 removed lines

@@ -63,7 +63,7 @@ 
 
 		$disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) );
 
-		if( false === $approved_result || false === $disapproved_result ) {
+		if ( false === $approved_result || false === $disapproved_result ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': There was an error processing the query.', $wpdb->last_error );
 		} else {
 			// All done: Meta values are migrated
@@ -96,11 +96,11 @@ 
 		$redux_settings = $this->get_redux_settings();
 
 		// No need to process
-		if( false === $redux_settings ) {
+		if ( false === $redux_settings ) {
 			return;
 		}
 
-		if( empty(  $redux_settings['license_key_status'] ) ) {
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
 		}
 
@@ -114,8 +114,8 @@ 
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
 
 		// And now remove the previous option, so this is a one-time thing.
-		delete_option('gravityview_settings');
-		delete_option('gravityview_settings-transients');
+		delete_option( 'gravityview_settings' );
+		delete_option( 'gravityview_settings-transients' );
 	}
 
 	/**
@@ -131,16 +131,16 @@ 
 
 		$data = array(
 			'edd_action' => 'check_license',
-			'license' => rgget('license_key', $redux_settings ),
+			'license' => rgget( 'license_key', $redux_settings ),
 			'update' => false,
 			'format' => 'object',
 		);
 
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
 
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
-			$redux_settings['license_key_status'] = $license_call->license;
-			$redux_settings['license_key_response'] = json_encode( $license_call );
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
 		}
 
 		return $redux_settings;
@@ -154,10 +154,10 @@ 
 	function get_redux_settings() {
 
 		// Previous settings set by Redux
-		$redux_option = get_option('gravityview_settings');
+		$redux_option = get_option( 'gravityview_settings' );
 
 		// No Redux settings? Don't proceed.
-		if( false === $redux_option ) {
+		if ( false === $redux_option ) {
 			return false;
 		}
 
@@ -167,21 +167,21 @@ 
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
 		);
 
-		if( $license_array = rgget( 'license', $redux_option ) ) {
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
 
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
 
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
 
 			// This contains the last response for license validation
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
 
-				$saved_license = rgget('license', $saved_values );
+				$saved_license = rgget( 'license', $saved_values );
 
 				// Only use the last-saved values if they are for the same license
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
 				}
 			}
 		}
@@ -193,8 +193,8 @@ 
 	/** ----  Migrate from old search widget to new search widget  ---- */
 	function update_search_on_views() {
 
-		if( !class_exists('GravityView_Widget_Search') ) {
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
 		}
 
 		// Loop through all the views
@@ -206,20 +206,20 @@ 
 
 		$views = get_posts( $query_args );
 
-		foreach( $views as $view ) {
+		foreach ( $views as $view ) {
 
 			$widgets = gravityview_get_directory_widgets( $view->ID );
 			$search_fields = null;
 
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
 
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
 
-			foreach( $widgets as $area => $ws ) {
-				foreach( $ws as $k => $widget ) {
-					if( $widget['id'] !== 'search_bar' ) { continue; }
+			foreach ( $widgets as $area => $ws ) {
+				foreach ( $ws as $k => $widget ) {
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
 
-					if( is_null( $search_fields ) ) {
+					if ( is_null( $search_fields ) ) {
 						$search_fields = $this->get_search_fields( $view->ID );
 					}
 
@@ -227,24 +227,24 @@ 
 					//  [search_free] => 1
 			        //  [search_date] => 1
 			        $search_generic = array();
-					if( !empty( $widget['search_free'] ) ) {
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}
-					if( !empty( $widget['search_date'] ) ) {
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
 					}
 
 					$search_config = array_merge( $search_generic, $search_fields );
 
 					// don't throw '[]' when json_encode an empty array
-					if( empty( $search_config ) ) {
+					if ( empty( $search_config ) ) {
 						$search_config = '';
 					} else {
 						$search_config = json_encode( $search_config );
 					}
 
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
 
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
 				}
@@ -272,26 +272,26 @@ 
 		// check view fields' settings
 		$fields = gravityview_get_directory_fields( $view_id, false );
 
-		if( !empty( $fields ) && is_array( $fields ) ) {
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
 
-			foreach( $fields as $t => $fs ) {
+			foreach ( $fields as $t => $fs ) {
 
-				foreach( $fs as $k => $field ) {
+				foreach ( $fs as $k => $field ) {
 					// is field a search_filter ?
-					if( empty( $field['search_filter'] ) ) { continue; }
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
 
 					// get field type & calculate the input type (by default)
-					$form_field = gravityview_get_field( $form, $field['id'] );
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
 
-					if( empty( $form_field['type'] ) ) {
+					if ( empty( $form_field[ 'type' ] ) ) {
 						continue;
 					}
 
 					// depending on the field type assign a group of possible search field types
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
 
 					// add field to config
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
 
 				}
 			}