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 +27 added lines, -27 removed lines

@@ -66,20 +66,20 @@ 
 
 /** Load common & connector functions */
 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' );
 
 /** Register Post Types and Rewrite Rules */
-require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' );
 
 /** Add Cache Class */
-require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' );
 
 /** Register hooks that are fired when the plugin is activated and deactivated. */
-if( is_admin() ) {
+if ( is_admin() ) {
 	register_activation_hook( __FILE__, array( 'GravityView_Plugin', 'activate' ) );
 	register_deactivation_hook( __FILE__, array( 'GravityView_Plugin', 'deactivate' ) );
 }
@@ -100,7 +100,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -110,7 +110,7 @@ 
 	private function __construct() {
 
 
-		if( ! GravityView_Compatibility::is_valid() ) {
+		if ( ! GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -139,7 +139,7 @@ 
 	 */
 	public function include_files() {
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' );
 
 		// Load fields
 		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-fields.php' );
@@ -150,19 +150,19 @@ 
 			include_once( $gv_field_filename );
 		}
 
-		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/edit-entry/class-edit-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.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' );
@@ -175,7 +175,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' );
@@ -190,7 +190,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' ) );
 	}
 
 
@@ -255,7 +255,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' );
 	}
 
 
@@ -276,7 +276,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 );
 		}
 
@@ -302,12 +302,12 @@ 
 	 */
 	public function frontend_actions() {
 
-		if( self::is_admin() ) { return; }
+		if ( self::is_admin() ) { 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' );
 
 
@@ -332,8 +332,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' => '' ) ) ),
 		);
 
 		/**
@@ -351,7 +351,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
@@ -365,7 +365,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
@@ -376,4 +376,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/field-types/type_text.php

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
-            $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
-        }
-        $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
+		}
+		$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="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 		?>
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
 
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
 			echo $this->get_tooltip() . $this->get_field_desc();
 		?><div>
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@ 
 
 	function render_input( $override_input = null ) {
 
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
@@ -28,10 +28,10 @@ 
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
         }
-        $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="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">

includes/admin/field-types/type_textarea.php

Indentation +8 added lines, -8 removed lines

@@ -28,14 +28,14 @@
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
-            $class = ' merge-tag-support mt-position-right ';
-
-            if( empty( $this->field['show_all_fields'] ) ) {
-            	$class .= ' mt-hide_all_fields';
-            }
-        }
-        $class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat';
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+			$class = ' merge-tag-support mt-position-right ';
+
+			if( empty( $this->field['show_all_fields'] ) ) {
+				$class .= ' mt-hide_all_fields';
+			}
+		}
+		$class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat';
 
 		?>
 		<textarea name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo esc_attr( $class ); ?>" rows="5"><?php echo esc_textarea(  $this->value ); ?></textarea>

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
 		?>
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
 
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
 			echo $this->get_tooltip() . $this->get_field_desc();
 		?><div>
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@ 
 	}
 
 	function render_input( $override_input = null ) {
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
@@ -28,17 +28,17 @@ 
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
             $class = ' merge-tag-support mt-position-right ';
 
-            if( empty( $this->field['show_all_fields'] ) ) {
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
             	$class .= ' mt-hide_all_fields';
             }
         }
-        $class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat';
+        $class .= ! empty( $this->field[ 'class' ] ) ? 'widefat ' . $this->field[ 'class' ] : 'widefat';
 
 		?>
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo esc_attr( $class ); ?>" rows="5"><?php echo esc_textarea(  $this->value ); ?></textarea>
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo esc_attr( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea>
        	<?php
 	}
 

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-common.php

Indentation +27 added lines, -27 removed lines

@@ -213,13 +213,13 @@ 
 
 				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
 					foreach ( $field['inputs'] as $input ) {
-                        /**
-                         * @hack
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
-                         */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
-                            continue;
-                        }
+						/**
+						 * @hack
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
+						 */
+						if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+							continue;
+						}
 						$fields[ (string)$input['id'] ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
@@ -466,7 +466,7 @@ 
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
 			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
 		} elseif( !isset( $criteria['context_view_id'] ) ) {
-            // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
+			// Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
 			$criteria['context_view_id'] = null;
 		}
 
@@ -1082,7 +1082,7 @@ 
 			),
 		);
 
-        $fields = $date_created + $fields;
+		$fields = $date_created + $fields;
 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
@@ -1094,13 +1094,13 @@ 
 			}
 		}
 
-        /**
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
-         * @since 1.12
-         * @param array $fields Sub-set of GF form fields that are sortable
-         * @param int $formid The Gravity Forms form ID that the fields are from
-         */
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
+		/**
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
+		 * @since 1.12
+		 * @param array $fields Sub-set of GF form fields that are sortable
+		 * @param int $formid The Gravity Forms form ID that the fields are from
+		 */
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
 
 		return $fields;
 	}
@@ -1365,17 +1365,17 @@ 
 	}
 
 
-    /**
-     * Display updated/error notice
-     *
-     * @param string $notice text/HTML of notice
-     * @param string $class CSS class for notice (`updated` or `error`)
-     *
-     * @return string
-     */
-    public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
-    }
+	/**
+	 * Display updated/error notice
+	 *
+	 * @param string $notice text/HTML of notice
+	 * @param string $class CSS class for notice (`updated` or `error`)
+	 *
+	 * @return string
+	 */
+	public static function generate_notice( $notice, $class = '' ) {
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+	}
 
 
 

Spacing +109 added lines, -109 removed lines

@@ -124,7 +124,7 @@ 
 
 		$entry = self::get_entry( $entry_slug, true );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		return $form;
 	}
@@ -175,7 +175,7 @@ 
 
 		$results = GFAPI::get_entries( 0, $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -193,9 +193,9 @@ 
 		if ( class_exists( 'GFAPI' ) ) {
 			$gf_forms = GFAPI::get_forms();
 			foreach ( $gf_forms as $form ) {
-				$forms[] = array(
-					'id' => $form['id'],
-					'title' => $form['title'],
+				$forms[ ] = array(
+					'id' => $form[ 'id' ],
+					'title' => $form[ 'title' ],
 				);
 			}
 		}
@@ -227,9 +227,9 @@ 
 		}
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields[ $field['id'] ] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ $field[ 'id' ] ] = array(
 						'label' => rgar( $field, 'label' ),
 						'parent' => null,
 						'type' => rgar( $field, 'type' ),
@@ -238,16 +238,16 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
                         /**
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+                        if ( 'email' == rgar( $field, 'type' ) && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields[ (string)$input['id'] ] = array(
+						$fields[ (string)$input[ 'id' ] ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
 							'parent' => $field,
@@ -259,11 +259,11 @@ 
 				}
 
 				/** @since 1.14 */
-				if( 'list' === $field['type'] && !empty( $field['enableColumns'] ) ) {
+				if ( 'list' === $field[ 'type' ] && ! empty( $field[ 'enableColumns' ] ) ) {
 
-					foreach ( (array)$field['choices'] as $key => $input ) {
+					foreach ( (array)$field[ 'choices' ] as $key => $input ) {
 
-						$input_id = sprintf( '%d.%d', $field['id'], $key ); // {field_id}.{column_key}
+						$input_id = sprintf( '%d.%d', $field[ 'id' ], $key ); // {field_id}.{column_key}
 
 						$fields[ $input_id ] = array(
 							'label'       => rgar( $input, 'text' ),
@@ -279,25 +279,25 @@ 
 				/**
 				 * @since 1.8
 				 */
-				if( 'quiz' === $field['type'] ) {
+				if ( 'quiz' === $field[ 'type' ] ) {
 					$has_quiz_fields = true;
 				}
 
 				/**
 				 * @since 1.8
 				 */
-				if( 'poll' === $field['type'] ) {
+				if ( 'poll' === $field[ 'type' ] ) {
 					$has_poll_fields = true;
 				}
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
 				/**
 				 * @hack Version 1.9
 				 */
-				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object) $field : (array) $field;
+				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object)$field : (array)$field;
 
 				if ( GFCommon::is_post_field( $field_for_is_post_field ) ) {
 					$has_post_fields = true;
@@ -309,7 +309,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -320,10 +320,10 @@ 
 			$payment_fields = GravityView_Fields::get_all( 'pricing' );
 
 			foreach ( $payment_fields as $payment_field ) {
-				if( isset( $fields["{$payment_field->name}"] ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) ) {
 					continue;
 				}
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -334,25 +334,25 @@ 
 		/**
 		 * @since 1.8
 		 */
-		if( $has_quiz_fields ) {
+		if ( $has_quiz_fields ) {
 
-			$fields['gquiz_score']   = array(
+			$fields[ 'gquiz_score' ] = array(
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
 				'type'  => 'quiz_score',
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_percent'] = array(
+			$fields[ 'gquiz_percent' ] = array(
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
 				'type'  => 'quiz_percent',
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_grade']   = array(
+			$fields[ 'gquiz_grade' ] = array(
 				/* translators: This is a field type used by the Gravity Forms Quiz Addon. "A" is 100-90, "B" is 89-80, "C" is 79-70, etc.  */
 				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
 				'type'  => 'quiz_grade',
 				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
 			);
-			$fields['gquiz_is_pass'] = array(
+			$fields[ 'gquiz_is_pass' ] = array(
 				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
 				'type'  => 'quiz_is_pass',
 				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
@@ -374,9 +374,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -416,32 +416,32 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? $passed_criteria[ 'cache' ] : true ),
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -452,21 +452,21 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
+					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] ' . $key . ' Date format not valid:', $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
@@ -474,12 +474,12 @@ 
 
 		// When multiple views are embedded, OR single entry, calculate the context view id and send it to the advanced filter
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry() ) {
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? $_GET[ 'view_id' ] : null;
+		} elseif ( ! isset( $criteria[ 'context_view_id' ] ) ) {
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
-			$criteria['context_view_id'] = null;
+			$criteria[ 'context_view_id' ] = null;
 		}
 
 		/**
@@ -488,7 +488,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 
@@ -519,7 +519,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -527,7 +527,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -547,9 +547,9 @@ 
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
@@ -558,7 +558,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -645,7 +645,7 @@ 
 			 */
 			$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
 
-			if( $check_entry_display ) {
+			if ( $check_entry_display ) {
 				// Is the entry allowed
 				$entry = self::check_entry_display( $entry );
 			}
@@ -678,12 +678,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -743,7 +743,7 @@ 
 			return false;
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
 			return false;
 		}
@@ -751,26 +751,26 @@ 
 		$criteria = self::calculate_get_entries_criteria();
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
 			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
+				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
 				return false;
 			}
 		}
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
 			return $entry;
 		}
 
-		$search_criteria = $criteria['search_criteria'];
+		$search_criteria = $criteria[ 'search_criteria' ];
 		unset( $criteria );
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
+			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
 			return false;
 		}
 
@@ -778,37 +778,37 @@ 
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
 			return $entry;
 		}
 
-		$filters = $search_criteria['field_filters'];
+		$filters = $search_criteria[ 'field_filters' ];
 		unset( $search_criteria );
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
-		unset( $filters['mode'] );
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
+		unset( $filters[ 'mode' ] );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		foreach ( $filters as $filter ) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			if ( in_array( $k, array( 'created_by', 'payment_status' ) ) ) {
 				$field_value = $entry[ $k ];
 				$field = null;
 			} else {
 				$field = self::get_field( $form, $k );
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
+			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
 
 			// verify if we are already free to go!
 			if ( ! $is_value_match && 'all' === $mode ) {
@@ -866,18 +866,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = rgar( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = rgar( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -885,7 +885,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -913,7 +913,7 @@ 
 		}
 
 		$field = self::get_field( $form, $field_id );
-		return isset( $field['label'] ) ?  $field['label'] : '';
+		return isset( $field[ 'label' ] ) ? $field[ 'label' ] : '';
 
 	}
 
@@ -931,7 +931,7 @@ 
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not exist
 	 */
 	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -978,19 +978,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1141,7 +1141,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1154,11 +1154,11 @@ 
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1193,9 +1193,9 @@ 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 		}
@@ -1236,14 +1236,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1257,9 +1257,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1409,11 +1409,11 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts[ 'href' ] = esc_url_raw( $href );
 
 		// Sort the attributes alphabetically, to help testing
 		ksort( $final_atts );
@@ -1424,7 +1424,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1448,7 +1448,7 @@ 
 	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
 		$merged = $array1;
 
-		foreach ( $array2 as $key => &$value )  {
+		foreach ( $array2 as $key => &$value ) {
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else {
@@ -1483,7 +1483,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1498,7 +1498,7 @@ 
      * @return string
      */
     public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 

includes/class-gravityview-change-entry-creator.php

Indentation +169 added lines, -169 removed lines

@@ -5,220 +5,220 @@
  */
 class GravityView_Change_Entry_Creator {
 
-    function __construct() {
-
-    	/**
-    	 * @since  1.5.1
-    	 */
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
-
-    	// ONLY ADMIN FROM HERE ON.
-    	if( !is_admin() ) { return; }
-
-	    /**
-         * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
-	     * @since 1.7.4
-	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
-	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
-		    return;
-	    }
-
-        /**
-         * Use `init` to fix bbPress warning
-         * @see https://bbpress.trac.wordpress.org/ticket/2309
-         */
-    	add_action('init', array( $this, 'load'), 100 );
-
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
+	function __construct() {
+
+		/**
+		 * @since  1.5.1
+		 */
+		add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
+
+		// ONLY ADMIN FROM HERE ON.
+		if( !is_admin() ) { return; }
+
+		/**
+		 * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
+		 * @since 1.7.4
+		 * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
+		 */
+		if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
+			return;
+		}
+
+		/**
+		 * Use `init` to fix bbPress warning
+		 * @see https://bbpress.trac.wordpress.org/ticket/2309
+		 */
+		add_action('init', array( $this, 'load'), 100 );
+
+		add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
 
-    }
+	}
 
-    /**
-     * When an user is created using the User Registration add-on, assign the entry to them
-     *
-     * @since  1.5.1
-     * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
-     * @param  int $user_id  WordPress User ID
-     * @param  array $config   User registration feed configuration
-     * @param  array  $entry     GF Entry array
-     * @param  string $password User password
-     * @return void
-     */
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
+	/**
+	 * When an user is created using the User Registration add-on, assign the entry to them
+	 *
+	 * @since  1.5.1
+	 * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
+	 * @param  int $user_id  WordPress User ID
+	 * @param  array $config   User registration feed configuration
+	 * @param  array  $entry     GF Entry array
+	 * @param  string $password User password
+	 * @return void
+	 */
+	function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
 
-    	/**
-    	 * Disable assigning the new user to the entry by returning false.
-    	 * @param  int $user_id  WordPress User ID
-	     * @param  array $config   User registration feed configuration
-	     * @param  array  $entry     GF Entry array
-    	 */
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
-
-    	// If filter returns false, do not process
-    	if( empty( $assign_to_lead ) ) {
-    		return;
-    	}
+		/**
+		 * Disable assigning the new user to the entry by returning false.
+		 * @param  int $user_id  WordPress User ID
+		 * @param  array $config   User registration feed configuration
+		 * @param  array  $entry     GF Entry array
+		 */
+		$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
+
+		// If filter returns false, do not process
+		if( empty( $assign_to_lead ) ) {
+			return;
+		}
 
-    	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
+		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
+		$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
 
-    	if( empty( $result ) ) {
-    		$status = __('Error', 'gravityview');
-    	} else {
-    		$status = __('Success', 'gravityview');
-    	}
-
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
+		if( empty( $result ) ) {
+			$status = __('Error', 'gravityview');
+		} else {
+			$status = __('Success', 'gravityview');
+		}
+
+		$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
 
-    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
+		do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
 
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
+		GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
 
-    }
+	}
 
-    /**
-     * Disable previous functionality; use this one as the canonical.
-     * @return void
-     */
-    function prevent_conflicts() {
+	/**
+	 * Disable previous functionality; use this one as the canonical.
+	 * @return void
+	 */
+	function prevent_conflicts() {
 
-    	// Plugin that was provided here:
-    	// @link https://gravityview.co/support/documentation/201991205/
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2);
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
+		// Plugin that was provided here:
+		// @link https://gravityview.co/support/documentation/201991205/
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2);
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
 
-    	// Disable for Gravity Forms Add-ons 3.6.2 and lower
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
+		// Disable for Gravity Forms Add-ons 3.6.2 and lower
+		if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
 
-    		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
+			$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
 
-    		// Now, no validation is required in the methods; let's hook in.
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
+			// Now, no validation is required in the methods; let's hook in.
+			remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
 
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
+			remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
 
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
-    	}
+			remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
+		}
 
-    }
+	}
 
-    /**
-     * @since  3.6.3
-     * @return void
-     */
-    function load() {
+	/**
+	 * @since  3.6.3
+	 * @return void
+	 */
+	function load() {
 
-    	// Does GF exist?
-        if( !class_exists('GFCommon') ) {
-            return;
-        }
+		// Does GF exist?
+		if( !class_exists('GFCommon') ) {
+			return;
+		}
 
-        // Can the user edit entries?
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
-            return;
-        }
+		// Can the user edit entries?
+		if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
+			return;
+		}
 
-        // If screen mode isn't set, then we're in the wrong place.
-        if( empty( $_REQUEST['screen_mode'] ) ) {
-            return;
-        }
+		// If screen mode isn't set, then we're in the wrong place.
+		if( empty( $_REQUEST['screen_mode'] ) ) {
+			return;
+		}
 
-        // Now, no validation is required in the methods; let's hook in.
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
+		// Now, no validation is required in the methods; let's hook in.
+		add_action('admin_init', array( &$this, 'set_screen_mode' ) );
 
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
 
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
+		add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
 
-    }
+	}
 
-    /**
-     * Allows for edit links to work with a link instead of a form (GET instead of POST)
-     * @return void
-     */
-    function set_screen_mode() {
+	/**
+	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
+	 * @return void
+	 */
+	function set_screen_mode() {
 
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( rgget('screen_mode') === 'edit' ) {
-            $_POST["screen_mode"] = 'edit';
-        }
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
+		if( rgget('screen_mode') === 'edit' ) {
+			$_POST["screen_mode"] = 'edit';
+		}
 
-    }
+	}
 
-    /**
-     * When the entry creator is changed, add a note to the entry
-     * @param  array $form   GF entry array
-     * @param  int $entry_id Entry ID
-     * @return void
-     */
-    function update_entry_creator($form, $entry_id) {
-            global $current_user;
+	/**
+	 * When the entry creator is changed, add a note to the entry
+	 * @param  array $form   GF entry array
+	 * @param  int $entry_id Entry ID
+	 * @return void
+	 */
+	function update_entry_creator($form, $entry_id) {
+			global $current_user;
 
-        // Update the entry
-        $created_by = absint( rgpost('created_by') );
+		// Update the entry
+		$created_by = absint( rgpost('created_by') );
 
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
 
-        // If the creator has changed, let's add a note about who it used to be.
-        $originally_created_by = rgpost('originally_created_by');
+		// If the creator has changed, let's add a note about who it used to be.
+		$originally_created_by = rgpost('originally_created_by');
 
-        // If there's no owner and there didn't used to be, keep going
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
-            return;
-        }
+		// If there's no owner and there didn't used to be, keep going
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
+			return;
+		}
 
-        // If the values have changed
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
+		// If the values have changed
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
 
-            $user_data = get_userdata($current_user->ID);
+			$user_data = get_userdata($current_user->ID);
 
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
 
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
+			$original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
 
-            if( !empty( $originally_created_by ) ) {
-                $originally_created_by_user_data = get_userdata($originally_created_by);
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
-            }
+			if( !empty( $originally_created_by ) ) {
+				$originally_created_by_user_data = get_userdata($originally_created_by);
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
+			}
 
-            if( !empty( $created_by ) ) {
-                $created_by_user_data =  get_userdata($created_by);
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
-            }
+			if( !empty( $created_by ) ) {
+				$created_by_user_data =  get_userdata($created_by);
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
+			}
 
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
-        }
+			GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
+		}
 
-    }
+	}
 
-    /**
-     * Output the select to change the entry creator
-     * @param int $form_id GF Form ID
-     * @param array $entry    GF entry array
-     * @return void
-     */
-    function add_select($form_id, $entry ) {
+	/**
+	 * Output the select to change the entry creator
+	 * @param int $form_id GF Form ID
+	 * @param array $entry    GF entry array
+	 * @return void
+	 */
+	function add_select($form_id, $entry ) {
 
-        if( rgpost('screen_mode') !== 'edit' ) {
-            return;
-        }
+		if( rgpost('screen_mode') !== 'edit' ) {
+			return;
+		}
 
-        $users = GVCommon::get_users( 'change_entry_creator' );
+		$users = GVCommon::get_users( 'change_entry_creator' );
 
-        $output = '<label for="change_created_by">';
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
-        $output .= '</label>
+		$output = '<label for="change_created_by">';
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
+		$output .= '</label>
         <select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
-        foreach($users as $user) {
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
-        }
-        $output .= '</select>';
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
-        echo $output;
-
-    }
+		$output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
+		foreach($users as $user) {
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
+		}
+		$output .= '</select>';
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
+		echo $output;
+
+	}
 
 }
 

Spacing +47 added lines, -47 removed lines

@@ -10,17 +10,17 @@ 
     	/**
     	 * @since  1.5.1
     	 */
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
+    	add_action( 'gform_user_registered', array( $this, 'assign_new_user_to_lead' ), 10, 4 );
 
     	// ONLY ADMIN FROM HERE ON.
-    	if( !is_admin() ) { return; }
+    	if ( ! is_admin() ) { return; }
 
 	    /**
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
 	     * @since 1.7.4
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
 	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator', false ) ) {
 		    return;
 	    }
 
@@ -28,9 +28,9 @@ 
          * Use `init` to fix bbPress warning
          * @see https://bbpress.trac.wordpress.org/ticket/2309
          */
-    	add_action('init', array( $this, 'load'), 100 );
+    	add_action( 'init', array( $this, 'load' ), 100 );
 
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
+    	add_action( 'plugins_loaded', array( $this, 'prevent_conflicts' ) );
 
     }
 
@@ -56,24 +56,24 @@ 
     	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
 
     	// If filter returns false, do not process
-    	if( empty( $assign_to_lead ) ) {
+    	if ( empty( $assign_to_lead ) ) {
     		return;
     	}
 
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
+    	$result = RGFormsModel::update_lead_property( $entry[ 'id' ], 'created_by', $user_id, false, true );
 
-    	if( empty( $result ) ) {
-    		$status = __('Error', 'gravityview');
+    	if ( empty( $result ) ) {
+    		$status = __( 'Error', 'gravityview' );
     	} else {
-    		$status = __('Success', 'gravityview');
+    		$status = __( 'Success', 'gravityview' );
     	}
 
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
+    	$note = sprintf( _x( '%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview' ), $status, $user_id );
 
-    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
+    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - ' . $note );
 
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
+        GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' );
 
     }
 
@@ -85,20 +85,20 @@ 
 
     	// Plugin that was provided here:
     	// @link https://gravityview.co/support/documentation/201991205/
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2);
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
+    	remove_action( "gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2 );
+    	remove_action( "gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2 );
 
     	// Disable for Gravity Forms Add-ons 3.6.2 and lower
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
+    	if ( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
 
     		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
 
     		// Now, no validation is required in the methods; let's hook in.
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
+    		remove_action( 'admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
 
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
+    		remove_action( "gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2 );
 
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
+    		remove_action( "gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2 );
     	}
 
     }
@@ -110,26 +110,26 @@ 
     function load() {
 
     	// Does GF exist?
-        if( !class_exists('GFCommon') ) {
+        if ( ! class_exists( 'GFCommon' ) ) {
             return;
         }
 
         // Can the user edit entries?
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
+        if ( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
             return;
         }
 
         // If screen mode isn't set, then we're in the wrong place.
-        if( empty( $_REQUEST['screen_mode'] ) ) {
+        if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
             return;
         }
 
         // Now, no validation is required in the methods; let's hook in.
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
+        add_action( 'admin_init', array( &$this, 'set_screen_mode' ) );
 
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
+        add_action( "gform_entry_info", array( &$this, 'add_select' ), 10, 2 );
 
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
+        add_action( "gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2 );
 
     }
 
@@ -140,8 +140,8 @@ 
     function set_screen_mode() {
 
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( rgget('screen_mode') === 'edit' ) {
-            $_POST["screen_mode"] = 'edit';
+        if ( rgget( 'screen_mode' ) === 'edit' ) {
+            $_POST[ "screen_mode" ] = 'edit';
         }
 
     }
@@ -152,42 +152,42 @@ 
      * @param  int $entry_id Entry ID
      * @return void
      */
-    function update_entry_creator($form, $entry_id) {
+    function update_entry_creator( $form, $entry_id ) {
             global $current_user;
 
         // Update the entry
-        $created_by = absint( rgpost('created_by') );
+        $created_by = absint( rgpost( 'created_by' ) );
 
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
 
         // If the creator has changed, let's add a note about who it used to be.
-        $originally_created_by = rgpost('originally_created_by');
+        $originally_created_by = rgpost( 'originally_created_by' );
 
         // If there's no owner and there didn't used to be, keep going
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
+        if ( empty( $originally_created_by ) && empty( $created_by ) ) {
             return;
         }
 
         // If the values have changed
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
+        if ( absint( $originally_created_by ) !== absint( $created_by ) ) {
 
-            $user_data = get_userdata($current_user->ID);
+            $user_data = get_userdata( $current_user->ID );
 
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
+            $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' );
 
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
+            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview' );
 
-            if( !empty( $originally_created_by ) ) {
-                $originally_created_by_user_data = get_userdata($originally_created_by);
+            if ( ! empty( $originally_created_by ) ) {
+                $originally_created_by_user_data = get_userdata( $originally_created_by );
                 $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
             }
 
-            if( !empty( $created_by ) ) {
-                $created_by_user_data =  get_userdata($created_by);
+            if ( ! empty( $created_by ) ) {
+                $created_by_user_data = get_userdata( $created_by );
                 $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
             }
 
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
+            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
         }
 
     }
@@ -198,24 +198,24 @@ 
      * @param array $entry    GF entry array
      * @return void
      */
-    function add_select($form_id, $entry ) {
+    function add_select( $form_id, $entry ) {
 
-        if( rgpost('screen_mode') !== 'edit' ) {
+        if ( rgpost( 'screen_mode' ) !== 'edit' ) {
             return;
         }
 
         $users = GVCommon::get_users( 'change_entry_creator' );
 
         $output = '<label for="change_created_by">';
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
         $output .= '</label>
         <select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
-        foreach($users as $user) {
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
+        $output .= '<option value=""> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
+        foreach ( $users as $user ) {
+            $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
         }
         $output .= '</select>';
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
+        $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
         echo $output;
 
     }

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 +35 added lines, -35 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>';
 
@@ -175,11 +175,11 @@ 
 	 * @return boolean
 	 */
 	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',
 			);
@@ -199,11 +199,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',
 			);
@@ -226,17 +226,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',
 			);
@@ -251,42 +251,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',
 				);
@@ -303,10 +303,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',
@@ -325,21 +325,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;
 		}