gravityview / GravityView

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

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 			return $meta_keys;
 		}
 
-		if( $acf_keys = get_field_objects( $post_id, array( 'load_value' => false ) ) ) {
+		if ( $acf_keys = get_field_objects( $post_id, array( 'load_value' => false ) ) ) {
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
 		}
 
@@ -63,9 +63,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();
 			}
 		}
 	}

future/loader.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 }
 
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
-if ( version_compare( phpversion(), '5.3' , '<' ) ) {
+if ( version_compare( phpversion(), '5.3', '<' ) ) {
 	return false;
 
 /** Tests with a suppressed future. */

future/includes/class-gv-shortcode.php

Spacing +9 added lines, -9 removed lines

@@ -56,16 +56,16 @@ 
 	public static function add() {
 		$shortcode = new static();
 		if ( shortcode_exists( $shortcode->name ) ) {
-			if ( empty( self::$shortcodes[$shortcode->name] ) ) {
+			if ( empty( self::$shortcodes[ $shortcode->name ] ) ) {
 				gravityview()->log->error( 'Shortcode [{shortcode}] has already been registered elsewhere.', array( 'shortcode' => $shortcode->name ) );
 				return null;
 			}
 		} else {
 			add_shortcode( $shortcode->name, array( get_class( $shortcode ), 'callback' ) );
-			self::$shortcodes[$shortcode->name] = $shortcode;
+			self::$shortcodes[ $shortcode->name ] = $shortcode;
 		}
 
-		return self::$shortcodes[$shortcode->name];
+		return self::$shortcodes[ $shortcode->name ];
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 */
 	public static function remove() {
 		$shortcode = new static();
-		unset( self::$shortcodes[$shortcode->name] );
+		unset( self::$shortcodes[ $shortcode->name ] );
 		remove_shortcode( $shortcode->name );
 	}
 
@@ -109,14 +109,14 @@ 
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
 
 		foreach ( $matches as $shortcode ) {
-			$shortcode_name = $shortcode[2];
+			$shortcode_name = $shortcode[ 2 ];
 
-			$shortcode_atts = shortcode_parse_atts( $shortcode[3] );
-			$shortcode_content = $shortcode[5];
+			$shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
+			$shortcode_content = $shortcode[ 5 ];
 
 			/** This is a registered GravityView shortcode. */
-			if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
-				$shortcode = clone self::$shortcodes[$shortcode_name];
+			if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
+				$shortcode = clone self::$shortcodes[ $shortcode_name ];
 			} else {
 				/** This is some generic shortcode. */
 				$shortcode = new self;

future/includes/class-gv-view.php

Spacing +5 added lines, -5 removed lines

@@ -86,7 +86,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -197,7 +197,7 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		}
 
@@ -335,7 +335,7 @@ 
 		
 		gravityview()->log->notice( 'This is a \GV\View object should not be accessed as an array.' );
 
-		if ( ! isset( $this[$offset] ) ) {
+		if ( ! isset( $this[ $offset ] ) ) {
 			return null;
 		}
 
@@ -353,7 +353,7 @@ 
 				return $this->template ? $this->template->ID : null;
 			default:
 				/** @todo move the rest out and get rid of _data completely! */
-				return $this->_data[$offset];
+				return $this->_data[ $offset ];
 		}
 	}
 
@@ -402,7 +402,7 @@ 
 			array( 'form' => $this->form ? gravityview_get_form( $this->form->ID ) : null ),
 			array( 'atts' => $this->settings->as_atts() ),
 			array( 'fields' => $this->fields->by_visible()->as_configuration() ),
-			array( 'template_id' => $this->template? $this->template->ID : null ),
+			array( 'template_id' => $this->template ? $this->template->ID : null ),
 			$this->_data
 		);
 	}

future/includes/class-gv-plugin.php

Spacing +7 added lines, -7 removed lines

@@ -202,8 +202,8 @@ 
 	 * @return string The version of PHP.
 	 */
 	private function get_php_version() {
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
 	}
 
 	/**
@@ -214,8 +214,8 @@ 
 	 * @return string The version of WordPress.
 	 */
 	private function get_wordpress_version() {
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
 	}
 
 	/**
@@ -226,13 +226,13 @@ 
 	 * @return string|null The version of Gravity Forms or null if inactive.
 	 */
 	private function get_gravityforms_version() {
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
 			return null;
 		}
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
 	}
 
 	private function __clone() { }

includes/widgets/search-widget/class-search-widget.php

Spacing +107 added lines, -107 removed lines

@@ -63,7 +63,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -85,7 +85,7 @@ 
 
 		// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
 		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
 
 		// ajax - get the searchable fields
@@ -221,7 +221,7 @@ 
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 		$script_source = empty( $script_min ) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
 
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -243,7 +243,7 @@ 
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
 	 */
 	public function register_no_conflict( $allowed ) {
-		$allowed[] = 'gravityview_searchwidget_admin';
+		$allowed[ ] = 'gravityview_searchwidget_admin';
 		return $allowed;
 	}
 
@@ -256,24 +256,24 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
 			exit( '0' );
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST[ 'formid' ];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -318,8 +318,8 @@ 
 			)
 		);
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
 		}
 
 		// Get fields with sub-inputs and no parent
@@ -341,13 +341,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -370,7 +370,7 @@ 
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -414,19 +414,19 @@ 
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'post_id' ] );
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'view_id' ] );
 			}
 
 			$args = gravityview_get_permalink_query_args( $post_id );
 
 			// Add hidden fields to the search form
 			foreach ( $args as $key => $value ) {
-				$search_fields[] = array(
+				$search_fields[ ] = array(
 					'name'  => $key,
 					'input' => 'hidden',
 					'value' => $value,
@@ -447,7 +447,7 @@ 
 	 */
 	public function filter_entries( $search_criteria ) {
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -464,12 +464,12 @@ 
 		$get = gv_map_deep( $get, 'rawurldecode' );
 
 		// Make sure array key is set up
-		$search_criteria['field_filters'] = rgar( $search_criteria, 'field_filters', array() );
+		$search_criteria[ 'field_filters' ] = rgar( $search_criteria, 'field_filters', array() );
 
 		// add free search
-		if ( ! empty( $get['gv_search'] ) ) {
+		if ( ! empty( $get[ 'gv_search' ] ) ) {
 
-			$search_all_value = trim( $get['gv_search'] );
+			$search_all_value = trim( $get[ 'gv_search' ] );
 
 			/**
 			 * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase?
@@ -478,7 +478,7 @@ 
 			 */
 			$split_words = apply_filters( 'gravityview/search-all-split-words', true );
 
-			if( $split_words ) {
+			if ( $split_words ) {
 
 				// Search for a piece
 				$words = explode( ' ', $search_all_value );
@@ -494,7 +494,7 @@ 
 			}
 
 			foreach ( $words as $word ) {
-				$search_criteria['field_filters'][] = array(
+				$search_criteria[ 'field_filters' ][ ] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -503,8 +503,8 @@ 
 		}
 
 		//start date & end date
-		$curr_start = !empty( $get['gv_start'] ) ? $get['gv_start'] : '';
-		$curr_end = !empty( $get['gv_start'] ) ? $get['gv_end'] : '';
+		$curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '';
+		$curr_end = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_end' ] : '';
 
 		/**
 		 * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n
@@ -519,16 +519,16 @@ 
 		/**
 		 * Don't set $search_criteria['start_date'] if start_date is empty as it may lead to bad query results (GFAPI::get_entries)
 		 */
-		if( !empty( $curr_start ) ) {
-			$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+		if ( ! empty( $curr_start ) ) {
+			$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 		}
-		if( !empty( $curr_end ) ) {
-			$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+		if ( ! empty( $curr_end ) ) {
+			$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => '=',
@@ -537,36 +537,36 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => absint( $get['gv_by'] ),
+				'value' => absint( $get[ 'gv_by' ] ),
 				'operator' => '=',
 			);
 		}
 
 
 		// Get search mode passed in URL
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
 
-			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false ) ) ) {
+			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false ) ) ) {
 				continue;
 			}
 
 			// could return simple filter or multiple filters
 			$filter = $this->prepare_field_filter( $key, $value );
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) {
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
-				$search_criteria['field_filters'][] = $filter;
+			} elseif ( ! empty( $filter ) ) {
+				$search_criteria[ 'field_filters' ][ ] = $filter;
 			}
 		}
 
@@ -575,7 +575,7 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
 
 		do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Returned Search Criteria: ', get_class( $this ) ), $search_criteria );
 
@@ -601,7 +601,7 @@ 
 		$field_id = str_replace( 'filter_', '', $key );
 
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
 			$field_id = str_replace( '_', '.', $field_id );
 		}
 
@@ -615,11 +615,11 @@ 
 			'value' => $value,
 		);
 
-		switch ( $form_field['type'] ) {
+		switch ( $form_field[ 'type' ] ) {
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = 'is';
+				$filter[ 'operator' ] = 'is';
 				break;
 
 			case 'post_category':
@@ -633,7 +633,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key' => $field_id,
 						'value' => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => 'is',
@@ -652,18 +652,18 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
 
 			case 'checkbox':
 				// convert checkbox on/off into the correct search filter
-				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field['inputs'] ) && ! empty( $form_field['choices'] ) ) {
-					foreach ( $form_field['inputs'] as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field['choices'][ $k ]['value'];
-							$filter['operator'] = 'is';
+				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field[ 'inputs' ] ) && ! empty( $form_field[ 'choices' ] ) ) {
+					foreach ( $form_field[ 'inputs' ] as $k => $input ) {
+						if ( $input[ 'id' ] == $field_id ) {
+							$filter[ 'value' ] = $form_field[ 'choices' ][ $k ][ 'value' ];
+							$filter[ 'operator' ] = 'is';
 							break;
 						}
 					}
@@ -673,7 +673,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'   => $field_id,
 							'value' => $val,
 							'operator' => 'is',
@@ -694,9 +694,9 @@ 
 					foreach ( $words as $word ) {
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
 							// Keep the same key for each filter
-							$filter['value'] = $word;
+							$filter[ 'value' ] = $word;
 							// Add a search for the value
-							$filters[] = $filter;
+							$filters[ ] = $filter;
 						}
 					}
 
@@ -723,19 +723,19 @@ 
 						 * @since 1.16.3
 						 * Safeguard until GF implements '<=' operator
 						 */
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
 							$operator = '<';
 							$date = date( 'Y-m-d', strtotime( $date . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key' => $field_id,
 							'value' => self::get_formatted_date( $date, 'Y-m-d' ),
 							'operator' => $operator,
 						);
 					}
 				} else {
-					$filter['value'] = self::get_formatted_date( $value, 'Y-m-d' );
+					$filter[ 'value' ] = self::get_formatted_date( $value, 'Y-m-d' );
 				}
 
 				break;
@@ -766,7 +766,7 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
 			$format = $datepicker[ $field->dateFormat ];
 		}
 
@@ -797,7 +797,7 @@ 
 	public function add_template_path( $file_paths ) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[ 102 ] = self::$file . 'templates/';
 
 		return $file_paths;
 	}
@@ -816,7 +816,7 @@ 
 		$has_date = false;
 
 		foreach ( $search_fields as $k => $field ) {
-			if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) {
 				$has_date = true;
 				break;
 			}
@@ -843,7 +843,7 @@ 
 		}
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
 
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
 			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] No search fields configured for widget:', get_class( $this ) ), $widget_args );
@@ -858,34 +858,34 @@ 
 
 			$updated_field = $this->get_search_filter_details( $updated_field );
 
-			switch ( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 
 				case 'search_all':
-					$updated_field['key'] = 'search_all';
-					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' );
 					break;
 
 				case 'entry_date':
-					$updated_field['key'] = 'entry_date';
-					$updated_field['input'] = 'entry_date';
-					$updated_field['value'] = array(
+					$updated_field[ 'key' ] = 'entry_date';
+					$updated_field[ 'input' ] = 'entry_date';
+					$updated_field[ 'value' ] = array(
 						'start' => $this->rgget_or_rgpost( 'gv_start' ),
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
 					);
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
-					$updated_field['choices'] = self::get_created_by_choices();
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
+					$updated_field[ 'choices' ] = self::get_created_by_choices();
 					break;
 			}
 
@@ -903,16 +903,16 @@ 
 		 */
 		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args );
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
 
 		if ( $this->has_date_field( $search_fields ) ) {
 			// enqueue datepicker stuff only if needed!
@@ -934,10 +934,10 @@ 
 	public static function get_search_class( $custom_class = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
-			$search_class .= ' '.$custom_class;
+		if ( ! empty( $custom_class ) ) {
+			$search_class .= ' ' . $custom_class;
 		}
 
 		/**
@@ -979,11 +979,11 @@ 
 
 		$label = rgget( 'label', $field );
 
-		if( '' === $label ) {
+		if ( '' === $label ) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
 
-			switch( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 				case 'search_all':
 					$label = __( 'Search Entries:', 'gravityview' );
 					break;
@@ -995,10 +995,10 @@ 
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
 
 						// Get the item with the `label` key
 						$values = wp_list_pluck( $items, 'label' );
@@ -1037,32 +1037,32 @@ 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
 
 		// get searched value from $_GET/$_POST (string or array)
 		$value = $this->rgget_or_rgpost( $name );
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
 
 		$filter = array(
-			'key' => $field['field'],
+			'key' => $field[ 'field' ],
 			'name' => $name,
 			'label' => self::get_field_label( $field, $form_field ),
-			'input' => $field['input'],
+			'input' => $field[ 'input' ],
 			'value' => $value,
-			'type' => $form_field['type'],
+			'type' => $form_field[ 'type' ],
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
-			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
-			$filter['choices'] = $form_field['choices'];
+		if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
 		}
 
 		return $filter;
@@ -1086,7 +1086,7 @@ 
 
 		$choices = array();
 		foreach ( $users as $user ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $user->display_name,
 			);
@@ -1141,7 +1141,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1185,7 +1185,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1214,7 +1214,7 @@ 
 	 * @return void
 	 */
 	private function maybe_enqueue_flexibility() {
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
 			wp_enqueue_script( 'gv-flexibility' );
 		}
 	}
@@ -1236,7 +1236,7 @@ 
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`

future/_mocks.php

Spacing +11 added lines, -11 removed lines

@@ -94,15 +94,15 @@ 
 		$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'] )
-			->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
-		if ( ! empty( $criteria['sorting'] ) ) {
+			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria[ 'search_criteria' ] ) )
+			->offset( $args[ 'offset' ] )
+			->limit( $criteria[ 'paging' ][ 'page_size' ] )
+			->page( ( ( $criteria[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $criteria[ 'paging' ][ 'page_size' ] ) + 1 );
+		if ( ! empty( $criteria[ 'sorting' ] ) ) {
 			$field = new \GV\Field();
-			$field->ID = $criteria['sorting']['key'];
-			$direction = strtolower( $criteria['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
-			$mode = $criteria['sorting']['is_numeric'] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
+			$field->ID = $criteria[ 'sorting' ][ 'key' ];
+			$direction = strtolower( $criteria[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+			$mode = $criteria[ 'sorting' ][ 'is_numeric' ] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
 			$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction, $mode ) );
 		}
 
@@ -128,7 +128,7 @@ 
 
 /** Add some global fix for field capability discrepancies. */
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
-	if ( empty( $fields  ) ) {
+	if ( empty( $fields ) ) {
 		return $fields;
 	}
 
@@ -155,11 +155,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-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'	=> '',
 				'show_in_shortcode' => false,
@@ -911,15 +911,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;
@@ -928,12 +928,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 ] );
 					}
 				}

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'	=> '',
 				'show_in_shortcode' => false,
@@ -238,19 +238,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 ] );
 					}
 				}