gravityview / GravityView

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

Indentation +209 added lines, -209 removed lines

@@ -5,239 +5,239 @@
  */
 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') );
-
-    }
-
-    /**
-     * 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;
-    	}
-
-    	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-    	$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
-
-    	if ( false === $result ) {
-    		$status = __('Error', 'gravityview');
-    		global $wpdb;
-		    $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
-    	} 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 );
-    	}
-
-    	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
-
-	    /**
-	     * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
-	     * @since 1.21.5
-	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
-	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
-		    return;
-	    }
-
-        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() {
-
-    	// Plugin that was provided here:
-    	// @link https://gravityview.co/support/documentation/201991205/
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
-
-    }
-
-    /**
-     * @since  3.6.3
-     * @return void
-     */
-    function load() {
-
-    	// 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;
-        }
-
-        // 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' ) );
-
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 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() {
-
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( \GV\Utils::_GET( '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;
+	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 = '' ) {
+
+		/**
+		 * 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_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
+
+		if ( false === $result ) {
+			$status = __('Error', 'gravityview');
+			global $wpdb;
+			$note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
+		} 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 );
+		}
+
+		gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
+
+		/**
+		 * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
+		 * @since 1.21.5
+		 * @param boolean $disable Disable the Change Entry Creator note. Default: false.
+		 */
+		if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
+			return;
+		}
+
+		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() {
+
+		// Plugin that was provided here:
+		// @link https://gravityview.co/support/documentation/201991205/
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
+
+	}
+
+	/**
+	 * @since  3.6.3
+	 * @return void
+	 */
+	function load() {
+
+		// 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;
+		}
+
+		// 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' ) );
+
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 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() {
+
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
+		if( \GV\Utils::_GET( '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;
 
-        // Update the entry
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
+		// Update the entry
+		$created_by = absint( \GV\Utils::_POST( '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 = \GV\Utils::_POST( 'originally_created_by' );
+		// If the creator has changed, let's add a note about who it used to be.
+		$originally_created_by = \GV\Utils::_POST( '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( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
-            return;
-        }
+		if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
+			return;
+		}
 
-        $created_by_id = \GV\Utils::get( $entry, 'created_by' );
+		$created_by_id = \GV\Utils::get( $entry, 'created_by' );
 
-        $users = GVCommon::get_users( 'change_entry_creator' );
+		$users = GVCommon::get_users( 'change_entry_creator' );
 
-        $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
+		$is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
 
-        // Make sure that the entry creator is included in the users list. If not, add them.
-        if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
+		// Make sure that the entry creator is included in the users list. If not, add them.
+		if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
 
-	        if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
-	            $users = array_merge( $users, $created_by_user );
-	        }
-	    }
+			if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
+				$users = array_merge( $users, $created_by_user );
+			}
+		}
 
-        $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>';
 
-	    // If there are users who are not being shown, show a warning.
-	    // TODO: Use AJAX instead of <select>
-	    $count_users = count_users();
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
-		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
-	    }
+		// If there are users who are not being shown, show a warning.
+		// TODO: Use AJAX instead of <select>
+		$count_users = count_users();
+		if( sizeof( $users ) < $count_users['total_users'] ) {
+			$output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
+		}
 
-	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &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 .= '<select name="created_by" id="change_created_by" class="widefat">';
+		$output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &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" />';
 
-	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
+		unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
 
-        echo $output;
-    }
+		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' ) );
 
     }
 
@@ -56,20 +56,20 @@ 
     	$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_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
+    	$result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true );
 
     	if ( false === $result ) {
-    		$status = __('Error', 'gravityview');
+    		$status = __( 'Error', 'gravityview' );
     		global $wpdb;
 		    $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
     	} 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 );
+    		$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 );
     	}
 
     	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
@@ -79,11 +79,11 @@ 
 	     * @since 1.21.5
 	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
 	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator_note', false ) ) {
 		    return;
 	    }
 
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
+        GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' );
 
     }
 
@@ -95,8 +95,8 @@ 
 
     	// Plugin that was provided here:
     	// @link https://gravityview.co/support/documentation/201991205/
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
+    	remove_action( "gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
+    	remove_action( "gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
 
     }
 
@@ -107,26 +107,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 );
 
     }
 
@@ -137,8 +137,8 @@ 
     function set_screen_mode() {
 
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
-            $_POST["screen_mode"] = 'edit';
+        if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
+            $_POST[ "screen_mode" ] = 'edit';
         }
 
     }
@@ -149,11 +149,11 @@ 
      * @param  int $entry_id Entry ID
      * @return void
      */
-    function update_entry_creator($form, $entry_id) {
+    function update_entry_creator( $form, $entry_id ) {
             global $current_user;
 
         // Update the entry
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
+        $created_by = absint( \GV\Utils::_POST( 'created_by' ) );
 
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
 
@@ -161,30 +161,30 @@ 
         $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
 
         // If there's no owner and there didn't used to be, keep going
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
+        if ( empty( $originally_created_by ) && empty( $created_by ) ) {
             return;
         }
 
         // If the values have changed
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
+        if ( absint( $originally_created_by ) !== absint( $created_by ) ) {
 
-            $user_data = get_userdata($current_user->ID);
+            $user_data = get_userdata( $current_user->ID );
 
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
+            $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' );
 
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
+            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview' );
 
-            if( !empty( $originally_created_by ) ) {
-                $originally_created_by_user_data = get_userdata($originally_created_by);
+            if ( ! empty( $originally_created_by ) ) {
+                $originally_created_by_user_data = get_userdata( $originally_created_by );
                 $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
             }
 
-            if( !empty( $created_by ) ) {
-                $created_by_user_data =  get_userdata($created_by);
+            if ( ! empty( $created_by ) ) {
+                $created_by_user_data = get_userdata( $created_by );
                 $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
             }
 
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
+            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
         }
 
     }
@@ -195,9 +195,9 @@ 
      * @param array $entry    GF entry array
      * @return void
      */
-    function add_select($form_id, $entry ) {
+    function add_select( $form_id, $entry ) {
 
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
+        if ( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
             return;
         }
 
@@ -216,23 +216,23 @@ 
 	    }
 
         $output = '<label for="change_created_by">';
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
         $output .= '</label>';
 
 	    // If there are users who are not being shown, show a warning.
 	    // TODO: Use AJAX instead of <select>
 	    $count_users = count_users();
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
+	    if ( sizeof( $users ) < $count_users[ 'total_users' ] ) {
 		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
 	    }
 
 	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &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="' . selected( $entry[ 'created_by' ], '0', false ) . '"> &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" />';
 
 	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
 

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

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 }
 
 if( is_array( $search_field['value'] ) ) {
-    gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
+	gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
 	$search_field['value'] = reset( $search_field['value'] );
 }
 

Spacing +14 added lines, -14 removed lines

@@ -10,14 +10,14 @@ 
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
 	return;
 }
 
-if( is_array( $search_field['value'] ) ) {
+if ( is_array( $search_field[ 'value' ] ) ) {
     gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
-	$search_field['value'] = reset( $search_field['value'] );
+	$search_field[ 'value' ] = reset( $search_field[ 'value' ] );
 }
 
 /**
@@ -26,26 +26,26 @@ 
  * @param string $default_option Default: `—` (—)
  * @param string $field_type Field type: "select" or "multiselect"
  */
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
 
 ?>
 <div class="gv-search-box gv-search-field-select">
-	<?php if( ! gv_empty( $search_field['label'], false, 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, false ) ) { ?>
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) { ?>
-				<?php if ( is_array( $choice['value'] ) ) { ?>
-					<optgroup label="<?php echo esc_attr( $choice['text'] ); ?>">
-						<?php foreach ( $choice['value'] as $subchoice ): ?>
-							<option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) { ?>
+				<?php if ( is_array( $choice[ 'value' ] ) ) { ?>
+					<optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>">
+						<?php foreach ( $choice[ 'value' ] as $subchoice ): ?>
+							<option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option>
 						<?php endforeach; ?>
 					</optgroup>
 				<?php } else { ?>
-					<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+					<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 				<?php } ?>
 			<?php } ?>
 		</select>

includes/admin/class-gravityview-admin-view-field.php

Spacing +14 added lines, -14 removed lines

@@ -15,34 +15,34 @@
 		$field_info_items = array();
 
 		// Fields with IDs, not like Source URL or Entry ID
-		if( is_numeric( $this->id ) ) {
+		if ( is_numeric( $this->id ) ) {
 
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
+			$field_type_title = GFCommon::get_field_type_title( $this->item[ 'input_type' ] );
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title )
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Type: %s', 'gravityview' ), $field_type_title )
 			);
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Field ID: %s', 'gravityview' ), $this->id ),
 			);
 		}
 
-		if( !empty( $this->item['desc'] ) ) {
-			$field_info_items[] = array(
-				'value' => $this->item['desc']
+		if ( ! empty( $this->item[ 'desc' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => $this->item[ 'desc' ]
 			);
 		}
 
-		if( !empty( $this->item['adminLabel'] ) ) {
-			$field_info_items[] = array(
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
+		if ( ! empty( $this->item[ 'adminLabel' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Admin Label: %s', 'gravityview' ), $this->item[ 'adminLabel' ] ),
 				'class'	=> 'gv-sublabel'
 			);
 		}
 
-		$field_info_items[] = array(
-			'value'          => sprintf( __('Form ID: %s', 'gravityview' ), $this->form_id ),
+		$field_info_items[ ] = array(
+			'value'          => sprintf( __( 'Form ID: %s', 'gravityview' ), $this->form_id ),
 			'hide_in_picker' => true,
 		);
 

includes/admin/class-gravityview-admin-view-item.php

Spacing +19 added lines, -19 removed lines

@@ -44,12 +44,12 @@ 
 	 */
 	protected $form_id;
 
-	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) {
+	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) {
 
 		// Backward compat
-		if ( ! empty( $item['type'] ) ) {
-			$item['input_type'] = $item['type'];
-			unset( $item['type'] );
+		if ( ! empty( $item[ 'type' ] ) ) {
+			$item[ 'input_type' ] = $item[ 'type' ];
+			unset( $item[ 'type' ] );
 		}
 
 		// Prevent items from not having index set
@@ -71,7 +71,7 @@ 
 		$this->id         = $item_id;
 		$this->form_id    = $form_id;
 		$this->settings   = $settings;
-		$this->label_type = $item['label_type'];
+		$this->label_type = $item[ 'label_type' ];
 	}
 
 	/**
@@ -115,14 +115,14 @@ 
 
 			foreach ( $field_info_items as $item ) {
 
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
 					continue;
 				}
 
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
 				$output .= '<span class="' . $class . '">';
-				$output .= esc_html( $item['value'] );
+				$output .= esc_html( $item[ 'value' ] );
 				$output .= '</span>';
 			}
 
@@ -150,29 +150,29 @@ 
 
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
 		// TODO: Un-hack this
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
 
 		// Should we show the icon that the field is being used as a link to single entry?
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
 
 		// When a field label is empty, use the Field ID
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
 
 		// If there's a custom label, and show label is checked, use that as the field heading
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
-			$label = $this->settings['custom_label'];
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
-			$label = $this->item['customLabel'];
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
+			$label = $this->settings[ 'custom_label' ];
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
+			$label = $this->item[ 'customLabel' ];
 		}
 
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
 
 		$label = esc_attr( $label );
 
-		if ( ! empty( $this->item['parent'] ) ) {
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
 		}
 
 		// Name of field / widget
@@ -188,10 +188,10 @@ 
 
 		$output .= '</h5>';
 
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
 
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
 
 		return $output;
 	}

future/includes/class-gv-renderer-entry.php

Spacing +4 added lines, -4 removed lines

@@ -58,16 +58,16 @@
 		if ( $view->joins ) {
 			$form_ids = array();
 			foreach ( $view->joins as $join ) {
-				$form_ids[] = $join->join->ID;
-				$form_ids[] = $join->join_on->ID;
+				$form_ids[ ] = $join->join->ID;
+				$form_ids[ ] = $join->join_on->ID;
 			}
 			foreach ( $entry->entries as $e ) {
-				if ( ! in_array( $e['form_id'], $form_ids ) ) {
+				if ( ! in_array( $e[ 'form_id' ], $form_ids ) ) {
 					gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $e->ID, 'view_id' => $view->ID ) );
 					return null;
 				}
 			}
-		} else if ( $view->form && $view->form->ID != $entry['form_id'] ) {
+		} else if ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) {
 			gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $entry->ID, 'view_id' => $view->ID ) );
 			return null;
 		}

future/includes/class-gv-entry-multi.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 			if ( ! $entry instanceof Entry ) {
 				continue;
 			}
-			$_entry->entries[ $entry['form_id'] ]  = &$entry;
+			$_entry->entries[ $entry[ 'form_id' ] ] = &$entry;
 		}
 		return $_entry;
 	}
@@ -65,7 +65,7 @@ 
 
 			foreach ( $this->entries as $entry ) {
 				$entry = $entry->as_entry();
-				$_entry['_multi'][ $entry['form_id'] ] = $entry;
+				$_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry;
 			}
 		}
 
@@ -87,7 +87,7 @@ 
 	public function get_permalink( \GV\View $view = null, \GV\Request $request = null, $track_directory = true ) {
 		$slugs = array();
 		add_filter( 'gravityview/entry/slug', $callback = function( $slug ) use ( &$slugs ) {
-			$slugs[] = $slug;
+			$slugs[ ] = $slug;
 			return implode( ',', $slugs );
 		}, 10, 1 );
 

future/includes/class-gv-template-field.php

Spacing +38 added lines, -38 removed lines

@@ -92,7 +92,7 @@ 
 	}
 
 	public function __destruct() {
-		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );;
+		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ;
 	}
 
 	/**
@@ -175,55 +175,55 @@ 
 
 			if ( $is_view && $post ) {
 				if ( $field_type ) {
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
-					$specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
-					$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
-					$inputType &&  $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
+					$specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
 				}
 
-				$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
-				$specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
-				$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
-				$specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
+				$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
+				$specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
 			}
 			
 			/** Field-specific */
 			if ( $field_id && $form_id ) {
 
 				if ( $field_id ) {
-					$specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
-					$specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
+					$specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
+					$specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
 				}
 
 				if ( $field_type ) {
-					$specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
-
-					$specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
-
-					$specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
-					$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type );
-					$inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType );
+					$specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
+
+					$specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
+
+					$specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
 				}
 			}
 
 			if ( $form_id ) {
 				/** Generic field templates */
-				$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
-				$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
+				$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
+				$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
 
-				$specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
-				$specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
+				$specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
+				$specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
 			}
 
 			/**
@@ -231,12 +231,12 @@ 
 			 * Ignore some types that conflict.
 			 */
 			if ( ! in_array( $field_type, array( 'notes' ) ) ) {
-				$specifics []= sprintf( '%s.php', $field_type );
-				$specifics []= sprintf( 'fields/%s.php', $field_type );
+				$specifics [ ] = sprintf( '%s.php', $field_type );
+				$specifics [ ] = sprintf( 'fields/%s.php', $field_type );
 			}
 
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
 
 			return array_merge( $specifics, $templates );
 		};
@@ -267,7 +267,7 @@ 
 			/** Prevent any PHP warnings that may be generated. */
 			ob_start();
 
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry['currency'], false, 'html' );
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry[ 'currency' ], false, 'html' );
 
 			if ( $errors = ob_get_clean() ) {
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );

includes/load-plugin-and-theme-hooks.php

Spacing +1 added lines, -1 removed lines

@@ -24,6 +24,6 @@
 $plugin_theme_hooks_files = glob( $include_path . 'class-gravityview-{plugin,theme}-hooks-*.php', $glob_flags );
 
 // Load all plugin and theme files automatically
-foreach ( (array) $plugin_theme_hooks_files as $gv_hooks_filename ) {
+foreach ( (array)$plugin_theme_hooks_files as $gv_hooks_filename ) {
 	include $gv_hooks_filename;
 }
\ No newline at end of file

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

Spacing +23 added lines, -23 removed lines

@@ -22,8 +22,8 @@ 
 	function __construct() {
 
 		$this->widget_id = 'poll';
-		$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_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>' );
 
 		$default_values = array(
 			'header' => 1,
@@ -32,27 +32,27 @@ 
 
 		$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' ),
 				),
 			),
 		);
@@ -62,7 +62,7 @@ 
 			add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 		}
 
-		parent::__construct( __( 'Poll Results', 'gravityview' ) , null, $default_values, $settings );
+		parent::__construct( __( 'Poll Results', 'gravityview' ), null, $default_values, $settings );
 	}
 
 	/**
@@ -89,11 +89,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 );
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function pre_render_frontend() {
 
-		if( ! class_exists('GFPolls') ) {
+		if ( ! class_exists( 'GFPolls' ) ) {
 
 			gravityview()->log->error( 'Poll Widget not displayed; the Poll Addon is not loaded' );
 
@@ -112,10 +112,10 @@ 
 
 		$view = gravityview()->views->get();
 
-		$poll_fields = array( $view->form->form['id'] => GFCommon::get_fields_by_type( $view->form, array( 'poll' ) ) );
+		$poll_fields = array( $view->form->form[ 'id' ] => GFCommon::get_fields_by_type( $view->form, array( 'poll' ) ) );
 
 		foreach ( $view->joins as $join ) {
-			$poll_fields[ $join->join_on->form['id'] ] = GFCommon::get_fields_by_type( $join->join_on->form, array( 'poll' ) );
+			$poll_fields[ $join->join_on->form[ 'id' ] ] = GFCommon::get_fields_by_type( $join->join_on->form, array( 'poll' ) );
 		}
 
 		$poll_fields = array_filter( $poll_fields );
@@ -167,12 +167,12 @@ 
 	 */
 	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' );
 		}
 
@@ -180,14 +180,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();
@@ -197,7 +197,7 @@ 
 		$gravityview_view->poll_settings = $settings;
 		$gravityview_view->poll_fields = $this->poll_fields;
 
-		$gravityview_view->render('widget', 'poll', false );
+		$gravityview_view->render( 'widget', 'poll', false );
 
 		unset( $gravityview_view->poll_merge_tag, $gravityview_view->poll_settings, $gravityview_view->poll_form, $gravityview_view->poll_fields );
 	}