gravityview / GravityView

future/_mocks.php

Spacing +12 added lines, -12 removed lines

@@ -96,18 +96,18 @@ 
 		$paging = rgar( $parameters, 'paging' );
 	} else {
 		$entries = $form->entries
-			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria['search_criteria'] ) )
-			->offset( $args['offset'] )
-			->limit( $criteria['paging']['page_size'] );
+			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria[ 'search_criteria' ] ) )
+			->offset( $args[ 'offset' ] )
+			->limit( $criteria[ 'paging' ][ 'page_size' ] );
 
-		if ( $criteria['paging']['page_size'] ) {
-			$entries = $entries->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
+		if ( $criteria[ 'paging' ][ 'page_size' ] ) {
+			$entries = $entries->page( ( ( $criteria[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $criteria[ 'paging' ][ 'page_size' ] ) + 1 );
 		}
 
-		if ( ! empty( $criteria['sorting'] ) ) {
+		if ( ! empty( $criteria[ 'sorting' ] ) ) {
 			$field = new \GV\Field();
-			$field->ID = $criteria['sorting']['key'];
-			switch( strtolower( $criteria['sorting']['direction'] ) ) {
+			$field->ID = $criteria[ 'sorting' ][ 'key' ];
+			switch ( strtolower( $criteria[ 'sorting' ][ 'direction' ] ) ) {
 				case 'asc':
 					$direction = \GV\Entry_Sort::ASC;
 					break;
@@ -120,7 +120,7 @@ 
 					break;
 			}
 
-			$mode = $criteria['sorting']['is_numeric'] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
+			$mode = $criteria[ 'sorting' ][ 'is_numeric' ] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
 			$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction, $mode ) );
 		}
 
@@ -146,7 +146,7 @@ 
 
 /** Add some global fix for field capability discrepancies. */
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
-	if ( empty( $fields  ) ) {
+	if ( empty( $fields ) ) {
 		return $fields;
 	}
 
@@ -173,11 +173,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;

includes/class-frontend-views.php

Spacing +116 added lines, -116 removed lines

@@ -85,9 +85,9 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -237,12 +237,12 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $multiple_views ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
 		} elseif ( ! $multiple_views ) {
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
@@ -285,25 +285,25 @@ 
 		global $wp_rewrite;
 
 		$is_front_page = ( $query->is_home || $query->is_page );
-		$show_on_front = ( 'page' === get_option('show_on_front') );
-		$front_page_id = get_option('page_on_front');
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
+		$front_page_id = get_option( 'page_on_front' );
 
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
 
 			// Force to be an array, potentially a query string ( entry=16 )
 			$_query = wp_parse_args( $query->query );
 
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
-				unset( $_query['pagename'] );
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
+				unset( $_query[ 'pagename' ] );
 			}
 
 			// this is where will break from core wordpress
 			/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */
 			$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query );
 			$endpoints = rgobj( $wp_rewrite, 'endpoints' );
-			foreach ( (array) $endpoints as $endpoint ) {
-				$ignore[] = $endpoint[1];
+			foreach ( (array)$endpoints as $endpoint ) {
+				$ignore[ ] = $endpoint[ 1 ];
 			}
 			unset( $endpoints );
 
@@ -313,21 +313,21 @@ 
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
 
-				$qv =& $query->query_vars;
+				$qv = & $query->query_vars;
 
 				// Prevent redirect when on the single entry endpoint
-				if( self::is_single_entry() ) {
+				if ( self::is_single_entry() ) {
 					add_filter( 'redirect_canonical', '__return_false' );
 				}
 
 				$query->is_page = true;
 				$query->is_home = false;
-				$qv['page_id']  = $front_page_id;
+				$qv[ 'page_id' ]  = $front_page_id;
 
 				// Correct <!--nextpage--> for page_on_front
-				if ( ! empty( $qv['paged'] ) ) {
-					$qv['page'] = $qv['paged'];
-					unset( $qv['paged'] );
+				if ( ! empty( $qv[ 'paged' ] ) ) {
+					$qv[ 'page' ] = $qv[ 'paged' ];
+					unset( $qv[ 'paged' ] );
 				}
 			}
 
@@ -360,7 +360,7 @@ 
 
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
 		$this->setPostId( $post_id );
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -396,7 +396,7 @@ 
 
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
 
-		if( 'post' === $search_method ) {
+		if ( 'post' === $search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -452,20 +452,20 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
 
 		if ( ! $apply_outside_loop ) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $title;
 		}
 
@@ -488,7 +488,7 @@ 
 		} else {
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 				foreach ( gravityview()->views->all() as $_view ) {
-					if ( intval( $_view->form->ID ) === intval( $entry['form_id'] ) ) {
+					if ( intval( $_view->form->ID ) === intval( $entry[ 'form_id' ] ) ) {
 						$view = $_view;
 						break;
 					}
@@ -500,7 +500,7 @@ 
 			} else {
 				/** Deprecated. Use gravityview()->views->all() or gravityview()->request->all() */
 				foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-					if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+					if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
 						$view_meta = $view_data;
 						break;
 					}
@@ -515,12 +515,12 @@ 
 			}
 		} else {
 			/** Deprecated stuff in the future. See the branch above. */
-			if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+			if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
 
-				$title = $view_meta['atts']['single_title'];
+				$title = $view_meta[ 'atts' ][ 'single_title' ];
 
 				// We are allowing HTML in the fields, so no escaping the output
-				$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+				$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
 
 				$title = do_shortcode( $title );
 			}
@@ -558,7 +558,7 @@ 
 		}
 
 		// Only render in the loop. Fixes issues with the_content filter being applied in places like the sidebar
-		if( ! in_the_loop() ) {
+		if ( ! in_the_loop() ) {
 			return $content;
 		}
 
@@ -633,7 +633,7 @@ 
 
 		$context = GravityView_View::getInstance()->getContext();
 
-		switch( $context ) {
+		switch ( $context ) {
 			case 'directory':
 				$tab = __( 'Multiple Entries', 'gravityview' );
 				break;
@@ -647,12 +647,12 @@ 
 		}
 
 
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
 
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -683,7 +683,7 @@ 
 	public function render_view( $passed_args ) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
+		if ( empty( $passed_args[ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
 			return null;
 		}
@@ -705,7 +705,7 @@ 
 			return null;
 		}
 
-		$view_id = $passed_args['id'];
+		$view_id = $passed_args[ 'id' ];
 
 		if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 			$view = gravityview()->views->get( $view_id );
@@ -742,7 +742,7 @@ 
 			$passed_args = array_filter( $passed_args, 'strlen' );
 
 			//Override shortcode args over View template settings
-			$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+			$atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] );
 
 			do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
 		}
@@ -766,14 +766,14 @@ 
 		 * @since 1.15
 		 * @since 1.17.2 Added check for if a user has no caps but is logged in (member of multisite, but not any site). Treat as if logged-out.
 		 */
-		if( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if ( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 
 			do_action( 'gravityview_log_debug', sprintf( '%s Returning: View %d is not visible by current user.', __METHOD__, $view_id ) );
 
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ( $this->isGravityviewPostType() ) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -789,10 +789,10 @@ 
 				$embed_only = $view->settings->get( 'embed_only' );
 			} else {
 				/** Deprecated. View attributes moved to \GV\View::$settings. */
-				$embed_only = ! empty( $atts['embed_only'] );
+				$embed_only = ! empty( $atts[ 'embed_only' ] );
 			}
 
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+			if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}
@@ -808,13 +808,13 @@ 
 		if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 			$view_data = $view->as_data();
 			$gravityview_view = new GravityView_View( $view_data );
-			$post_id = intval( $view->settings->get( 'post_id' ) ? : get_the_ID() );
+			$post_id = intval( $view->settings->get( 'post_id' ) ?: get_the_ID() );
 			$template_id = $view->template ? $view->template->ID : null;
 		} else {
 			/** These constructs are deprecated. Use the new gravityview() wrapper. */
 			$gravityview_view = new GravityView_View( $view_data );
-			$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : get_the_ID();
-			$template_id = $view_data['template_id'];
+			$post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : get_the_ID();
+			$template_id = $view_data[ 'template_id' ];
 		}
 
 		$gravityview_view->setPostId( $post_id );
@@ -825,20 +825,20 @@ 
 			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $template_id, 'table', 'directory' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $template_id, 'table', 'directory' );
 
 			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true );
 
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 				$hide_until_searched = $view->settings->get( 'hide_until_searched' );
 			} else {
 				/** $atts is deprecated, use \GV\View:$settings */
-				$hide_until_searched = ! empty( $atts['hide_until_searched'] );
+				$hide_until_searched = ! empty( $atts[ 'hide_until_searched' ] );
 			}
 
 			/**
@@ -856,12 +856,12 @@ 
 					$sort_columns = $view->settings->get( 'sort_columns' );
 				} else {
 					/** $atts is deprecated, use \GV\View:$settings */
-					$sort_columns = ! empty( $atts['sort_columns'] );
+					$sort_columns = ! empty( $atts[ 'sort_columns' ] );
 				}
 
 				if ( $sort_columns ) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 );
 				}
 
 				if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
@@ -869,19 +869,19 @@ 
 				} else {
 					/** $atts is deprecated, use \GV\View:$settings */
 					/** $view_data is deprecated, use \GV\View properties */
-					$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+					$view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] );
 				}
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) );
 
 			} else {
 
 				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' );
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
+			$gravityview_view->setPaging( $view_entries[ 'paging' ] );
 			$gravityview_view->setContext( 'directory' );
 			$sections = array( 'header', 'body', 'footer' );
 
@@ -898,7 +898,7 @@ 
 				do_action( 'gravityview_render_entry_' . $view->ID );
 			} else {
 				/** $view_data is depreacted, use \GV\View properties */
-				do_action( 'gravityview_render_entry_'.$view_data['id'] );
+				do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] );
 			}
 
 			$entry = $this->getEntry();
@@ -909,7 +909,7 @@ 
 				do_action( 'gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.' );
 
 				// Only display warning once when multiple Views are embedded
-				if( $view_id !== (int) GravityView_frontend::get_context_view_id() ) {
+				if ( $view_id !== (int)GravityView_frontend::get_context_view_id() ) {
 					ob_end_clean();
 					return null;
 				}
@@ -934,7 +934,7 @@ 
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
 			$multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $this->getGvOutputData()->has_multiple_views();
 			if ( $multiple_views && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id );
 				ob_end_clean();
 				return null;
 			}
@@ -944,14 +944,14 @@ 
 			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
 
 			//fetch entry detail
-			$view_entries['count'] = 1;
-			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			$view_entries[ 'count' ] = 1;
+			$view_entries[ 'entries' ][ ] = $entry;
+			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] );
 
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 				$back_link_label = $view->settings->get( 'back_link_label', null );
 			} else {
-				$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+				$back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null;
 			}
 
 			// set back link label
@@ -965,8 +965,8 @@ 
 		self::add_style( $template_id );
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries( $view_entries[ 'entries' ] );
+		$gravityview_view->setTotalEntries( $view_entries[ 'count' ] );
 
 		// If Edit
 		if ( 'edit' === gravityview_get_context() ) {
@@ -983,7 +983,7 @@ 
 
 			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
 			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
+				do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' );
 				$gravityview_view->render( $view_slug, $section, false );
 			}
 		}
@@ -1037,7 +1037,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ] );
 
@@ -1065,14 +1065,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
 			}
 		}
@@ -1091,19 +1091,19 @@ 
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries; showing all approval statuses' );
 			return $search_criteria;
 		}
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => GravityView_Entry_Approval::meta_key,
 				'value' => GravityView_Entry_Approval_Status::APPROVED
 			);
 
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
 		}
@@ -1130,18 +1130,18 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries, so entry is approved for viewing' );
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
 
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
 	}
@@ -1175,29 +1175,29 @@ 
 		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => rgget( 'search_field', $args ), // The field ID to search
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
 				'operator' => $operator,
 			);
 
 			// Lock search mode to "all" with implicit presearch filter.
-			$search_criteria['field_filters']['mode'] = 'all';
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
 		}
 
@@ -1208,7 +1208,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -1332,7 +1332,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => self::updateViewSorting( $args, $form_id ),
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -1357,7 +1357,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id );
 
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $parameters passed to gravityview_get_entries(): ', $parameters );
 
@@ -1382,17 +1382,17 @@ 
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 		$offset = ( $curr_page - 1 ) * $page_size;
 
-		if ( ! empty( $args['offset'] ) ) {
-			$offset += intval( $args['offset'] );
+		if ( ! empty( $args[ 'offset' ] ) ) {
+			$offset += intval( $args[ 'offset' ] );
 		}
 
 		$paging = array(
@@ -1416,8 +1416,8 @@ 
 	 */
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' );
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' );
 
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
 
@@ -1434,12 +1434,12 @@ 
 			$form = GFAPI::get_form( $form_id );
 
 			// Get the first GF_Field field ID, set as the key for entry randomization
-			if( ! empty( $form['fields'] ) ) {
+			if ( ! empty( $form[ 'fields' ] ) ) {
 
 				/** @var GF_Field $field */
-				foreach ( $form['fields'] as $field ) {
+				foreach ( $form[ 'fields' ] as $field ) {
 
-					if( ! is_a( $field, 'GF_Field' ) ) {
+					if ( ! is_a( $field, 'GF_Field' ) ) {
 						continue;
 					}
 
@@ -1482,11 +1482,11 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		if( ! $sort_field ) {
+		if ( ! $sort_field ) {
 			return $sort_field_id;
 		}
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1503,7 +1503,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1588,7 +1588,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1621,14 +1621,14 @@ 
 					$template_id = $view->template ? $view->template->ID : null;
 					$data = $view->as_data();
 				} else {
-					$template_id = $data['template_id'];
+					$template_id = $data[ 'template_id' ];
 				}
 
 				/**
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1640,7 +1640,7 @@ 
 					$lightbox = $view->settings->get( 'lightbox' );
 				} else {
 					/** View data attributes are now stored in \GV\View::$settings */
-					$lightbox = ! empty( $data['atts']['lightbox'] );
+					$lightbox = ! empty( $data[ 'atts' ][ 'lightbox' ] );
 				}
 
 				// If the thickbox is enqueued, add dependencies
@@ -1650,13 +1650,13 @@ 
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
 				}
 
 				/**
@@ -1664,19 +1664,19 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
@@ -1767,11 +1767,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1779,29 +1779,29 @@ 
 
 		$class = 'gv-sort';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1819,7 +1819,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field->type;
 		}
@@ -1842,7 +1842,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php

Spacing +8 added lines, -8 removed lines

@@ -49,8 +49,8 @@ 
 			return $meta_keys;
 		}
 
-		if( isset( $wp_filter['acf/format_value/type=wysiwyg'] ) && is_object( $wp_filter['acf/format_value/type=wysiwyg'] ) ) {
-			$backup_filters = clone( $wp_filter['acf/format_value/type=wysiwyg'] );
+		if ( isset( $wp_filter[ 'acf/format_value/type=wysiwyg' ] ) && is_object( $wp_filter[ 'acf/format_value/type=wysiwyg' ] ) ) {
+			$backup_filters = clone( $wp_filter[ 'acf/format_value/type=wysiwyg' ] );
 		}
 
 		// Prevent infinite loop by removing filters
@@ -59,11 +59,11 @@ 
 		$acf_keys = get_field_objects( $post_id, array( 'load_value' => false ) );
 
 		// Restore existing filters
-		if( ! empty( $backup_filters ) ) {
-			$wp_filter['acf/format_value/type=wysiwyg'] = $backup_filters;
+		if ( ! empty( $backup_filters ) ) {
+			$wp_filter[ 'acf/format_value/type=wysiwyg' ] = $backup_filters;
 		}
 
-		if( $acf_keys ) {
+		if ( $acf_keys ) {
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
 		}
 
@@ -78,9 +78,9 @@ 
 	 * @return void
 	 */
 	private function fix_posted_fields() {
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
-				$_POST['fields'] = _gravityview_process_posted_fields();
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
 			}
 		}
 	}

gravityview.php

Spacing +30 added lines, -30 removed lines

@@ -90,7 +90,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -101,7 +101,7 @@ 
 
 		self::require_files();
 
-		if( ! GravityView_Compatibility::is_valid() ) {
+		if ( ! GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -116,15 +116,15 @@ 
 	 */
 	private static function require_files() {
 		require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-html-elements.php');
-		require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
+		require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' );
+		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-html-elements.php' );
+		require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' );
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
 		require_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
-		require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
+		require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' );
+		require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' );
 	}
 
 	/**
@@ -157,22 +157,22 @@ 
 		}
 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval-status.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-approval.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval.php' );
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' );
 
 		// Load Extensions
 		// @todo: Convert to a scan of the directory or a method where this all lives
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/entry-notes/class-gravityview-field-notes.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/entry-notes/class-gravityview-field-notes.php' );
 
 		// Load WordPress Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' );
 
 		// Load GravityView Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' );
 
 		// Add oEmbed
 		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
@@ -185,7 +185,7 @@ 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
 		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -200,7 +200,7 @@ 
 	 * @return bool
 	 */
 	public static function is_network_activated() {
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
+		return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
 	}
 
 
@@ -221,12 +221,12 @@ 
 
 			if ( php_sapi_name() == 'cli' ) {
 				printf( __( "GravityView requires PHP Version %s or newer. You're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
-					GV_FUTURE_MIN_PHP_VERSION , phpversion() );
+					GV_FUTURE_MIN_PHP_VERSION, phpversion() );
 			} else {
 				printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
 				printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' );
 				printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
-					'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_FUTURE_MIN_PHP_VERSION , "</h3>\n\n", $version );
+					'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", $version );
 				printf( '</body>' );
 			}
 
@@ -296,7 +296,7 @@ 
 	 * @since 1.7.5.1
 	 */
 	public static function include_widget_class() {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
 	}
 
 
@@ -318,7 +318,7 @@ 
 		}
 		if ( ! $loaded ) {
 			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
+			$mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo';
 			load_textdomain( 'gravityview', $mofile );
 		}
 
@@ -355,12 +355,12 @@ 
 	 */
 	public function frontend_actions( $force = false ) {
 
-		if( self::is_admin() && ! $force ) { return; }
+		if ( self::is_admin() && ! $force ) { return; }
 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
 
 
@@ -385,8 +385,8 @@ 
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
 		);
 
 		/**
@@ -404,7 +404,7 @@ 
      * @param mixed $data Additional data to display
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Message to display
@@ -418,7 +418,7 @@ 
      * @param  string $message log message
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Error message to display
@@ -429,4 +429,4 @@ 
 
 } // end class GravityView_Plugin
 
-add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1);
+add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 );

includes/class-gravityview-html-elements.php

Spacing +25 added lines, -25 removed lines

@@ -42,16 +42,16 @@ 
 
 		$args = wp_parse_args( $args, $defaults );
 
-		$forms = gravityview_get_forms( (bool) $args['active'], (bool) $args['trash'] );
+		$forms = gravityview_get_forms( (bool)$args[ 'active' ], (bool)$args[ 'trash' ] );
 
-		if( array() === $args['options'] ) {
+		if ( array() === $args[ 'options' ] ) {
 			foreach ( $forms as $form ) {
 
-				if ( in_array( $form['id'], $args['exclude'] ) ) {
+				if ( in_array( $form[ 'id' ], $args[ 'exclude' ] ) ) {
 					continue;
 				}
 
-				$args['options'][ $form['id'] ] = esc_html( $form['title'] );
+				$args[ 'options' ][ $form[ 'id' ] ] = esc_html( $form[ 'title' ] );
 			}
 		}
 
@@ -83,15 +83,15 @@ 
 
 		$args = wp_parse_args( $args, $defaults );
 
-		if( empty( $args['form_id'] ) ) {
+		if ( empty( $args[ 'form_id' ] ) ) {
 			return '';
 		}
 
-		$fields = GVCommon::get_sortable_fields_array( $args['form_id'] );
+		$fields = GVCommon::get_sortable_fields_array( $args[ 'form_id' ] );
 
-		if( array() === $args['options'] ) {
+		if ( array() === $args[ 'options' ] ) {
 			foreach ( $fields as $field_id => $field ) {
-				$args['options'][ $field_id ] = esc_html( $field['label'] );
+				$args[ 'options' ][ $field_id ] = esc_html( $field[ 'label' ] );
 			}
 		}
 
@@ -127,43 +127,43 @@ 
 		$args = wp_parse_args( $args, $defaults );
 
 		$data_elements = '';
-		foreach ( $args['data'] as $key => $value ) {
+		foreach ( $args[ 'data' ] as $key => $value ) {
 			$data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
 		}
 
-		if( $args['multiple'] ) {
+		if ( $args[ 'multiple' ] ) {
 			$multiple = ' MULTIPLE';
 		} else {
 			$multiple = '';
 		}
 
-		if( $args['placeholder'] ) {
-			$placeholder = $args['placeholder'];
+		if ( $args[ 'placeholder' ] ) {
+			$placeholder = $args[ 'placeholder' ];
 		} else {
 			$placeholder = '';
 		}
 
-		$disabled = $args['disabled'] ? ' disabled="disabled"' : '';
-		$class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-		$output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( str_replace( '-', '_', $args['id'] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"'. $data_elements . '>';
+		$disabled = $args[ 'disabled' ] ? ' disabled="disabled"' : '';
+		$class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args[ 'class' ] ) ) );
+		$output = '<select name="' . esc_attr( $args[ 'name' ] ) . '" id="' . esc_attr( str_replace( '-', '_', $args[ 'id' ] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"' . $data_elements . '>';
 
-		if ( ! empty( $args['options'] ) ) {
+		if ( ! empty( $args[ 'options' ] ) ) {
 
-			if ( $args['show_option_none'] ) {
-				if( $args['multiple'] ) {
-					$selected = selected( true, in_array( -1, $args['selected'] ), false );
+			if ( $args[ 'show_option_none' ] ) {
+				if ( $args[ 'multiple' ] ) {
+					$selected = selected( true, in_array( -1, $args[ 'selected' ] ), false );
 				} else {
-					$selected = selected( $args['selected'], -1, false );
+					$selected = selected( $args[ 'selected' ], -1, false );
 				}
-				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args[ 'show_option_none' ] ) . '</option>';
 			}
 
-			foreach( $args['options'] as $key => $option ) {
+			foreach ( $args[ 'options' ] as $key => $option ) {
 
-				if( $args['multiple'] && is_array( $args['selected'] ) ) {
-					$selected = selected( true, in_array( $key, $args['selected'], true ), false );
+				if ( $args[ 'multiple' ] && is_array( $args[ 'selected' ] ) ) {
+					$selected = selected( true, in_array( $key, $args[ 'selected' ], true ), false );
 				} else {
-					$selected = selected( $args['selected'], $key, false );
+					$selected = selected( $args[ 'selected' ], $key, false );
 				}
 
 				$output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';

future/includes/class-gv-settings-view.php

Spacing +36 added lines, -36 removed lines

@@ -34,7 +34,7 @@ 
 
 		$default_settings = array(
 			'id' => array(
-				'label' => __('View ID', 'gravityview'),
+				'label' => __( 'View ID', 'gravityview' ),
 				'type' => 'number',
 				'group'	=> 'default',
 				'value' => NULL,
@@ -42,7 +42,7 @@ 
 				'show_in_shortcode' => false,
 			),
 			'page_size' => array(
-				'label' 	=> __('Number of entries per page', 'gravityview'),
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
 				'type' => 'number',
 				'class'	=> 'small-text',
 				'group'	=> 'default',
@@ -50,7 +50,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'offset' => array(
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
 				'type' => 'number',
 				'class'	=> 'small-text',
 				'group'	=> 'default',
@@ -74,8 +74,8 @@ 
 			),
 			'admin_show_all_statuses' => array(
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
 				'requires' => 'show_only_approved',
 				'type' => 'checkbox',
 				'group'	=> 'default',
@@ -100,40 +100,40 @@ 
 			'user_edit' => array(
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'sort_field' => array(
-				'label'	=> __('Sort by field', 'gravityview'),
+				'label'	=> __( 'Sort by field', 'gravityview' ),
 				'type' => 'select',
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __( 'Default', 'gravityview' ),
+					'date_created' => __( 'Date Created', 'gravityview' ),
 				),
 				'show_in_shortcode' => true,
 			),
 			'sort_direction' => array(
-				'label' 	=> __('Sort direction', 'gravityview'),
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
 				'type' => 'select',
 				'value' => 'ASC',
 				'group'	=> 'sort',
 				'options' => array(
-					'ASC' => __('ASC', 'gravityview'),
-					'DESC' => __('DESC', 'gravityview'),
+					'ASC' => __( 'ASC', 'gravityview' ),
+					'DESC' => __( 'DESC', 'gravityview' ),
 				),
 				'show_in_shortcode' => true,
 			),
@@ -148,69 +148,69 @@ 
 				'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ),
 			),
 			'start_date' => array(
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'end_date' => array(
-				'label' 	=> __('Filter by End Date', 'gravityview'),
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'class' => array(
-				'label' 	=> __('CSS Class', 'gravityview'),
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
 				'group'	=> 'default',
 				'type' => 'text',
 				'value' => '',
 				'show_in_shortcode' => false,
 			),
 			'search_value' => array(
-				'label' 	=> __('Search Value', 'gravityview'),
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
+				'label' 	=> __( 'Search Value', 'gravityview' ),
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'search_field' => array(
-				'label' 	=> __('Search Field', 'gravityview'),
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
+				'label' 	=> __( 'Search Field', 'gravityview' ),
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
 				'type' => 'number',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'single_title' => array(
-				'label'	=> __('Single Entry Title', 'gravityview'),
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
 				'type'	=> 'text',
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
 				'group'	=> 'default',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'back_link_label' => array(
-				'label'	=> __('Back Link Label', 'gravityview'),
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
 				'type'	=> 'text',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'embed_only' => array(
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'value'	=> '',
 				'tooltip' => false,
@@ -225,7 +225,7 @@ 
 		);
 
 		if ( version_compare( \GFFormsModel::get_database_version(), '2.3-beta-4', '>=' ) ) {
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
 		}
 
 		/**
@@ -245,19 +245,19 @@ 
 		// By default, we only want the key => value pairing, not the whole array.
 		if ( ! $detailed ) {
 			$defaults = array();
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ( $default_settings as $key => $value ) {
+				$defaults[ $key ] = $value[ 'value' ];
 			}
 			return $defaults;
 
 		// But sometimes, we want all the details.
 		} else {
-			foreach ($default_settings as $key => $value) {
+			foreach ( $default_settings as $key => $value ) {
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
 				if ( ! empty( $group ) && is_string( $group ) ) {
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
 						unset( $default_settings[ $key ] );
 					}
 				}

includes/class-data.php

Spacing +128 added lines, -128 removed lines

@@ -21,12 +21,12 @@ 
 			gravityview()->request = new \GV\Dummy_Request();
 		}
 
-		if( !empty( $passed_post ) ) {
+		if ( ! empty( $passed_post ) ) {
 
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
 
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
-				foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
+				foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
 					if ( \GV\View::exists( $view_id ) && ! gravityview()->views->contains( $view_id ) ) {
 						gravityview()->views->add( \GV\View::by_id( $view_id ) );
 					}
@@ -72,9 +72,9 @@ 
 	 */
 	public function maybe_get_view_id( $passed_post ) {
 		$ids = array();
-		if( ! empty( $passed_post ) ) {
+		if ( ! empty( $passed_post ) ) {
 
-			if( is_numeric( $passed_post ) ) {
+			if ( is_numeric( $passed_post ) ) {
 				$passed_post = get_post( $passed_post );
 			}
 
@@ -83,14 +83,14 @@ 
 				$passed_post = array( $passed_post );
 			}
 
-			if( is_array( $passed_post ) ) {
+			if ( is_array( $passed_post ) ) {
 
-				foreach ( $passed_post as &$post) {
+				foreach ( $passed_post as &$post ) {
 					if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && is_object( $post ) && property_exists( $post, 'ID' ) ) {
 						$post = get_post( $post ); // Convert into real WP_Post, thanks globals
 						$views = \GV\View_Collection::from_post( $post );
 						foreach ( $views->all() as $view ) {
-							$ids []= $view->ID;
+							$ids [ ] = $view->ID;
 
 							/** And as a side-effect... add each view to the global scope. */
 							if ( ! gravityview()->views->contains( $view->ID ) ) {
@@ -99,19 +99,19 @@ 
 						}
 					} else {
 						/** Deprecated, see \GV\View_Collection::from_post */
-						if( ( get_post_type( $post ) === 'gravityview' ) ) {
-							$ids[] = $post->ID;
-						} else{
+						if ( ( get_post_type( $post ) === 'gravityview' ) ) {
+							$ids[ ] = $post->ID;
+						} else {
 							// Parse the Post Content
 							$id = $this->parse_post_content( $post->post_content );
-							if( $id ) {
-								$ids = array_merge( $ids, (array) $id );
+							if ( $id ) {
+								$ids = array_merge( $ids, (array)$id );
 							}
 
 							// Parse the Post Meta
 							$id = $this->parse_post_meta( $post->ID );
-							if( $id ) {
-								$ids = array_merge( $ids, (array) $id );
+							if ( $id ) {
+								$ids = array_merge( $ids, (array)$id );
 							}
 						}
 					}
@@ -125,37 +125,37 @@ 
 					if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 						$shortcodes = \GV\Shortcode::parse( $passed_post );
 						foreach ( $shortcodes as $shortcode ) {
-							if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
-								$ids []= $shortcode->atts['id'];
+							if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
+								$ids [ ] = $shortcode->atts[ 'id' ];
 
 								/** And as a side-effect... add each view to the global scope. */
-								if ( ! gravityview()->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
-									gravityview()->views->add( $shortcode->atts['id'] );
+								if ( ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
+									gravityview()->views->add( $shortcode->atts[ 'id' ] );
 								}
 							}
 						}
 					} else {
 						/** Deprecated, use \GV\Shortcode::parse. */
 						$id = $this->parse_post_content( $passed_post );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						if ( $id ) {
+							$ids = array_merge( $ids, (array)$id );
 						}
 					}
 
 				} else {
 					$id = $this->get_id_from_atts( $passed_post );
-					$ids[] = intval( $id );
+					$ids[ ] = intval( $id );
 				}
 			}
 		}
 
-		if( empty($ids) ) {
+		if ( empty( $ids ) ) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new GravityView_View_Data( $passed_post );
 		}
 
@@ -180,8 +180,8 @@ 
 				return array();
 			}
 			return array_combine(
-				array_map( function ( $view ) { return $view->ID; }, gravityview()->views->all() ),
-				array_map( function ( $view ) { return $view->as_data(); }, gravityview()->views->all() )
+				array_map( function( $view ) { return $view->ID; }, gravityview()->views->all() ),
+				array_map( function( $view ) { return $view->as_data(); }, gravityview()->views->all() )
 			);
 		}
 		return $this->views;
@@ -208,19 +208,19 @@ 
 			return $view->as_data();
 		}
 
-		if( ! is_numeric( $view_id) ) {
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
+		if ( ! is_numeric( $view_id ) ) {
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id ) );
 			return false;
 		}
 
 		// Backup: the view hasn't been fetched yet. Doing it now.
 		if ( ! isset( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] View #%s not set yet.', $view_id ) );
 			return $this->add_view( $view_id, $atts );
 		}
 
 		if ( empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id ) );
 			return false;
 		}
 
@@ -265,8 +265,8 @@ 
 		}
 
 		// Handle array of IDs
-		if( is_array( $view_id ) ) {
-			foreach( $view_id as $id ) {
+		if ( is_array( $view_id ) ) {
+			foreach ( $view_id as $id ) {
 
 				$this->add_view( $id, $atts );
 			}
@@ -275,21 +275,21 @@ 
 		}
 
 		// The view has been set already; returning stored view.
-		if ( !empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
+		if ( ! empty( $this->views[ $view_id ] ) ) {
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id ) );
 			return $this->views[ $view_id ];
 		}
 
-		if( ! $this->view_exists( $view_id ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
+		if ( ! $this->view_exists( $view_id ) ) {
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id ) );
 			return false;
 		}
 
 		$form_id = gravityview_get_form_id( $view_id );
 
-		if( empty( $form_id ) ) {
+		if ( empty( $form_id ) ) {
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id ) );
 
 			return false;
 		}
@@ -297,21 +297,21 @@ 
 		// Get the settings for the View ID
 		$view_settings = gravityview_get_template_settings( $view_id );
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id ), $view_settings );
 
 		// Merge the view settings with the defaults
 		$view_defaults = wp_parse_args( $view_settings, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() );
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
 
-		if( ! empty( $atts ) && is_array( $atts ) ) {
+		if ( ! empty( $atts ) && is_array( $atts ) ) {
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
 
 			// Get the settings from the shortcode and merge them with defaults.
 			$atts = shortcode_atts( $view_defaults, $atts );
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
 
 		} else {
 
@@ -320,7 +320,7 @@ 
 
 		}
 
-		unset( $atts['id'], $view_defaults, $view_settings );
+		unset( $atts[ 'id' ], $view_defaults, $view_settings );
 
 		$data = array(
 			'id' => $view_id,
@@ -333,7 +333,7 @@ 
 			'form' => gravityview_get_form( $form_id ),
 		);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] View #%s being added.', $view_id ), $data );
 
 		$this->views[ $view_id ] = $data;
 
@@ -383,15 +383,15 @@ 
 			throw new Exception( __METHOD__ . ' should not be called anymore. Why was it?' );
 		}
 
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
+		if ( empty( $dir_fields ) || ! is_array( $dir_fields ) ) {
 			return $dir_fields;
 		}
 
-		foreach( $dir_fields as $area => $fields ) {
+		foreach ( $dir_fields as $area => $fields ) {
 
-			foreach( (array)$fields as $uniqid => $properties ) {
+			foreach ( (array)$fields as $uniqid => $properties ) {
 
-				if( $this->hide_field_check_conditions( $properties ) ) {
+				if ( $this->hide_field_check_conditions( $properties ) ) {
 					unset( $dir_fields[ $area ][ $uniqid ] );
 				}
 
@@ -418,7 +418,7 @@ 
 		}
 
 		// logged-in visibility
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
+		if ( ! empty( $properties[ 'only_loggedin' ] ) && ! GVCommon::has_cap( $properties[ 'only_loggedin_cap' ] ) ) {
 			return true;
 		}
 
@@ -449,14 +449,14 @@ 
 		// Get the settings from the shortcode and merge them with defaults.
 		$atts = wp_parse_args( $atts, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() );
 
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
+		$view_id = ! empty( $atts[ 'view_id' ] ) ? (int)$atts[ 'view_id' ] : NULL;
 
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
-			$view_id = (int)$atts['id'];
+		if ( empty( $view_id ) && ! empty( $atts[ 'id' ] ) ) {
+			$view_id = (int)$atts[ 'id' ];
 		}
 
-		if( empty( $view_id ) ) {
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
+		if ( empty( $view_id ) ) {
+			do_action( 'gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
 			return;
 		}
 
@@ -480,68 +480,68 @@ 
 		if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 			$ids = array();
 			foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
-				if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
-					if ( \GV\View::exists( $shortcode->atts['id'] ) && ! gravityview()->views->contains( $shortcode->atts['id'] ) ) {
-						gravityview()->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
+				if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
+					if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) ) {
+						gravityview()->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
 					}
 					/**
 					 * The original function outputs the ID even though it wasn't added by ::add_view()
 					 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
 					 * until better times.
 					 */
-					$ids []= $shortcode->atts['id'];
+					$ids [ ] = $shortcode->atts[ 'id' ];
 				}
 			}
 			if ( empty ( $ids ) ) {
 				return null;
 			}
-			return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+			return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 		}
 
 		/**
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
 		 * @since 1.6
 		 */
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
+		if ( ! shortcode_exists( 'gravityview' ) && class_exists( 'GravityView_Shortcode' ) ) {
 			new GravityView_Shortcode;
 		}
 
 		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
 
-		if( empty( $shortcodes ) ) {
+		if ( empty( $shortcodes ) ) {
 			return NULL;
 		}
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
 
 		$ids = array();
 
-		foreach ($shortcodes as $key => $shortcode) {
+		foreach ( $shortcodes as $key => $shortcode ) {
 
-			$shortcode[3] = htmlspecialchars_decode( $shortcode[3], ENT_QUOTES );
+			$shortcode[ 3 ] = htmlspecialchars_decode( $shortcode[ 3 ], ENT_QUOTES );
 
-			$args = shortcode_parse_atts( $shortcode[3] );
+			$args = shortcode_parse_atts( $shortcode[ 3 ] );
 
-			if( empty( $args['id'] ) ) {
-				do_action('gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode );
+			if ( empty( $args[ 'id' ] ) ) {
+				do_action( 'gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode );
 				continue;
 			}
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args[ 'id' ] ), $args );
 
 			// Store the View to the object for later fetching.
-			$this->add_view( $args['id'], $args );
+			$this->add_view( $args[ 'id' ], $args );
 
-			$ids[] = $args['id'];
+			$ids[ ] = $args[ 'id' ];
 		}
 
-		if( empty($ids) ) {
+		if ( empty( $ids ) ) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 
 	}
 
@@ -570,7 +570,7 @@ 
 		 */
 		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
 
-		if( empty( $meta_keys ) ) {
+		if ( empty( $meta_keys ) ) {
 			return NULL;
 		}
 
@@ -578,16 +578,16 @@ 
 
 		$meta_content = '';
 
-		foreach( $meta_keys as $key ) {
-			$meta = get_post_meta( $post_id, $key , true );
-			if( ! is_string( $meta ) ) {
+		foreach ( $meta_keys as $key ) {
+			$meta = get_post_meta( $post_id, $key, true );
+			if ( ! is_string( $meta ) ) {
 				continue;
 			}
 			$meta_content .= $meta . ' ';
 		}
 
-		if( empty( $meta_content ) ) {
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
+		if ( empty( $meta_content ) ) {
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
 			return NULL;
 		}
 
@@ -615,16 +615,16 @@ 
 		$message = NULL;
 
 		// Not invalid if not set!
-		if( empty( $post_id ) || empty( $view_id ) ) {
+		if ( empty( $post_id ) || empty( $view_id ) ) {
 
-			if( $empty_is_valid ) {
+			if ( $empty_is_valid ) {
 				return true;
 			}
 
 			$message = esc_html__( 'The ID is required.', 'gravityview' );
 		}
 
-		if( ! $message ) {
+		if ( ! $message ) {
 			$status = get_post_status( $post_id );
 
 			// Nothing exists with that post ID.
@@ -636,7 +636,7 @@ 
 			}
 		}
 
-		if( ! $message ) {
+		if ( ! $message ) {
 
 			// Nothing exists with that post ID.
 			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
@@ -645,8 +645,8 @@ 
 
 		}
 
-		if( ! $message ) {
-			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) )  {
+		if ( ! $message ) {
+			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) ) {
 				$views = GV\View_Collection::from_post( $post );
 				$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
 			} else {
@@ -655,21 +655,21 @@ 
 			}
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
 			}
 		}
 
-		if( ! $message ) {
+		if ( ! $message ) {
 
 			// It's a View
 			if ( ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && \GV\View::exists( $post_id ) )
 				|| 'gravityview' === get_post_type( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
 			}
 		}
 
-		if( $message ) {
+		if ( $message ) {
 			return new WP_Error( 'invalid_embed_id', $message );
 		}
 
@@ -686,7 +686,7 @@ 
 
 		$args = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults( $with_details ) : self::get_default_args( $with_details );
 
-		if( !isset( $args[ $key ] ) ) { return NULL; }
+		if ( ! isset( $args[ $key ] ) ) { return NULL; }
 
 		return $args[ $key ];
 	}
@@ -717,7 +717,7 @@ 
 
 		$default_settings = array(
 			'id' => array(
-				'label' => __('View ID', 'gravityview'),
+				'label' => __( 'View ID', 'gravityview' ),
 				'type' => 'number',
 				'group'	=> 'default',
 				'value' => NULL,
@@ -725,7 +725,7 @@ 
 				'show_in_shortcode' => false,
 			),
 			'page_size' => array(
-				'label' 	=> __('Number of entries per page', 'gravityview'),
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
 				'type' => 'number',
 				'class'	=> 'small-text',
 				'group'	=> 'default',
@@ -733,7 +733,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'offset' => array(
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
 				'type' => 'number',
 				'class'	=> 'small-text',
 				'group'	=> 'default',
@@ -757,8 +757,8 @@ 
 			),
 			'admin_show_all_statuses' => array(
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
 				'requires' => 'show_only_approved',
 				'type' => 'checkbox',
 				'group'	=> 'default',
@@ -783,40 +783,40 @@ 
 			'user_edit' => array(
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'sort_field' => array(
-				'label'	=> __('Sort by field', 'gravityview'),
+				'label'	=> __( 'Sort by field', 'gravityview' ),
 				'type' => 'select',
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __( 'Default', 'gravityview' ),
+					'date_created' => __( 'Date Created', 'gravityview' ),
 				),
 				'show_in_shortcode' => true,
 			),
 			'sort_direction' => array(
-				'label' 	=> __('Sort direction', 'gravityview'),
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
 				'type' => 'select',
 				'value' => 'ASC',
 				'group'	=> 'sort',
 				'options' => array(
-					'ASC' => __('ASC', 'gravityview'),
-					'DESC' => __('DESC', 'gravityview'),
+					'ASC' => __( 'ASC', 'gravityview' ),
+					'DESC' => __( 'DESC', 'gravityview' ),
 				),
 				'show_in_shortcode' => true,
 			),
@@ -831,69 +831,69 @@ 
 				'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ),
 			),
 			'start_date' => array(
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'end_date' => array(
-				'label' 	=> __('Filter by End Date', 'gravityview'),
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'class' => array(
-				'label' 	=> __('CSS Class', 'gravityview'),
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
 				'group'	=> 'default',
 				'type' => 'text',
 				'value' => '',
 				'show_in_shortcode' => false,
 			),
 			'search_value' => array(
-				'label' 	=> __('Search Value', 'gravityview'),
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
+				'label' 	=> __( 'Search Value', 'gravityview' ),
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'search_field' => array(
-				'label' 	=> __('Search Field', 'gravityview'),
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
+				'label' 	=> __( 'Search Field', 'gravityview' ),
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
 				'type' => 'number',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'single_title' => array(
-				'label'	=> __('Single Entry Title', 'gravityview'),
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
 				'type'	=> 'text',
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
 				'group'	=> 'default',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'back_link_label' => array(
-				'label'	=> __('Back Link Label', 'gravityview'),
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
 				'type'	=> 'text',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'embed_only' => array(
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'value'	=> '',
 				'tooltip' => false,
@@ -908,7 +908,7 @@ 
 		);
 
 		if ( version_compare( \GFFormsModel::get_database_version(), '2.3-beta-4', '>=' ) ) {
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
 		}
 
 		/**
@@ -920,12 +920,12 @@ 
 		$default_settings = apply_filters( 'gravityview_default_args', $default_settings );
 
 		// By default, we only want the key => value pairing, not the whole array.
-		if( empty( $with_details ) ) {
+		if ( empty( $with_details ) ) {
 
 			$defaults = array();
 
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ( $default_settings as $key => $value ) {
+				$defaults[ $key ] = $value[ 'value' ];
 			}
 
 			return $defaults;
@@ -934,12 +934,12 @@ 
 		// But sometimes, we want all the details.
 		else {
 
-			foreach ($default_settings as $key => $value) {
+			foreach ( $default_settings as $key => $value ) {
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
-				if( !empty( $group ) && is_string( $group ) ) {
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
+				if ( ! empty( $group ) && is_string( $group ) ) {
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
 						unset( $default_settings[ $key ] );
 					}
 				}