@@ -58,12 +58,14 @@ discard block |
||
| 58 | 58 | $value = $this->get_value( $atts ); |
| 59 | 59 | |
| 60 | 60 | if ( false === $operator && is_null( $value ) ) { |
| 61 | - if ( false !== $atts['if'] ) { // Only-if test |
|
| 61 | + if ( false !== $atts['if'] ) { |
|
| 62 | +// Only-if test |
|
| 62 | 63 | $match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) ); |
| 63 | 64 | } else { |
| 64 | 65 | $match = $authed; // Just login test |
| 65 | 66 | } |
| 66 | - } else { // Regular test |
|
| 67 | + } else { |
|
| 68 | +// Regular test |
|
| 67 | 69 | $match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator ); |
| 68 | 70 | } |
| 69 | 71 | |
@@ -160,12 +162,15 @@ discard block |
||
| 160 | 162 | $opens = 0; // inner opens |
| 161 | 163 | $found = false; // found split position |
| 162 | 164 | |
| 163 | - while ( $content ) { // scan |
|
| 165 | + while ( $content ) { |
|
| 166 | +// scan |
|
| 164 | 167 | |
| 165 | 168 | if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches ) ) { |
| 166 | - if ( ! $found ) { // We're still iffing. |
|
| 169 | + if ( ! $found ) { |
|
| 170 | +// We're still iffing. |
|
| 167 | 171 | $if .= $content; |
| 168 | - } else { // We are elsing |
|
| 172 | + } else { |
|
| 173 | +// We are elsing |
|
| 169 | 174 | $else .= $content; |
| 170 | 175 | } |
| 171 | 176 | break; // No more shortcodes |
@@ -173,9 +178,11 @@ discard block |
||
| 173 | 178 | |
| 174 | 179 | list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches; |
| 175 | 180 | |
| 176 | - if ( ! $found ) { // We're still iffing. |
|
| 181 | + if ( ! $found ) { |
|
| 182 | +// We're still iffing. |
|
| 177 | 183 | $if .= $before_shortcode; |
| 178 | - } else { // We are elsing |
|
| 184 | + } else { |
|
| 185 | +// We are elsing |
|
| 179 | 186 | $else .= $before_shortcode; |
| 180 | 187 | } |
| 181 | 188 | |
@@ -199,9 +206,11 @@ discard block |
||
| 199 | 206 | } |
| 200 | 207 | |
| 201 | 208 | // Tack on the shortcode |
| 202 | - if ( ! $found ) { // We're still iffing. |
|
| 209 | + if ( ! $found ) { |
|
| 210 | +// We're still iffing. |
|
| 203 | 211 | $if .= $shortcode; |
| 204 | - } else { // We are elsing |
|
| 212 | + } else { |
|
| 213 | +// We are elsing |
|
| 205 | 214 | $else .= $shortcode; |
| 206 | 215 | } |
| 207 | 216 | } |