gravityview / GravityView

future/includes/class-gv-template-view-table.php

Indentation +33 added lines, -33 removed lines

@@ -19,8 +19,8 @@ 
 
 
 	/**
-     * Constructor. Add filters to modify output.
-     *
+	 * Constructor. Add filters to modify output.
+	 *
 	 * @since 2.0.4
 	 *
 	 * @param View $view
@@ -29,19 +29,19 @@ 
 	 */
 	public function __construct( View $view, Entry_Collection $entries, Request $request ) {
 
-	    add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
+		add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
 
 		parent::__construct( $view, $entries, $request );
 	}
 
 	/**
-     * Add sorting links to HTML columns that support sorting
-     *
-     * @since 2.0.4
-     * @since 2.0.5 Made static
-     *
-     * @static
-     *
+	 * Add sorting links to HTML columns that support sorting
+	 *
+	 * @since 2.0.4
+	 * @since 2.0.5 Made static
+	 *
+	 * @static
+	 *
 	 * @param string $column_label Label for the table column
 	 * @param \GV\Template_Context $context
 	 *
@@ -52,7 +52,7 @@ 
 		$sort_columns = $context->view->settings->get( 'sort_columns' );
 
 		if ( empty( $sort_columns ) ) {
-            return $column_label;
+			return $column_label;
 		}
 
 		if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) {
@@ -193,15 +193,15 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/before', $context );
 
-                /**
-                 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/before`
-                 */
-                do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
 
-                foreach ( $fields->all() as $field ) {
+				foreach ( $fields->all() as $field ) {
 					$this->the_field( $field, $entry );
 				}
 
@@ -212,13 +212,13 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/after', $context );
 
-                /**
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/after`
-                 */
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
 
 				?>
 			</tr>
@@ -255,7 +255,7 @@ 
 			'hide_empty' => false,
 			'zone_id' => 'directory_table-columns',
 			'markup' => '<td id="{{ field_id }}" class="{{ class }}">{{ value }}</td>',
-            'form' => $form,
+			'form' => $form,
 		);
 
 		/** Output. */
@@ -280,11 +280,11 @@ 
 		do_action( 'gravityview/template/table/body/before', $context );
 
 		/**
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/before`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/before`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
 	}
 
@@ -306,11 +306,11 @@ 
 		do_action( 'gravityview/template/table/body/after', $context );
 
 		/**
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/after`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/after`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
 	}
 

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

Spacing +2 added lines, -2 removed lines

@@ -115,8 +115,8 @@
 			'entries' => $entries,
 			'request' => $request,
 		), empty( $parameters ) ? array() : array(
-			'paging' => $parameters['paging'],
-			'sorting' => $parameters['sorting'],
+			'paging' => $parameters[ 'paging' ],
+			'sorting' => $parameters[ 'sorting' ],
 		), empty( $post ) ? array() : array(
 			'post' => $post,
 		) ) );

includes/class-common.php

Indentation +33 added lines, -33 removed lines

@@ -305,12 +305,12 @@ 
 						}
 
 						/**
-                         * @hack
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
-                         */
+						 * @hack
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
+						 */
 						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
-                            continue;
-                        }
+							continue;
+						}
 						$fields["{$input['id']}"] = array(
 							'label' => \GV\Utils::get( $input, 'label' ),
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
@@ -1349,7 +1349,7 @@ 
 			),
 		);
 
-        $fields = $date_created + $fields;
+		$fields = $date_created + $fields;
 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
@@ -1361,13 +1361,13 @@ 
 			}
 		}
 
-        /**
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
-         * @since 1.12
-         * @param array $fields Sub-set of GF form fields that are sortable
-         * @param int $formid The Gravity Forms form ID that the fields are from
-         */
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
+		/**
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
+		 * @since 1.12
+		 * @param array $fields Sub-set of GF form fields that are sortable
+		 * @param int $formid The Gravity Forms form ID that the fields are from
+		 */
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
 
 		return $fields;
 	}
@@ -1659,26 +1659,26 @@ 
 	}
 
 
-    /**
-     * Display updated/error notice
-     *
-     * @since 1.19.2 Added $cap and $object_id parameters
-     *
-     * @param string $notice text/HTML of notice
-     * @param string $class CSS class for notice (`updated` or `error`)
-     * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
-     *
-     * @return string
-     */
-    public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
-
-    	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
-    		return '';
-	    }
-
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
-    }
+	/**
+	 * Display updated/error notice
+	 *
+	 * @since 1.19.2 Added $cap and $object_id parameters
+	 *
+	 * @param string $notice text/HTML of notice
+	 * @param string $class CSS class for notice (`updated` or `error`)
+	 * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
+	 *
+	 * @return string
+	 */
+	public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
+
+		// If $cap is defined, only show notice if user has capability
+		if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+			return '';
+		}
+
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+	}
 
 	/**
 	 * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets

Spacing +112 added lines, -112 removed lines

@@ -125,8 +125,8 @@ 
 
 		$form = false;
 
-		if( $entry ) {
-			$form = GFAPI::get_form( $entry['form_id'] );
+		if ( $entry ) {
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
 		}
 
 		return $form;
@@ -192,12 +192,12 @@ 
 
 			$has_transaction_data = \GV\Utils::get( $entry, $meta, false );
 
-			if( ! empty( $has_transaction_data ) ) {
+			if ( ! empty( $has_transaction_data ) ) {
 				break;
 			}
 		}
 
-		return (bool) $has_transaction_data;
+		return (bool)$has_transaction_data;
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -252,10 +252,10 @@ 
 	 *
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
 	 */
-	public static function get_forms(  $active = true, $trash = false ) {
+	public static function get_forms( $active = true, $trash = false ) {
 		$forms = array();
 		if ( class_exists( 'GFAPI' ) ) {
-			if( 'any' === $active ) {
+			if ( 'any' === $active ) {
 				$active_forms = GFAPI::get_forms( true, $trash );
 				$inactive_forms = GFAPI::get_forms( false, $trash );
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -286,9 +286,9 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field['id']}"] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field[ 'id' ]}" ] = array(
 						'label' => \GV\Utils::get( $field, 'label' ),
 						'parent' => null,
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -297,10 +297,10 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
 
-						if( ! empty( $input['isHidden'] ) ) {
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
 							continue;
 						}
 
@@ -308,10 +308,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => \GV\Utils::get( $input, 'label' ),
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
 							'parent' => $field,
@@ -323,7 +323,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -337,7 +337,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -350,11 +350,11 @@ 
 			foreach ( $payment_fields as $payment_field ) {
 
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
 					continue;
 				}
 
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -386,9 +386,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -428,33 +428,33 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
 			'context_view_id' => null,
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -465,33 +465,33 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
 
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
 
-		if ( empty( $criteria['context_view_id'] ) ) {
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
 			// Calculate the context view id and send it to the advanced filter
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
 			}
 		}
 
@@ -501,7 +501,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 	}
@@ -531,7 +531,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -539,7 +539,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -560,9 +560,9 @@ 
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -573,7 +573,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -678,12 +678,12 @@ 
 			 */
 			$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
 
-			if( $check_entry_display ) {
+			if ( $check_entry_display ) {
 				// Is the entry allowed
 				$entry = self::check_entry_display( $entry );
 			}
 
-			if( is_wp_error( $entry ) ) {
+			if ( is_wp_error( $entry ) ) {
 				gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
 				return false;
 			}
@@ -714,7 +714,7 @@ 
 	 */
 	public static function matches_operation( $val1, $val2, $operation ) {
 
-		$json_function = function_exists('wp_json_encode') ? 'wp_json_encode' : 'json_encode';
+		$json_function = function_exists( 'wp_json_encode' ) ? 'wp_json_encode' : 'json_encode';
 
 		// Only process strings
 		$val1 = ! is_string( $val1 ) ? $json_function( $val1 ) : $val1;
@@ -722,12 +722,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -770,7 +770,7 @@ 
 				$json_val_1 = json_decode( $val1, true );
 				$json_val_2 = json_decode( $val2, true );
 
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
 
 					$json_in = false;
 					$json_val_1 = $json_val_1 ? $json_val_1 : array( $val1 );
@@ -781,7 +781,7 @@ 
 						foreach ( $json_val_2 as $item_2 ) {
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
 
-							if( $json_in ) {
+							if ( $json_in ) {
 								break 2;
 							}
 						}
@@ -829,62 +829,62 @@ 
 	public static function check_entry_display( $entry ) {
 
 		if ( ! $entry || is_wp_error( $entry ) ) {
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
 		}
 
 		$criteria = self::calculate_get_entries_criteria();
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No search criteria found:', array( 'data' => $criteria ) );
 			return $entry;
 		}
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
 			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
+				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
 			}
 		}
 
-		$search_criteria = $criteria['search_criteria'];
+		$search_criteria = $criteria[ 'search_criteria' ];
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
+			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
 		}
 
 		// check entry date
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No field filters criteria found:', array( 'data' => $search_criteria ) );
 			return $entry;
 		}
 
-		$filters = $search_criteria['field_filters'];
+		$filters = $search_criteria[ 'field_filters' ];
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
 
 		// Prevent the mode from being processed below
-		unset( $filters['mode'] );
+		unset( $filters[ 'mode' ] );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		foreach ( $filters as $filter ) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				gravityview()->log->debug( '[apply_filters_to_entry] Filter key not set: {filter}', array( 'filter' => $filter ) );
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			$field = self::get_field( $form, $k );
 
@@ -892,14 +892,14 @@ 
 				$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null;
 				$field = $k;
 			} else {
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
 				 // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it
 				$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? \GV\Utils::get( $field_value, $k ) : $field_value;
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
 
-			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
 
 			// Any match is all we need to know
 			if ( $is_value_match && 'any' === $mode ) {
@@ -908,7 +908,7 @@ 
 
 			// Any failed match is a total fail
 			if ( ! $is_value_match && 'all' === $mode ) {
-				return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
+				return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
 			}
 		}
 
@@ -918,7 +918,7 @@ 
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved: all conditions were met' );
 			return $entry;
 		} else {
-			return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
+			return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
 		}
 
 	}
@@ -959,18 +959,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = \GV\Utils::get( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = \GV\Utils::get( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -978,7 +978,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1012,7 +1012,7 @@ 
 
 		$label = \GV\Utils::get( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -1040,7 +1040,7 @@ 
 			$form = GFAPI::get_form( $form );
 		}
 
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -1087,19 +1087,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1286,7 +1286,7 @@ 
 
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
 
-		if( $json_decode ) {
+		if ( $json_decode ) {
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
 		}
 
@@ -1302,7 +1302,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1315,11 +1315,11 @@ 
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1354,9 +1354,9 @@ 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 		}
@@ -1397,14 +1397,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1418,9 +1418,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1570,18 +1570,18 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts[ 'href' ] = esc_url_raw( $href );
 
 		/**
 		 * Fix potential security issue with target=_blank
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
 		 */
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
 		}
 
 		// Sort the attributes alphabetically, to help testing
@@ -1593,7 +1593,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1620,7 +1620,7 @@ 
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
-				$merged[] = $value;
+				$merged[ ] = $value;
 			} else {
 				$merged[ $key ] = $value;
 			}
@@ -1653,7 +1653,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1673,11 +1673,11 @@ 
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
 
     	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
     		return '';
 	    }
 
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**

includes/class-gravityview-entry-link-shortcode.php

Spacing +16 added lines, -16 removed lines

@@ -75,7 +75,7 @@ 
 
 		$atts = shortcode_atts( self::$defaults, $atts );
 
-		$atts['action'] = 'edit';
+		$atts[ 'action' ] = 'edit';
 
 		return $this->shortcode( $atts, $content, $context );
 	}
@@ -91,7 +91,7 @@ 
 
 		$atts = shortcode_atts( self::$defaults, $atts );
 
-		$atts['action'] = 'delete';
+		$atts[ 'action' ] = 'delete';
 
 		return $this->shortcode( $atts, $content, $context );
 	}
@@ -131,7 +131,7 @@ 
 
 		$this->settings = shortcode_atts( self::$defaults, $atts, $context );
 
-		$this->view_id = empty( $this->settings['view_id'] ) ? GravityView_View::getInstance()->getViewId() : absint( $this->settings['view_id'] );
+		$this->view_id = empty( $this->settings[ 'view_id' ] ) ? GravityView_View::getInstance()->getViewId() : absint( $this->settings[ 'view_id' ] );
 
 		if ( empty( $this->view_id ) ) {
 			gravityview()->log->error( 'A View ID was not defined and we are not inside a View' );
@@ -139,12 +139,12 @@ 
 			return null;
 		}
 
-		$this->entry = $this->get_entry( $this->settings['entry_id'] );
+		$this->entry = $this->get_entry( $this->settings[ 'entry_id' ] );
 
 		gravityview()->log->debug( '{context} atts:', array( 'context' => $context, 'data' => $atts ) );
 
 		if ( ! $this->has_cap() ) {
-			gravityview()->log->error( 'User does not have the capability to {action} this entry: {entry_id}', array( 'action' => esc_attr( $this->settings['action'] ), 'entry_id' => $this->entry['id'] ) );
+			gravityview()->log->error( 'User does not have the capability to {action} this entry: {entry_id}', array( 'action' => esc_attr( $this->settings[ 'action' ] ), 'entry_id' => $this->entry[ 'id' ] ) );
 
 			return null;
 		}
@@ -158,7 +158,7 @@ 
 		}
 
 		// Get just the URL, not the tag
-		if ( 'url' === $this->settings['return'] ) {
+		if ( 'url' === $this->settings[ 'return' ] ) {
 			return $url;
 		}
 
@@ -179,13 +179,13 @@ 
 	 */
 	private function get_link_atts() {
 
-		wp_parse_str( $this->settings['link_atts'], $link_atts );
+		wp_parse_str( $this->settings[ 'link_atts' ], $link_atts );
 
-		if ( 'delete' === $this->settings['action'] ) {
-			$link_atts['onclick'] = isset( $link_atts['onclick'] ) ? $link_atts['onclick'] : GravityView_Delete_Entry::get_confirm_dialog();
+		if ( 'delete' === $this->settings[ 'action' ] ) {
+			$link_atts[ 'onclick' ] = isset( $link_atts[ 'onclick' ] ) ? $link_atts[ 'onclick' ] : GravityView_Delete_Entry::get_confirm_dialog();
 		}
 
-		return (array) $link_atts;
+		return (array)$link_atts;
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 			return $content;
 		}
 
-		switch ( $this->settings['action'] ) {
+		switch ( $this->settings[ 'action' ] ) {
 			case 'edit':
 				$anchor_text = __( 'Edit Entry', 'gravityview' );
 				break;
@@ -233,9 +233,9 @@ 
 	private function get_url() {
 
 		// if post_id is not defined, default to view_id
-		$post_id = empty( $this->settings['post_id'] ) ? null : absint( $this->settings['post_id'] );
+		$post_id = empty( $this->settings[ 'post_id' ] ) ? null : absint( $this->settings[ 'post_id' ] );
 
-		switch ( $this->settings['action'] ) {
+		switch ( $this->settings[ 'action' ] ) {
 			case 'edit':
 				$url = GravityView_Edit_Entry::get_edit_link( $this->entry, $this->view_id, $post_id );
 				break;
@@ -260,7 +260,7 @@ 
 	 */
 	private function has_cap() {
 
-		switch ( $this->settings['action'] ) {
+		switch ( $this->settings[ 'action' ] ) {
 			case 'edit':
 				$has_cap = GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry, $this->view_id );
 				break;
@@ -325,9 +325,9 @@ 
 	 */
 	private function maybe_add_field_values_query_args( $url ) {
 
-		if ( $url && ! empty( $this->settings['field_values'] ) ) {
+		if ( $url && ! empty( $this->settings[ 'field_values' ] ) ) {
 
-			wp_parse_str( $this->settings['field_values'], $field_values );
+			wp_parse_str( $this->settings[ 'field_values' ], $field_values );
 
 			$url = add_query_arg( $field_values, $url );
 		}

future/includes/class-gv-shortcode-gravityview.php

Spacing +13 added lines, -13 removed lines

@@ -37,8 +37,8 @@ 
 			'detail' => null,
 		) );
 		
-		if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) {
-			if ( $atts['detail'] && $view = $request->is_view() ) {
+		if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) {
+			if ( $atts[ 'detail' ] && $view = $request->is_view() ) {
 				$view_id = $view->ID;
 			}
 		}
@@ -76,7 +76,7 @@ 
 			return get_the_password_form( $view->ID );
 		}
 
-		if ( ! $view->form  ) {
+		if ( ! $view->form ) {
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
 
 			/**
@@ -100,7 +100,7 @@ 
 		/**
 		 * View details.
 		 */
-		if ( $atts['detail'] ) {
+		if ( $atts[ 'detail' ] ) {
 			return $this->detail( $view, $entries, $atts );
 
 		/**
@@ -114,7 +114,7 @@ 
 				return '';
 			}
 
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -125,7 +125,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -145,7 +145,7 @@ 
 				return '';
 			}
 
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -156,7 +156,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -173,10 +173,10 @@ 
 				
 				// Mock the request with the actual View, not the global one
 				$mock_request = new \GV\Mock_Request();
-				$mock_request->returns['is_view'] = $view;
-				$mock_request->returns['is_entry'] = $request->is_entry();
-				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry();
-				$mock_request->returns['is_search'] = $request->is_search();
+				$mock_request->returns[ 'is_view' ] = $view;
+				$mock_request->returns[ 'is_entry' ] = $request->is_entry();
+				$mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry();
+				$mock_request->returns[ 'is_search' ] = $request->is_search();
 
 				$request = $mock_request;
 			}
@@ -198,7 +198,7 @@ 
 	private function detail( $view, $entries, $atts ) {
 		$output = '';
 
-		switch ( $key = $atts['detail'] ):
+		switch ( $key = $atts[ 'detail' ] ):
 			case 'total_entries':
 				$output = number_format_i18n( $entries->total() );
 				break;