gravityview / GravityView

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

Spacing +21 added lines, -21 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;
 			}
 		}
@@ -80,7 +80,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 ) );
 
 			/**
@@ -101,12 +101,12 @@ 
 			return __( 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * View details.
 		 */
-		if ( $atts['detail'] ) {
+		if ( $atts[ 'detail' ] ) {
 			return $this->detail( $view, $entries, $atts );
 
 		/**
@@ -120,7 +120,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' );
 			}
@@ -131,7 +131,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -151,7 +151,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' );
 			}
@@ -162,7 +162,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -179,10 +179,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;
 			}
@@ -218,16 +218,16 @@ 
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts );
+		$filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts );
 
 		$atts = array();
 
-		foreach( $filtered_atts as $key => $passed_value ) {
+		foreach ( $filtered_atts as $key => $passed_value ) {
 
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
 			$passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value );
 
-			switch( $defaults[ $key ]['type'] ) {
+			switch ( $defaults[ $key ][ 'type' ] ) {
 
 				/**
 				 * Make sure number fields are numeric.
@@ -235,7 +235,7 @@ 
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
 				 */
 				case 'number':
-					if( is_numeric( $passed_value ) ) {
+					if ( is_numeric( $passed_value ) ) {
 						$atts[ $key ] = ( $passed_value + 0 );
 					}
 					break;
@@ -250,8 +250,8 @@ 
 				 */
 				case 'select':
 				case 'radio':
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
 						$atts[ $key ] = $passed_value;
 					}
 					break;
@@ -263,7 +263,7 @@ 
 			}
 		}
 
-		$atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null );
+		$atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null );
 
 		return $atts;
 	}
@@ -280,7 +280,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;

includes/class-gravityview-shortcode.php

Spacing +9 added lines, -9 removed lines

@@ -48,8 +48,8 @@ 
 		gravityview()->log->debug( '$passed_atts: ', array( 'data' => $passed_atts ) );
 
 		// Get details about the current View
-		if( !empty( $passed_atts['detail'] ) ) {
-			return $this->get_view_detail( $passed_atts['detail'] );
+		if ( ! empty( $passed_atts[ 'detail' ] ) ) {
+			return $this->get_view_detail( $passed_atts[ 'detail' ] );
 		}
 
 		$atts = $this->parse_and_sanitize_atts( $passed_atts );
@@ -85,16 +85,16 @@ 
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts );
+		$filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts );
 
 		$atts = array();
 
-		foreach( $filtered_atts as $key => $passed_value ) {
+		foreach ( $filtered_atts as $key => $passed_value ) {
 
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
 			$passed_value = GravityView_Merge_Tags::replace_variables( $passed_value );
 
-			switch( $defaults[ $key ]['type'] ) {
+			switch ( $defaults[ $key ][ 'type' ] ) {
 
 				/**
 				 * Make sure number fields are numeric.
@@ -102,7 +102,7 @@ 
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
 				 */
 				case 'number':
-					if( is_numeric( $passed_value ) ) {
+					if ( is_numeric( $passed_value ) ) {
 						$atts[ $key ] = ( $passed_value + 0 );
 					}
 					break;
@@ -117,8 +117,8 @@ 
 				 */
 				case 'select':
 				case 'radio':
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
 						$atts[ $key ] = $passed_value;
 					}
 					break;
@@ -147,7 +147,7 @@ 
 		$gravityview_view = GravityView_View::getInstance();
 		$return = '';
 
-		switch( $detail ) {
+		switch ( $detail ) {
 			case 'total_entries':
 				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
 				break;

includes/class-gvlogic-shortcode.php

Spacing +20 added lines, -20 removed lines

@@ -87,7 +87,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -121,9 +121,9 @@ 
 
 		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
 
-		if( $with_values ) {
+		if ( $with_values ) {
 			$operators_with_values = array();
-			foreach( $operators as $key ) {
+			foreach ( $operators as $key ) {
 				$operators_with_values[ $key ] = '';
 			}
 			return $operators_with_values;
@@ -142,7 +142,7 @@ 
 
 		$operators = $this->get_operators( false );
 
-		if( !in_array( $operation, $operators ) ) {
+		if ( ! in_array( $operation, $operators ) ) {
 			gravityview()->log->debug( ' Attempted to add invalid operation type. {operation}', array( 'operation' => $operation ) );
 			return false;
 		}
@@ -194,7 +194,7 @@ 
 			return null;
 		}
 
-		if( empty( $atts ) ) {
+		if ( empty( $atts ) ) {
 			gravityview()->log->error( '$atts are empty.', array( 'data' => $atts ) );
 			return null;
 		}
@@ -209,7 +209,7 @@ 
 		$this->parse_atts();
 
 		// We need an "if"
-		if( false === $this->if ) {
+		if ( false === $this->if ) {
 			gravityview()->log->error( '$atts->if is empty.', array( 'data' => $this->passed_atts ) );
 			return null;
 		}
@@ -217,7 +217,7 @@ 
 		$setup = $this->setup_operation_and_comparison();
 
 		// We need an operation and comparison value
-		if( ! $setup ) {
+		if ( ! $setup ) {
 			gravityview()->log->error( 'No valid operators were passed.', array( 'data' => $this->atts ) );
 			return null;
 		}
@@ -267,7 +267,7 @@ 
 	 */
 	private function get_output() {
 
-		if( $this->is_match ) {
+		if ( $this->is_match ) {
 			$output = $this->content;
 		} else {
 			$output = $this->else_content;
@@ -285,7 +285,7 @@ 
 		 * @param string $output HTML/text output
 		 * @param GVLogic_Shortcode $this This class
 		 */
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
 
 		gravityview()->log->debug( 'Output: ', array( 'data' => $output ) );
 
@@ -305,14 +305,14 @@ 
 		list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content ), 2, NULL );
 		list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content ), 2, NULL );
 
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
 		$else_content = isset( $after_else ) ? $after_else : $else_attr;
 
 		// The content is everything OTHER than the [else]
 		$this->content = $before_else_if;
 
 		if ( ! $this->is_match ) {
-			if( $elseif_content = $this->process_elseif( $before_else ) ) {
+			if ( $elseif_content = $this->process_elseif( $before_else ) ) {
 				$this->else_content = $elseif_content;
 			} else {
 				$this->else_content = $else_content;
@@ -340,16 +340,16 @@ 
 		foreach ( $else_if_matches as $key => $else_if_match ) {
 
 			// If $else_if_match[5] exists and has content, check for more shortcodes
-			preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER );
+			preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER );
 
 			// If the logic passes, this is the value that should be used for $this->else_content
-			$else_if_value = $else_if_match[5];
-			$check_elseif_match = $else_if_match[0];
+			$else_if_value = $else_if_match[ 5 ];
+			$check_elseif_match = $else_if_match[ 0 ];
 
 			// Retrieve the value of the match that is currently being checked, without any other [else] tags
-			if( ! empty( $recursive_matches[0][0] ) ) {
-				$else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value );
-				$check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match );
+			if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) {
+				$else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value );
+				$check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match );
 			}
 
 			$check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match );
@@ -366,7 +366,7 @@ 
 			}
 
 			// Process any remaining [else] tags
-			return $this->process_elseif( $else_if_match[5] );
+			return $this->process_elseif( $else_if_match[ 5 ] );
 		}
 
 		return false;
@@ -392,7 +392,7 @@ 
 		$this->atts = array_intersect_key( $this->passed_atts, $this->atts );
 
 		// Strip whitespace if it's not default false
-		$this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false;
+		$this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false;
 
 		/**
 		 * @action `gravityview/gvlogic/parse_atts/after` Modify shortcode attributes after it's been parsed
@@ -403,7 +403,7 @@ 
 		do_action( 'gravityview/gvlogic/parse_atts/after', $this );
 
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
-		unset( $this->atts['if'] );
+		unset( $this->atts[ 'if' ] );
 	}
 }