gravityview / GravityView

future/includes/class-gv-utils.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 		 * Try subkeys after split.
 		 */
 		if ( count( $parts = explode( '/', $key, 2 ) ) > 1 ) {
-			return self::get( self::get( $array, $parts[0] ), $parts[1], $default );
+			return self::get( self::get( $array, $parts[ 0 ] ), $parts[ 1 ], $default );
 		}
 
 		return $default;
@@ -145,7 +145,7 @@ 
 	public static function gf_query_debug( $query ) {
 		$introspect = $query->_introspect();
 		return array(
-			'where' => $query->_where_unwrap( $introspect['where'] )
+			'where' => $query->_where_unwrap( $introspect[ 'where' ] )
 		);
 	}
 }

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-forms-directory.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@
 		$KWS_GF_Change_Lead_Creator = new KWS_GF_Change_Lead_Creator;
 
 		// Now, no validation is required in the methods; let's hook in.
-		remove_action('admin_init', array( $KWS_GF_Change_Lead_Creator, 'set_screen_mode' ) );
+		remove_action( 'admin_init', array( $KWS_GF_Change_Lead_Creator, 'set_screen_mode' ) );
 
-		remove_action("gform_entry_info", array( $KWS_GF_Change_Lead_Creator, 'add_select' ), 10 );
+		remove_action( "gform_entry_info", array( $KWS_GF_Change_Lead_Creator, 'add_select' ), 10 );
 
-		remove_action("gform_after_update_entry", array( $KWS_GF_Change_Lead_Creator, 'update_entry_creator' ), 10 );
+		remove_action( "gform_after_update_entry", array( $KWS_GF_Change_Lead_Creator, 'update_entry_creator' ), 10 );
 
 	}
 }

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

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 );
 

future/includes/class-gv-view.php

Spacing +29 added lines, -30 removed lines

@@ -108,7 +108,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -210,11 +210,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 );
 		}
 	}
@@ -283,13 +283,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' );
 			}
@@ -300,7 +300,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' );
 				}
@@ -313,7 +313,7 @@ 
 		 * Viewing a single entry.
 		 */
 		} else if ( $entry = $request->is_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' );
 			}
@@ -324,7 +324,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' );
 				}
@@ -498,7 +498,7 @@ 
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $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;
@@ -540,10 +540,10 @@ 
 
 			list( $join, $join_column, $join_on, $join_on_column ) = $meta;
 
-			$forms_ids [] = GF_Form::by_id( $join_on );
+			$forms_ids [ ] = GF_Form::by_id( $join_on );
 		}
 
-		return ( !empty( $forms_ids) ) ? $forms_ids : null;
+		return ( ! empty( $forms_ids ) ) ? $forms_ids : null;
 	}
 
 	/**
@@ -581,7 +581,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,
 			) );
 		}
 
@@ -814,34 +814,33 @@ 
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
 			 */
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $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.' );
 			}
 
@@ -849,10 +848,10 @@ 
 				/**
 				 * New \GF_Query stuff :)
 				 */
-				$query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
-				$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?
@@ -894,15 +893,15 @@ 
 				} );
 			} 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'] ) && ! 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 ) );
 				}
 			}

includes/class-admin-installer.php

Spacing +48 added lines, -48 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function register_noconflict( $items ) {
 
-		$items[] = 'gravityview-admin-installer';
+		$items[ ] = 'gravityview-admin-installer';
 
 		return $items;
 	}
@@ -72,17 +72,17 @@ 
 			return;
 		}
 
-		add_filter( 'plugins_api', function ( $data, $action, $args ) use ( $downloads_data ) {
+		add_filter( 'plugins_api', function( $data, $action, $args ) use ( $downloads_data ) {
 			foreach ( $downloads_data as $extension ) {
-				if ( empty( $extension['info'] ) || empty( $args->slug ) || $args->slug !== $extension['info']['slug'] ) {
+				if ( empty( $extension[ 'info' ] ) || empty( $args->slug ) || $args->slug !== $extension[ 'info' ][ 'slug' ] ) {
 					continue;
 				}
 
-				return (object) array(
-					'slug'          => $extension['info']['slug'],
-					'name'          => $extension['info']['title'],
-					'version'       => $extension['licensing']['version'],
-					'download_link' => $extension['files'][0]['file'],
+				return (object)array(
+					'slug'          => $extension[ 'info' ][ 'slug' ],
+					'name'          => $extension[ 'info' ][ 'title' ],
+					'version'       => $extension[ 'licensing' ][ 'version' ],
+					'download_link' => $extension[ 'files' ][ 0 ][ 'file' ],
 				);
 			}
 
@@ -144,13 +144,13 @@ 
 
 		foreach ( $all_plugins as $path => $plugin ) {
 
-			if ( empty( $plugin['TextDomain'] ) ) {
+			if ( empty( $plugin[ 'TextDomain' ] ) ) {
 				continue;
 			}
 
-			$wp_plugins[ $plugin['TextDomain'] ] = array(
+			$wp_plugins[ $plugin[ 'TextDomain' ] ] = array(
 				'path'      => $path,
-				'version'   => $plugin['Version'],
+				'version'   => $plugin[ 'Version' ],
 				'activated' => is_plugin_active( $path )
 			);
 		}
@@ -208,7 +208,7 @@ 
 			return $downloads_data;
 		}
 
-		if( \GV\Plugin::is_network_activated() ) {
+		if ( \GV\Plugin::is_network_activated() ) {
 			$home_url = network_home_url();
 		} else {
 			$home_url = home_url();
@@ -236,13 +236,13 @@ 
 
 		$downloads_data = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( empty( $downloads_data['products'] ) ) {
+		if ( empty( $downloads_data[ 'products' ] ) ) {
 			return array();
 		}
 
-		$this->set_downloads_data( $downloads_data['products'] );
+		$this->set_downloads_data( $downloads_data[ 'products' ] );
 
-		return $downloads_data['products'];
+		return $downloads_data[ 'products' ];
 	}
 
 	/**
@@ -315,7 +315,7 @@ 
 
 				foreach ( $downloads_data as $extension ) {
 
-					if ( empty( $extension['info'] ) ) {
+					if ( empty( $extension[ 'info' ] ) ) {
 						continue;
 					}
 
@@ -344,29 +344,29 @@ 
 
         $details = $this->get_download_display_details( $download, $wp_plugins );
 
-        $download_info = $details['download_info'];
+        $download_info = $details[ 'download_info' ];
 
 		?>
-        <div class="item <?php echo esc_attr( $details['item_class'] ); ?>">
+        <div class="item <?php echo esc_attr( $details[ 'item_class' ] ); ?>">
             <div class="addon-inner">
-                <a href="<?php echo esc_url( $download_info['link'] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info['thumbnail'] ); ?>" alt="" /></a>
-                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info['title'] ) ); ?></h3>
+                <a href="<?php echo esc_url( $download_info[ 'link' ] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info[ 'thumbnail' ] ); ?>" alt="" /></a>
+                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info[ 'title' ] ) ); ?></h3>
                 <div>
-                    <?php if( ! empty( $details['status_label'] ) ) { ?>
-                    <div class="status <?php echo esc_attr( $details['status'] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details['status_label'] ) ); ?>">
-                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details['status_label'] ); ?></span>
+                    <?php if ( ! empty( $details[ 'status_label' ] ) ) { ?>
+                    <div class="status <?php echo esc_attr( $details[ 'status' ] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details[ 'status_label' ] ) ); ?>">
+                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details[ 'status_label' ] ); ?></span>
                     </div>
 			        <?php } ?>
 
-                    <a data-status="<?php echo esc_attr( $details['status'] ); ?>" data-plugin-path="<?php echo esc_attr( $details['plugin_path'] ); ?>" href="<?php echo esc_url( $details['href'] ); ?>" class="button <?php echo esc_attr( $details['button_class'] ); ?>" title="<?php echo esc_attr( $details['button_title'] ); ?>">
-                        <span class="title"><?php echo esc_html( $details['button_label'] ); ?></span>
-                        <?php if( $details['spinner'] ) { ?><span class="spinner"></span><?php } ?>
+                    <a data-status="<?php echo esc_attr( $details[ 'status' ] ); ?>" data-plugin-path="<?php echo esc_attr( $details[ 'plugin_path' ] ); ?>" href="<?php echo esc_url( $details[ 'href' ] ); ?>" class="button <?php echo esc_attr( $details[ 'button_class' ] ); ?>" title="<?php echo esc_attr( $details[ 'button_title' ] ); ?>">
+                        <span class="title"><?php echo esc_html( $details[ 'button_label' ] ); ?></span>
+                        <?php if ( $details[ 'spinner' ] ) { ?><span class="spinner"></span><?php } ?>
                     </a>
                 </div>
 
                 <div class="addon-excerpt"><?php
 
-                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
+                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info[ 'excerpt' ] );
 
                     // Allow some pure HTML tags, but remove everything else from the excerpt.
                     $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
@@ -406,7 +406,7 @@ 
 	 */
 	private function get_download_display_details( $download, $wp_plugins ) {
 
-		$download_info = wp_parse_args( (array) $download['info'], array(
+		$download_info = wp_parse_args( (array)$download[ 'info' ], array(
 			'thumbnail' => '',
 			'title' => '',
 			'textdomain' => '',
@@ -418,9 +418,9 @@ 
 			'installer_excerpt' => null, // May not be defined
 		) );
 
-		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info['textdomain'], false );
+		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info[ 'textdomain' ], false );
 
-		$has_access = ! empty( $download['files'] );
+		$has_access = ! empty( $download[ 'files' ] );
 		$spinner = true;
 		$href = $plugin_path = '#';
 		$status = $item_class = $button_title = $button_class = '';
@@ -430,7 +430,7 @@ 
 		$required_license = $galactic_only ? __( 'All Access', 'gravityview' ) : __( 'Core + Extensions', 'gravityview' );
 
 		// The license is not active - no matter what level, this should not work
-		if( ! $is_active  && empty( $base_price ) ) {
+		if ( ! $is_active && empty( $base_price ) ) {
 			$spinner      = false;
 			$status_label = '';
 			$button_class = 'disabled disabled-license';
@@ -443,7 +443,7 @@ 
 			$status_label = '';
 			$button_label = sprintf( __( 'Purchase Now for %s', 'gravityview' ), '$' . $base_price );
 			$button_class = 'button-primary button-large';
-			$href         = $download_info['link'];
+			$href         = $download_info[ 'link' ];
 			$item_class   = 'featured';
 		}
 
@@ -456,7 +456,7 @@ 
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
 		}
 
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
+        elseif ( ! empty( $download_info[ 'coming_soon' ] ) ) {
 	        $spinner      = false;
 	        $status       = 'notinstalled';
 	        $status_label = __( 'Coming Soon', 'gravityview' );
@@ -471,8 +471,8 @@ 
 			$href = add_query_arg(
 				array(
 					'action'   => 'install-plugin',
-					'plugin'   => $download_info['slug'],
-					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info['slug'] ),
+					'plugin'   => $download_info[ 'slug' ],
+					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info[ 'slug' ] ),
 				),
 				self_admin_url( 'update.php' )
 			);
@@ -484,25 +484,25 @@ 
 		}
 
 		// Access and the plugin is installed but not active
-		elseif ( false === $wp_plugin['activated'] ) {
+		elseif ( false === $wp_plugin[ 'activated' ] ) {
 			$status = 'inactive';
 			$status_label = __( 'Inactive', 'gravityview' );
 			$button_label = __( 'Activate', 'gravityview' );
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 
 		}
 
 		// Access and the plugin is installed and active
 		else {
 
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 			$status = 'active';
 			$status_label = __( 'Active', 'gravityview' );
 			$button_label = __( 'Deactivate', 'gravityview' );
 
 		}
 
-		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
+		return compact( 'download_info', 'plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
     }
 
 	/**
@@ -517,11 +517,11 @@ 
 	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
 		$base_price = \GFCommon::to_number( $base_price );
 
-		unset( $download['pricing']['amount'] );
+		unset( $download[ 'pricing' ][ 'amount' ] );
 
 		// Price options array, not single price
-		if ( ! $base_price && ! empty( $download['pricing'] ) ) {
-			$base_price = array_shift( $download['pricing'] );
+		if ( ! $base_price && ! empty( $download[ 'pricing' ] ) ) {
+			$base_price = array_shift( $download[ 'pricing' ] );
 		}
 
 		return floatval( $base_price );
@@ -535,13 +535,13 @@ 
 	public function activate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		$result = activate_plugin( $data['path'] );
+		$result = activate_plugin( $data[ 'path' ] );
 
-		if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) {
+		if ( is_wp_error( $result ) || ! is_plugin_active( $data[ 'path' ] ) ) {
 			wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
             ) );
@@ -558,13 +558,13 @@ 
 	public function deactivate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		deactivate_plugins( $data['path'] );
+		deactivate_plugins( $data[ 'path' ] );
 
-		if( is_plugin_active( $data['path'] ) ) {
+		if ( is_plugin_active( $data[ 'path' ] ) ) {
             wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
             ) );

includes/class-gravityview-gfformsmodel.php

Spacing +12 added lines, -12 removed lines

@@ -40,17 +40,17 @@ 
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
 
 		if ( in_array( $source_field, array( 'date_created', 'date_updated', 'payment_date' ), true ) ) {
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
 		}
 
 		if ( $source_field instanceof GF_Field && $source_field->type == 'date' ) {
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
 		}
 
 		if ( in_array( $_operation = str_replace( ' ', '_', trim( $operation ) ), array( 'in', 'not_in' ) ) ) {
-			return GVCommon::matches_operation( (array) $field_value, (array) $target_value, $_operation );
+			return GVCommon::matches_operation( (array)$field_value, (array)$target_value, $_operation );
 		}
 
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form );
@@ -74,18 +74,18 @@ 
 
         $post_data = self::get_post_fields( $form, $entry );
 
-        $media = get_attached_media( 'image', $entry['post_id'] );
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
 
         $post_images = array();
 
         foreach ( $media as $media_item ) {
-            foreach( (array) $post_data['images'] as $post_data_item ) {
-                if(
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
+                if (
                     \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
                     \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
                     \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
                 ) {
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
                 }
             }
         }
@@ -113,7 +113,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::get_post_fields( $form, $entry );
         }
 
@@ -140,7 +140,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::copy_post_image( $url, $post_id );
         }
 
@@ -175,7 +175,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::media_handle_upload( $url, $post_id, $post_data );
         }
 

includes/class-api.php

Spacing +103 added lines, -103 removed lines

@@ -31,7 +31,7 @@ 
 
 		$form = $gravityview_view->getForm();
 
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
 			/** Allow to fall through for back compatibility testing purposes. */
 		} else {
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@ 
 
 		$label = '';
 
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
 
-			$label = $field['label'];
+			$label = $field[ 'label' ];
 
 			// Support Gravity Forms 1.9+
-			if( class_exists( 'GF_Field' ) ) {
+			if ( class_exists( 'GF_Field' ) ) {
 
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
-				if( $field_object ) {
+				if ( $field_object ) {
 
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
 
 					// This is a complex field, with labels on a per-input basis
-					if( $input ) {
+					if ( $input ) {
 
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
 
 					} else {
 
 						// This is a field with one label
-						$label = $field_object->get_field_label( true, $field['label'] );
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
 
 					}
 
@@ -70,9 +70,9 @@ 
 			}
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( !empty( $field['custom_label'] ) ) {
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
 
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
 
 			}
 
@@ -134,11 +134,11 @@ 
 
 		$width = NULL;
 
-		if( !empty( $field['width'] ) ) {
-			$width = absint( $field['width'] );
+		if ( ! empty( $field[ 'width' ] ) ) {
+			$width = absint( $field[ 'width' ] );
 
 			// If using percentages, limit to 100%
-			if( '%d%%' === $format && $width > 100 ) {
+			if ( '%d%%' === $format && $width > 100 ) {
 				$width = 100;
 			}
 
@@ -159,42 +159,42 @@ 
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
 		$classes = array();
 
-		if( !empty( $field['custom_class'] ) ) {
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
 
-            $custom_class = $field['custom_class'];
+            $custom_class = $field[ 'custom_class' ];
 
-            if( !empty( $entry ) ) {
+            if ( ! empty( $entry ) ) {
 
                 // We want the merge tag to be formatted as a class. The merge tag may be
                 // replaced by a multiple-word value that should be output as a single class.
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
 
                 // And then we want life to return to normal
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
             }
 
 			// And now we want the spaces to be handled nicely.
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
 
 		}
 
-		if(!empty($field['id'])) {
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
-				$form_id = '-'.$form['id'];
+		if ( ! empty( $field[ 'id' ] ) ) {
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
 				$gravityview_view = GravityView_View::getInstance();
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
-		return esc_attr(implode(' ', $classes));
+		return esc_attr( implode( ' ', $classes ) );
 	}
 
 	/**
@@ -210,11 +210,11 @@ 
 	 * @return string Sanitized unique HTML `id` attribute for the field
 	 */
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
-		$id = $field['id'];
+		$id = $field[ 'id' ];
 
 		if ( ! empty( $id ) ) {
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
-				$form_id = '-' . $form['id'];
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@ 
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
 		return esc_attr( $id );
@@ -262,14 +262,14 @@ 
 	 */
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
 			return NULL;
 		}
 
 		$href = self::entry_link( $entry, $base_id );
 
-		if( '' === $href ) {
+		if ( '' === $href ) {
 			return NULL;
 		}
 
@@ -306,7 +306,7 @@ 
 		} else {
 			$gravityview_view = GravityView_View::getInstance();
 
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
 				$is_search = true;
 			}
 		}
@@ -403,9 +403,9 @@ 
 
 		// If we've saved the permalink in memory, use it
 		// @since 1.3
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
 
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
 			$link = home_url();
 		}
 
@@ -414,7 +414,7 @@ 
 
 			// If not yet saved, cache the permalink.
 			// @since 1.3
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
 		}
 
 		// Deal with returning to proper pagination for embedded views
@@ -422,13 +422,13 @@ 
 
 			$args = array();
 
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
+				$args[ 'pagenum' ] = intval( $pagenum );
 			}
 
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 			$link = add_query_arg( $args, $link );
@@ -465,7 +465,7 @@ 
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
 
 		// Generate an unique hash to use as the default value
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
 
 		/**
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -476,7 +476,7 @@ 
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
 
 		// Make sure we have something - use the original ID as backup.
-		if( empty( $slug ) ) {
+		if ( empty( $slug ) ) {
 			$slug = $id;
 		}
 
@@ -570,15 +570,15 @@ 
          * @param boolean $custom Should we process the custom entry slug?
          */
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
+        if ( $custom ) {
             // create the gravityview_unique_id and save it
 
             // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
 
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
 
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
 
         }
     }
@@ -597,7 +597,7 @@ 
 
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
 			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		} else if ( empty( $entry ) ) {
 			// @deprecated path
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
@@ -617,9 +617,9 @@ 
 
 		$query_arg_name = \GV\Entry::get_endpoint_name();
 
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
 
-		if ( get_option('permalink_structure') && !is_preview() ) {
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
 
 			$args = array();
 
@@ -629,9 +629,9 @@ 
 			 */
 			$link_parts = explode( '?', $directory_link );
 
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
 
 		} else {
 
@@ -643,21 +643,21 @@ 
 		 */
 		if ( $add_directory_args ) {
 
-			if ( ! empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			/**
 			 * @since 1.7
 			 */
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 		}
 
-		if( $post_id ) {
+		if ( $post_id ) {
 			$passed_post = get_post( $post_id );
 			$views       = \GV\View_Collection::from_post( $passed_post );
 			$has_multiple_views = $views->count() > 1;
@@ -666,7 +666,7 @@ 
 		}
 
 		if ( $has_multiple_views ) {
-			$args['gvid'] = gravityview_get_view_id();
+			$args[ 'gvid' ] = gravityview_get_view_id();
 		}
 
 		return add_query_arg( $args, $directory_link );
@@ -687,7 +687,7 @@ 
 }
 
 function gv_class( $field, $form = NULL, $entry = array() ) {
-	return GravityView_API::field_class( $field, $form, $entry  );
+	return GravityView_API::field_class( $field, $form, $entry );
 }
 
 /**
@@ -710,7 +710,7 @@ 
 		$view_id = 0;
 		if ( $context->view ) {
 			$view_id = $context->view->ID;
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
 			}
 		}
@@ -738,7 +738,7 @@ 
 		$default_css_class .= ' gv-container-no-results';
 	}
 
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
 
 	/**
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -765,7 +765,7 @@ 
 
 	$value = GravityView_API::field_value( $entry, $field );
 
-	if( $value === '' ) {
+	if ( $value === '' ) {
 		/**
 		 * @filter `gravityview_empty_value` What to display when a field is empty
 		 * @param string $value (empty string)
@@ -878,7 +878,7 @@ 
  */
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
 
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
 
 		// For the complete field value as generated by Gravity Forms
 		return $display_value;
@@ -912,16 +912,16 @@ 
 		$terms = explode( ', ', $value );
 	}
 
-	foreach ($terms as $term_name ) {
+	foreach ( $terms as $term_name ) {
 
 		// If we're processing a category,
-		if( $taxonomy === 'category' ) {
+		if ( $taxonomy === 'category' ) {
 
 			// Use rgexplode to prevent errors if : doesn't exist
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
 
 			// The explode was succesful; we have the category ID
-			if( !empty( $term_id )) {
+			if ( ! empty( $term_id ) ) {
 				$term = get_term_by( 'id', $term_id, $taxonomy );
 			} else {
 			// We have to fall back to the name
@@ -934,7 +934,7 @@ 
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ( $term ) {
 
 			$term_link = get_term_link( $term, $taxonomy );
 
@@ -943,11 +943,11 @@ 
 			    continue;
 			}
 
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
 		}
 	}
 
-	return implode(', ', $output );
+	return implode( ', ', $output );
 }
 
 /**
@@ -961,8 +961,8 @@ 
 
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
 
-	if( empty( $link ) ) {
-		return strip_tags( $output);
+	if ( empty( $link ) ) {
+		return strip_tags( $output );
 	}
 
 	return $output;
@@ -981,7 +981,7 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if ( ! $fe->getGvOutputData() ) {
 
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
 
@@ -989,7 +989,7 @@ 
 	}
 
 	// Make 100% sure that we're dealing with a properly called situation
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
 
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
 
@@ -1211,12 +1211,12 @@ 
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
 	/** @define "GRAVITYVIEW_DIR" "../" */
 
-	if( !class_exists( 'GravityView_Field' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
+	if ( ! class_exists( 'GravityView_Field' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
 	}
 
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
 	}
 
 	if ( is_null( $context ) ) {
@@ -1319,21 +1319,21 @@ 
 	} else {
 		// @deprecated path
 		// Required fields.
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
 			return '';
 		}
 	}
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
 	} else {
 		// @deprecated path
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
-		$field = $args['field'];
-		$form = $args['form'];
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
+		$field = $args[ 'field' ];
+		$form = $args[ 'form' ];
 	}
 
 	/**
@@ -1353,43 +1353,43 @@ 
 	);
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
 	} else {
 		// @deprecated path
-		$placeholders['value'] = gv_value( $entry, $field );
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
 	}
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
 		return '';
 	}
 
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$placeholders['value'] = wpautop( $placeholders['value'] );
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
 	}
 
 	// Get width setting, if exists
-	$placeholders['width'] = GravityView_API::field_width( $field );
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
 
 	// If replacing with CSS inline formatting, let's do it.
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
 
 	// Grab the Class using `gv_class`
-	$placeholders['class'] = gv_class( $field, $form, $entry );
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
 	} else {
 		// Default Label value
-		$placeholders['label_value'] = gv_label( $field, $entry );
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
 	}
 
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
 
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
 	/**
@@ -1400,7 +1400,7 @@ 
 	 * @since 2.0
 	 * @param \GV\Template_Context $context The context.
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1427,7 +1427,7 @@ 
 	foreach ( $placeholders as $tag => $value ) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
 			continue;
 		}
 

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

Spacing +5 added lines, -5 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 ) {
@@ -185,11 +185,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();
@@ -345,7 +345,7 @@ 
 			return;
 		}
 
-		$this->callbacks []= array( $type, $callback );
+		$this->callbacks [ ] = array( $type, $callback );
 	}
 
 	/**

includes/class-common.php

Spacing +125 added lines, -125 removed lines

@@ -125,8 +125,8 @@ 
 
 		$form = false;
 
-		if( $entry ) {
-			$form = GFAPI::get_form( $entry['form_id'] );
+		if ( $entry ) {
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
 		}
 
 		return $form;
@@ -202,7 +202,7 @@ 
 			}
 		}
 
-		return (bool) $has_transaction_data;
+		return (bool)$has_transaction_data;
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -257,10 +257,10 @@ 
 	 *
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
 	 */
-	public static function get_forms(  $active = true, $trash = false ) {
+	public static function get_forms( $active = true, $trash = false ) {
 		$forms = array();
 		if ( class_exists( 'GFAPI' ) ) {
-			if( 'any' === $active ) {
+			if ( 'any' === $active ) {
 				$active_forms = GFAPI::get_forms( true, $trash );
 				$inactive_forms = GFAPI::get_forms( false, $trash );
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -291,9 +291,9 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field['id']}"] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field[ 'id' ]}" ] = array(
 						'label' => \GV\Utils::get( $field, 'label' ),
 						'parent' => null,
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -302,10 +302,10 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
 
-						if( ! empty( $input['isHidden'] ) ) {
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
 							continue;
 						}
 
@@ -313,10 +313,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => \GV\Utils::get( $input, 'label' ),
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
 							'parent' => $field,
@@ -328,7 +328,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -342,7 +342,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -355,11 +355,11 @@ 
 			foreach ( $payment_fields as $payment_field ) {
 
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
 					continue;
 				}
 
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -391,9 +391,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -433,33 +433,33 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
 			'context_view_id' => null,
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -470,33 +470,33 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
 
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
 
-		if ( empty( $criteria['context_view_id'] ) ) {
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
 			// Calculate the context view id and send it to the advanced filter
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
 			}
 		}
 
@@ -506,7 +506,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 	}
@@ -541,7 +541,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -549,7 +549,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -571,9 +571,9 @@ 
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -584,7 +584,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -693,12 +693,12 @@ 
 		 */
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
 
-		if( $check_entry_display ) {
+		if ( $check_entry_display ) {
 			// Is the entry allowed
 			$entry = self::check_entry_display( $entry );
 		}
 
-		if( is_wp_error( $entry ) ) {
+		if ( is_wp_error( $entry ) ) {
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
 			return false;
 		}
@@ -732,12 +732,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -780,18 +780,18 @@ 
 				$json_val_1 = json_decode( $val1, true );
 				$json_val_2 = json_decode( $val2, true );
 
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
 
 					$json_in = false;
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
 
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
 					foreach ( $json_val_1 as $item_1 ) {
 						foreach ( $json_val_2 as $item_2 ) {
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
 
-							if( $json_in ) {
+							if ( $json_in ) {
 								break 2;
 							}
 						}
@@ -843,10 +843,10 @@ 
 	public static function check_entry_display( $entry, $view = null ) {
 
 		if ( ! $entry || is_wp_error( $entry ) ) {
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
 		}
 
@@ -855,15 +855,15 @@ 
 			 * Check whether the entry is in the entries subset by running a modified query.
 			 */
 			add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry ) {
-				$_tmp_query       = new \GF_Query( $view->form->ID, array( 'field_filters' => array( 'mode' => 'all', array( 'key' => 'id', 'operation' => 'is', 'value' => $entry['id'] ) ) ) );
+				$_tmp_query       = new \GF_Query( $view->form->ID, array( 'field_filters' => array( 'mode' => 'all', array( 'key' => 'id', 'operation' => 'is', 'value' => $entry[ 'id' ] ) ) ) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
 
 				$query_parts      = $query->_introspect();
 
-				$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
+				$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
 			}, 10, 3 );
 
-			if ( ( ! $entries = $view->get_entries()->all() ) || $entries[0]->ID !== $entry['id'] ) {
+			if ( ( ! $entries = $view->get_entries()->all() ) || $entries[ 0 ]->ID !== $entry[ 'id' ] ) {
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
 			}
@@ -876,59 +876,59 @@ 
 			'context_view_id' => $view ? $view->ID : null,
 		) );
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No search criteria found:', array( 'data' => $criteria ) );
 			return $entry;
 		}
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
 			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
+				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
 			}
 		}
 
-		$search_criteria = $criteria['search_criteria'];
+		$search_criteria = $criteria[ 'search_criteria' ];
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
+			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
 		}
 
 		// check entry date
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No field filters criteria found:', array( 'data' => $search_criteria ) );
 			return $entry;
 		}
 
-		$filters = $search_criteria['field_filters'];
+		$filters = $search_criteria[ 'field_filters' ];
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
 
-		$mode = $mode ? : 'all'; // If mode is an empty string, assume it's 'all'
+		$mode = $mode ?: 'all'; // If mode is an empty string, assume it's 'all'
 
 		// Prevent the mode from being processed below
-		unset( $filters['mode'] );
+		unset( $filters[ 'mode' ] );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		foreach ( $filters as $filter ) {
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				gravityview()->log->debug( '[apply_filters_to_entry] Filter key not set, any field mode', array( 'filter' => $filter ) );
 				/**
 				 * This is a cross-field search. Let's start digging'.
 				 */
 				foreach ( \GV\Utils::get( $form, 'fields', array() ) as $field ) {
 					$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
-					if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field ) ) {
-						if ( 'any' === $mode) {
+					if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field ) ) {
+						if ( 'any' === $mode ) {
 							return $entry; // All good here
 						} // mode === 'all'
 						continue 2; // Next filter
@@ -937,13 +937,13 @@ 
 				}
 
 				if ( 'all' === $mode ) {
-					return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter );
+					return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter );
 				}
 
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			$field = self::get_field( $form, $k );
 
@@ -951,12 +951,12 @@ 
 				$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null;
 				$field = $k;
 			} else {
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
 				 // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it
 				$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? \GV\Utils::get( $field_value, $k ) : $field_value;
 			}
 
-			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
 
 			// Any match is all we need to know
 			if ( $is_value_match && 'any' === $mode ) {
@@ -965,7 +965,7 @@ 
 
 			// Any failed match is a total fail
 			if ( ! $is_value_match && 'all' === $mode ) {
-				return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
+				return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
 			}
 		}
 
@@ -975,7 +975,7 @@ 
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved: all conditions were met' );
 			return $entry;
 		} else {
-			return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
+			return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
 		}
 
 	}
@@ -1016,18 +1016,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = \GV\Utils::get( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = \GV\Utils::get( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -1035,7 +1035,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1069,7 +1069,7 @@ 
 
 		$label = \GV\Utils::get( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -1097,7 +1097,7 @@ 
 			$form = GFAPI::get_form( $form );
 		}
 
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -1144,19 +1144,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1188,7 +1188,7 @@ 
 			'post_type'      => 'gravityview',
 			'posts_per_page' => 100,
 			'meta_key'       => '_gravityview_form_id',
-			'meta_value'     => (int) $form_id,
+			'meta_value'     => (int)$form_id,
 		);
 		$args     = wp_parse_args( $args, $defaults );
 		$views    = get_posts( $args );
@@ -1200,21 +1200,21 @@ 
 
 			$data = unserialize( $view->meta_value );
 
-			if( ! $data || ! is_array( $data ) ) {
+			if ( ! $data || ! is_array( $data ) ) {
 				continue;
 			}
 
 			foreach ( $data as $datum ) {
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
-					$joined_forms[] = $view->post_id;
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
+					$joined_forms[ ] = $view->post_id;
 				}
 			}
 		}
 
 		if ( $joined_forms ) {
-			$joined_args  = array(
+			$joined_args = array(
 				'post_type'      => 'gravityview',
-				'posts_per_page' => $args['posts_per_page'],
+				'posts_per_page' => $args[ 'posts_per_page' ],
 				'post__in'       => $joined_forms,
 			);
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1370,7 +1370,7 @@ 
 
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
 
-		if( $json_decode ) {
+		if ( $json_decode ) {
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
 		}
 
@@ -1386,7 +1386,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1399,11 +1399,11 @@ 
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1438,9 +1438,9 @@ 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 		}
@@ -1481,14 +1481,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1502,9 +1502,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1654,18 +1654,18 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts[ 'href' ] = esc_url_raw( $href );
 
 		/**
 		 * Fix potential security issue with target=_blank
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
 		 */
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
 		}
 
 		// Sort the attributes alphabetically, to help testing
@@ -1677,7 +1677,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1704,7 +1704,7 @@ 
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
-				$merged[] = $value;
+				$merged[ ] = $value;
 			} else {
 				$merged[ $key ] = $value;
 			}
@@ -1737,7 +1737,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1757,11 +1757,11 @@ 
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
 
     	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
     		return '';
 	    }
 
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**