Completed
Push — master ( 13652e...8e57b5 )
by
unknown
01:51
created
public/includes/lasso.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -259,14 +259,14 @@  discard block
 block discarded – undo
259 259
 		$out = load_textdomain( $domain, trailingslashit( LASSO_DIR ). 'languages/' . $domain . '-' . $locale . '.mo' );
260 260
 	}
261 261
 	
262
-    // new ajax function to lock post for editing
262
+	// new ajax function to lock post for editing
263 263
 	public function editus_lock_post()
264 264
 	{
265 265
 		$post_id= $_POST["postid"];
266 266
 		$locked = wp_check_post_lock($post_id);
267 267
 		
268 268
 		if (!$locked) {
269
-		    wp_set_post_lock($post_id);
269
+			wp_set_post_lock($post_id);
270 270
 			echo "true";
271 271
 		} else {
272 272
 			$user_info = get_userdata($locked);
@@ -309,59 +309,59 @@  discard block
 block discarded – undo
309 309
 		 );
310 310
 		foreach ($_POST as $key => $value) {
311 311
 			if ($key !="code" && $key !="action") {
312
-			    //$shortcode = $shortcode.$key.'="'.$value.'" ';
312
+				//$shortcode = $shortcode.$key.'="'.$value.'" ';
313 313
 				$atts[$key] = $value;
314 314
 			}
315 315
 		}
316 316
 		if ($code == "aesop_video") {
317
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
318
-		    echo aesop_video_shortcode($atts);
317
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
318
+			echo aesop_video_shortcode($atts);
319 319
 		}
320 320
 		else if ($code == "aesop_image") {
321
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
322
-		    echo aesop_image_shortcode($atts);
321
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
322
+			echo aesop_image_shortcode($atts);
323 323
 		}
324 324
 		else if ($code == "aesop_quote") {
325
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
326
-		    echo aesop_quote_shortcode($atts);
325
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
326
+			echo aesop_quote_shortcode($atts);
327 327
 		}
328 328
 		else if ($code == "aesop_parallax") {
329
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
330
-		    echo aesop_parallax_shortcode($atts);
329
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
330
+			echo aesop_parallax_shortcode($atts);
331 331
 		}
332 332
 		else if ($code == "aesop_character") {
333
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
334
-		    echo aesop_character_shortcode($atts);
333
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
334
+			echo aesop_character_shortcode($atts);
335 335
 		}
336 336
 		else if ($code == "aesop_collection") {
337
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
338
-		    echo aesop_collection_shortcode($atts);
337
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
338
+			echo aesop_collection_shortcode($atts);
339 339
 		}
340 340
 		else if ($code == "aesop_chapter") {
341
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
342
-		    echo aesop_chapter_shortcode($atts);
341
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
342
+			echo aesop_chapter_shortcode($atts);
343 343
 		}
344 344
 		else if ($code == "aesop_content") {
345
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
346
-		    echo aesop_content_shortcode($atts, $atts['content_data']);
345
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
346
+			echo aesop_content_shortcode($atts, $atts['content_data']);
347 347
 		}
348 348
 		else if ($code == "aesop_gallery") {
349
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
350
-		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
349
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
350
+			echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
351 351
 		}
352 352
 		else if ($code == "aesop_audio") {
353
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
354
-		    echo aesop_audio_shortcode($atts);
353
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
354
+			echo aesop_audio_shortcode($atts);
355 355
 		}
356 356
 		else {
357 357
 			$code = '['.$code.' ';
358 358
 			foreach ($atts as $key => $value) {
359
-			    $code = ''.$key.'="'.$value.'" ';
359
+				$code = ''.$key.'="'.$value.'" ';
360 360
 			}
361 361
 			$code = $code.']';
362 362
 			echo do_shortcode($code);
363
-		    //require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
364
-		    //echo aesop_audio_shortcode($atts);
363
+			//require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
364
+			//echo aesop_audio_shortcode($atts);
365 365
 		}
366 366
 		
367 367
 		exit; 
Please login to merge, or discard this patch.
Braces   +10 added lines, -20 removed lines patch added patch discarded remove patch
@@ -316,44 +316,34 @@
 block discarded – undo
316 316
 		if ($code == "aesop_video") {
317 317
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
318 318
 		    echo aesop_video_shortcode($atts);
319
-		}
320
-		else if ($code == "aesop_image") {
319
+		} else if ($code == "aesop_image") {
321 320
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
322 321
 		    echo aesop_image_shortcode($atts);
323
-		}
324
-		else if ($code == "aesop_quote") {
322
+		} else if ($code == "aesop_quote") {
325 323
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
326 324
 		    echo aesop_quote_shortcode($atts);
327
-		}
328
-		else if ($code == "aesop_parallax") {
325
+		} else if ($code == "aesop_parallax") {
329 326
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
330 327
 		    echo aesop_parallax_shortcode($atts);
331
-		}
332
-		else if ($code == "aesop_character") {
328
+		} else if ($code == "aesop_character") {
333 329
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
334 330
 		    echo aesop_character_shortcode($atts);
335
-		}
336
-		else if ($code == "aesop_collection") {
331
+		} else if ($code == "aesop_collection") {
337 332
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
338 333
 		    echo aesop_collection_shortcode($atts);
339
-		}
340
-		else if ($code == "aesop_chapter") {
334
+		} else if ($code == "aesop_chapter") {
341 335
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
342 336
 		    echo aesop_chapter_shortcode($atts);
343
-		}
344
-		else if ($code == "aesop_content") {
337
+		} else if ($code == "aesop_content") {
345 338
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
346 339
 		    echo aesop_content_shortcode($atts, $atts['content_data']);
347
-		}
348
-		else if ($code == "aesop_gallery") {
340
+		} else if ($code == "aesop_gallery") {
349 341
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
350 342
 		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
351
-		}
352
-		else if ($code == "aesop_audio") {
343
+		} else if ($code == "aesop_audio") {
353 344
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
354 345
 		    echo aesop_audio_shortcode($atts);
355
-		}
356
-		else {
346
+		} else {
357 347
 			$code = '['.$code.' ';
358 348
 			foreach ($atts as $key => $value) {
359 349
 			    $code = ''.$key.'="'.$value.'" ';
Please login to merge, or discard this patch.
public/includes/editor-modules.php 1 patch
Braces   +32 added lines, -20 removed lines patch added patch discarded remove patch
@@ -109,8 +109,9 @@  discard block
 block discarded – undo
109 109
 
110 110
 	ob_start();
111 111
 
112
-	if ( !lasso_user_can() )
113
-		return;
112
+	if ( !lasso_user_can() ) {
113
+			return;
114
+	}
114 115
 
115 116
 	// let users add custom css classes
116 117
 	$custom_classes = apply_filters( 'lasso_sidebar_classes', '' );
@@ -133,8 +134,9 @@  discard block
 block discarded – undo
133 134
 
134 135
 	ob_start();
135 136
 
136
-	if ( !lasso_user_can() )
137
-		return;
137
+	if ( !lasso_user_can() ) {
138
+			return;
139
+	}
138 140
 	
139 141
 	$is_mobile = wp_is_mobile();
140 142
 
@@ -208,8 +210,11 @@  discard block
 block discarded – undo
208 210
 						<?php if ( class_exists ('Aesop_Events') ) { ?>
209 211
 						     <li data-type="events" title="<?php esc_attr_e( 'Event', 'lasso' );?>"  class="lasso-toolbar--component__event"></li>
210 212
 						<?php }?>
211
-					<?php else: ?>
212
-						<li data-type="wpimg" title="<?php esc_attr_e( 'WordPress Image', 'lasso' );?>" class="image lasso-toolbar--component__image"></li>
213
+					<?php else {
214
+	: ?>
215
+						<li data-type="wpimg" title="<?php esc_attr_e( 'WordPress Image', 'lasso' );
216
+}
217
+?>" class="image lasso-toolbar--component__image"></li>
213 218
 						<li data-type="wpquote" title="<?php esc_attr_e( 'WordPress Quote', 'lasso' );?>" class="quote lasso-toolbar--component__quote"></li>
214 219
 						<!--li data-type="wpvideo" title="<?php esc_attr_e( 'WordPress Video', 'lasso' );?>" class="video lasso-toolbar--component__video"></li-->
215 220
 					<?php endif; ?>
@@ -277,8 +282,9 @@  discard block
 block discarded – undo
277 282
 
278 283
 	ob_start();
279 284
 
280
-	if ( !lasso_user_can() )
281
-		return;
285
+	if ( !lasso_user_can() ) {
286
+			return;
287
+	}
282 288
 
283 289
 	// let users add custom css classes
284 290
 	$custom_classes = apply_filters( 'lasso_component_classes', '' );
@@ -304,8 +310,9 @@  discard block
 block discarded – undo
304 310
 
305 311
 	ob_start();
306 312
 
307
-	if ( !lasso_user_can() )
308
-		return;
313
+	if ( !lasso_user_can() ) {
314
+			return;
315
+	}
309 316
 
310 317
 	// has post thumbnail
311 318
 	$has_thumbnail = has_post_thumbnail( get_the_ID() ) ? 'class="lasso--featImg--has-thumb"' : false;
@@ -333,8 +340,9 @@  discard block
 block discarded – undo
333 340
 
334 341
 	ob_start();
335 342
 
336
-	if ( !lasso_user_can() )
337
-		return;
343
+	if ( !lasso_user_can() ) {
344
+			return;
345
+	}
338 346
 
339 347
 	global $post;
340 348
 
@@ -480,8 +488,9 @@  discard block
 block discarded – undo
480 488
 
481 489
 	ob_start();
482 490
 
483
-	if ( !lasso_user_can('edit_posts') )
484
-		return;
491
+	if ( !lasso_user_can('edit_posts') ) {
492
+			return;
493
+	}
485 494
 
486 495
 	$status = get_post_status( get_the_ID() );
487 496
 
@@ -613,8 +622,9 @@  discard block
 block discarded – undo
613 622
 
614 623
 	ob_start();
615 624
 
616
-	if ( !lasso_user_can() )
617
-		return;
625
+	if ( !lasso_user_can() ) {
626
+			return;
627
+	}
618 628
 
619 629
 	// let users add custom css classes
620 630
 	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
@@ -634,8 +644,9 @@  discard block
 block discarded – undo
634 644
 
635 645
 	ob_start();
636 646
 
637
-	if ( !lasso_user_can() )
638
-		return;
647
+	if ( !lasso_user_can() ) {
648
+			return;
649
+	}
639 650
 
640 651
 	// let users add custom css classes
641 652
 	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
@@ -706,8 +717,9 @@  discard block
 block discarded – undo
706 717
 
707 718
 	$blob = array();
708 719
 
709
-	if ( empty( $codes ) )
710
-		return;
720
+	if ( empty( $codes ) ) {
721
+			return;
722
+	}
711 723
 
712 724
 	foreach ( $codes as $slug => $shortcode ) {
713 725
 		$return = '';
Please login to merge, or discard this patch.