AesopInteractive / lasso

includes/process/map.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 			}
 
 			// udpate start point
-            $point = json_decode( $start_point, true );
+			$point = json_decode( $start_point, true );
 			update_post_meta( $postid, 'ase_map_component_start_point', $point );
 
 			// update zoom

public/includes/components.php

Indentation +11 added lines, -11 removed lines

@@ -236,16 +236,16 @@ 
 if ( !function_exists('lasso_wp_image') ):
 
 	function lasso_wp_image(){
-        $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
-        $use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
-        if ($use_wp_block_image == 'on') {
-        	return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
-        }
-        else if ($use_old_wpimg != 'on') {
-        	return '<figure data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
-        } else {
-            return '<figure data-component-type="wpimg" data-linkoption="img" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
-        }
+		$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+		$use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
+		if ($use_wp_block_image == 'on') {
+			return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		}
+		else if ($use_old_wpimg != 'on') {
+			return '<figure data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		} else {
+			return '<figure data-component-type="wpimg" data-linkoption="img" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		}
 	}
 
 endif;
@@ -287,7 +287,7 @@ 
 
 if ( !function_exists('lasso_wp_image_block') ):
 	function lasso_wp_image_block(){
-        return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
 	}
 
 endif;

includes/process/meta.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 			}
 		}
 
-        do_action( 'editus_after_meta_update', $post_id, $data );
+		do_action( 'editus_after_meta_update', $post_id, $data );
 
 
 		return true;

public/includes/helpers.php

Indentation +27 added lines, -27 removed lines

@@ -199,13 +199,13 @@ 
 	if ( empty( $postid ) )
 		$postid = get_the_ID();
 
-    if ('category' == $taxonomy)  {
-        $objects = get_the_category( $postid );
-    } else if ('tag' == $taxonomy)  {
-        $objects = get_the_tags( $postid );
-    } else {
-        $objects = get_the_terms( $postid, $taxonomy );
-    }
+	if ('category' == $taxonomy)  {
+		$objects = get_the_category( $postid );
+	} else if ('tag' == $taxonomy)  {
+		$objects = get_the_tags( $postid );
+	} else {
+		$objects = get_the_terms( $postid, $taxonomy );
+	}
 
 	if ( empty( $objects) )
 		return;
@@ -227,16 +227,16 @@ 
 */
 function lasso_get_objects( $taxonomy = 'category' ) {
 
-    if ('category' == $taxonomy)  {
-        $objects = get_categories(array('hide_empty' => 0));
-    } else if ('tag' == $taxonomy)  {
-        $objects = get_tags(array('hide_empty' => 0));
-    } else {
-        $objects = get_terms( array(
-            'taxonomy' => $taxonomy,
-            'hide_empty' => false,
-        ));
-    }
+	if ('category' == $taxonomy)  {
+		$objects = get_categories(array('hide_empty' => 0));
+	} else if ('tag' == $taxonomy)  {
+		$objects = get_tags(array('hide_empty' => 0));
+	} else {
+		$objects = get_terms( array(
+			'taxonomy' => $taxonomy,
+			'hide_empty' => false,
+		));
+	}
 	
 	if ( empty( $objects) )
 		return;
@@ -261,7 +261,7 @@ 
 		'public' => true,
 	), 'objects' );
 	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
-    unset( $post_types[ 'attachment' ] );
+	unset( $post_types[ 'attachment' ] );
 
 	/**
 	 * Set which post types are allowed
@@ -288,7 +288,7 @@ 
 	$post_types = get_post_types( array(
 		'public' => true,
 	), 'names' );
-    unset( $post_types[ 'attachment' ] );
+	unset( $post_types[ 'attachment' ] );
 
 	/**
 	 * Set which post types are allowed
@@ -400,7 +400,7 @@ 
  */
 if ( !function_exists( 'lasso_user_can' ) ):
 	function lasso_user_can( $action = '', $postid = 0 ) {
-        $result = false;
+		$result = false;
 		if ( empty( $action ) )
 			$action = 'edit_posts';
 
@@ -415,17 +415,17 @@ 
 				$allowed_post_types = array_diff($allowed_post_types,array('page'));
 			}
 			
-            if (!empty($allowed_post_types) && !empty($postid)) {
+			if (!empty($allowed_post_types) && !empty($postid)) {
 				$type = get_post_type( $postid );
-                $allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
+				$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
 				
-                if ( in_array( $type, $allowed_post_types ) ) {
+				if ( in_array( $type, $allowed_post_types ) ) {
 				   $result =  true;
-			    }
-            } else {
-                //we are not checking against a post, return true
+				}
+			} else {
+				//we are not checking against a post, return true
 				$result =  true;
-        	}
+			}
 		} else {
 			$result = false;
 		}

includes/process/new_object.php

Indentation +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 
 		$object = is_null( $data[ 'object'] ) ? false : $data[ 'object' ];
         
-        $new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );        
-        $new_post_text  = !empty($new_post_text) ? $new_post_text : wp_strip_all_tags(apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso')));
+		$new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );        
+		$new_post_text  = !empty($new_post_text) ? $new_post_text : wp_strip_all_tags(apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso')));
 
 		// insert a new post
 		$args = array(

public/includes/wrap-shortcodes.php

Indentation +10 added lines, -10 removed lines

@@ -23,11 +23,11 @@ 
 function lasso_wrap_shortcodes( $content ) {
 	global $shortcode_tags;
 
-    $no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
+	$no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
 
-    if ($no_wrap_shortcode == 'on') {
-        return $content;
-    }
+	if ($no_wrap_shortcode == 'on') {
+		return $content;
+	}
 
 	if ( false === strpos( $content, '[' ) ) {
 		return $content;
@@ -78,7 +78,7 @@ 
 	if ( strpos( $m[2],'aesop_'  ) === 0 ) {
 		// check against the exceptions
 		if (strpos_arr($m[2],$exception_arr1)===false) {
-		    return $m[0];
+			return $m[0];
 		}
 	}
 	if (strpos_arr($m[2],$exception_arr2)!==false) {
@@ -90,9 +90,9 @@ 
 
 /* a helper function */
 function strpos_arr($haystack, $needle) {
-    if(!is_array($needle)) $needle = array($needle);
-    foreach($needle as $what) {
-        if(($pos = strpos($haystack, $what))!==false) return $pos;
-    }
-    return false;
+	if(!is_array($needle)) $needle = array($needle);
+	foreach($needle as $what) {
+		if(($pos = strpos($haystack, $what))!==false) return $pos;
+	}
+	return false;
 }
\ No newline at end of file

lasso.php

Indentation +66 added lines, -66 removed lines

@@ -48,7 +48,7 @@ 
 add_filter('register_post_type_args', 'lasso_show_in_rest', 10, 2);
 function lasso_show_in_rest($args, $post_type){
  
-    $allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
+	$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
 	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
 	if (in_array( $post_type,$allowed_post_types)) {
 		$args['show_in_rest'] = true;
@@ -57,7 +57,7 @@ 
 		}
 	}
  
-    return $args;
+	return $args;
 }
 
 
@@ -106,25 +106,25 @@ 
 //table codes to be added
 class editus_table {
     
-    public function __construct(){
-        $add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
-        if ($add_table) {
-            add_action('wp_enqueue_scripts', array($this,'scripts'));
+	public function __construct(){
+		$add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
+		if ($add_table) {
+			add_action('wp_enqueue_scripts', array($this,'scripts'));
             
-        }
+		}
 	}
     
-    function scripts()
-    {
-        add_action('lasso_editor_controls_after_outside', array($this,'editus_table_edit_menu'));
-            add_filter('lasso_components',array($this,'editus_components_add_table'),10,1);
-            add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_table'), 10 );
-            wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
-            wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
-    }
+	function scripts()
+	{
+		add_action('lasso_editor_controls_after_outside', array($this,'editus_table_edit_menu'));
+			add_filter('lasso_components',array($this,'editus_components_add_table'),10,1);
+			add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_table'), 10 );
+			wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
+			wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
+	}
     
-    function editus_table_edit_menu()
-    { ?>
+	function editus_table_edit_menu()
+	{ ?>
 
         <ul class='editus-table-menu'>
           <li data-action="insertcol"><?php echo __('Insert Column','lasso')?></li>
@@ -134,31 +134,31 @@ 
           <li data-action="deltable"><?php echo __('Delete Table','lasso')?></li
         </ul>
     <?php
-    }
+	}
     
     
-    function editus_html_table()
-    {   
-        return '<figure class="wp-block-table"><table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table></figure><p><br></p>';
-    }
+	function editus_html_table()
+	{   
+		return '<figure class="wp-block-table"><table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table></figure><p><br></p>';
+	}
 
 
-    function editus_components_add_table( $array ){
-        $custom = array(
-               'htmltable' => array(
-                         'name'    => __('HTML Table','lasso'),
-                          'content' => self::editus_html_table(),
-                )
-        );
-        return array_merge( $array, $custom );
-    }
+	function editus_components_add_table( $array ){
+		$custom = array(
+			   'htmltable' => array(
+						 'name'    => __('HTML Table','lasso'),
+						  'content' => self::editus_html_table(),
+				)
+		);
+		return array_merge( $array, $custom );
+	}
 
 
-    function editus_toolbar_components_add_table( ) {
-          ?>
+	function editus_toolbar_components_add_table( ) {
+		  ?>
           <li data-type="htmltable" title="<?php esc_attr_e( 'HTML Table', 'lasso' );?>" class="quote lasso-toolbar--component__htmltable dashicons dashicons-grid-view"></li>
           <?php
-    }
+	}
 }
 
 
@@ -169,41 +169,41 @@ 
 //table codes to be added
 class editus_paragraph {
     
-    public function __construct(){
-        $add_paragraph = lasso_editor_get_option('add_paragraph', 'lasso_editor', false);
-        if ($add_paragraph) {
-            add_action('wp_enqueue_scripts', array($this,'scripts'));
+	public function __construct(){
+		$add_paragraph = lasso_editor_get_option('add_paragraph', 'lasso_editor', false);
+		if ($add_paragraph) {
+			add_action('wp_enqueue_scripts', array($this,'scripts'));
             
-        }
+		}
 	}
     
-    function scripts()
-    {
-            add_action('lasso_editor_controls_after_outside', array($this,'editus_paragraph_style'));
-            add_filter('lasso_components',array($this,'editus_components_add_paragraph'),10,1);
-            add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_paragraph'), 10 );
-            //wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
-            //wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
-    }
+	function scripts()
+	{
+			add_action('lasso_editor_controls_after_outside', array($this,'editus_paragraph_style'));
+			add_filter('lasso_components',array($this,'editus_components_add_paragraph'),10,1);
+			add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_paragraph'), 10 );
+			//wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
+			//wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
+	}
    
-    function editus_components_add_paragraph( $array ){
-        $custom = array(
-               'htmlparagraph' => array(
-                         'name'    => __('HTML Paragraph','lasso'),
-                          'content' => self::editus_html_paragraph(),
-                )
-        );
-        return array_merge( $array, $custom );
-    }
+	function editus_components_add_paragraph( $array ){
+		$custom = array(
+			   'htmlparagraph' => array(
+						 'name'    => __('HTML Paragraph','lasso'),
+						  'content' => self::editus_html_paragraph(),
+				)
+		);
+		return array_merge( $array, $custom );
+	}
     
     
-    function editus_html_paragraph()
-    {   
-        return '<p contenteditable="true"><br></p>';
-    }
+	function editus_html_paragraph()
+	{   
+		return '<p contenteditable="true"><br></p>';
+	}
 
-    function editus_paragraph_style()
-    { ?>
+	function editus_paragraph_style()
+	{ ?>
         <style>
         #lasso-toolbar--components__list .lasso-toolbar--component__htmlparagraph:before
         { 
@@ -212,14 +212,14 @@ 
         }
         </style>
     <?php
-    }
+	}
     
 
-    function editus_toolbar_components_add_paragraph( ) {
-          ?>
+	function editus_toolbar_components_add_paragraph( ) {
+		  ?>
           <li data-type="htmlparagraph" title="<?php esc_attr_e( 'HTML Paragraph', 'lasso' );?>" class="quote lasso-toolbar--component__htmlparagraph dashicons dashicons-editor-paragraph"></li>
           <?php
-    }
+	}
 }
 
 new editus_paragraph();

public/includes/lasso.php

Indentation +136 added lines, -136 removed lines

@@ -59,7 +59,7 @@ 
 		
 		add_action( 'wp_ajax_get_aesop_component',     array( $this, 'get_aesop_component' ) );
 		add_action( 'wp_ajax_editus_do_shortcode',     array( $this, 'editus_do_shortcode' ) );
-        add_action( 'wp_ajax_editus_do_block',     array( $this, 'editus_do_block' ) );
+		add_action( 'wp_ajax_editus_do_block',     array( $this, 'editus_do_block' ) );
 		add_action( 'wp_ajax_editus_lock_post',     array( $this, 'editus_lock_post' ) );
 		add_action( 'wp_ajax_editus_unlock_post',     array( $this, 'editus_unlock_post' ) );
 		add_action( 'wp_ajax_editus_hide_tour',     array( $this, 'editus_hide_tour' ) );
@@ -69,19 +69,19 @@ 
 		add_action( 'wp_ajax_editus_featured_img',     array( $this, 'set_featured_img' ) );
 		add_action( 'wp_ajax_editus_del_featured_img',     array( $this, 'del_featured_img' ) );
         
-        add_action( 'wp_ajax_editus_publish_post',     array( $this, 'on_publish_post' ) );
+		add_action( 'wp_ajax_editus_publish_post',     array( $this, 'on_publish_post' ) );
         
-        add_action( 'wp_ajax_editus_create_gallery',     array( $this, 'create_gallery' ) );
-        add_action( 'wp_ajax_editus_update_gallery',     array( $this, 'update_gallery' ) );
+		add_action( 'wp_ajax_editus_create_gallery',     array( $this, 'create_gallery' ) );
+		add_action( 'wp_ajax_editus_update_gallery',     array( $this, 'update_gallery' ) );
 
 		// enable saving custom fields through REST API
 		self::enable_metasave('post');
 		self::enable_metasave('page');
         
-        $default_post_types = apply_filters( 'lasso_allowed_post_types', array( 'post', 'page'));
+		$default_post_types = apply_filters( 'lasso_allowed_post_types', array( 'post', 'page'));
 		$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor',  $default_post_types);
-        foreach ( $allowed_post_types  as $post_type ) {
-           self::enable_metasave($post_type);
+		foreach ( $allowed_post_types  as $post_type ) {
+		   self::enable_metasave($post_type);
 		}
 		//enqueue assets
 		new assets();
@@ -278,14 +278,14 @@ 
 		$out = load_textdomain( $domain, trailingslashit( LASSO_DIR ). 'languages/' . $domain . '-' . $locale . '.mo' );
 	}
 	
-    // new ajax function to lock post for editing
+	// new ajax function to lock post for editing
 	public function editus_lock_post()
 	{
 		$post_id= $_POST["postid"];
 		$locked = wp_check_post_lock($post_id);
 		
 		if (!$locked) {
-		    wp_set_post_lock($post_id);
+			wp_set_post_lock($post_id);
 			echo "true";
 		} else {
 			$user_info = get_userdata($locked);
@@ -298,9 +298,9 @@ 
 	{
 		$post_id= $_POST["postid"];
 		$locked = wp_check_post_lock($post_id);
-        if (!$locked) {
-            delete_post_meta( $post_id, '_edit_lock');
-        }
+		if (!$locked) {
+			delete_post_meta( $post_id, '_edit_lock');
+		}
 		echo "true";
 		
 		exit;
@@ -328,14 +328,14 @@ 
 		$status = isset( $data['status'] ) ? $data['status'] : false;
 		$postid = isset( $data['postid'] ) ? $data['postid'] : false;
 		$slug   = isset( $data['story_slug'] ) ? $data['story_slug'] : false;
-        $excerpt   = isset( $data['excerpt'] ) ? $data['excerpt'] : false;
+		$excerpt   = isset( $data['excerpt'] ) ? $data['excerpt'] : false;
 	
 
 		$args = array(
 			'ID'   			=> (int) $postid,
 			'post_name'  	=> $slug,
 			'post_status' 	=> $status,
-            'post_excerpt'  => wp_strip_all_tags($excerpt,true)
+			'post_excerpt'  => wp_strip_all_tags($excerpt,true)
 		);
 		
 		
@@ -410,12 +410,12 @@ 
 		exit;
 	}
     
-    public function editus_do_block()
+	public function editus_do_block()
 	{
 		
 		$code= $_POST["code"];
 
-        $out = do_blocks( $code );
+		$out = do_blocks( $code );
 		
 		echo $out;
 		exit;
@@ -434,67 +434,67 @@ 
 			}
 		}
 		if ($code == "aesop_video") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
-		    echo aesop_video_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
+			echo aesop_video_shortcode($atts);
 		}
 		else if ($code == "aesop_image") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
-		    echo aesop_image_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
+			echo aesop_image_shortcode($atts);
 		}
 		else if ($code == "aesop_quote") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
-		    echo aesop_quote_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
+			echo aesop_quote_shortcode($atts);
 		}
 		else if ($code == "aesop_parallax") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
-		    echo aesop_parallax_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
+			echo aesop_parallax_shortcode($atts);
 		}
 		else if ($code == "aesop_character") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
-		    echo aesop_character_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
+			echo aesop_character_shortcode($atts);
 		}
 		else if ($code == "aesop_collection") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
-		    echo aesop_collection_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
+			echo aesop_collection_shortcode($atts);
 		}
 		else if ($code == "aesop_chapter") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
-		    echo aesop_chapter_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
+			echo aesop_chapter_shortcode($atts);
 		}
 		else if ($code == "aesop_content") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
-		    echo aesop_content_shortcode($atts, $atts['content_data']);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
+			echo aesop_content_shortcode($atts, $atts['content_data']);
 		}
 		else if ($code == "aesop_gallery") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
-		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
+			echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
 		}
 		else if ($code == "aesop_audio") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
-		    echo aesop_audio_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
+			echo aesop_audio_shortcode($atts);
 		}
 		else if ($code == "aesop_document") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-document.php');
-		    echo aesop_document_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-document.php');
+			echo aesop_document_shortcode($atts);
 		}
 		else if ($code == "aesop_timeline_stop") {		
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-timeline.php');
-		    echo aesop_timeline_stop_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-timeline.php');
+			echo aesop_timeline_stop_shortcode($atts);
 		}
-        /*else if ($code == "aesop_content") {
+		/*else if ($code == "aesop_content") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-content.php');
 		    echo aesop_content_shortcode($atts);
 		}*/
-        else if ($code == "aesop_wpimg") {
-            self::wpimg($atts);
+		else if ($code == "aesop_wpimg") {
+			self::wpimg($atts);
 		}
 		else if ($code == "aesop_wpimg-block") {
-            self::wpimg_block($atts);
+			self::wpimg_block($atts);
 		}
 		else {
 			$code = '['.$code.' ';
 			foreach ($atts as $key => $value) {
-			    $code = ''.$key.'="'.$value.'" ';
+				$code = ''.$key.'="'.$value.'" ';
 			}
 			$code = $code.']';
 			echo do_shortcode($code);
@@ -503,102 +503,102 @@ 
 		exit; 
 	}
     
-    public static function wpimg($atts) {
+	public static function wpimg($atts) {
 
-        echo '<figure data-component-type="wpimg"';
+		echo '<figure data-component-type="wpimg"';
         
-        $extra = "";
+		$extra = "";
         
-        // try to use srcset and sizes on new WP installs
+		// try to use srcset and sizes on new WP installs
 		if ( function_exists('wp_get_attachment_image_srcset') && $attachment_id = attachment_url_to_postid( $atts['img'] ) ) {
 			$srcset = wp_get_attachment_image_srcset( $attachment_id, 'full' );
 			$sizes = wp_get_attachment_image_sizes( $attachment_id, 'full' );
-            $extra = "srcset='$srcset' sizes='$sizes' ";
-        }
-        if ($atts['align']=="left") {
-            $extra .= 'class="alignleft';
-        } else if ($atts['align']=="right") {
-            $extra .= 'class="alignright';
-        } else {
-            $extra .= 'class="aligncenter';
-        }
-        if ($atts['imgwidth'] || $atts['imgheight']) {
-            if ($atts['imgwidth']) {
-                $extra .= 'width:'. $atts['imgwidth'].';';
-            }
-            if ($atts['imgheight']) {
-                $extra .= 'height:'. $atts['imgheight'].';';
-            }
+			$extra = "srcset='$srcset' sizes='$sizes' ";
+		}
+		if ($atts['align']=="left") {
+			$extra .= 'class="alignleft';
+		} else if ($atts['align']=="right") {
+			$extra .= 'class="alignright';
+		} else {
+			$extra .= 'class="aligncenter';
+		}
+		if ($atts['imgwidth'] || $atts['imgheight']) {
+			if ($atts['imgwidth']) {
+				$extra .= 'width:'. $atts['imgwidth'].';';
+			}
+			if ($atts['imgheight']) {
+				$extra .= 'height:'. $atts['imgheight'].';';
+			}
             
-        }
-        $extra .= '"';
+		}
+		$extra .= '"';
         
-        foreach ($atts as $key => $value) {
+		foreach ($atts as $key => $value) {
 			 echo ' data-'.$key.'="'.$value.'"';
 		}
-        //echo ' class="wp-image- lasso--wpimg__wrap lasso-component">';
-        echo ' class="wp-caption lasso-component">';
-        $hrefset = false;
-        if ($atts['link'] != '' && (!isset($atts['linkoption']) || $atts['linkoption']=="url" ))
-        {
-            echo '<a href="' . $atts['link'] . '">';
-            $hrefset = true;
-        } else if (isset($atts['linkoption']) && $atts['linkoption'] == 'img' ) {
-            echo '<a href="' . $atts['img'] . '">';
-            $hrefset = true;
-        }
-        echo '<img src="' . $atts['img'] . '" alt="'. $atts['alt']  .  '" '. $extra. '>';
-        if ($hrefset)
-        {
-            echo '</a>';
-        }
-        if ($atts['caption'])
-        {
-            echo '<figcaption class="wp-caption-text">'.$atts['caption'].'</figcaption>';
-        }
-        echo '</figure>';
-        echo '<p><br></p>';
-        return;
-    }
+		//echo ' class="wp-image- lasso--wpimg__wrap lasso-component">';
+		echo ' class="wp-caption lasso-component">';
+		$hrefset = false;
+		if ($atts['link'] != '' && (!isset($atts['linkoption']) || $atts['linkoption']=="url" ))
+		{
+			echo '<a href="' . $atts['link'] . '">';
+			$hrefset = true;
+		} else if (isset($atts['linkoption']) && $atts['linkoption'] == 'img' ) {
+			echo '<a href="' . $atts['img'] . '">';
+			$hrefset = true;
+		}
+		echo '<img src="' . $atts['img'] . '" alt="'. $atts['alt']  .  '" '. $extra. '>';
+		if ($hrefset)
+		{
+			echo '</a>';
+		}
+		if ($atts['caption'])
+		{
+			echo '<figcaption class="wp-caption-text">'.$atts['caption'].'</figcaption>';
+		}
+		echo '</figure>';
+		echo '<p><br></p>';
+		return;
+	}
 	
 	public static function wpimg_block($atts) {
 		$imgextra = '';
 		if (!empty($atts['id'])) {
 			$imgextra = 'class="wp-image-'.$atts['id'].'"';
 		}
-        $figclass = 'aligncenter';
-        if ($atts['align']=="left") {
-            $figclass = 'alignleft';
-        } else if ($atts['align']=="right") {
-            $figclass = 'alignright';
-        } else {
-            $figclass = 'aligncenter';
-        }
+		$figclass = 'aligncenter';
+		if ($atts['align']=="left") {
+			$figclass = 'alignleft';
+		} else if ($atts['align']=="right") {
+			$figclass = 'alignright';
+		} else {
+			$figclass = 'aligncenter';
+		}
         
-        if ($atts['align']=="left" || $atts['align']=="right") {
-            echo '<div class="wp-block-image" data-component-type="wpimg-block">';
-            echo '<figure class="'.$figclass.' size-large" contenteditable="false">'; 
-        } else {      
-            echo '<figure class="wp-block-image '.$figclass.' size-large" contenteditable="false">';  
-        }        
-        if (!empty($atts['link'])) {
-            echo '<a href="'.$atts['link'].'">';
-        }        
-        echo '<img src="' . $atts['img'] . '" alt="'. $atts['alt']  . '"' . $imgextra . ' >';
-        if ($atts['caption'])
-        {
-            echo '<figcaption>'.$atts['caption'].'</figcaption>';
-        }
-        if (!empty($atts['link'])) {
-            echo '</a>';
-        }
-        echo '</figure>';
-        if ($atts['align']=="left" || $atts['align']=="right") {
-            echo '</div>';
-        }  
-        echo '<p><br></p>';
-        return;
-    }
+		if ($atts['align']=="left" || $atts['align']=="right") {
+			echo '<div class="wp-block-image" data-component-type="wpimg-block">';
+			echo '<figure class="'.$figclass.' size-large" contenteditable="false">'; 
+		} else {      
+			echo '<figure class="wp-block-image '.$figclass.' size-large" contenteditable="false">';  
+		}        
+		if (!empty($atts['link'])) {
+			echo '<a href="'.$atts['link'].'">';
+		}        
+		echo '<img src="' . $atts['img'] . '" alt="'. $atts['alt']  . '"' . $imgextra . ' >';
+		if ($atts['caption'])
+		{
+			echo '<figcaption>'.$atts['caption'].'</figcaption>';
+		}
+		if (!empty($atts['link'])) {
+			echo '</a>';
+		}
+		echo '</figure>';
+		if ($atts['align']=="left" || $atts['align']=="right") {
+			echo '</div>';
+		}  
+		echo '<p><br></p>';
+		return;
+	}
 	
 	
 	public function get_ase_options()
@@ -634,12 +634,12 @@ 
 		exit;
 	}
     
-    /* This function doesn't actually publish post, but should be called when a post is published */
-    public function on_publish_post( ) {
+	/* This function doesn't actually publish post, but should be called when a post is published */
+	public function on_publish_post( ) {
 
 		$post_id = isset( $_POST['postid'] ) ? $_POST['postid'] : false;
         
-        do_action( 'transition_post_status', 'publish', 'draft', get_post( $post_id ) );
+		do_action( 'transition_post_status', 'publish', 'draft', get_post( $post_id ) );
 
 		exit;
 	}
@@ -697,14 +697,14 @@ 
 			$allow_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
 			
 			if ($taxonomy =='category') {
-                // convert from names to category ids
+				// convert from names to category ids
 				$cats = array();
 				foreach ($value as $cat) {
 					$cat_id = get_cat_ID($cat);
 					if ($cat_id !=0) {
 						$cats [] = $cat_id;
 					} else if ($allow_new_category) {
-					    $cats [] = wp_create_category($cat);
+						$cats [] = wp_create_category($cat);
 					}
 				}
 				$value = $cats;
@@ -724,7 +724,7 @@ 
 		}
 	}
     
-    public function create_gallery( ) {
+	public function create_gallery( ) {
 
 		$postid  	= isset( $_POST['postid'] ) ? $_POST['postid'] : false;
         
@@ -778,10 +778,10 @@ 
 			'message' => 'gallery-created',
 			'id' => $postid)
 		);
-        exit;
+		exit;
 	}
     
-    public function update_gallery( ) {
+	public function update_gallery( ) {
         
 		$options      = isset( $_POST['fields'] ) ? $_POST['fields'] : false;
         
@@ -797,12 +797,12 @@ 
 
 		self::save_gallery_options( $postid, $gallery_ids, $options, $type );
 
-        echo json_encode( array('message' => 'gallery-updated') );
+		echo json_encode( array('message' => 'gallery-updated') );
 
-        exit;
+		exit;
 	}
     
-    public function save_gallery_options( $postid, $gallery_ids, $options, $type = false ) {
+	public function save_gallery_options( $postid, $gallery_ids, $options, $type = false ) {
 
 		// gallery width
 		$gallery_width = isset( $options['width'] ) ? $options['width'] : false;
@@ -886,7 +886,7 @@ 
 	public function set_date( $postid, $value) {
 		if( $value ) {
 			$value = self::getEnglishMonthName($value)." ".date("H:i:s", current_time( 'timestamp', 1 ));
-            wp_update_post(
+			wp_update_post(
 				array (
 					'ID'            => $postid, // ID of the post to update
 					'post_date'     => date( 'Y-m-d H:i:s',  strtotime($value) ),

public/includes/editor-modules.php

Indentation +196 added lines, -196 removed lines

@@ -114,7 +114,7 @@ 
 				height: 42px;
 			}
 		<?php
-            } 
+			} 
 		} else { 
 		?> 
 
@@ -123,8 +123,8 @@ 
             }
             
         <?php
-        }
-        ?>
+		}
+		?>
         </style>
 		<div id="lasso--controls" class="lasso-post-status--<?php echo sanitize_html_class( $status );?> <?php echo sanitize_html_class( $custom_classes );?>" data-post-id="<?php echo get_the_ID();?>" >
 
@@ -240,7 +240,7 @@ 
 	
 	$sc_saving_class = ('on' == $shortcodify_disabled || $ase_status == 'ase-not-active')  ? 'shortcodify-disabled' : 'shortcodify-enabled';
 
-    $use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
+	$use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
 
 	?>
 	<div class="lasso--text-popup lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$ase_status.' '.sanitize_html_class( $custom_classes );?>"  style="display:none;">
@@ -298,7 +298,7 @@ 
 function lasso_editor_text_toolbar() {
 
 	ob_start();
-    $text_select_popup = lasso_editor_get_option('text_select_popup', 'lasso_editor', false);
+	$text_select_popup = lasso_editor_get_option('text_select_popup', 'lasso_editor', false);
 
 	
 	$is_mobile = wp_is_mobile();
@@ -317,7 +317,7 @@ 
 	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
 	
 	// mobile styles
-    $mobile_class = $is_mobile ? 'lasso-mobile' : false;
+	$mobile_class = $is_mobile ? 'lasso-mobile' : false;
 	$mobile_style =$is_mobile ? 'style="bottom:0px;"' : null;
 	
 	//show color
@@ -332,7 +332,7 @@ 
 	
 	$sc_saving_class = ('on' == $shortcodify_disabled || $ase_status == 'ase-not-active')  ? 'shortcodify-disabled' : 'shortcodify-enabled';
 
-    $use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
+	$use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
 
 	?>
 	<div class="lasso--toolbar_wrap lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$mobile_class.' '.$ase_status.' '.sanitize_html_class( $custom_classes );?>" <?php echo $mobile_style ?>>
@@ -556,7 +556,7 @@ 
 	
 	//editor options
 	$allow_change_date = lasso_editor_get_option('allow_change_date', 'lasso_editor');
-    $allow_edit_excerpt = lasso_editor_get_option('allow_edit_excerpt', 'lasso_editor');
+	$allow_edit_excerpt = lasso_editor_get_option('allow_edit_excerpt', 'lasso_editor');
 	$no_url_setting = lasso_editor_get_option('no_url_setting', 'lasso_editor');
 	$support_custom_taxonomy   = lasso_editor_get_option( 'support_custom_taxonomy', 'lasso_editor' );
 	
@@ -577,7 +577,7 @@ 
 	// do we support pending status
 	$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');
     
-    $excerpt = $post->post_excerpt;
+	$excerpt = $post->post_excerpt;
 
 ?>
 	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
@@ -674,7 +674,7 @@ 
 						}?>
 						<?php 
 						if ($allow_change_date) { 
-						    $dateformat = get_option( 'date_format' ); 
+							$dateformat = get_option( 'date_format' ); 
 						?>
 						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
 							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
@@ -768,8 +768,8 @@ 
 								$types = lasso_post_types_names();
 								if ( !empty( $types ) ) {
 									foreach( $types as $name => $label ) 
-                                    {   	
-                                        $type = $name;									
+									{   	
+										$type = $name;									
 										//$type = preg_replace( '/s\b/','', $name );
 										if ($type == 'page' && !current_user_can('edit_pages')) {
 											continue;
@@ -791,7 +791,7 @@ 
 						if ( !empty( $types ) ) {
 							// get the first element
 							$keys = array_keys($types);
-						    $type =$keys[0];						
+							$type =$keys[0];						
 							//$type = preg_replace( '/s\b/','', $type );
 							printf( '<input type="hidden" name="object" value="%s">', lcfirst( esc_attr( $type ) ) );		
 						}
@@ -819,8 +819,8 @@ 
 	global $post;
 	
 	global $wp_post_types;
-    $labels = &$wp_post_types['post']->labels;
-    $labels->name = 'Articles';
+	$labels = &$wp_post_types['post']->labels;
+	$labels->name = 'Articles';
 
 	ob_start();
 
@@ -880,7 +880,7 @@ 
 	ob_start();
 
 
-    $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+	$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
     
 	// let users add custom css classes
 	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
@@ -982,10 +982,10 @@ 
 function lasso_editor_options_blob() {
 
 	$codes   = function_exists( 'aesop_shortcodes' ) ? aesop_shortcodes() : array();
-    $codes   = add_wpimg_options( $codes );
+	$codes   = add_wpimg_options( $codes );
 	$codes   = add_wpimg_block_options( $codes );
 	$codes   = add_wpcover_block_options( $codes );
-    $codes   = apply_filters( 'lasso_custom_options', $codes );
+	$codes   = apply_filters( 'lasso_custom_options', $codes );
 	$galleries  = function_exists( 'lasso_editor_galleries_exist' ) && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
 
 	$nonce = wp_create_nonce( 'lasso_gallery' );
@@ -1087,9 +1087,9 @@ 
 		$return .= '</form>';
 
 		// extra JS codes
-        if (isset($shortcode['codes'])) {
-		    $return .= $shortcode['codes'];
-        }
+		if (isset($shortcode['codes'])) {
+			$return .= $shortcode['codes'];
+		}
 		$blob[$slug] = $return;
 	}
 
@@ -1098,95 +1098,95 @@ 
 
 
 function add_wpimg_options( $shortcodes ) {
-    $custom = array(
-        'wpimg'    => array(
-            'name'     => __( 'Image', 'lasso' ),
-            'type'     => 'single',
-            'atts'     => array(
-                'img'    => array(
-                    'type'  => 'media_upload',
-                    'default'  => '',
-                    'desc'   => __( 'Image URL', 'lasso' ),
-                    'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
-                ),
-                'align'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'center',
-                            'name' => __( 'Center', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'left',
-                            'name' => __( 'Left', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'right',
-                            'name' => __( 'Right', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'center',
-                    'desc'   => __( 'Alignment', 'lasso' ),
-                    'tip'=>''
-                ),			
+	$custom = array(
+		'wpimg'    => array(
+			'name'     => __( 'Image', 'lasso' ),
+			'type'     => 'single',
+			'atts'     => array(
+				'img'    => array(
+					'type'  => 'media_upload',
+					'default'  => '',
+					'desc'   => __( 'Image URL', 'lasso' ),
+					'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
+				),
+				'align'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'center',
+							'name' => __( 'Center', 'aesop-core' )
+						),
+						array(
+							'value' => 'left',
+							'name' => __( 'Left', 'aesop-core' )
+						),
+						array(
+							'value' => 'right',
+							'name' => __( 'Right', 'aesop-core' )
+						),
+					),
+					'default'  => 'center',
+					'desc'   => __( 'Alignment', 'lasso' ),
+					'tip'=>''
+				),			
                 
-                'imgwidth'    => array(
-                    'type'  => 'text_small',
-                    'default'  => '300px',
-                    'desc'   => __( 'Image Width', 'lasso' ),
-                    'tip'  => __( 'Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core' )
-                ),
-                'imgheight'    => array(
-                    'type'  => 'text_small',
-                    'default'  => '',
-                    'desc'   => __( 'Image Height', 'lasso' ),
-                    'tip'  => __( 'Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core' )
-                ),	
-                'linkoption'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'none',
-                            'name' => __( 'None', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'img',
-                            'name' => __( 'Image', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'url',
-                            'name' => __( 'URL', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'none',
-                    'desc'   => __( 'Link', 'lasso' ),
-                    'tip'  => __( 'Click leads to:', 'lasso' )
-                ),				
+				'imgwidth'    => array(
+					'type'  => 'text_small',
+					'default'  => '300px',
+					'desc'   => __( 'Image Width', 'lasso' ),
+					'tip'  => __( 'Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core' )
+				),
+				'imgheight'    => array(
+					'type'  => 'text_small',
+					'default'  => '',
+					'desc'   => __( 'Image Height', 'lasso' ),
+					'tip'  => __( 'Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core' )
+				),	
+				'linkoption'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'none',
+							'name' => __( 'None', 'aesop-core' )
+						),
+						array(
+							'value' => 'img',
+							'name' => __( 'Image', 'aesop-core' )
+						),
+						array(
+							'value' => 'url',
+							'name' => __( 'URL', 'aesop-core' )
+						),
+					),
+					'default'  => 'none',
+					'desc'   => __( 'Link', 'lasso' ),
+					'tip'  => __( 'Click leads to:', 'lasso' )
+				),				
                 
-                'link'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'URL Link', 'lasso' ),
-                    'tip'  => __( 'URL link', 'lasso' )
-                ),
-                'alt'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Image ALT', 'lasso' ),
-                    'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
-                ),
+				'link'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'URL Link', 'lasso' ),
+					'tip'  => __( 'URL link', 'lasso' )
+				),
+				'alt'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Image ALT', 'lasso' ),
+					'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
+				),
                 
-                'caption'    => array(
-                    'type'  => 'text_area',
-                    'default'  => '',
-                    'desc'   => __( 'Caption', 'lasso' ),
-                    'tip'  => __( 'Optional caption for the image.', 'lasso' )
-                ),
+				'caption'    => array(
+					'type'  => 'text_area',
+					'default'  => '',
+					'desc'   => __( 'Caption', 'lasso' ),
+					'tip'  => __( 'Optional caption for the image.', 'lasso' )
+				),
                 
 
-            ),
-            'desc'     => __( 'An image.', 'aesop-core' ),
-            'codes'    => '<script>	            
+			),
+			'desc'     => __( 'An image.', 'aesop-core' ),
+			'codes'    => '<script>	            
 						jQuery(document).ready(function($){
                             function linkSetting(l){								
 							    if ( l=="url") {
@@ -1206,101 +1206,101 @@ 
 							})
 						});
 			           </script>'
-        )
-    );
+		)
+	);
 
-    return array_merge( $shortcodes, $custom );
+	return array_merge( $shortcodes, $custom );
 }
 
 function add_wpimg_block_options( $shortcodes ) {
-    $custom = array(
-        'wpimg-block'    => array(
-            'name'     => __( 'Image', 'lasso' ),
-            'type'     => 'single',
-            'atts'     => array(
-                'img'    => array(
-                    'type'  => 'media_upload',
-                    'default'  => '',
-                    'desc'   => __( 'Image URL', 'lasso' ),
-                    'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
-                ),
-                'align'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'center',
-                            'name' => __( 'Center', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'left',
-                            'name' => __( 'Left', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'right',
-                            'name' => __( 'Right', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'center',
-                    'desc'   => __( 'Alignment', 'lasso' ),
-                    'tip'=>''
-                ),		
-                'alt'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Image ALT', 'lasso' ),
-                    'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
-                ),
-                'caption'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Caption', 'lasso' ),
-                    'tip'  => __( 'Optional caption for the image.', 'lasso' )
-                ),
-                'link'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Link URL', 'lasso' ),
-                    'tip'  => __( 'Optional URL to link.', 'lasso' )
-                ),
+	$custom = array(
+		'wpimg-block'    => array(
+			'name'     => __( 'Image', 'lasso' ),
+			'type'     => 'single',
+			'atts'     => array(
+				'img'    => array(
+					'type'  => 'media_upload',
+					'default'  => '',
+					'desc'   => __( 'Image URL', 'lasso' ),
+					'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
+				),
+				'align'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'center',
+							'name' => __( 'Center', 'aesop-core' )
+						),
+						array(
+							'value' => 'left',
+							'name' => __( 'Left', 'aesop-core' )
+						),
+						array(
+							'value' => 'right',
+							'name' => __( 'Right', 'aesop-core' )
+						),
+					),
+					'default'  => 'center',
+					'desc'   => __( 'Alignment', 'lasso' ),
+					'tip'=>''
+				),		
+				'alt'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Image ALT', 'lasso' ),
+					'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
+				),
+				'caption'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Caption', 'lasso' ),
+					'tip'  => __( 'Optional caption for the image.', 'lasso' )
+				),
+				'link'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Link URL', 'lasso' ),
+					'tip'  => __( 'Optional URL to link.', 'lasso' )
+				),
                
 
-            ),
-            'desc'     => __( 'A WP Image Block.', 'aesop-core' ),
-            'codes'    => '<script>	            
+			),
+			'desc'     => __( 'A WP Image Block.', 'aesop-core' ),
+			'codes'    => '<script>	            
 						jQuery(document).ready(function($){
                             
 						});
 			           </script>'
-        )
-    );
+		)
+	);
 
-    return array_merge( $shortcodes, $custom );
+	return array_merge( $shortcodes, $custom );
 }
 
 function add_wpcover_block_options( $shortcodes ) {
-    $custom = array(
-        'wpcover-block'    => array(
-            'name'     => __( 'Cover', 'lasso' ),
-            'type'     => 'single',
-            'atts'     => array(
-                'img'    => array(
-                    'type'  => 'media_upload',
-                    'default'  => '',
-                    'desc'   => __( 'Image URL', 'lasso' ),
-                    'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
-                )
-
-            ),
-            'desc'     => __( 'A WP Cover Block.', 'aesop-core' ),
-            'codes'    => '<script>	            
+	$custom = array(
+		'wpcover-block'    => array(
+			'name'     => __( 'Cover', 'lasso' ),
+			'type'     => 'single',
+			'atts'     => array(
+				'img'    => array(
+					'type'  => 'media_upload',
+					'default'  => '',
+					'desc'   => __( 'Image URL', 'lasso' ),
+					'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
+				)
+
+			),
+			'desc'     => __( 'A WP Cover Block.', 'aesop-core' ),
+			'codes'    => '<script>	            
 						jQuery(document).ready(function($){
                             
 						});
 			           </script>'
-        )
-    );
+		)
+	);
 
-    return array_merge( $shortcodes, $custom );
+	return array_merge( $shortcodes, $custom );
 }
 
 /**
@@ -1345,23 +1345,23 @@ 
  * @return string
  */
 function lasso_editor_adjustBrightness($hex, $steps) { 
-    $steps = max(-255, min(255, $steps));
+	$steps = max(-255, min(255, $steps));
 
-    // Normalize into a six character long hex string
-    $hex = str_replace('#', '', $hex);
-    if (strlen($hex) == 3) {
-        $hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
-    }
+	// Normalize into a six character long hex string
+	$hex = str_replace('#', '', $hex);
+	if (strlen($hex) == 3) {
+		$hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
+	}
 
-    // Split into three parts: R, G and B
-    $color_parts = str_split($hex, 2);
-    $return = '#';
+	// Split into three parts: R, G and B
+	$color_parts = str_split($hex, 2);
+	$return = '#';
 
-    foreach ($color_parts as $color) {
-        $color   = hexdec($color); // Convert to decimal
-        $color   = max(0,min(255,$color + $steps)); // Adjust color
-        $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
-    }
+	foreach ($color_parts as $color) {
+		$color   = hexdec($color); // Convert to decimal
+		$color   = max(0,min(255,$color + $steps)); // Adjust color
+		$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
+	}
 
-    return $return;
+	return $return;
 }