gravityview / GravityView

includes/class-admin.php

Braces +3 added lines, -3 removed lines

@@ -266,7 +266,7 @@ 
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
+		if( !empty( $wp_styles->registered ) ) {
 			foreach ($wp_styles->registered as $key => $style) {
 				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
 					wp_dequeue_style( $key );
@@ -337,8 +337,8 @@ 
 
         //unregistering scripts
         $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
+        foreach( $wp_objects->registered as $handle => $script_registration ) {
+            if( in_array( $handle, $required_objects ) ) {
                 $registered[ $handle ] = $script_registration;
             }
         }

Indentation +60 added lines, -61 removed lines

@@ -182,7 +182,7 @@ 
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
 			8  => __( 'View submitted.', 'gravityview' ),
 			9  => sprintf(
-		        /* translators: Date and time the View is scheduled to be published */
+				/* translators: Date and time the View is scheduled to be published */
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
 				// translators: Publish box date format, see http://php.net/date
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -222,39 +222,39 @@ 
 		}
 
 		$wp_allowed_scripts = array(
-            'common',
-            'admin-bar',
-            'autosave',
-            'post',
+			'common',
+			'admin-bar',
+			'autosave',
+			'post',
 			'inline-edit-post',
-            'utils',
-            'svg-painter',
-            'wp-auth-check',
-            'heartbeat',
+			'utils',
+			'svg-painter',
+			'wp-auth-check',
+			'heartbeat',
 			'media-editor',
 			'media-upload',
-            'thickbox',
+			'thickbox',
 			'wp-color-picker',
 
-            // Settings
+			// Settings
 			'gv-admin-edd-license',
 
-            // Common
-            'select2-js',
-            'qtip-js',
+			// Common
+			'select2-js',
+			'qtip-js',
 
-            // jQuery
+			// jQuery
 			'jquery',
-            'jquery-ui-core',
-            'jquery-ui-sortable',
-            'jquery-ui-datepicker',
-            'jquery-ui-dialog',
-            'jquery-ui-slider',
+			'jquery-ui-core',
+			'jquery-ui-sortable',
+			'jquery-ui-datepicker',
+			'jquery-ui-dialog',
+			'jquery-ui-slider',
 			'jquery-ui-dialog',
 			'jquery-ui-tabs',
 			'jquery-ui-draggable',
 			'jquery-ui-droppable',
-            'jquery-ui-accordion',
+			'jquery-ui-accordion',
 		);
 
 		$this->remove_conflicts( $wp_scripts, $wp_allowed_scripts, 'scripts' );
@@ -288,23 +288,23 @@ 
 			return;
 		}
 
-        $wp_allowed_styles = array(
-	        'admin-bar',
-        	'colors',
-	        'ie',
-	        'wp-auth-check',
-	        'media-views',
+		$wp_allowed_styles = array(
+			'admin-bar',
+			'colors',
+			'ie',
+			'wp-auth-check',
+			'media-views',
 			'thickbox',
 			'dashicons',
-	        'wp-jquery-ui-dialog',
-	        'jquery-ui-sortable',
+			'wp-jquery-ui-dialog',
+			'jquery-ui-sortable',
 
-            // Settings
-	        'gravityview_settings',
+			// Settings
+			'gravityview_settings',
 
-	        // @todo qTip styles not loading for some reason!
-	        'jquery-qtip.js',
-	    );
+			// @todo qTip styles not loading for some reason!
+			'jquery-qtip.js',
+		);
 
 		$this->remove_conflicts( $wp_styles, $wp_allowed_styles, 'styles' );
 
@@ -324,32 +324,32 @@ 
 	 */
 	private function remove_conflicts( &$wp_objects, $required_objects, $type = 'scripts' ) {
 
-        /**
-         * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
-         * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
-         * @param array $required_objects
-         */
-        $required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
-
-        //reset queue
-        $queue = array();
-        foreach( $wp_objects->queue as $object ) {
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
-                $queue[] = $object;
-            }
-        }
-        $wp_objects->queue = $queue;
-
-        $required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
-
-        //unregistering scripts
-        $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
-                $registered[ $handle ] = $script_registration;
-            }
-        }
-        $wp_objects->registered = $registered;
+		/**
+		 * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
+		 * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
+		 * @param array $required_objects
+		 */
+		$required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
+
+		//reset queue
+		$queue = array();
+		foreach( $wp_objects->queue as $object ) {
+			if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
+				$queue[] = $object;
+			}
+		}
+		$wp_objects->queue = $queue;
+
+		$required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
+
+		//unregistering scripts
+		$registered = array();
+		foreach( $wp_objects->registered as $handle => $script_registration ){
+			if( in_array( $handle, $required_objects ) ){
+				$registered[ $handle ] = $script_registration;
+			}
+		}
+		$wp_objects->registered = $registered;
 	}
 
 	/**
@@ -412,7 +412,6 @@ 
 	 *
 	 * @deprecated since 1.12
 	 * @see GravityView_Compatibility::get_plugin_status()
-
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
 	static function get_plugin_status( $location = '' ) {

Spacing +74 added lines, -74 removed lines

@@ -4,10 +4,10 @@ 
 
 	function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if ( ! is_admin() ) { return; }
 
 		// If Gravity Forms isn't active or compatibile, stop loading
-		if( false === GravityView_Compatibility::is_valid() ) {
+		if ( false === GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -25,7 +25,7 @@ 
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
 
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
+		if ( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && ! GFForms::is_gravity_page() ) {
 			require_once( GFCommon::get_base_path() . '/tooltips.php' );
 		}
 
@@ -50,18 +50,18 @@ 
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
 
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
 
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
 
 		//Hooks for no-conflict functionality
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
+		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9 );
 
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
+		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000 );
+		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1 );
+		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1 );
 
 	}
 
@@ -74,20 +74,20 @@ 
 	public function backend_actions() {
 
 		/** @define "GRAVITYVIEW_DIR" "../" */
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-label.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-label.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		/**
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
 		 *
 		 * Nice place to insert extensions' backend stuff
 		 */
-		do_action('gravityview_include_backend_actions');
+		do_action( 'gravityview_include_backend_actions' );
 	}
 
 	/**
@@ -103,12 +103,12 @@ 
 
 		$actions = array();
 
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
 		}
 
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
+			$actions[ ] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
 		}
 
 		return array_merge( $actions, $links );
@@ -131,12 +131,12 @@ 
 	function post_updated_messages( $messages, $bulk_counts = NULL ) {
 		global $post;
 
-		$post_id = isset($_GET['post']) ? intval($_GET['post']) : ( is_object( $post ) && isset( $post->ID ) ? $post->ID : NULL );
+		$post_id = isset( $_GET[ 'post' ] ) ? intval( $_GET[ 'post' ] ) : ( is_object( $post ) && isset( $post->ID ) ? $post->ID : NULL );
 
 		// By default, there will only be one item being modified.
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
 		// of modified items that will override this array.
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
 
 
 		// If we're starting fresh, a new form was created.
@@ -145,60 +145,60 @@ 
 
 		$new_form_text = '';
 
-		if( !empty( $start_fresh ) ) {
+		if ( ! empty( $start_fresh ) ) {
 
 			// Get the form that was created
 			$connected_form = gravityview_get_form_id( $post_id );
 
-			if( !empty( $connected_form ) ) {
+			if ( ! empty( $connected_form ) ) {
 				$form = gravityview_get_form( $connected_form );
-				$form_name = esc_attr( $form['title'] );
+				$form_name = esc_attr( $form[ 'title' ] );
 				$image = self::get_floaty();
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
 
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
 				$new_form_text = wpautop( $new_form_text );
 
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
 			}
 		}
 
-		$messages['gravityview'] = array(
+		$messages[ 'gravityview' ] = array(
 			0  => '', // Unused. Messages start at index 1.
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			3  => __( 'View deleted.', 'gravityview' ),
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 			8  => __( 'View submitted.', 'gravityview' ),
 			9  => sprintf(
 		        /* translators: Date and time the View is scheduled to be published */
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
 				// translators: Publish box date format, see http://php.net/date
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
 			) . $new_form_text,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 
 			/**
 			 * These apply to `bulk_post_updated_messages`
 			 * @file wp-admin/edit.php
 			 */
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
 		);
 
 		return $messages;
@@ -211,13 +211,13 @@ 
 	function no_conflict_scripts() {
 		global $wp_scripts;
 
-		if( ! gravityview_is_admin_page() ) {
+		if ( ! gravityview_is_admin_page() ) {
 			return;
 		}
 
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
 
-		if( empty( $no_conflict_mode ) ) {
+		if ( empty( $no_conflict_mode ) ) {
 			return;
 		}
 
@@ -267,24 +267,24 @@ 
 	function no_conflict_styles() {
 		global $wp_styles;
 
-		if( ! gravityview_is_admin_page() ) {
+		if ( ! gravityview_is_admin_page() ) {
 			return;
 		}
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
-			foreach ($wp_styles->registered as $key => $style) {
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
+		if ( ! empty( $wp_styles->registered ) ) {
+			foreach ( $wp_styles->registered as $key => $style ) {
+				if ( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
 					wp_dequeue_style( $key );
 				}
 			}
 		}
 
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
 
 		// If no conflict is off, jQuery will suffice.
-		if( empty( $no_conflict_mode ) ) {
+		if ( empty( $no_conflict_mode ) ) {
 			return;
 		}
 
@@ -311,7 +311,7 @@ 
 		/**
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
 		 */
-		do_action('gravityview_remove_conflicts_after');
+		do_action( 'gravityview_remove_conflicts_after' );
 	}
 
 	/**
@@ -333,9 +333,9 @@ 
 
         //reset queue
         $queue = array();
-        foreach( $wp_objects->queue as $object ) {
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
-                $queue[] = $object;
+        foreach ( $wp_objects->queue as $object ) {
+	        if ( in_array( $object, $required_objects ) || preg_match( '/gravityview|gf_|gravityforms/ism', $object ) ) {
+                $queue[ ] = $object;
             }
         }
         $wp_objects->queue = $queue;
@@ -344,8 +344,8 @@ 
 
         //unregistering scripts
         $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
+        foreach ( $wp_objects->registered as $handle => $script_registration ) {
+            if ( in_array( $handle, $required_objects ) ) {
                 $registered[ $handle ] = $script_registration;
             }
         }
@@ -358,7 +358,7 @@ 
 	 * @param [type] $registered [description]
 	 * @param [type] $scripts    [description]
 	 */
-	private function add_script_dependencies($registered, $scripts) {
+	private function add_script_dependencies( $registered, $scripts ) {
 
 		//gets all dependent scripts linked to the $scripts array passed
 		do {
@@ -367,7 +367,7 @@ 
 				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
 				foreach ( $deps as $dep ) {
 					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
-						$dependents[] = $dep;
+						$dependents[ ] = $dep;
 					}
 				}
 			}
@@ -431,29 +431,29 @@ 
 	static function is_admin_page( $hook = '', $page = NULL ) {
 		global $current_screen, $plugin_page, $pagenow, $post;
 
-		if( ! is_admin() ) { return false; }
+		if ( ! is_admin() ) { return false; }
 
 		$is_page = false;
 
-		$is_gv_screen = (!empty($current_screen) && isset($current_screen->post_type) && $current_screen->post_type === 'gravityview');
+		$is_gv_screen = ( ! empty( $current_screen ) && isset( $current_screen->post_type ) && $current_screen->post_type === 'gravityview' );
 
-		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
+		$is_gv_post_type_get = ( isset( $_GET[ 'post_type' ] ) && $_GET[ 'post_type' ] === 'gravityview' );
 
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
+		$is_gv_settings_get = isset( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings';
 
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
-			$gv_post = get_post( intval( $_GET['post'] ) );
-			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
+		if ( empty( $post ) && $pagenow === 'post.php' && ! empty( $_GET[ 'post' ] ) ) {
+			$gv_post = get_post( intval( $_GET[ 'post' ] ) );
+			$is_gv_post_type = ( ! empty( $gv_post ) && ! empty( $gv_post->post_type ) && $gv_post->post_type === 'gravityview' );
 		} else {
-			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
+			$is_gv_post_type = ( ! empty( $post ) && ! empty( $post->post_type ) && $post->post_type === 'gravityview' );
 		}
 
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
+		if ( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
 
 			// $_GET `post_type` variable
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
+			if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 				$is_page = 'single';
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
+			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( ! empty( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings' ) ) {
 				$is_page = 'settings';
 			} else {
 				$is_page = 'views';
@@ -468,7 +468,7 @@ 
 		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
 
 		// If the current page is the same as the compared page
-		if( !empty( $page ) ) {
+		if ( ! empty( $page ) ) {
 			return $is_page === $page;
 		}
 
@@ -489,6 +489,6 @@ 
  *
  * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
  */
-function gravityview_is_admin_page($hook = '', $page = NULL) {
+function gravityview_is_admin_page( $hook = '', $page = NULL ) {
 	return GravityView_Admin::is_admin_page( $hook, $page );
 }

includes/class-cache.php

Spacing +14 added lines, -14 removed lines

@@ -79,7 +79,7 @@ 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
+		foreach ( $this->lead_db_columns as $column ) {
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
 		}
 
@@ -112,9 +112,9 @@ 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
 		
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add( $entry[ 'form_id' ] );
 	}
 
 	/**
@@ -127,9 +127,9 @@ 
 	 */
 	public function entry_updated( $form, $lead_id ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -144,9 +144,9 @@ 
 	 */
 	public function entry_created( $entry, $form ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		$forms = 'f:' . implode( '&f:', (array)$form_ids );
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
@@ -242,7 +242,7 @@ 
 
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
 
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
@@ -275,7 +275,7 @@ 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			if ( in_array( $form_id, $blacklist ) ) {
 
@@ -347,7 +347,7 @@ 
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
 
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
 
@@ -383,7 +383,7 @@ 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			$key = $this->get_cache_key_prefix( $form_id );
 
@@ -497,7 +497,7 @@ 
 
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
 
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
 
@@ -526,7 +526,7 @@ 
 		 */
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }

includes/class-data.php

Spacing +113 added lines, -113 removed lines

@@ -17,11 +17,11 @@ 
 	 */
 	private function __construct( $passed_post = NULL ) {
 
-		if( !empty( $passed_post ) ) {
+		if ( ! empty( $passed_post ) ) {
 
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
 
-			if( !empty( $id_or_id_array ) ) {
+			if ( ! empty( $id_or_id_array ) ) {
 				$this->add_view( $id_or_id_array );
 			}
 		}
@@ -56,33 +56,33 @@ 
 
 		$ids = array();
 
-		if( ! empty( $passed_post ) ) {
+		if ( ! empty( $passed_post ) ) {
 
-			if( is_numeric( $passed_post ) ) {
+			if ( is_numeric( $passed_post ) ) {
 				$passed_post = get_post( $passed_post );
 			}
 
 			// Convert WP_Posts into WP_Posts[] array
-			if( $passed_post instanceof WP_Post ) {
+			if ( $passed_post instanceof WP_Post ) {
 				$passed_post = array( $passed_post );
 			}
 
-			if( is_array( $passed_post ) ) {
+			if ( is_array( $passed_post ) ) {
 
-				foreach ( $passed_post as &$post) {
-					if( ( get_post_type( $post ) === 'gravityview' ) ) {
-						$ids[] = $post->ID;
-					} else{
+				foreach ( $passed_post as &$post ) {
+					if ( ( get_post_type( $post ) === 'gravityview' ) ) {
+						$ids[ ] = $post->ID;
+					} else {
 						// Parse the Post Content
 						$id = $this->parse_post_content( $post->post_content );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						if ( $id ) {
+							$ids = array_merge( $ids, (array)$id );
 						}
 
 						// Parse the Post Meta
 						$id = $this->parse_post_meta( $post->ID );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						if ( $id ) {
+							$ids = array_merge( $ids, (array)$id );
 						}
 					}
 
@@ -93,24 +93,24 @@ 
 				if ( is_string( $passed_post ) ) {
 
 					$id = $this->parse_post_content( $passed_post );
-					if( $id ) {
-						$ids = array_merge( $ids, (array) $id );
+					if ( $id ) {
+						$ids = array_merge( $ids, (array)$id );
 					}
 
 				} else {
 					$id = $this->get_id_from_atts( $passed_post );
-					$ids[] = intval( $id );
+					$ids[ ] = intval( $id );
 				}
 			}
 		}
 
-		if( empty($ids) ) {
+		if ( empty( $ids ) ) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new GravityView_View_Data( $passed_post );
 		}
 
@@ -131,19 +131,19 @@ 
 
 	function get_view( $view_id, $atts = NULL ) {
 
-		if( ! is_numeric( $view_id) ) {
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
+		if ( ! is_numeric( $view_id ) ) {
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id ) );
 			return false;
 		}
 
 		// Backup: the view hasn't been fetched yet. Doing it now.
 		if ( ! isset( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] View #%s not set yet.', $view_id ) );
 			return $this->add_view( $view_id, $atts );
 		}
 
 		if ( empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id ) );
 			return false;
 		}
 
@@ -174,8 +174,8 @@ 
 	function add_view( $view_id, $atts = NULL ) {
 
 		// Handle array of IDs
-		if( is_array( $view_id ) ) {
-			foreach( $view_id as $id ) {
+		if ( is_array( $view_id ) ) {
+			foreach ( $view_id as $id ) {
 
 				$this->add_view( $id, $atts );
 			}
@@ -184,21 +184,21 @@ 
 		}
 
 		// The view has been set already; returning stored view.
-		if ( !empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
+		if ( ! empty( $this->views[ $view_id ] ) ) {
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id ) );
 			return $this->views[ $view_id ];
 		}
 
-		if( ! $this->view_exists( $view_id ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
+		if ( ! $this->view_exists( $view_id ) ) {
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id ) );
 			return false;
 		}
 
 		$form_id = gravityview_get_form_id( $view_id );
 
-		if( empty( $form_id ) ) {
+		if ( empty( $form_id ) ) {
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id ) );
 
 			return false;
 		}
@@ -206,21 +206,21 @@ 
 		// Get the settings for the View ID
 		$view_settings = gravityview_get_template_settings( $view_id );
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id ), $view_settings );
 
 		// Merge the view settings with the defaults
 		$view_defaults = wp_parse_args( $view_settings, self::get_default_args() );
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
 
-		if( ! empty( $atts ) && is_array( $atts ) ) {
+		if ( ! empty( $atts ) && is_array( $atts ) ) {
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
 
 			// Get the settings from the shortcode and merge them with defaults.
 			$atts = shortcode_atts( $view_defaults, $atts );
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
 
 		} else {
 
@@ -229,7 +229,7 @@ 
 
 		}
 
-		unset( $atts['id'], $view_defaults, $view_settings );
+		unset( $atts[ 'id' ], $view_defaults, $view_settings );
 
 		$data = array(
 			'id' => $view_id,
@@ -242,7 +242,7 @@ 
 			'form' => gravityview_get_form( $form_id ),
 		);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] View #%s being added.', $view_id ), $data );
 
 		$this->views[ $view_id ] = $data;
 
@@ -277,15 +277,15 @@ 
 	 */
 	private function filter_fields( $dir_fields ) {
 
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
+		if ( empty( $dir_fields ) || ! is_array( $dir_fields ) ) {
 			return $dir_fields;
 		}
 
-		foreach( $dir_fields as $area => $fields ) {
+		foreach ( $dir_fields as $area => $fields ) {
 
-			foreach( (array)$fields as $uniqid => $properties ) {
+			foreach ( (array)$fields as $uniqid => $properties ) {
 
-				if( $this->hide_field_check_conditions( $properties ) ) {
+				if ( $this->hide_field_check_conditions( $properties ) ) {
 					unset( $dir_fields[ $area ][ $uniqid ] );
 				}
 
@@ -307,7 +307,7 @@ 
 	private function hide_field_check_conditions( $properties ) {
 
 		// logged-in visibility
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
+		if ( ! empty( $properties[ 'only_loggedin' ] ) && ! GVCommon::has_cap( $properties[ 'only_loggedin_cap' ] ) ) {
 			return true;
 		}
 
@@ -321,14 +321,14 @@ 
 		// Get the settings from the shortcode and merge them with defaults.
 		$atts = wp_parse_args( $atts, self::get_default_args() );
 
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
+		$view_id = ! empty( $atts[ 'view_id' ] ) ? (int)$atts[ 'view_id' ] : NULL;
 
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
-			$view_id = (int)$atts['id'];
+		if ( empty( $view_id ) && ! empty( $atts[ 'id' ] ) ) {
+			$view_id = (int)$atts[ 'id' ];
 		}
 
-		if( empty( $view_id ) ) {
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
+		if ( empty( $view_id ) ) {
+			do_action( 'gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
 			return;
 		}
 
@@ -350,44 +350,44 @@ 
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
 		 * @since 1.6
 		 */
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
+		if ( ! shortcode_exists( 'gravityview' ) && class_exists( 'GravityView_Shortcode' ) ) {
 			new GravityView_Shortcode;
 		}
 
 		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
 
-		if( empty( $shortcodes ) ) {
+		if ( empty( $shortcodes ) ) {
 			return NULL;
 		}
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
 
 		$ids = array();
 
-		foreach ($shortcodes as $key => $shortcode) {
+		foreach ( $shortcodes as $key => $shortcode ) {
 
-			$args = shortcode_parse_atts( $shortcode[3] );
+			$args = shortcode_parse_atts( $shortcode[ 3 ] );
 
-			if( empty( $args['id'] ) ) {
-				do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
+			if ( empty( $args[ 'id' ] ) ) {
+				do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
 				continue;
 			}
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args[ 'id' ] ), $args );
 
 			// Store the View to the object for later fetching.
-			$this->add_view( $args['id'], $args );
+			$this->add_view( $args[ 'id' ], $args );
 
-			$ids[] = $args['id'];
+			$ids[ ] = $args[ 'id' ];
 		}
 
-		if( empty($ids) ) {
+		if ( empty( $ids ) ) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 
 	}
 
@@ -408,7 +408,7 @@ 
 		 */
 		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
 
-		if( empty( $meta_keys ) ) {
+		if ( empty( $meta_keys ) ) {
 			return NULL;
 		}
 
@@ -416,16 +416,16 @@ 
 
 		$meta_content = '';
 
-		foreach( $meta_keys as $key ) {
-			$meta = get_post_meta( $post_id, $key , true );
-			if( ! is_string( $meta ) ) {
+		foreach ( $meta_keys as $key ) {
+			$meta = get_post_meta( $post_id, $key, true );
+			if ( ! is_string( $meta ) ) {
 				continue;
 			}
 			$meta_content .= $meta . ' ';
 		}
 
-		if( empty( $meta_content ) ) {
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
+		if ( empty( $meta_content ) ) {
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
 			return NULL;
 		}
 
@@ -452,16 +452,16 @@ 
 		$message = NULL;
 
 		// Not invalid if not set!
-		if( empty( $post_id ) || empty( $view_id ) ) {
+		if ( empty( $post_id ) || empty( $view_id ) ) {
 
-			if( $empty_is_valid ) {
+			if ( $empty_is_valid ) {
 				return true;
 			}
 
 			$message = esc_html__( 'The ID is required.', 'gravityview' );
 		}
 
-		if( ! $message ) {
+		if ( ! $message ) {
 			$status = get_post_status( $post_id );
 
 			// Nothing exists with that post ID.
@@ -473,7 +473,7 @@ 
 			}
 		}
 
-		if( ! $message ) {
+		if ( ! $message ) {
 
 			// Nothing exists with that post ID.
 			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
@@ -482,25 +482,25 @@ 
 
 		}
 
-		if( ! $message ) {
+		if ( ! $message ) {
 			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
 			}
 		}
 
-		if( ! $message ) {
+		if ( ! $message ) {
 
 			// It's a View
-			if( 'gravityview' === get_post_type( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+			if ( 'gravityview' === get_post_type( $post_id ) ) {
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
 			}
 
 		}
 
-		if( $message ) {
+		if ( $message ) {
 			return new WP_Error( 'invalid_embed_id', $message );
 		}
 
@@ -517,7 +517,7 @@ 
 
 		$args = self::get_default_args( $with_details );
 
-		if( !isset( $args[ $key ] ) ) { return NULL; }
+		if ( ! isset( $args[ $key ] ) ) { return NULL; }
 
 		return $args[ $key ];
 	}
@@ -546,7 +546,7 @@ 
 		 */
 		$default_settings = apply_filters( 'gravityview_default_args', array(
 			'id' => array(
-				'label' => __('View ID', 'gravityview'),
+				'label' => __( 'View ID', 'gravityview' ),
 				'type' => 'number',
 				'group'	=> 'default',
 				'value' => NULL,
@@ -554,7 +554,7 @@ 
 				'show_in_shortcode' => false,
 			),
 			'page_size' => array(
-				'label' 	=> __('Number of entries per page', 'gravityview'),
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
 				'type' => 'number',
 				'class'	=> 'small-text',
 				'group'	=> 'default',
@@ -594,40 +594,40 @@ 
 			'user_edit' => array(
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'sort_field' => array(
-				'label'	=> __('Sort by field', 'gravityview'),
+				'label'	=> __( 'Sort by field', 'gravityview' ),
 				'type' => 'select',
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __( 'Default', 'gravityview' ),
+					'date_created' => __( 'Date Created', 'gravityview' ),
 				),
 				'show_in_shortcode' => true,
 			),
 			'sort_direction' => array(
-				'label' 	=> __('Sort direction', 'gravityview'),
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
 				'type' => 'select',
 				'value' => 'ASC',
 				'group'	=> 'sort',
 				'options' => array(
-					'ASC' => __('ASC', 'gravityview'),
-					'DESC' => __('DESC', 'gravityview'),
+					'ASC' => __( 'ASC', 'gravityview' ),
+					'DESC' => __( 'DESC', 'gravityview' ),
 					//'RAND' => __('Random', 'gravityview'),
 				),
 				'show_in_shortcode' => true,
@@ -643,83 +643,83 @@ 
 				'show_in_template' => array( 'default_table' ),
 			),
 			'start_date' => array(
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'end_date' => array(
-				'label' 	=> __('Filter by End Date', 'gravityview'),
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'class' => array(
-				'label' 	=> __('CSS Class', 'gravityview'),
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
 				'group'	=> 'default',
 				'type' => 'text',
 				'value' => '',
 				'show_in_shortcode' => false,
 			),
 			'search_value' => array(
-				'label' 	=> __('Search Value', 'gravityview'),
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
+				'label' 	=> __( 'Search Value', 'gravityview' ),
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'search_field' => array(
-				'label' 	=> __('Search Field', 'gravityview'),
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
+				'label' 	=> __( 'Search Field', 'gravityview' ),
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
 				'type' => 'number',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'single_title' => array(
-				'label'	=> __('Single Entry Title', 'gravityview'),
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
 				'type'	=> 'text',
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
 				'group'	=> 'default',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'back_link_label' => array(
-				'label'	=> __('Back Link Label', 'gravityview'),
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
 				'type'	=> 'text',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'embed_only' => array(
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
-		));
+		) );
 
 		// By default, we only want the key => value pairing, not the whole array.
-		if( empty( $with_details ) ) {
+		if ( empty( $with_details ) ) {
 
 			$defaults = array();
 
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ( $default_settings as $key => $value ) {
+				$defaults[ $key ] = $value[ 'value' ];
 			}
 
 			return $defaults;
@@ -728,12 +728,12 @@ 
 		// But sometimes, we want all the details.
 		else {
 
-			foreach ($default_settings as $key => $value) {
+			foreach ( $default_settings as $key => $value ) {
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
-				if( !empty( $group ) && is_string( $group ) ) {
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
+				if ( ! empty( $group ) && is_string( $group ) ) {
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
 						unset( $default_settings[ $key ] );
 					}
 				}

Braces +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 				foreach ( $passed_post as &$post) {
 					if( ( get_post_type( $post ) === 'gravityview' ) ) {
 						$ids[] = $post->ID;
-					} else{
+					} else {
 						// Parse the Post Content
 						$id = $this->parse_post_content( $post->post_content );
 						if( $id ) {

includes/class-gravityview-entry-notes.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 		// Make sure the keys are all set
 		$note = wp_parse_args( $note, $default_note );
 
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
+		GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) );
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public static function delete_notes( $note_ids = array() ) {
 
-		if( !is_array( $note_ids ) ) {
+		if ( ! is_array( $note_ids ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array', $note_ids );
 		}
 
@@ -111,8 +111,8 @@ 
 	 */
 	public static function filter_avatar( $avatar = '', $note ) {
 
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
+		if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
+			$avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
 		}
 
 		return $avatar;

includes/widgets/register-gravityview-widgets.php

Spacing +7 added lines, -7 removed lines

@@ -20,15 +20,15 @@
  */
 function gravityview_register_gravityview_widgets() {
 
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
 
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
 
-	if( class_exists('GFPolls') ) {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
+	if ( class_exists( 'GFPolls' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
 	}
 
 }

includes/widgets/poll/class-gravityview-widget-poll.php

Spacing +22 added lines, -22 removed lines

@@ -21,9 +21,9 @@ 
 	 */
 	function __construct() {
 
-		$this->widget_description = __('Displays the results of Poll Fields that exist in the form.', 'gravityview' );
+		$this->widget_description = __( 'Displays the results of Poll Fields that exist in the form.', 'gravityview' );
 
-		$this->widget_subtitle = sprintf( _x('Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
+		$this->widget_subtitle = sprintf( _x( 'Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
 
 		$default_values = array(
 			'header' => 1,
@@ -32,32 +32,32 @@ 
 
 		$settings = array(
 			'percentages' => array(
-				'label' => __('Display Percentages', 'gravityview'),
+				'label' => __( 'Display Percentages', 'gravityview' ),
 				'type' => 'checkbox',
 				'value' => true,
 				'tooltip' => __( 'Display results percentages as part of results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
 			),
 			'counts' => array(
-				'label' => __('Display Counts', 'gravityview'),
+				'label' => __( 'Display Counts', 'gravityview' ),
 				'type' => 'checkbox',
 				'value' => true,
 				'tooltip' => __( 'Display number of times each choice has been selected when displaying results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
 			),
 			'style' => array(
 				'type' => 'select',
-				'label' => __('Style', 'gravityview'),
+				'label' => __( 'Style', 'gravityview' ),
 				'tooltip' => __( 'The Polls Add-On currently supports 4 built in styles: red, green, orange, blue. Defaults to "green".', 'gravityview' ),
 				'value' => 'green',
 				'choices' => array(
-					'green' => __('Green', 'gravityview'),
-					'blue' => __('Blue', 'gravityview'),
-					'red' => __('Red', 'gravityview'),
-					'orange' => __('Orange', 'gravityview'),
+					'green' => __( 'Green', 'gravityview' ),
+					'blue' => __( 'Blue', 'gravityview' ),
+					'red' => __( 'Red', 'gravityview' ),
+					'orange' => __( 'Orange', 'gravityview' ),
 				)
 			)
 		);
 
-		parent::__construct( __( 'Poll Results', 'gravityview' ) , 'poll', $default_values, $settings );
+		parent::__construct( __( 'Poll Results', 'gravityview' ), 'poll', $default_values, $settings );
 
 		// frontend - add template path
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
@@ -88,11 +88,11 @@ 
 
 		$GFPolls = GFPolls::get_instance();
 
-		wp_enqueue_script('gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array('jquery'), $GFPolls->_version);
+		wp_enqueue_script( 'gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array( 'jquery' ), $GFPolls->_version );
 
 		$GFPolls->localize_scripts();
 
-		wp_enqueue_style('gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version);
+		wp_enqueue_style( 'gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version );
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function pre_render_frontend() {
 
-		if( !class_exists('GFPolls') ) {
+		if ( ! class_exists( 'GFPolls' ) ) {
 
 			$return = false;
 
@@ -158,14 +158,14 @@ 
 	 *
 	 * @since 1.8
 	 */
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 
-		if( !$this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
 		// Make sure the class is loaded in DataTables
-		if( !class_exists( 'GFFormDisplay' ) ) {
+		if ( ! class_exists( 'GFFormDisplay' ) ) {
 			include_once( GFCommon::get_base_path() . '/form_display.php' );
 		}
 
@@ -173,14 +173,14 @@ 
 
 		$settings = $this->get_frontend_settings( $widget_args );
 
-		$percentages = empty( $settings['percentages'] ) ? 'false' : 'true';
+		$percentages = empty( $settings[ 'percentages' ] ) ? 'false' : 'true';
 
-		$counts = empty( $settings['counts'] ) ? 'false' : 'true';
+		$counts = empty( $settings[ 'counts' ] ) ? 'false' : 'true';
 
-		if( !empty( $settings['field'] ) ) {
-			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings['field'], $settings['style'], $percentages, $counts );
+		if ( ! empty( $settings[ 'field' ] ) ) {
+			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings[ 'field' ], $settings[ 'style' ], $percentages, $counts );
 		} else {
-			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings['style'], $percentages, $counts );
+			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings[ 'style' ], $percentages, $counts );
 		}
 
 		$gravityview_view = GravityView_View::getInstance();
@@ -189,7 +189,7 @@ 
 
 		$gravityview_view->poll_settings = $settings;
 
-		$gravityview_view->render('widget', 'poll', false );
+		$gravityview_view->render( 'widget', 'poll', false );
 
 	}
 

includes/widgets/search-widget/templates/search-field-date.php

Spacing +3 added lines, -3 removed lines

@@ -11,10 +11,10 @@
 ?>
 
 <div class="gv-search-box">
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
 	</p>
 </div>
\ No newline at end of file

includes/widgets/search-widget/templates/search-field-hidden.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $search_field = $gravityview_view->search_field;
-?><div><input type="hidden" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>"></div>
\ No newline at end of file
+?><div><input type="hidden" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>"></div>
\ No newline at end of file

includes/widgets/search-widget/templates/search-field-search_all.php

Spacing +3 added lines, -3 removed lines

@@ -7,14 +7,14 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 
 ?>
 
 <div class="gv-search-box">
 	<div class="gv-search">
-	<?php if( ! gv_empty( $label, false ) ) { ?>
+	<?php if ( ! gv_empty( $label, false ) ) { ?>
 		<label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 		<p><input type="text" name="gv_search" id="gv_search_<?php echo $view_id; ?>" value="<?php echo $value; ?>" /></p>