gravityview / GravityView

future/includes/class-gv-extension.php

Spacing +17 added lines, -17 removed lines

@@ -180,13 +180,13 @@ 
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
 
 		// Force the screen to be GravityView
-		$tab['screen'] = 'gravityview';
+		$tab[ 'screen' ] = 'gravityview';
 
 		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
-			$metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
+			$metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
 			\GravityView_Metabox_Tabs::add( $metabox );
 		} else {
-			add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
 		}
 	}
 
@@ -211,14 +211,14 @@ 
 	 */
 	protected function is_extension_supported() {
 
-		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
+		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
 
 		if ( ! function_exists( 'gravityview' ) ) {
 			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
-		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
-		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
+		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
 		} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
 			$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
 		} else {
@@ -258,12 +258,12 @@ 
 
 		$locale = get_locale();
 
-		if ( function_exists('get_user_locale') && is_admin() ) {
+		if ( function_exists( 'get_user_locale' ) && is_admin() ) {
 			$locale = get_user_locale();
 		}
 
 		// Traditional WordPress plugin locale filter
-		$locale = apply_filters( 'plugin_locale',  $locale, $this->_text_domain );
+		$locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain );
 
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
 
@@ -291,7 +291,7 @@ 
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
 			return;
 		}
 
@@ -308,7 +308,7 @@ 
             	'version'	=> $this->_version, // current version number
             	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
+            	'item_name' => $this->_title, // name of this plugin
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
           	)
         );
@@ -337,16 +337,16 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if ( is_array( $notice ) && empty( $notice['message'] ) ) {
+		if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		} else if ( is_string( $notice ) ) {
 			$notice = array( 'message' => $notice );
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices []= $notice;
+		self::$admin_notices [ ] = $notice;
 	}
 
 	/**
@@ -360,8 +360,8 @@ 
 		}
 
 		foreach ( self::$admin_notices as $key => $notice ) {
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
-			echo wpautop( $notice['message'] );
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
+			echo wpautop( $notice[ 'message' ] );
 			echo '<div class="clear"></div>';
 			echo '</div>';
 		}

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

Spacing +43 added lines, -43 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 );
 
     }
 
@@ -136,13 +136,13 @@ 
      */
     function set_screen_mode() {
 
-    	if( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
+    	if ( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
     		return;
 	    }
 
     	// 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';
         }
 
     }
@@ -153,11 +153,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 );
 
@@ -165,30 +165,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' );
         }
 
     }
@@ -199,9 +199,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;
         }
 
@@ -220,23 +220,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 );
 

future/_mocks.php

Spacing +44 added lines, -47 removed lines

@@ -102,8 +102,7 @@ 
 			$entries = $view->get_entries( gravityview()->request );
 		}
 
-		$page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ?
-			: ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+		$page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 		/** Set paging, count and unwrap the entries. */
 		$paging = array(
@@ -142,17 +141,17 @@ 
  * @return null|string The value of a field in an entry.
  */
 function GravityView_API_field_value( $entry, $field_settings, $format ) {
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
 		return null;
 	}
 
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
-		$multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry['_multi'] ) );
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
+		$multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry[ '_multi' ] ) );
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
 	}
 
-	if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
+	if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
 		return null;
 	}
@@ -162,18 +161,18 @@ 
 	 *
 	 * Fields with a numeric ID are Gravity Forms ones.
 	 */
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;;
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ;
 
 	/** Initialize the future field. */
 	switch ( $source ):
 		/** The Gravity Forms backend. */
 		case \GV\Source::BACKEND_GRAVITYFORMS:
-			if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
+			if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
 				return null;
 			}
 
-			if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) {
+			if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) {
 				return null;
 			}
 
@@ -181,7 +180,7 @@ 
 
 		/** Our internal backend. */
 		case \GV\Source::BACKEND_INTERNAL:
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
 				return null;
 			}
 
@@ -215,13 +214,13 @@ 
 
 	/** A bail condition. */
 	$bail = function( $label, $field_settings, $entry, $force_show_label, $form ) {
-		if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) {
+		if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) {
 
-			$label = isset( $field_settings['label'] ) ? $field_settings['label'] : '';
+			$label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : '';
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( ! empty( $field_settings['custom_label'] ) ) {
-				$label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry );
+			if ( ! empty( $field_settings[ 'custom_label' ] ) ) {
+				$label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry );
 			}
 
 			/**
@@ -247,19 +246,19 @@ 
 
 	$label = '';
 
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
-		if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) {
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
+		if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) {
 			$form = $_form->form;
 		}
 	}
 
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
 	}
 
-	if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
+	if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
 	}
@@ -271,31 +270,31 @@ 
 	 *
 	 * Fields with a numeric ID are Gravity Forms ones.
 	 */
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
 
 	/** Initialize the future field. */
 	switch ( $source ):
 		/** The Gravity Forms backend. */
 		case \GV\Source::BACKEND_GRAVITYFORMS:
-			if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
+			if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
 			}
 
-			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) {
-				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) );
+			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) {
+				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) );
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form );
 			}
-			if ( empty( $field_settings['show_label'] ) ) {
+			if ( empty( $field_settings[ 'show_label' ] ) ) {
 				/** The label never wins... */
-				$field_settings['label'] = '';
+				$field_settings[ 'label' ] = '';
 			}
 
 			break;
 
 		/** Our internal backend. */
 		case \GV\Source::BACKEND_INTERNAL:
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
 			}
 			break;
@@ -307,8 +306,8 @@ 
 			break;
 	endswitch;
 
-	if( $force_show_label ) {
-		$field_settings['show_label'] = '1';
+	if ( $force_show_label ) {
+		$field_settings[ 'show_label' ] = '1';
 	}
 
 	/** Add the field settings. */
@@ -444,7 +443,7 @@ 
 			'\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(),
 			'\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(),
 			'\GravityView_View::_current_field' => \GravityView_View::getInstance()->getCurrentField(),
-			'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'],
+			'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ],
 			'wp_query::in_the_loop' => $wp_query->in_the_loop,
 		);
 	}
@@ -532,7 +531,7 @@ 
 					break;
 				case 'wp_actions[loop_start]':
 					global $wp_actions;
-					$wp_actions['loop_start'] = $value;
+					$wp_actions[ 'loop_start' ] = $value;
 					break;
 				case 'wp_query::in_the_loop':
 					global $wp_query;
@@ -629,9 +628,7 @@ 
 				case 'request':
 					self::thaw( array(
 						'\GravityView_View::context' => (
-							$value->is_entry() ? 'single' :
-							( $value->is_edit_entry() ? 'edit' :
-									( $value->is_view() ? 'directory': null )
+							$value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null )
 								)
 						),
 						'\GravityView_frontend::is_search' => $value->is_search(),
@@ -685,14 +682,14 @@ 
 		global $wp_query, $wp_actions;
 
 		$wp_query->in_the_loop = false;
-		$wp_actions['loop_start'] = 0;
+		$wp_actions[ 'loop_start' ] = 0;
 	}
 }
 
 
 /** Add some global fix for field capability discrepancies. */
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
-	if ( empty( $fields  ) ) {
+	if ( empty( $fields ) ) {
 		return $fields;
 	}
 
@@ -719,11 +716,11 @@ 
 		}
 
 		foreach ( $_fields as $uid => &$_field ) {
-			if ( ! isset( $_field['only_loggedin'] ) ) {
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
 				continue;
 			}
 			/** If we do not require login, we don't require a cap. */
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
 		}
 	}
 	return $fields;
@@ -754,8 +751,8 @@ 
 		}
 
 		foreach ( $_fields as $uid => &$_field ) {
-			if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) {
-				$_field['form_id'] = $view->form->ID;
+			if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) {
+				$_field[ 'form_id' ] = $view->form->ID;
 			}
 		}
 	}
@@ -769,25 +766,25 @@ 
 	if ( class_exists( '\GravityView_frontend' ) ) {
 		global $wp_filter;
 
-		if ( empty( $wp_filter['gravityview_after'] ) ) {
+		if ( empty( $wp_filter[ 'gravityview_after' ] ) ) {
 			return;
 		}
 
 		/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
-		if ( is_array( $wp_filter['gravityview_after'] ) ) {
-			if ( ! empty( $wp_filter['gravityview_after'][10] ) ) {
-				foreach ( $wp_filter['gravityview_after'][10] as $function_key => $callback ) {
+		if ( is_array( $wp_filter[ 'gravityview_after' ] ) ) {
+			if ( ! empty( $wp_filter[ 'gravityview_after' ][ 10 ] ) ) {
+				foreach ( $wp_filter[ 'gravityview_after' ][ 10 ] as $function_key => $callback ) {
 					if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
-						unset( $wp_filter['gravityview_after'][10][ $function_key ] );
+						unset( $wp_filter[ 'gravityview_after' ][ 10 ][ $function_key ] );
 					}
 				}
 			}
 			return;
 		}
 
-		foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) {
+		foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) {
 			if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
-				unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] );
+				unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] );
 			}
 		}
 	}

future/includes/class-gv-field.php

Spacing +17 added lines, -17 removed lines

@@ -166,7 +166,7 @@ 
 	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
 	 */
 	public static function from_configuration( $configuration ) {
-		if ( empty( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) ) {
 			$field = new self();
 			gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) );
 			$field->update_configuration( $configuration );
@@ -179,8 +179,8 @@ 
 		} else {
 			$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
 		}
-		$trace = $trace[1];
-		if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) {
+		$trace = $trace[ 1 ];
+		if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
 			$field = new self();
 			gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
 			$field->update_configuration( $configuration );
@@ -188,7 +188,7 @@ 
 		}
 
 		/** @var \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */
-		$field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
+		$field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
 
 		/**
 		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -227,24 +227,24 @@ 
 	public function update_configuration( $configuration ) {
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
 
-		if ( $this->ID != $configuration['id'] ) {
+		if ( $this->ID != $configuration[ 'id' ] ) {
 			/** Smelling trouble here... */
 			gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) );
 		}
 
-		$this->ID = $configuration['id'];
-		$this->label = $configuration['label'];
-		$this->show_label = $configuration['show_label'] == '1';
-		$this->custom_label = $configuration['custom_label'];
-		$this->custom_class = $configuration['custom_class'];
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
-		$this->search_filter = $configuration['search_filter'] == '1';
-		$this->show_as_link = $configuration['show_as_link'] == '1';
+		$this->ID = $configuration[ 'id' ];
+		$this->label = $configuration[ 'label' ];
+		$this->show_label = $configuration[ 'show_label' ] == '1';
+		$this->custom_label = $configuration[ 'custom_label' ];
+		$this->custom_class = $configuration[ 'custom_class' ];
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
 
 		/** Shared among all field types (sort of). */
 		$shared_configuration_keys = array(
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
 		);
 
 		/** Everything else goes into the properties for now. @todo subclasses! */
@@ -273,7 +273,7 @@ 
 
 		/** A custom label is available. */
 		if ( ! empty( $this->custom_label ) ) {
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
+			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
 		}
 
 		return '';
@@ -350,7 +350,7 @@ 
 	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
 	 */
 	public function __get( $key ) {
-		switch( $key ) {
+		switch ( $key ) {
 			default:
 				if ( isset( $this->configuration[ $key ] ) ) {
 					return $this->configuration[ $key ];
@@ -368,7 +368,7 @@ 
 	 * @return boolean Whether this $key is set or not.
 	 */
 	public function __isset( $key ) {
-		switch( $key ) {
+		switch ( $key ) {
 			default:
 				return isset( $this->configuration[ $key ] );
 		}

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

Spacing +6 added lines, -6 removed lines

@@ -104,11 +104,11 @@ 
 
 		/** Call all lazy callbacks. */
 		foreach ( $this->callbacks as $callback ) {
-			if ( $callback[0] != 'count' ) {
+			if ( $callback[ 0 ] != 'count' ) {
 				continue;
 			}
 
-			$total += $callback[1]( $this->filters );
+			$total += $callback[ 1 ]( $this->filters );
 		}
 
 		if ( ! $total ) {
@@ -148,7 +148,7 @@ 
 
 		foreach ( $this->all() as $entry ) {
 			$entry = $entry->as_entry();
-			$result[] = Utils::get( $entry, $key, null );
+			$result[ ] = Utils::get( $entry, $key, null );
 		}
 
 		return $result;
@@ -206,11 +206,11 @@ 
 
 		/** Call all lazy callbacks. */
 		foreach ( $this->callbacks as $i => $callback ) {
-			if ( $callback[0] != 'fetch' ) {
+			if ( $callback[ 0 ] != 'fetch' ) {
 				continue;
 			}
 
-			$this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) );
+			$this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) );
 		}
 
 		$this->fetched = parent::count();
@@ -366,7 +366,7 @@ 
 			return;
 		}
 
-		$this->callbacks []= array( $type, $callback );
+		$this->callbacks [ ] = array( $type, $callback );
 	}
 
 	/**

future/includes/class-gv-view.php

Spacing +76 added lines, -77 removed lines

@@ -125,7 +125,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -227,11 +227,11 @@ 
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
 
 		add_filter( 'query_vars', function( $query_vars ) { 
-			$query_vars[] = 'csv';
+			$query_vars[ ] = 'csv';
 			return $query_vars;
 		} );
 
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
 			call_user_func_array( 'add_rewrite_rule', $rule );
 		}
 	}
@@ -300,13 +300,13 @@ 
 			return $content;
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -317,7 +317,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -340,7 +340,7 @@ 
 
 			foreach ( $entryset as $e ) {
 
-				if ( 'active' !== $e['status'] ) {
+				if ( 'active' !== $e[ 'status' ] ) {
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -351,7 +351,7 @@ 
 				}
 
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
 						return __( 'You are not allowed to view this content.', 'gravityview' );
 					}
@@ -526,7 +526,7 @@ 
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
 
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 		}
 
 		return $joins;
@@ -621,13 +621,13 @@ 
 			}
 
 			foreach ( $_fields as $field ) {
-				if ( ! empty( $field['unions'] ) ) {
-					foreach ( $field['unions'] as $form_id => $field_id ) {
+				if ( ! empty( $field[ 'unions' ] ) ) {
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
 						if ( ! isset( $unions[ $form_id ] ) ) {
 							$unions[ $form_id ] = array();
 						}
 
-						$unions[ $form_id ][ $field['id'] ] =
+						$unions[ $form_id ][ $field[ 'id' ] ] =
 							is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );
 					}
 				}
@@ -676,7 +676,7 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		}
 
@@ -915,11 +915,11 @@ 
 			 * Remove multiple sorting before calling legacy filters.
 			 * This allows us to fake it till we make it.
 			 */
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
 				$has_multisort = true;
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
 				}
 			}
 
@@ -927,34 +927,33 @@ 
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
 			 */
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
-			$parameters['context_view_id'] = $this->ID;
+			$parameters[ 'context_view_id' ] = $this->ID;
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
 			if ( $request instanceof REST\Request ) {
 				$atts = $this->settings->as_atts();
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
-						'paging' => array( 'page_size' => $atts['page_size'] ),
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 					) );
-				$parameters['paging'] = $paging_parameters['paging'];
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 			}
 
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 			/**
 			 * Cleanup duplicate field_filter parameters to simplify the query.
 			 */
 			$unique_field_filters = array();
-			foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) {
+			foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) {
 				if ( 'mode' === $key ) {
-					$unique_field_filters['mode'] = $filter;
+					$unique_field_filters[ 'mode' ] = $filter;
 				} else if ( ! in_array( $filter, $unique_field_filters ) ) {
-					$unique_field_filters[] = $filter;
+					$unique_field_filters[ ] = $filter;
 				}
 			}
-			$parameters['search_criteria']['field_filters'] = $unique_field_filters;
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
 
-			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
+			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
 				gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
 			}
 
@@ -963,7 +962,7 @@ 
 				$query_class = $this->get_query_class();
 
 				/** @var \GF_Query $query */
-				$query = new $query_class( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
 				/**
 				 * Apply multisort.
@@ -974,15 +973,15 @@ 
 					$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() );
 					$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() );
 
-					$has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] );
+					$has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] );
 
-					if( $has_sort_query_param ) {
-						$has_sort_query_param = array_filter( array_values( $_GET['sort'] ) );
+					if ( $has_sort_query_param ) {
+						$has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) );
 					}
 
 					if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) {
-						$sort_field_ids = array_keys( $_GET['sort'] );
-						$sort_directions = array_values( $_GET['sort'] );
+						$sort_field_ids = array_keys( $_GET[ 'sort' ] );
+						$sort_directions = array_values( $_GET[ 'sort' ] );
 					} else {
 						$sort_field_ids = $view_setting_sort_field_ids;
 						$sort_directions = $view_setting_sort_directions;
@@ -990,7 +989,7 @@ 
 
 					$skip_first = false;
 
-					foreach ( (array) $sort_field_ids as $key => $sort_field_id ) {
+					foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
 
 						if ( ! $skip_first && ! $has_sort_query_param ) {
 							$skip_first = true; // Skip the first one, it's already in the query
@@ -1020,15 +1019,15 @@ 
 
 					$merged_time = false;
 
-					foreach ( $q['order'] as $oid => $order ) {
-						if ( $order[0] instanceof \GF_Query_Column ) {
-							$column = $order[0];
-						} else if ( $order[0] instanceof \GF_Query_Call ) {
-							if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) {
+					foreach ( $q[ 'order' ] as $oid => $order ) {
+						if ( $order[ 0 ] instanceof \GF_Query_Column ) {
+							$column = $order[ 0 ];
+						} else if ( $order[ 0 ] instanceof \GF_Query_Call ) {
+							if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) {
 								$orders[ $oid ] = $order;
 								continue; // Need something that resembles a single sort
 							}
-							$column = $order[0]->columns[0];
+							$column = $order[ 0 ]->columns[ 0 ];
 						}
 
 						if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
@@ -1042,7 +1041,7 @@ 
 
 						$orders[ $oid ] = array(
 							new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ),
-							$order[1] // Mock it!
+							$order[ 1 ] // Mock it!
 						);
 
 						$merged_time = true;
@@ -1053,15 +1052,15 @@ 
 						 * ORDER again.
 						 */
 						if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) {
-							$sql['order'] = 'ORDER BY ' . implode( ', ', $_orders );
+							$sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders );
 						}
 					}
 
 					return $sql;
 				} );
 
-				$query->limit( $parameters['paging']['page_size'] )
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
 				/**
 				 * Any joins?
@@ -1084,7 +1083,7 @@ 
 
 							$query_parameters = $query->_introspect();
 
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 						}
 
 						/**
@@ -1118,7 +1117,7 @@ 
 						}
 
 						$q = $query->_introspect();
-						$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
+						$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
 
 						if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
 
@@ -1143,7 +1142,7 @@ 
 
 							$query_parameters = $query->_introspect();
 
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 						}
 					}
 				
@@ -1167,7 +1166,7 @@ 
 							$conditions = array();
 
 							foreach ( $condition->expressions as $_condition ) {
-								$conditions[] = $recurse( $_condition, $fields, $recurse );
+								$conditions[ ] = $recurse( $_condition, $fields, $recurse );
 							}
 
 							return call_user_func_array(
@@ -1196,10 +1195,10 @@ 
 						$q = new $query_class( $form_id );
 
 						// Copy the WHERE clauses but substitute the field_ids to the respective ones
-						$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
+						$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
 
 						// Copy the ORDER clause and substitute the field_ids to the respective ones
-						foreach ( $query_parameters['order'] as $order ) {
+						foreach ( $query_parameters[ 'order' ] as $order ) {
 							list( $column, $_order ) = $order;
 
 							if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1213,15 +1212,15 @@ 
 
 						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
 							// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 							// Record the SQL
-							$unions_sql[] = array(
+							$unions_sql[ ] = array(
 								// Remove columns, we'll rebuild them
 								'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
-								'from'    => $sql['from'],
-								'join'    => $sql['join'],
-								'where'   => $sql['where'],
+								'from'    => $sql[ 'from' ],
+								'join'    => $sql[ 'join' ],
+								'where'   => $sql[ 'where' ],
 								// Remove order and limit
 							);
 
@@ -1238,11 +1237,11 @@ 
 
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-						$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+						$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 						// Remove columns, we'll rebuild them
-						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
-						$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
+						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
+						$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
 
 						$unions = array();
 
@@ -1253,30 +1252,30 @@ 
 						};
 
 						// Add all the order columns into the selects, so we can order by the whole union group
-						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
+						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
 						
 						$columns = array(
-							sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
+							sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
 						);
 
 						foreach ( array_slice( $order_matches, 1 ) as $match ) {
-							$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
+							$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
 
 							// Rewrite the order columns to the shared aliases
-							$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
+							$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
 						}
 
 						$columns = array_unique( $columns );
 
 						// Add the columns to every UNION
 						foreach ( $unions_sql as $union_sql ) {
-							$union_sql['select'] .= implode( ', ', $columns );
-							$unions []= implode( ' ', $union_sql );
+							$union_sql[ 'select' ] .= implode( ', ', $columns );
+							$unions [ ] = implode( ' ', $union_sql );
 						}
 
 						// Add the columns to the main SELECT, but only grab the entry id column
-						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
-						$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
+						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
+						$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
 
 						return $sql;
 					} );
@@ -1321,20 +1320,20 @@ 
 				} );
 			} else {
 				$entries = $this->form->entries
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 					->offset( $this->settings->get( 'offset' ) )
-					->limit( $parameters['paging']['page_size'] )
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 
-				if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) {
 					// Pluck off multisort arrays
-					$parameters['sorting'] = $parameters['sorting'][0];
+					$parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ];
 				}
 
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
 					$field = new \GV\Field();
-					$field->ID = $parameters['sorting']['key'];
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 				}
 			}
@@ -1409,7 +1408,7 @@ 
 		$allowed = $headers = array();
 
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $id => $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		$renderer = new Field_Renderer();
@@ -1431,17 +1430,17 @@ 
 			} );
 
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
 			}
 
 			foreach ( $allowed as $field ) {
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
 
-				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
+				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
 
 				if ( ! $headers_done ) {
 					$label = $field->get_label( $view, $source, $entry );
-					$headers[] = $label ? $label : $field->ID;
+					$headers[ ] = $label ? $label : $field->ID;
 				}
 			}
 

includes/helper-functions.php

Spacing +52 added lines, -52 removed lines

@@ -32,19 +32,19 @@ 
 	// If there's an overriding CSS file in the current template folder, use it.
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
 
-	if( file_exists( $template_css_path ) ) {
+	if ( file_exists( $template_css_path ) ) {
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
 	} else {
 		// Default: use GravityView CSS file
 
 		// If no path is provided, assume default plugin templates CSS folder
-		if( '' === $dir_path ) {
+		if ( '' === $dir_path ) {
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
 		}
 		
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
 	}
 
 	return $path;
@@ -82,9 +82,9 @@ 
 
 	$parsed_permalink = parse_url( get_permalink( $id ) );
 
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
 
-	if( empty( $permalink_args ) ) {
+	if ( empty( $permalink_args ) ) {
 		return array();
 	}
 
@@ -109,15 +109,15 @@ 
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
 
 	$output = '';
-	if( is_array( $current ) ) {
-		if( in_array( $value, $current ) ) {
+	if ( is_array( $current ) ) {
+		if ( in_array( $value, $current ) ) {
 			$output = __checked_selected_helper( true, true, false, $type );
 		}
 	} else {
 		$output = __checked_selected_helper( $value, $current, false, $type );
 	}
 
-	if( $echo ) {
+	if ( $echo ) {
 		echo $output;
 	}
 
@@ -125,7 +125,7 @@ 
 }
 
 
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
 
 	/**
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@ 
  */
 function gravityview_strip_whitespace( $string ) {
 	$string = normalize_whitespace( $string );
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
 }
 
 /**
@@ -185,7 +185,7 @@ 
  * @return string Included file contents
  */
 function gravityview_ob_include( $file_path, $object = NULL ) {
-	if( ! file_exists( $file_path ) ) {
+	if ( ! file_exists( $file_path ) ) {
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
 		return '';
 	}
@@ -209,15 +209,15 @@ 
 
 	$width = $height * 0.7586206897;
 
-	if( function_exists('is_rtl') && is_rtl() ) {
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
 		$css_class = is_string( $css_class ) ? $css_class : 'alignright';
 	} else {
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
 		$css_class = is_string( $css_class ) ? $css_class : 'alignleft';
 	}
 
-	return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
+	return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
 }
 
 /**
@@ -241,9 +241,9 @@ 
 function gravityview_number_format( $number, $decimals = '', $separator = true ) {
 	global $wp_locale;
 
-	if( '' === $decimals ) {
+	if ( '' === $decimals ) {
 
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
 
 		/**
 		 * Calculate the position of the decimal point in the number
@@ -276,7 +276,7 @@ 
 	$parts = parse_url( $value );
 
 	// No domain? Strange...show the original text.
-	if( empty( $parts['host'] ) ) {
+	if ( empty( $parts[ 'host' ] ) ) {
 		return $value;
 	}
 
@@ -289,16 +289,16 @@ 
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
 	 * If true: `http://example.com => example.com`
 	 */
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
 
-		if( isset( $parts['scheme'] ) ) {
-			$return .= $parts['scheme'];
+		if ( isset( $parts[ 'scheme' ] ) ) {
+			$return .= $parts[ 'scheme' ];
 		}
 
 	}
 
 	// The domain, which may contain a subdomain
-	$domain = $parts['host'];
+	$domain = $parts[ 'host' ];
 
 	/**
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -306,10 +306,10 @@ 
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
 	 * If true: `www.example.com => example.com`
 	 */
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
 
-	if( $strip_www ) {
-		$domain = str_replace('www.', '', $domain );
+	if ( $strip_www ) {
+		$domain = str_replace( 'www.', '', $domain );
 	}
 
 	/**
@@ -319,11 +319,11 @@ 
 	 * If true: `http://demo.example.com => example.com` \n
 	 * If false: `http://demo.example.com => demo.example.com`
 	 */
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
 
-	if( $strip_subdomains ) {
+	if ( $strip_subdomains ) {
 
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
 
 	}
 
@@ -337,12 +337,12 @@ 
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
 	 */
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
 
-	if( empty( $root_only ) ) {
+	if ( empty( $root_only ) ) {
 
-		if( isset( $parts['path'] ) ) {
-			$return .= $parts['path'];
+		if ( isset( $parts[ 'path' ] ) ) {
+			$return .= $parts[ 'path' ];
 		}
 	}
 
@@ -352,12 +352,12 @@ 
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
 	 * If true: `http://example.com/?query=example => example.com`
 	 */
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
 
-	if( empty( $strip_query_string ) ) {
+	if ( empty( $strip_query_string ) ) {
 
-		if( isset( $parts['query'] ) ) {
-			$return .= '?'.$parts['query'];
+		if ( isset( $parts[ 'query' ] ) ) {
+			$return .= '?' . $parts[ 'query' ];
 		}
 
 	}
@@ -374,8 +374,8 @@ 
  */
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
 
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
-		return $matches['domain'];
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
+		return $matches[ 'domain' ];
 	} else {
 		return $string_maybe_has_subdomain;
 	}
@@ -444,7 +444,7 @@ 
 
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
 			$value = true;
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
 			$value = false;
 		}
 	}
@@ -473,7 +473,7 @@ 
  */
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
 
-	if( ! is_string( $value ) ) {
+	if ( ! is_string( $value ) ) {
 		return $value;
 	}
 
@@ -484,12 +484,12 @@ 
 	}
 
 	// There was a JSON error (PHP 5.3+)
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
 		return $value;
 	}
 
 	// It wasn't JSON (PHP < 5.3 fallback)
-	if( is_null( $decoded ) ) {
+	if ( is_null( $decoded ) ) {
 		return $value;
 	}
 
@@ -512,7 +512,7 @@ 
 
 	// Use the original function, if exists.
 	// Requires WP 4.4+
-	if( function_exists( 'map_deep') ) {
+	if ( function_exists( 'map_deep' ) ) {
 		return map_deep( $value, $callback );
 	}
 
@@ -577,7 +577,7 @@ 
 
 	$exploded = explode( '.', "{$field_id}" );
 
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
 }
 
 /**
@@ -618,13 +618,13 @@ 
 	 */
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
 
-	$terms = get_terms( $args['taxonomy'], $args );
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
 
 	$choices = array();
 
 	if ( is_array( $terms ) ) {
 		foreach ( $terms as $term_id => $term_name ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'text'  => $term_name,
 				'value' => $term_id
 			);
@@ -648,21 +648,21 @@ 
 function _gravityview_process_posted_fields() {
 	$fields = array();
 
-	if( !empty( $_POST['gv_fields'] ) ) {
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
 
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
 			$fields_holder = array();
-			GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder );
+			GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder );
 
-			if ( isset( $fields_holder['fields'] ) ) {
-				$fields = $fields_holder['fields'];
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
+				$fields = $fields_holder[ 'fields' ];
 			} else {
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
 			}
 
 		} else {
-			$fields = $_POST['gv_fields'];
+			$fields = $_POST[ 'gv_fields' ];
 		}
 	}
 

includes/widgets/class-gravityview-widget-page-size.php

Spacing +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 		$default_size = 25;
 
 		if ( $context instanceof \GV\Template_Context ) {
-			$default_size = (int) $context->view->settings->get( 'page_size' );
+			$default_size = (int)$context->view->settings->get( 'page_size' );
 		}
 
 		$sizes = array( 10, 25, $default_size, 50, 100 );
@@ -58,7 +58,7 @@ 
 
 		$page_sizes = array();
 		foreach ( $sizes as $size ) {
-			$page_sizes [] = array(
+			$page_sizes [ ] = array(
 				'value' => $size,
 				'text'  => $size
 			);
@@ -83,11 +83,11 @@ 
 	 */
 	public function render_frontend( $widget_args, $content = '', $context = null ) {
 
-		if( ! $this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
-		$page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
+		$page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
 
 		$settings = shortcode_atts( array(
 			'label'   => __( 'Page Size', 'gravityview' ),
@@ -106,20 +106,20 @@ 
         <div class="gv-widget-page-size">
             <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();">
                 <div>
-                    <?php if( ! empty( $settings['label'] ) ) { ?>
-                    <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label>
+                    <?php if ( ! empty( $settings[ 'label' ] ) ) { ?>
+                    <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label>
                     <?php } ?>
                     <select name="page_size" id="gv-page_size">
-                        <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option>
+                        <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option>
 						<?php
-						foreach ( $settings['choices'] as $choice ) { ?>
-                            <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+						foreach ( $settings[ 'choices' ] as $choice ) { ?>
+                            <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 						<?php } ?>
                     </select>
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
-                    if( ! empty( $_GET ) ) {
+                    if ( ! empty( $_GET ) ) {
                         $get = $_GET;
-                        unset( $get['page_size'] );
+                        unset( $get[ 'page_size' ] );
 	                    foreach ( $get as $key => $value ) {
 							if ( is_array( $value ) ) {
 								foreach ( $value as $_key => $_value ) {
@@ -158,7 +158,7 @@ 
 		}
 
 		// Already overridden
-		if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) {
+		if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) {
 			return;
 		}
 
@@ -166,7 +166,7 @@ 
 			'view' => $view,
 		) );
 
-		if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
+		if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
 			gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) );
 			return;
 		}

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

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 	// Output the Clear button, if enabled
 	GravityView_Widget_Search::the_clear_search_button();
 
-	if ( isset( $_GET['page_size'] ) ) {
+	if ( isset( $_GET[ 'page_size' ] ) ) {
 		?>
-		<input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET['page_size'] ); ?>" />
+		<input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET[ 'page_size' ] ); ?>" />
 		<?php
 	}