gravityview / GravityView

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

Spacing +14 added lines, -14 removed lines

@@ -61,8 +61,8 @@ 
 		$value    = $this->get_value( $atts );
 
 		if ( false === $operator && is_null( $value ) ) {
-			if ( false !== $atts['if'] ) { // Only-if test
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
 			} else {
 				$match = $authed; // Just login test
 			}
@@ -81,7 +81,7 @@ 
 
 				// Need to match all AND
 				foreach ( $and_values as $and_value ) {
-					$match = $authed && \GVCommon::matches_operation( $atts['if'], $and_value, $operator );
+					$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $and_value, $operator );
 					if ( ! $match ) {
 						break;
 					}
@@ -92,7 +92,7 @@ 
 				// Only need to match a single OR
 				foreach ( $or_values as $or_value ) {
 
-					$match = \GVCommon::matches_operation( $atts['if'], $or_value, $operator );
+					$match = \GVCommon::matches_operation( $atts[ 'if' ], $or_value, $operator );
 
 					// Negate the negative operators
 					if ( ( $authed && $match ) || ( $authed && ( ! $match && in_array( $operator, array( 'isnot', 'not_contains', 'not_in' ) ) ) ) ) {
@@ -101,7 +101,7 @@ 
 				}
 
 			} else {
-				$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
+				$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
 			}
 
 			$output = $this->get_output( $match, $atts, $output );
@@ -189,8 +189,8 @@ 
 	 * @return string The output.
 	 */
 	private function get_output( $match, $atts, $content ) {
-		if ( ! $match && ! empty( $atts['else'] ) ) {
-			return $atts['else']; // Attributized else is easy :)
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
+			return $atts[ 'else' ]; // Attributized else is easy :)
 		}
 
 		$if = '';
@@ -317,18 +317,18 @@ 
 		$atts = array_intersect_key( $supplied_atts, $atts );
 
 		// Strip whitespace if it's not default false
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
-			$atts['if'] = trim( $atts['if'] );
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
 		} else {
-			$atts['if'] = false;
+			$atts[ 'if' ] = false;
 		}
 
-		if ( isset( $atts['logged_in'] ) ) {
+		if ( isset( $atts[ 'logged_in' ] ) ) {
 			// Truthy
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
-				$atts['logged_in'] = false;
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
+				$atts[ 'logged_in' ] = false;
 			} else {
-				$atts['logged_in'] = true;
+				$atts[ 'logged_in' ] = true;
 			}
 		}
 

Braces +18 added lines, -9 removed lines

@@ -61,14 +61,16 @@ 
 		$value    = $this->get_value( $atts );
 
 		if ( false === $operator && is_null( $value ) ) {
-			if ( false !== $atts['if'] ) { // Only-if test
+			if ( false !== $atts['if'] ) {
+// Only-if test
 				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
 			} else {
 				$match = $authed; // Just login test
 			}
 
 			$output = $this->get_output( $match, $atts, $content );
-		} else { // Regular test
+		} else {
+// Regular test
 
 			$output = $content;
 
@@ -199,12 +201,15 @@ 
 		$opens = 0; // inner opens
 		$found = false; // found split position
 
-		while ( $content ) { // scan
+		while ( $content ) {
+// scan
 
 			if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches ) ) {
-				if ( ! $found ) { // We're still iffing.
+				if ( ! $found ) {
+// We're still iffing.
 					$if .= $content;
-				} else { // We are elsing
+				} else {
+// We are elsing
 					$else .= $content;
 				}
 				break; // No more shortcodes
@@ -212,9 +217,11 @@ 
 
 			list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches;
 
-			if ( ! $found ) { // We're still iffing.
+			if ( ! $found ) {
+// We're still iffing.
 				$if .= $before_shortcode;
-			} else { // We are elsing
+			} else {
+// We are elsing
 				$else .= $before_shortcode;
 			}
 
@@ -238,9 +245,11 @@ 
 				}
 
 				// Tack on the shortcode
-				if ( ! $found ) { // We're still iffing.
+				if ( ! $found ) {
+// We're still iffing.
 					$if .= $shortcode;
-				} else { // We are elsing
+				} else {
+// We are elsing
 					$else .= $shortcode;
 				}
 			}