gravityview / GravityView

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

Doc Comments -1 removed lines

@@ -18,7 +18,6 @@
 	/**
 	 * Process and output the [gventry] shortcode.
 	 *
-	 * @param array $passed_atts The attributes passed.
 	 * @param string $content The content inside the shortcode.
 	 * @param string $tag The shortcode tag.
 	 *

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

Doc Comments -1 removed lines

@@ -18,7 +18,6 @@
 	/**
 	 * Process and output the [gvfield] shortcode.
 	 *
-	 * @param array $passed_atts The attributes passed.
 	 * @param string $content The content inside the shortcode.
 	 * @param string $tag The shortcode tag.
 	 *

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

Doc Comments +2 added lines

@@ -248,6 +248,8 @@
 
 	/**
 	 * Process the attributes passed to the shortcode. Make sure they're valid
+	 * @param string $content
+	 * @param string $tag
 	 * @return void
 	 */
 	private function parse_atts( $atts, $content, $tag ) {

Spacing +13 added lines, -13 removed lines

@@ -57,13 +57,13 @@ 
 		$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
 			}
 		} else { // Regular test
-			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
+			$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
 		}
 
 		// Output and get recursive!
@@ -81,7 +81,7 @@ 
 	 * @return bool Yes, or no.
 	 */
 	private function authorized( $atts ) {
-		if ( is_null( $needs_login  = \GV\Utils::get( $atts, 'logged_in', null ) ) ) {
+		if ( is_null( $needs_login = \GV\Utils::get( $atts, 'logged_in', null ) ) ) {
 			return true; // No auth requirements have been set
 		}
 		return ! $needs_login ^ is_user_logged_in(); // XNOR
@@ -143,8 +143,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 = '';
@@ -267,18 +267,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

@@ -57,12 +57,14 @@ 
 		$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
 			}
-		} else { // Regular test
+		} else {
+// Regular test
 			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
 		}
 
@@ -153,11 +155,14 @@ 
 		$opens = 0; // inner opens
 		$found = false; // found split position
 
-		while ( $content ) { // scan
+		while ( $content ) {
+// scan
 			if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#', $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
@@ -165,9 +170,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;
 			}
 
@@ -191,9 +198,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;
 				}
 			}

includes/class-gvlogic-shortcode.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		return self::$instance;
 	}
 
-	public function shortcode( $atts, $content = '', $tag = '') {
+	public function shortcode( $atts, $content = '', $tag = '' ) {
 		$shortcode = new \GV\Shortcodes\gvlogic();
 		return $shortcode->callback( $atts, $content, $tag );
 	}