gravityview / GravityView

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

Spacing +35 added lines, -35 removed lines

@@ -39,7 +39,7 @@ 
 		 */
 		$default_settings = apply_filters( 'gravityview_default_args', array(
 			'id' => array(
-				'label' => __('View ID', 'gravityview'),
+				'label' => __( 'View ID', 'gravityview' ),
 				'type' => 'number',
 				'group'	=> 'default',
 				'value' => NULL,
@@ -47,7 +47,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',
@@ -55,7 +55,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',
@@ -79,8 +79,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',
@@ -105,40 +105,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' ),
 					//'RAND' => __('Random', 'gravityview'),
 				),
 				'show_in_shortcode' => true,
@@ -154,69 +154,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,
@@ -239,19 +239,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/fields/class-gravityview-field-source-url.php

Spacing +6 added lines, -6 removed lines

@@ -26,24 +26,24 @@
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
 		// Don't link to entry; doesn't make sense.
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		$add_options = array();
-		$add_options['link_to_source'] = array(
+		$add_options[ 'link_to_source' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Link to URL:', 'gravityview' ),
-			'desc' => __('Display as a link to the Source URL', 'gravityview'),
+			'desc' => __( 'Display as a link to the Source URL', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
-		$add_options['source_link_text'] = array(
+		$add_options[ 'source_link_text' ] = array(
 			'type' => 'text',
 			'label' => __( 'Link Text:', 'gravityview' ),
-			'desc' => __('Customize the link text. If empty, the link text will be the URL.', 'gravityview'),
+			'desc' => __( 'Customize the link text. If empty, the link text will be the URL.', 'gravityview' ),
 			'value' => NULL,
 			'merge_tags' => true,
 		);

includes/class-gravityview-logging.php

Indentation +10 added lines, -10 removed lines

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

Spacing +15 added lines, -15 removed lines

@@ -7,9 +7,9 @@ 
 
 	function __construct() {
 
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
+		add_action( 'gravityview_log_error', array( $this, 'log_error' ), 10, 2 );
 
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
+		add_action( 'gravityview_log_debug', array( $this, 'log_debug' ), 10, 2 );
 
 		// Enable debug with Gravity Forms Logging Add-on
 	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
@@ -34,7 +34,7 @@ 
 			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
 		}
 
-		$panels[] = new GravityView_Debug_Bar;
+		$panels[ ] = new GravityView_Debug_Bar;
 
 		return $panels;
 	}
@@ -44,7 +44,7 @@ 
 	 * @param array $supported_plugins List of plugins
 	 */
 	public function enable_gform_logging( $supported_plugins ) {
-	    $supported_plugins['gravityview'] = 'GravityView';
+	    $supported_plugins[ 'gravityview' ] = 'GravityView';
 	    return $supported_plugins;
 	}
 
@@ -72,7 +72,7 @@ 
 	 * @return string "print_r" or "var_export"
 	 */
 	static function get_print_function() {
-		if( ob_get_level() > 0 ) {
+		if ( ob_get_level() > 0 ) {
 			$function = 'var_export';
 		} else {
 			$function = 'print_r';
@@ -90,33 +90,33 @@ 
 			'data' => $data,
 		);
 
-		if( !in_array( $notice, self::$notices ) ) {
-			self::$notices[] = $notice;
+		if ( ! in_array( $notice, self::$notices ) ) {
+			self::$notices[ ] = $notice;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if ( class_exists( "GFLogging" ) ) {
 			GFLogging::include_logger();
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
+	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::DEBUG );
 	    }
 	}
 
-	static function log_error( $message = '', $data = null  ) {
+	static function log_error( $message = '', $data = null ) {
 
 		$function = self::get_print_function();
 
 		$error = array(
 			'message' => $message,
 			'data' => $data,
-		    'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
+		    'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
 		);
 
-		if( !in_array( $error, self::$errors ) ) {
-			self::$errors[] = $error;
+		if ( ! in_array( $error, self::$errors ) ) {
+			self::$errors[ ] = $error;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if ( class_exists( "GFLogging" ) ) {
 		    GFLogging::include_logger();
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ( $error, true), KLogger::ERROR );
+		    GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $error, true ), KLogger::ERROR );
 		}
 	}
 

includes/class-data.php

Spacing +129 added lines, -129 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 ) );
 					}
@@ -73,24 +73,24 @@ 
 	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 );
 			}
 
 			// Convert WP_Posts into WP_Posts[] array
-			if( $passed_post instanceof WP_Post ) {
+			if ( $passed_post instanceof WP_Post ) {
 				$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' ) && $post instanceof WP_Post ) {
 						$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 ];
 	}
@@ -723,7 +723,7 @@ 
 		 */
 		$default_settings = apply_filters( 'gravityview_default_args', array(
 			'id' => array(
-				'label' => __('View ID', 'gravityview'),
+				'label' => __( 'View ID', 'gravityview' ),
 				'type' => 'number',
 				'group'	=> 'default',
 				'value' => NULL,
@@ -731,7 +731,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',
@@ -739,7 +739,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',
@@ -763,8 +763,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',
@@ -789,40 +789,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' ),
 					//'RAND' => __('Random', 'gravityview'),
 				),
 				'show_in_shortcode' => true,
@@ -838,69 +838,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,
@@ -912,15 +912,15 @@ 
 				'value' => '',
 				'show_in_shortcode' => false,
 			),
-		));
+		) );
 
 		// 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;
@@ -929,12 +929,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 ] );
 					}
 				}