gravityview / GravityView

includes/class-gravityview-admin-notices.php

Spacing +39 added lines, -39 removed lines

@@ -15,7 +15,7 @@ 
  * When the plugin is activated, flush dismissed notices
  * @since 1.15.1
  */
-register_activation_hook( GRAVITYVIEW_FILE, array( 'GravityView_Admin_Notices', 'flush_dismissed_notices' ) );
+register_activation_hook(GRAVITYVIEW_FILE, array('GravityView_Admin_Notices', 'flush_dismissed_notices'));
 
 /**
  * Handle displaying and storing of admin notices for GravityView
@@ -33,10 +33,10 @@ 
 	}
 
 	function add_hooks() {
-		add_action( 'network_admin_notices', array( $this, 'dismiss_notice' ), 50 );
-		add_action( 'admin_notices', array( $this, 'dismiss_notice' ), 50 );
-		add_action( 'admin_notices', array( $this, 'admin_notice' ), 100 );
-		add_action( 'network_admin_notices', array( $this, 'admin_notice' ), 100 );
+		add_action('network_admin_notices', array($this, 'dismiss_notice'), 50);
+		add_action('admin_notices', array($this, 'dismiss_notice'), 50);
+		add_action('admin_notices', array($this, 'admin_notice'), 100);
+		add_action('network_admin_notices', array($this, 'admin_notice'), 100);
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 * @return void
 	 */
 	static public function flush_dismissed_notices() {
-		delete_transient( 'gravityview_dismissed_notices' );
+		delete_transient('gravityview_dismissed_notices');
 	}
 
 	/**
@@ -57,26 +57,26 @@ 
 	public function dismiss_notice() {
 
 		// No dismiss sent
-		if( empty( $_GET['gv-dismiss'] ) ) {
+		if (empty($_GET['gv-dismiss'])) {
 			return;
 		}
 
 		// Invalid nonce
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
+		if (!wp_verify_nonce($_GET['gv-dismiss'], 'dismiss')) {
 			return;
 		}
 
-		$notice_id = esc_attr( $_GET['notice'] );
+		$notice_id = esc_attr($_GET['notice']);
 
 		//don't display a message if use has dismissed the message for this version
-		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
+		$dismissed_notices = (array)get_transient('gravityview_dismissed_notices');
 
 		$dismissed_notices[] = $notice_id;
 
-		$dismissed_notices = array_unique( $dismissed_notices );
+		$dismissed_notices = array_unique($dismissed_notices);
 
 		// Remind users every 16 weeks
-		set_transient( 'gravityview_dismissed_notices', $dismissed_notices, WEEK_IN_SECONDS * 16 );
+		set_transient('gravityview_dismissed_notices', $dismissed_notices, WEEK_IN_SECONDS * 16);
 
 	}
 
@@ -91,15 +91,15 @@ 
 	 * @param  string $notice            Notice array, set using `add_notice()`.
 	 * @return boolean                   True: show notice; False: hide notice
 	 */
-	private function is_notice_dismissed( $notice ) {
+	private function is_notice_dismissed($notice) {
 
 		// There are no dismissed notices.
-		if( empty( self::$dismissed_notices ) ) {
+		if (empty(self::$dismissed_notices)) {
 			return false;
 		}
 
 		// Has the
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
+		$is_dismissed = !empty($notice['dismiss']) && in_array($notice['dismiss'], self::$dismissed_notices);
 
 		return $is_dismissed ? true : false;
 	}
@@ -124,17 +124,17 @@ 
 	 */
 	private function check_show_multisite_notices() {
 
-		if( ! is_multisite() ) {
+		if (!is_multisite()) {
 			return true;
 		}
 
 		// It's network activated but the user can't manage network plugins; they can't do anything about it.
-		if( GravityView_Plugin::is_network_activated() && ! is_main_site() ) {
+		if (GravityView_Plugin::is_network_activated() && !is_main_site()) {
 			return false;
 		}
 
 		// or they don't have admin capabilities
-		if( ! is_super_admin() ) {
+		if (!is_super_admin()) {
 			return false;
 		}
 
@@ -155,53 +155,53 @@ 
 		 * @filter `gravityview/admin/notices` Modify the notices displayed in the admin
 		 * @since 1.12
 		 */
-		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
+		$notices = apply_filters('gravityview/admin/notices', self::$admin_notices);
 
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
+		if (empty($notices) || !$this->check_show_multisite_notices()) {
 			return;
 		}
 
 		//don't display a message if use has dismissed the message for this version
 		// TODO: Use get_user_meta instead of get_transient
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
+		self::$dismissed_notices = isset($_GET['show-dismissed-notices']) ? array() : (array)get_transient('gravityview_dismissed_notices');
 
 		$output = '';
 
-		foreach( $notices as $notice ) {
+		foreach ($notices as $notice) {
 
 			// If the user doesn't have the capability to see the warning
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
-				do_action( 'gravityview_log_debug', 'Notice not shown because user does not have the capability to view it.', $notice );
+			if (isset($notice['cap']) && false === GVCommon::has_cap($notice['cap'])) {
+				do_action('gravityview_log_debug', 'Notice not shown because user does not have the capability to view it.', $notice);
 				continue;
 			}
 
-			if( true === $this->is_notice_dismissed( $notice ) ) {
-				do_action( 'gravityview_log_debug', 'Notice not shown because the notice has already been dismissed.', $notice );
+			if (true === $this->is_notice_dismissed($notice)) {
+				do_action('gravityview_log_debug', 'Notice not shown because the notice has already been dismissed.', $notice);
 				continue;
 			}
 
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
+			$output .= '<div id="message" style="position:relative" class="notice '.gravityview_sanitize_html_class($notice['class']).'">';
 
 			// Too cute to leave out.
 			$output .= gravityview_get_floaty();
 
-			if( !empty( $notice['title'] ) ) {
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
+			if (!empty($notice['title'])) {
+				$output .= '<h3>'.esc_html($notice['title']).'</h3>';
 			}
 
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
+			$message = isset($notice['message']) ? $notice['message'] : '';
 
-			if( !empty( $notice['dismiss'] ) ) {
+			if (!empty($notice['dismiss'])) {
 
 				$dismiss = esc_attr($notice['dismiss']);
 
-				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
+				$url = esc_url(add_query_arg(array('gv-dismiss' => wp_create_nonce('dismiss'), 'notice' => $dismiss)));
 
 				$align = is_rtl() ? 'alignleft' : 'alignright';
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
+				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="'.$align.' button button-link">'.esc_html__('Dismiss', 'gravityview').'</a></p>';
 			}
 
-			$output .= wpautop( $message );
+			$output .= wpautop($message);
 
 			$output .= '<div class="clear"></div>';
 			$output .= '</div>';
@@ -210,7 +210,7 @@ 
 
 		echo $output;
 
-		unset( $output, $align, $message, $notices );
+		unset($output, $align, $message, $notices);
 
 		//reset the notices handler
 		self::$admin_notices = array();
@@ -223,14 +223,14 @@ 
 	 * @param array $notice Array with `class`, `message`, `dismiss` and `cap` keys. The message is not escaped.
 	 * @return void
 	 */
-	public static function add_notice( $notice = array() ) {
+	public static function add_notice($notice = array()) {
 
-		if( !isset( $notice['message'] ) ) {
-			do_action( 'gravityview_log_error', 'GravityView_Admin[add_notice] Notice not set', $notice );
+		if (!isset($notice['message'])) {
+			do_action('gravityview_log_error', 'GravityView_Admin[add_notice] Notice not set', $notice);
 			return;
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice['class'] = empty($notice['class']) ? 'error' : $notice['class'];
 
 		self::$admin_notices[] = $notice;
 	}

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 +42 added lines, -42 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'));
 
     }
 
@@ -45,7 +45,7 @@ 
      * @param  string $password User password
      * @return void
      */
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
+    function assign_new_user_to_lead($user_id, $config, $entry = array(), $password = '') {
 
     	/**
     	 * Disable assigning the new user to the entry by returning false.
@@ -53,27 +53,27 @@ 
 	     * @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 );
+    	$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 ) ) {
+    	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 );
+    	$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');
 
     }
 
@@ -89,16 +89,16 @@ 
     	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,7 +140,7 @@ 
     function set_screen_mode() {
 
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( rgget('screen_mode') === 'edit' ) {
+        if (rgget('screen_mode') === 'edit') {
             $_POST["screen_mode"] = 'edit';
         }
 
@@ -156,38 +156,38 @@ 
             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 );
+        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 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_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 ) ) {
+            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 );
+                $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');
         }
 
     }
@@ -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' );
+        $users = GVCommon::get_users('change_entry_creator');
 
         $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 .= '<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-entry-list.php

Spacing +31 added lines, -31 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -75,7 +75,7 @@ 
 	 * @param string $link_format
 	 * @param string $after_link
 	 */
-	function __construct( $entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '' ) {
+	function __construct($entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '') {
 
 		$this->entries = $entries;
 		$this->post_id = $post_id;
@@ -90,28 +90,28 @@ 
 	/**
 	 * @param int $post_id
 	 */
-	public function set_post_id( $post_id ) {
+	public function set_post_id($post_id) {
 		$this->post_id = $post_id;
 	}
 
 	/**
 	 * @param string $link_format
 	 */
-	public function set_link_format( $link_format ) {
+	public function set_link_format($link_format) {
 		$this->link_format = $link_format;
 	}
 
 	/**
 	 * @param boolean $skip_current_entry
 	 */
-	public function set_skip_current_entry( $skip_current_entry ) {
+	public function set_skip_current_entry($skip_current_entry) {
 		$this->skip_current_entry = (bool)$skip_current_entry;
 	}
 
 	/**
 	 * @param string $after_link
 	 */
-	public function set_after_link( $after_link ) {
+	public function set_after_link($after_link) {
 		$this->after_link = $after_link;
 	}
 
@@ -119,7 +119,7 @@ 
 	 * Set the message when there are no entries to display
 	 * @param string $empty_message
 	 */
-	public function set_empty_message( $empty_message ) {
+	public function set_empty_message($empty_message) {
 		$this->empty_message = $empty_message;
 	}
 
@@ -127,23 +127,23 @@ 
 	 * Set the context in which this entry list is being displayed.
 	 * @param string $context
 	 */
-	public function set_context( $context ) {
+	public function set_context($context) {
 		$this->context = $context;
 	}
 
 	/**
 	 * @param string $wrapper_tag
 	 */
-	public function set_wrapper_tag( $wrapper_tag ) {
-		$this->wrapper_tag = esc_attr( $wrapper_tag );
+	public function set_wrapper_tag($wrapper_tag) {
+		$this->wrapper_tag = esc_attr($wrapper_tag);
 	}
 
 	/**
 	 *
 	 * @param string $item_tag
 	 */
-	public function set_item_tag( $item_tag ) {
-		$this->item_tag = esc_attr( $item_tag );
+	public function set_item_tag($item_tag) {
+		$this->item_tag = esc_attr($item_tag);
 	}
 
 	/**
@@ -170,32 +170,32 @@ 
 	public function get_output() {
 
 		// No Entries
-		if( empty( $this->entries ) ) {
+		if (empty($this->entries)) {
 			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
 		}
 
 		$output = '';
 		$current_entry = GravityView_View::getInstance()->getCurrentEntry();
 
-		$output .= '<'. $this->wrapper_tag .'>';
+		$output .= '<'.$this->wrapper_tag.'>';
 
-		foreach( $this->entries as $entry ) {
+		foreach ($this->entries as $entry) {
 
-			if( $this->skip_entry( $entry, $current_entry ) ) {
+			if ($this->skip_entry($entry, $current_entry)) {
 				continue;
 			}
 
-			$output .= $this->get_item_output( $entry );
+			$output .= $this->get_item_output($entry);
 		}
 
-		$output .= '</'. $this->wrapper_tag .'>';
+		$output .= '</'.$this->wrapper_tag.'>';
 
 		/**
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
 		 * @param string $output HTML to be displayed
 		 * @param GravityView_Entry_List $this The current class instance
 		 */
-		$output = apply_filters( 'gravityview/widget/recent-entries/output', $output, $this );
+		$output = apply_filters('gravityview/widget/recent-entries/output', $output, $this);
 
 		return $output;
 	}
@@ -208,18 +208,18 @@ 
 	 *
 	 * @return bool True: Skip entry; False: don't skip entry
 	 */
-	private function skip_entry( $entry, $current_entry ) {
+	private function skip_entry($entry, $current_entry) {
 
 		// If skip entry is off, or there's no current entry, return false
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
+		if (empty($this->skip_current_entry) || empty($current_entry)) {
 			return false;
 		}
 
 		// If in Single or Edit mode, $current_entry will be an array.
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
+		$current_entry_id = is_array($current_entry) ? $current_entry['id'] : $current_entry;
 
 		// If the entry ID matches the current entry, yes: skip
-		if( $entry['id'] === $current_entry_id ) {
+		if ($entry['id'] === $current_entry_id) {
 			return true;
 		}
 
@@ -240,13 +240,13 @@ 
 	 *
 	 * @return string HTML output for the entry
 	 */
-	private function get_item_output( $entry ) {
+	private function get_item_output($entry) {
 
-		$link = GravityView_API::entry_link( $entry, $this->post_id );
+		$link = GravityView_API::entry_link($entry, $this->post_id);
 
-		$item_output = gravityview_get_link( $link, $this->link_format );
+		$item_output = gravityview_get_link($link, $this->link_format);
 
-		if( !empty( $this->after_link ) ) {
+		if (!empty($this->after_link)) {
 
 			/**
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -255,14 +255,14 @@ 
 			 * @param array $entry Gravity Forms entry array
 			 * @param GravityView_Entry_List $this The current class instance
 			 */
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
+			$after_link = apply_filters('gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this);
 
 			$item_output .= $after_link;
 		}
 
-		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
+		$item_output = GravityView_API::replace_variables($item_output, $this->form, $entry);
 
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
+		$item_output = '<'.$this->item_tag.'>'.$item_output.'</'.$this->item_tag.'>';
 
 		/**
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list
@@ -271,7 +271,7 @@ 
 		 * @param array $entry Gravity Forms entry array
 		 * @param GravityView_Entry_List $this The current class instance
 		 */
-		$item_output = apply_filters( 'gravityview/entry-list/item', $item_output, $entry, $this );
+		$item_output = apply_filters('gravityview/entry-list/item', $item_output, $entry, $this);
 
 		return $item_output;
 	}

includes/class-gravityview-entry-notes.php

Spacing +17 added lines, -17 removed lines

@@ -17,7 +17,7 @@ 
 	 * @since 1.15
 	 */
 	private function add_hooks() {
-		add_filter( 'gform_notes_avatar', array( 'GravityView_Entry_Notes', 'filter_avatar' ), 10, 2 );
+		add_filter('gform_notes_avatar', array('GravityView_Entry_Notes', 'filter_avatar'), 10, 2);
 	}
 
 
@@ -31,7 +31,7 @@ 
 	 * @param string $note Note content.
 	 * @param string $note_type Type of note. Default: `gravityview`
 	 */
-	public static function add_note( $lead_id, $user_id, $user_name, $note = '', $note_type = 'gravityview' ) {
+	public static function add_note($lead_id, $user_id, $user_name, $note = '', $note_type = 'gravityview') {
 
 		$default_note = array(
 			'lead_id' => 0,
@@ -47,12 +47,12 @@ 
 		 * @since 1.15.2
 		 * @param array $note Array with `lead_id`, `user_id`, `user_name`, `note`, and `note_type` key value pairs
 		 */
-		$note = apply_filters( 'gravityview/entry_notes/add_note', compact( 'lead_id', 'user_id', 'user_name', 'note', 'note_type' ) );
+		$note = apply_filters('gravityview/entry_notes/add_note', compact('lead_id', 'user_id', 'user_name', 'note', 'note_type'));
 
 		// Make sure the keys are all set
-		$note = wp_parse_args( $note, $default_note );
+		$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']));
 	}
 
 	/**
@@ -60,8 +60,8 @@ 
 	 * @see GFFormsModel::delete_note()
 	 * @param int $note_id Entry note ID
 	 */
-	public static function delete_note( $note_id ) {
-		GFFormsModel::delete_note( $note_id );
+	public static function delete_note($note_id) {
+		GFFormsModel::delete_note($note_id);
 	}
 
 	/**
@@ -70,13 +70,13 @@ 
 	 * @todo Write more efficient delete note method using SQL
 	 * @param int[] $note_ids Array of entry note ids
 	 */
-	public static function delete_notes( $note_ids = array() ) {
+	public static function delete_notes($note_ids = array()) {
 
-		if( !is_array( $note_ids ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array', $note_ids );
+		if (!is_array($note_ids)) {
+			do_action('gravityview_log_error', __METHOD__.' - Note IDs not an array', $note_ids);
 		}
 
-		GFFormsModel::delete_notes( $note_ids );
+		GFFormsModel::delete_notes($note_ids);
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 *
 	 * @return stdClass[] Integer-keyed array of note objects
 	 */
-	public static function get_notes( $entry_id ) {
-		$notes = GFFormsModel::get_lead_notes( $entry_id );
+	public static function get_notes($entry_id) {
+		$notes = GFFormsModel::get_lead_notes($entry_id);
 
 		/**
 		 * @filter `gravityview/entry_notes/get_notes` Modify the notes array for an entry
@@ -96,7 +96,7 @@ 
 		 * @param stdClass[] $notes Integer-keyed array of note objects
 		 * @param int $entry_id Entry to get notes for
 		 */
-		$notes = apply_filters( 'gravityview/entry_notes/get_notes', $notes, $entry_id );
+		$notes = apply_filters('gravityview/entry_notes/get_notes', $notes, $entry_id);
 
 		return $notes;
 	}
@@ -109,10 +109,10 @@ 
 	 * @param object $note Note object with id, user_id, date_created, value, note_type, user_name, user_email vars
 	 * @return string Possibly-modified avatar
 	 */
-	public static function filter_avatar( $avatar = '', $note ) {
+	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/class-gravityview-image.php

Indentation +1 added lines, -1 removed lines

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

Spacing +25 added lines, -25 removed lines

@@ -49,7 +49,7 @@ 
 	}
 
 
-	function __construct( $atts = array() ) {
+	function __construct($atts = array()) {
 
 		$defaults = array(
 			'width' => $this->width,
@@ -63,13 +63,13 @@ 
 			'validate_src' => true
 		);
 
-		$atts = wp_parse_args( $atts, $defaults );
+		$atts = wp_parse_args($atts, $defaults);
 
-		foreach( $atts as $key => $val ) {
+		foreach ($atts as $key => $val) {
 			$this->{$key} = $val;
 		}
 
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
+		$this->class = !empty($this->class) ? esc_attr(implode(' ', (array)$this->class)) : $this->class;
 
 		$this->set_image_size();
 
@@ -85,17 +85,17 @@ 
 	 */
 	function validate_image_src() {
 
-		if ( !$this->validate_src ) { return true; }
+		if (!$this->validate_src) { return true; }
 
-		$info = pathinfo( $this->src );
+		$info = pathinfo($this->src);
 
 		/**
 		 * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag
 		 * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']`
 		 */
-		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ));
+		$image_exts = apply_filters('gravityview_image_extensions', array('jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico'));
 
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
+		return isset($info['extension']) && in_array(strtolower($info['extension']), $image_exts);
 	}
 
 	/**
@@ -103,20 +103,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_image_size( $string = NULL, $width = NULL, $height = NULL ) {
+	public function set_image_size($string = NULL, $width = NULL, $height = NULL) {
 
 
 		// If there is no width or height passed
-		if ( empty( $width ) || empty( $height ) ) {
+		if (empty($width) || empty($height)) {
 
 			// And there is no string size passed
 			// 		And we want to get the image size using PHP
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
+			if (empty($string) && !empty($this->getimagesize)) {
 
-				$image_size = getimagesize( $this->src );
+				$image_size = getimagesize($this->src);
 
-				if ( !empty( $image_size ) ) {
-					list( $width, $height ) = $image_size;
+				if (!empty($image_size)) {
+					list($width, $height) = $image_size;
 				}
 
 			}
@@ -127,14 +127,14 @@ 
 				 * @filter `gravityview_image_sizes` Modify the image size presets used by GravityView_Image class
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
 				 */
-				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
+				$image_sizes = apply_filters('gravityview_image_sizes', array(
 					'tiny' => array('width' => 40, 'height' => 30),
 					'small' => array('width' => 100, 'height' => 75),
 					'medium' => array('width' => 250, 'height' => 188),
 					'large' => array('width' => 448, 'height' => 336),
-				) );
+				));
 
-				switch( $this->size ) {
+				switch ($this->size) {
 					case 'tiny':
 						extract($image_sizes['tiny']);
 						break;
@@ -153,8 +153,8 @@ 
 						break;
 					default:
 						// Verify that the passed sizes are integers.
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
+						$width = !empty($width) ? intval($width) : intval($this->width);
+						$height = !empty($height) ? intval($height) : intval($this->height);
 				}
 
 			}
@@ -171,18 +171,18 @@ 
 	 */
 	public function html() {
 
-		if ( ! $this->validate_image_src() ) {
+		if (!$this->validate_image_src()) {
 			$html = '';
 		} else {
 			$atts = '';
-			foreach ( array( 'width', 'height', 'alt', 'title', 'class' ) as $attr ) {
+			foreach (array('width', 'height', 'alt', 'title', 'class') as $attr) {
 
-				if ( empty( $this->{$attr} ) ) { continue; }
+				if (empty($this->{$attr} )) { continue; }
 
-				$atts .= sprintf( ' %s="%s"', $attr, esc_attr( $this->{$attr} ) );
+				$atts .= sprintf(' %s="%s"', $attr, esc_attr($this->{$attr} ));
 			}
 
-			$html = sprintf( '<img src="%s" %s />', esc_url_raw( $this->src ), $atts );
+			$html = sprintf('<img src="%s" %s />', esc_url_raw($this->src), $atts);
 		}
 
 		/**
@@ -190,6 +190,6 @@ 
 		 * @param string $html the generated image html
 		 * @param GravityView_Image $this The current image object
 		 */
-		return apply_filters( 'gravityview_image_html', $html, $this );
+		return apply_filters('gravityview_image_html', $html, $this);
 	}
 }

includes/class-gravityview-logging.php

Indentation +9 added lines, -9 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -7,15 +7,15 @@ 
 
 	function __construct() {
 
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
+		add_action('gravityview_log_error', array($this, 'log_error'), 10, 2);
 
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
+		add_action('gravityview_log_debug', array($this, 'log_debug'), 10, 2);
 
 		// Enable debug with Gravity Forms Logging Add-on
-	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
+	    add_filter('gform_logging_supported', array($this, 'enable_gform_logging'));
 
 	    // Load Debug Bar integration
-	    add_filter( 'debug_bar_panels', array( $this, 'add_debug_bar' ) );
+	    add_filter('debug_bar_panels', array($this, 'add_debug_bar'));
 
 	}
 
@@ -24,14 +24,14 @@ 
 	 *
 	 * @see http://wordpress.org/plugins/debug-bar/
 	 */
-	public function add_debug_bar( $panels ) {
+	public function add_debug_bar($panels) {
 
-		if ( ! class_exists( 'Debug_Bar_Panel' ) ) {
+		if (!class_exists('Debug_Bar_Panel')) {
 			return;
 		}
 
-		if ( ! class_exists( 'GravityView_Debug_Bar' ) ) {
-			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
+		if (!class_exists('GravityView_Debug_Bar')) {
+			include_once(GRAVITYVIEW_DIR.'includes/class-debug-bar.php');
 		}
 
 		$panels[] = new GravityView_Debug_Bar;
@@ -43,7 +43,7 @@ 
 	 * Enables debug with Gravity Forms logging add-on
 	 * @param array $supported_plugins List of plugins
 	 */
-	public function enable_gform_logging( $supported_plugins ) {
+	public function enable_gform_logging($supported_plugins) {
 	    $supported_plugins['gravityview'] = 'GravityView';
 	    return $supported_plugins;
 	}
@@ -72,7 +72,7 @@ 
 	 * @return string "print_r" or "var_export"
 	 */
 	static function get_print_function() {
-		if( ob_get_level() > 0 ) {
+		if (ob_get_level() > 0) {
 			$function = 'var_export';
 		} else {
 			$function = 'print_r';
@@ -81,43 +81,43 @@ 
 		return $function;
 	}
 
-	static function log_debug( $message = '', $data = null ) {
+	static function log_debug($message = '', $data = null) {
 
 		$function = self::get_print_function();
 
 		$notice = array(
-			'message' => $function( $message, true ),
+			'message' => $function($message, true),
 			'data' => $data,
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
+			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary(null, 3) : '',
 		);
 
-		if( !in_array( $notice, self::$notices ) ) {
+		if (!in_array($notice, self::$notices)) {
 			self::$notices[] = $notice;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if (class_exists("GFLogging")) {
 			GFLogging::include_logger();
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
+	        GFLogging::log_message('gravityview', $function($message, true).$function($data, true), KLogger::DEBUG);
 	    }
 	}
 
-	static function log_error( $message = '', $data = null  ) {
+	static function log_error($message = '', $data = null) {
 
 		$function = self::get_print_function();
 
 		$error = array(
 			'message' => $message,
 			'data' => $data,
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
+			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary(null, 3) : '',
 		);
 
-		if( !in_array( $error, self::$errors ) ) {
+		if (!in_array($error, self::$errors)) {
 			self::$errors[] = $error;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if (class_exists("GFLogging")) {
 		    GFLogging::include_logger();
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
+		    GFLogging::log_message('gravityview', $function($message, true).$function($data, true), KLogger::ERROR);
 		}
 	}
 

includes/class-gravityview-migrate.php

Spacing +60 added lines, -60 removed lines

@@ -15,7 +15,7 @@ 
 class GravityView_Migrate {
 
 	function __construct() {
-		add_action( 'admin_init', array( $this, 'update_settings' ), 1 );
+		add_action('admin_init', array($this, 'update_settings'), 1);
 	}
 
 	public function update_settings() {
@@ -32,8 +32,8 @@ 
 	private function maybe_migrate_search_widget() {
 
 		// check if search migration is already performed
-		$is_updated = get_option( 'gv_migrate_searchwidget' );
-		if ( $is_updated ) {
+		$is_updated = get_option('gv_migrate_searchwidget');
+		if ($is_updated) {
 			return;
 		} else {
 			$this->update_search_on_views();
@@ -51,22 +51,22 @@ 
 		$redux_settings = $this->get_redux_settings();
 
 		// No need to process
-		if( false === $redux_settings ) {
+		if (false === $redux_settings) {
 			return;
 		}
 
-		if( empty(  $redux_settings['license_key_status'] ) ) {
-			$redux_settings = $this->get_redux_license_status( $redux_settings );
+		if (empty($redux_settings['license_key_status'])) {
+			$redux_settings = $this->get_redux_license_status($redux_settings);
 		}
 
 		// Get the current app settings (just defaults)
 		$current = GravityView_Settings::get_instance()->get_app_settings();
 
 		// Merge the redux settings with the defaults
-		$updated_settings = wp_parse_args( $redux_settings, $current );
+		$updated_settings = wp_parse_args($redux_settings, $current);
 
 		// Update the defaults to the new merged
-		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
+		GravityView_Settings::get_instance()->update_app_settings($updated_settings);
 
 		// And now remove the previous option, so this is a one-time thing.
 		delete_option('gravityview_settings');
@@ -82,20 +82,20 @@ 
 	 *
 	 * @return array
 	 */
-	function get_redux_license_status( $redux_settings = array() ) {
+	function get_redux_license_status($redux_settings = array()) {
 
 		$data = array(
 			'edd_action' => 'check_license',
-			'license' => rgget('license_key', $redux_settings ),
+			'license' => rgget('license_key', $redux_settings),
 			'update' => false,
 			'format' => 'object',
 		);
 
-		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
+		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call($data);
 
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
+		if (is_object($license_call) && isset($license_call->license)) {
 			$redux_settings['license_key_status'] = $license_call->license;
-			$redux_settings['license_key_response'] = json_encode( $license_call );
+			$redux_settings['license_key_response'] = json_encode($license_call);
 		}
 
 		return $redux_settings;
@@ -112,31 +112,31 @@ 
 		$redux_option = get_option('gravityview_settings');
 
 		// No Redux settings? Don't proceed.
-		if( false === $redux_option ) {
+		if (false === $redux_option) {
 			return false;
 		}
 
 
 		$redux_settings = array(
-			'support-email' => rgget( 'support-email', $redux_option ),
-			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
+			'support-email' => rgget('support-email', $redux_option),
+			'no-conflict-mode' => (rgget('no-conflict-mode', $redux_option) ? '1' : '0'),
 		);
 
-		if( $license_array = rgget( 'license', $redux_option ) ) {
+		if ($license_array = rgget('license', $redux_option)) {
 
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
+			$redux_settings['license_key'] = $license_key = rgget('license', $license_array);
 
 			$redux_last_changed_values = get_option('gravityview_settings-transients');
 
 			// This contains the last response for license validation
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
+			if (!empty($redux_last_changed_values) && $saved_values = rgget('changed_values', $redux_last_changed_values)) {
 
-				$saved_license = rgget('license', $saved_values );
+				$saved_license = rgget('license', $saved_values);
 
 				// Only use the last-saved values if they are for the same license
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
+				if ($saved_license && rgget('license', $saved_license) === $license_key) {
+					$redux_settings['license_key_status'] = rgget('status', $saved_license);
+					$redux_settings['license_key_response'] = rgget('response', $saved_license);
 				}
 			}
 		}
@@ -148,8 +148,8 @@ 
 	/** ----  Migrate from old search widget to new search widget  ---- */
 	function update_search_on_views() {
 
-		if( !class_exists('GravityView_Widget_Search') ) {
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
+		if (!class_exists('GravityView_Widget_Search')) {
+			include_once(GRAVITYVIEW_DIR.'includes/extensions/search-widget/class-search-widget.php');
 		}
 
 		// Loop through all the views
@@ -159,94 +159,94 @@ 
 			'posts_per_page' => -1,
 		);
 
-		$views = get_posts( $query_args );
+		$views = get_posts($query_args);
 
-		foreach( $views as $view ) {
+		foreach ($views as $view) {
 
-			$widgets = get_post_meta( $view->ID, '_gravityview_directory_widgets', true );
+			$widgets = get_post_meta($view->ID, '_gravityview_directory_widgets', true);
 			$search_fields = null;
 
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
+			if (empty($widgets) || !is_array($widgets)) { continue; }
 
-			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
+			do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID);
 
-			foreach( $widgets as $area => $ws ) {
-				foreach( $ws as $k => $widget ) {
-					if( $widget['id'] !== 'search_bar' ) { continue; }
+			foreach ($widgets as $area => $ws) {
+				foreach ($ws as $k => $widget) {
+					if ($widget['id'] !== 'search_bar') { continue; }
 
-					if( is_null( $search_fields ) ) {
-						$search_fields = $this->get_search_fields( $view->ID );
+					if (is_null($search_fields)) {
+						$search_fields = $this->get_search_fields($view->ID);
 					}
 
 					// check widget settings:
 					//  [search_free] => 1
 			        //  [search_date] => 1
 			        $search_generic = array();
-					if( !empty( $widget['search_free'] ) ) {
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
+					if (!empty($widget['search_free'])) {
+						$search_generic[] = array('field' => 'search_all', 'input' => 'input_text');
 					}
-					if( !empty( $widget['search_date'] ) ) {
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
+					if (!empty($widget['search_date'])) {
+						$search_generic[] = array('field' => 'entry_date', 'input' => 'date');
 					}
 
-					$search_config = array_merge( $search_generic, $search_fields );
+					$search_config = array_merge($search_generic, $search_fields);
 
 					// don't throw '[]' when json_encode an empty array
-					if( empty( $search_config ) ) {
+					if (empty($search_config)) {
 						$search_config = '';
 					} else {
-						$search_config = json_encode( $search_config );
+						$search_config = json_encode($search_config);
 					}
 
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
+					$widgets[$area][$k]['search_fields'] = $search_config;
+					$widgets[$area][$k]['search_layout'] = 'horizontal';
 
-					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
+					do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[$area][$k]);
 				}
 			}
 
 			// update widgets view
-			update_post_meta( $view->ID, '_gravityview_directory_widgets', $widgets );
+			update_post_meta($view->ID, '_gravityview_directory_widgets', $widgets);
 
 		} // foreach Views
 
 		// all done! enjoy the new Search Widget!
-		update_option( 'gv_migrate_searchwidget', true );
+		update_option('gv_migrate_searchwidget', true);
 
-		do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] All done! enjoy the new Search Widget!' );
+		do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] All done! enjoy the new Search Widget!');
 	}
 
 
-	function get_search_fields( $view_id ) {
+	function get_search_fields($view_id) {
 
-		$form_id = gravityview_get_form_id( $view_id );
-		$form = gravityview_get_form( $form_id );
+		$form_id = gravityview_get_form_id($view_id);
+		$form = gravityview_get_form($form_id);
 
 		$search_fields = array();
 
 		// check view fields' settings
-		$fields = get_post_meta( $view_id, '_gravityview_directory_fields', true );
+		$fields = get_post_meta($view_id, '_gravityview_directory_fields', true);
 
-		if( !empty( $fields ) && is_array( $fields ) ) {
+		if (!empty($fields) && is_array($fields)) {
 
-			foreach( $fields as $t => $fs ) {
+			foreach ($fields as $t => $fs) {
 
-				foreach( $fs as $k => $field ) {
+				foreach ($fs as $k => $field) {
 					// is field a search_filter ?
-					if( empty( $field['search_filter'] ) ) { continue; }
+					if (empty($field['search_filter'])) { continue; }
 
 					// get field type & calculate the input type (by default)
-					$form_field = gravityview_get_field( $form, $field['id'] );
+					$form_field = gravityview_get_field($form, $field['id']);
 
-					if( empty( $form_field['type'] ) ) {
+					if (empty($form_field['type'])) {
 						continue;
 					}
 
 					// depending on the field type assign a group of possible search field types
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
+					$type = GravityView_Widget_Search::get_search_input_types($field['id'], $form_field['type']);
 
 					// add field to config
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
+					$search_fields[] = array('field' => $field['id'], 'input' => $type);
 
 				}
 			}

Indentation +12 added lines, -12 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * GravityView Migrate Class - where awesome features become even better, seamlessly!
- *
- * @package   GravityView
- * @author    Zack Katz <zack@katzwebservices.com>
- * @license   ToBeDefined
- * @link      http://www.katzwebservices.com
- * @copyright Copyright 2014, Katz Web Services, Inc.
- *
- * @since 1.2
- */
+	 * GravityView Migrate Class - where awesome features become even better, seamlessly!
+	 *
+	 * @package   GravityView
+	 * @author    Zack Katz <zack@katzwebservices.com>
+	 * @license   ToBeDefined
+	 * @link      http://www.katzwebservices.com
+	 * @copyright Copyright 2014, Katz Web Services, Inc.
+	 *
+	 * @since 1.2
+	 */
 
 
 class GravityView_Migrate {
@@ -180,8 +180,8 @@ 
 
 					// check widget settings:
 					//  [search_free] => 1
-			        //  [search_date] => 1
-			        $search_generic = array();
+					//  [search_date] => 1
+					$search_generic = array();
 					if( !empty( $widget['search_free'] ) ) {
 						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}

includes/class-gravityview-shortcode.php

Spacing +30 added lines, -30 removed lines

@@ -25,7 +25,7 @@ 
 	private function add_hooks() {
 
 		// Shortcode to render view (directory)
-		add_shortcode( 'gravityview', array( $this, 'shortcode' ) );
+		add_shortcode('gravityview', array($this, 'shortcode'));
 	}
 
 	/**
@@ -39,23 +39,23 @@ 
 	 * @param string|null $content Content passed inside the shortcode
 	 * @return null|string If admin, null. Otherwise, output of $this->render_view()
 	 */
-	function shortcode( $passed_atts, $content = null ) {
+	function shortcode($passed_atts, $content = null) {
 
 		// Don't process when saving post.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return null;
 		}
 
-		do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts );
+		do_action('gravityview_log_debug', __FUNCTION__.' $passed_atts: ', $passed_atts);
 
 		// Get details about the current View
-		if( !empty( $passed_atts['detail'] ) ) {
-			return $this->get_view_detail( $passed_atts['detail'] );
+		if (!empty($passed_atts['detail'])) {
+			return $this->get_view_detail($passed_atts['detail']);
 		}
 
-		$atts = $this->parse_and_sanitize_atts( $passed_atts );
+		$atts = $this->parse_and_sanitize_atts($passed_atts);
 
-		return GravityView_frontend::getInstance()->render_view( $atts );
+		return GravityView_frontend::getInstance()->render_view($atts);
 	}
 
 	/**
@@ -76,26 +76,26 @@ 
 	 *
 	 * @return array Valid and sanitized attribute pairs
 	 */
-	private function parse_and_sanitize_atts( $passed_atts ) {
+	private function parse_and_sanitize_atts($passed_atts) {
 
-		$defaults = GravityView_View_Data::get_default_args( true );
+		$defaults = GravityView_View_Data::get_default_args(true);
 
-		$supported_atts = array_fill_keys( array_keys( $defaults ), '' );
+		$supported_atts = array_fill_keys(array_keys($defaults), '');
 
 		// Whittle down the attributes to only valid pairs
-		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
+		$filtered_atts = shortcode_atts($supported_atts, $passed_atts, 'gravityview');
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $passed_atts, $filtered_atts ) : $filtered_atts;
+		$filtered_atts = function_exists('array_intersect_key') ? array_intersect_key($passed_atts, $filtered_atts) : $filtered_atts;
 
 		$atts = array();
 
-		foreach( $filtered_atts as $key => $passed_value ) {
+		foreach ($filtered_atts as $key => $passed_value) {
 
 			// Allow using {get} merge tags in shortcode attributes
-			$passed_value = GravityView_Merge_Tags::replace_get_variables( $passed_value );
+			$passed_value = GravityView_Merge_Tags::replace_get_variables($passed_value);
 
-			switch( $defaults[ $key ]['type'] ) {
+			switch ($defaults[$key]['type']) {
 
 				/**
 				 * Make sure number fields are numeric.
@@ -103,14 +103,14 @@ 
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
 				 */
 				case 'number':
-					if( is_numeric( $passed_value ) ) {
-						$atts[ $key ] = ( $passed_value + 0 );
+					if (is_numeric($passed_value)) {
+						$atts[$key] = ($passed_value + 0);
 					}
 					break;
 
 				// Checkboxes should be 1 or 0
 				case 'checkbox':
-					$atts[ $key ] = gv_empty( $passed_value ) ? 0 : 1;
+					$atts[$key] = gv_empty($passed_value) ? 0 : 1;
 					break;
 
 				/**
@@ -118,15 +118,15 @@ 
 				 */
 				case 'select':
 				case 'radio':
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
-						$atts[ $key ] = $passed_value;
+					$options = isset($defaults[$key]['choices']) ? $defaults[$key]['choices'] : $defaults[$key]['options'];
+					if (in_array($passed_value, array_keys($options))) {
+						$atts[$key] = $passed_value;
 					}
 					break;
 
 				case 'text':
 				default:
-					$atts[ $key ] = $passed_value;
+					$atts[$key] = $passed_value;
 					break;
 			}
 		}
@@ -143,26 +143,26 @@ 
 	 *
 	 * @return string Detail information
 	 */
-	private function get_view_detail( $detail = '' ) {
+	private function get_view_detail($detail = '') {
 
 		$gravityview_view = GravityView_View::getInstance();
 		$return = '';
 
-		switch( $detail ) {
+		switch ($detail) {
 			case 'total_entries':
-				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
+				$return = number_format_i18n($gravityview_view->getTotalEntries());
 				break;
 			case 'first_entry':
 				$paging = $gravityview_view->getPaginationCounts();
-				$return = empty( $paging ) ? '' : number_format_i18n( $paging['first'] );
+				$return = empty($paging) ? '' : number_format_i18n($paging['first']);
 				break;
 			case 'last_entry':
 				$paging = $gravityview_view->getPaginationCounts();
-				$return = empty( $paging ) ? '' : number_format_i18n( $paging['last'] );
+				$return = empty($paging) ? '' : number_format_i18n($paging['last']);
 				break;
 			case 'page_size':
 				$paging = $gravityview_view->getPaging();
-				$return = number_format_i18n( $paging['page_size'] );
+				$return = number_format_i18n($paging['page_size']);
 				break;
 		}
 
@@ -171,7 +171,7 @@ 
 		 * @since 1.13
 		 * @param string $return Existing output
 		 */
-		$return = apply_filters( 'gravityview/shortcode/detail/' . $detail, $return );
+		$return = apply_filters('gravityview/shortcode/detail/'.$detail, $return);
 
 		return $return;
 	}

includes/class-post-types.php

Spacing +37 added lines, -37 removed lines

@@ -17,10 +17,10 @@ 
 
 		// Load custom post types. It's a static method.
 		// Load even when invalid to allow for export
-		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
+		add_action('init', array('GravityView_Post_Types', 'init_post_types'));
 
-		if( GravityView_Compatibility::is_valid() ) {
-			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
+		if (GravityView_Compatibility::is_valid()) {
+			add_action('init', array('GravityView_Post_Types', 'init_rewrite'));
 		}
 	}
 
@@ -39,11 +39,11 @@ 
 		 * @since 1.13
 		 * @param boolean $is_hierarchical Default: false
 		 */
-		$is_hierarchical = (bool)apply_filters( 'gravityview_is_hierarchical', false );
+		$is_hierarchical = (bool)apply_filters('gravityview_is_hierarchical', false);
 
-		$supports = array( 'title', 'revisions' );
+		$supports = array('title', 'revisions');
 
-		if( $is_hierarchical ) {
+		if ($is_hierarchical) {
 			$supports[] = 'page-attributes';
 		}
 
@@ -54,30 +54,30 @@ 
 		 * @param array $supports Array of features associated with a functional area of the edit screen. Default: 'title', 'revisions'. If $is_hierarchical, also 'page-attributes'
 		 * @param[in] boolean $is_hierarchical Do Views support parent/child relationships? See `gravityview_is_hierarchical` filter.
 		 */
-		$supports = apply_filters( 'gravityview_post_type_support', $supports, $is_hierarchical );
+		$supports = apply_filters('gravityview_post_type_support', $supports, $is_hierarchical);
 
 		//Register Custom Post Type - gravityview
 		$labels = array(
-			'name'                => _x( 'Views', 'Post Type General Name', 'gravityview' ),
-			'singular_name'       => _x( 'View', 'Post Type Singular Name', 'gravityview' ),
-			'menu_name'           => _x( 'Views', 'Menu name', 'gravityview' ),
-			'parent_item_colon'   => __( 'Parent View:', 'gravityview' ),
-			'all_items'           => __( 'All Views', 'gravityview' ),
-			'view_item'           => _x( 'View', 'View Item', 'gravityview' ),
-			'add_new_item'        => __( 'Add New View', 'gravityview' ),
-			'add_new'             => __( 'New View', 'gravityview' ),
-			'edit_item'           => __( 'Edit View', 'gravityview' ),
-			'update_item'         => __( 'Update View', 'gravityview' ),
-			'search_items'        => __( 'Search Views', 'gravityview' ),
+			'name'                => _x('Views', 'Post Type General Name', 'gravityview'),
+			'singular_name'       => _x('View', 'Post Type Singular Name', 'gravityview'),
+			'menu_name'           => _x('Views', 'Menu name', 'gravityview'),
+			'parent_item_colon'   => __('Parent View:', 'gravityview'),
+			'all_items'           => __('All Views', 'gravityview'),
+			'view_item'           => _x('View', 'View Item', 'gravityview'),
+			'add_new_item'        => __('Add New View', 'gravityview'),
+			'add_new'             => __('New View', 'gravityview'),
+			'edit_item'           => __('Edit View', 'gravityview'),
+			'update_item'         => __('Update View', 'gravityview'),
+			'search_items'        => __('Search Views', 'gravityview'),
 			'not_found'           => self::no_views_text(),
-			'not_found_in_trash'  => __( 'No Views found in Trash', 'gravityview' ),
-			'filter_items_list'     => __( 'Filter Views list', 'gravityview' ),
-			'items_list_navigation' => __( 'Views list navigation', 'gravityview' ),
-			'items_list'            => __( 'Views list', 'gravityview' ),
+			'not_found_in_trash'  => __('No Views found in Trash', 'gravityview'),
+			'filter_items_list'     => __('Filter Views list', 'gravityview'),
+			'items_list_navigation' => __('Views list navigation', 'gravityview'),
+			'items_list'            => __('Views list', 'gravityview'),
 		);
 		$args = array(
-			'label'               => __( 'view', 'gravityview' ),
-			'description'         => __( 'Create views based on a Gravity Forms form', 'gravityview' ),
+			'label'               => __('view', 'gravityview'),
+			'description'         => __('Create views based on a Gravity Forms form', 'gravityview'),
 			'labels'              => $labels,
 			'supports'            => $supports,
 			'hierarchical'        => $is_hierarchical,
@@ -88,7 +88,7 @@ 
 			 * @param[in,out] boolean `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
 			 * @param int $view_id The ID of the View currently being requested. `0` for general setting
 			 */
-			'public'              => apply_filters( 'gravityview_direct_access', GravityView_Compatibility::is_valid(), 0 ),
+			'public'              => apply_filters('gravityview_direct_access', GravityView_Compatibility::is_valid(), 0),
 			'show_ui'             => GravityView_Compatibility::is_valid(),
 			'show_in_menu'        => GravityView_Compatibility::is_valid(),
 			'show_in_nav_menus'   => true,
@@ -101,7 +101,7 @@ 
 			 * @since 1.7.3
 			 * @param boolean False: don't have frontend archive; True: yes, have archive. Default: false
 			 */
-			'has_archive'         => apply_filters( 'gravityview_has_archive', false ),
+			'has_archive'         => apply_filters('gravityview_has_archive', false),
 			'exclude_from_search' => true,
 			'rewrite'             => array(
 				/**
@@ -109,13 +109,13 @@ 
 				 * @see http://docs.gravityview.co/article/62-changing-the-view-slug
 				 * @param string $slug The slug shown in the URL
 				 */
-				'slug' => apply_filters( 'gravityview_slug', 'view' )
+				'slug' => apply_filters('gravityview_slug', 'view')
 			),
 			'capability_type'     => 'gravityview',
 			'map_meta_cap'        => true,
 		);
 
-		register_post_type( 'gravityview', $args );
+		register_post_type('gravityview', $args);
 
 	}
 
@@ -131,7 +131,7 @@ 
 		$endpoint = self::get_entry_var_name();
 
 		//add_permastruct( "{$endpoint}", $endpoint.'/%'.$endpoint.'%/?', true);
-		add_rewrite_endpoint( "{$endpoint}", EP_ALL );
+		add_rewrite_endpoint("{$endpoint}", EP_ALL);
 	}
 
 	/**
@@ -147,9 +147,9 @@ 
 		 * @filter `gravityview_directory_endpoint` Change the slug used for single entries
 		 * @param[in,out] string $endpoint Slug to use when accessing single entry. Default: `entry`
 		 */
-		$endpoint = apply_filters( 'gravityview_directory_endpoint', 'entry' );
+		$endpoint = apply_filters('gravityview_directory_endpoint', 'entry');
 
-		return sanitize_title( $endpoint );
+		return sanitize_title($endpoint);
 	}
 
 	/**
@@ -159,20 +159,20 @@ 
 	 */
 	static function no_views_text() {
 
-		if( !class_exists( 'GravityView_Admin' ) ) {
-			require_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		if (!class_exists('GravityView_Admin')) {
+			require_once(GRAVITYVIEW_DIR.'includes/class-admin.php');
 		}
 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		if( GVCommon::has_cap( 'edit_gravityviews' ) ) {
-			$output = sprintf( esc_attr__( "%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview' ), '<h3>', '<a href="' . admin_url( 'post-new.php?post_type=gravityview' ) . '">', '</a>', '</h3>', '<a href="' . admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) . '">', '</a>' );
+		if (GVCommon::has_cap('edit_gravityviews')) {
+			$output = sprintf(esc_attr__("%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview'), '<h3>', '<a href="'.admin_url('post-new.php?post_type=gravityview').'">', '</a>', '</h3>', '<a href="'.admin_url('edit.php?post_type=gravityview&page=gv-getting-started').'">', '</a>');
 		} else {
-			$output = esc_attr__( 'There are no active Views', 'gravityview' );
+			$output = esc_attr__('There are no active Views', 'gravityview');
 		}
 
-		return $image . wpautop( $output );
+		return $image.wpautop($output);
 	}