AesopInteractive / lasso

public/includes/lasso.php

Indentation +127 added lines, -127 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,63 +434,63 @@ 
 			}
 		}
 		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_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);
@@ -499,95 +499,95 @@ 
 		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';
+		}
         
-        echo '<div class="wp-block-image" data-component-type="wpimg-block">'; 
-        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></div>';
-        echo '<p><br></p>';
-        return;
-    }
+		echo '<div class="wp-block-image" data-component-type="wpimg-block">'; 
+		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></div>';
+		echo '<p><br></p>';
+		return;
+	}
 	
 	
 	public function get_ase_options()
@@ -623,12 +623,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;
 	}
@@ -686,14 +686,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;
@@ -713,7 +713,7 @@ 
 		}
 	}
     
-    public function create_gallery( ) {
+	public function create_gallery( ) {
 
 		$postid  	= isset( $_POST['postid'] ) ? $_POST['postid'] : false;
         
@@ -767,10 +767,10 @@ 
 			'message' => 'gallery-created',
 			'id' => $postid)
 		);
-        exit;
+		exit;
 	}
     
-    public function update_gallery( ) {
+	public function update_gallery( ) {
         
 		$options      = isset( $_POST['fields'] ) ? $_POST['fields'] : false;
         
@@ -786,12 +786,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;
@@ -875,7 +875,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) ),

Spacing +192 added lines, -192 removed lines

@@ -52,35 +52,35 @@ 
 		require_once LASSO_DIR.'/public/includes/wrap-shortcodes.php';
 
 		// Activate plugin when new blog is added
-		add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) );
+		add_action('wpmu_new_blog', array($this, 'activate_new_site'));
 
 		// Load plugin text domain
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
+		add_action('init', array($this, 'load_plugin_textdomain'));
 		
-		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_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' ) );
-		add_action( 'wp_ajax_editus_set_post_setting',     array( $this, 'editus_set_post_setting' ) );
-		add_action( 'wp_ajax_editus_get_ase_options',     array( $this, 'get_ase_options' ) );
-		add_action( 'wp_ajax_editus_delete_post',     array( $this, 'delete_post' ) );
-		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_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_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'));
+		add_action('wp_ajax_editus_set_post_setting', array($this, 'editus_set_post_setting'));
+		add_action('wp_ajax_editus_get_ase_options', array($this, 'get_ase_options'));
+		add_action('wp_ajax_editus_delete_post', array($this, 'delete_post'));
+		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'));
-		$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor',  $default_post_types);
-        foreach ( $allowed_post_types  as $post_type ) {
+        $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);
 		}
 		//enqueue assets
@@ -109,7 +109,7 @@ 
 	public static function get_instance() {
 
 		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
+		if (null == self::$instance) {
 			self::$instance = new self;
 		}
 
@@ -126,18 +126,18 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       activated on an individual blog.
 	 */
-	public static function activate( $network_wide ) {
+	public static function activate($network_wide) {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide  ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_activate();
 				}
 
@@ -163,18 +163,18 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       deactivated on an individual blog.
 	 */
-	public static function deactivate( $network_wide ) {
+	public static function deactivate($network_wide) {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_deactivate();
 
 				}
@@ -198,13 +198,13 @@ 
 	 *
 	 * @param int     $blog_id ID of the new blog.
 	 */
-	public function activate_new_site( $blog_id ) {
+	public function activate_new_site($blog_id) {
 
-		if ( 1 !== did_action( 'wpmu_new_blog' ) ) {
+		if (1 !== did_action('wpmu_new_blog')) {
 			return;
 		}
 
-		switch_to_blog( $blog_id );
+		switch_to_blog($blog_id);
 		self::single_activate();
 		restore_current_blog();
 
@@ -229,7 +229,7 @@ 
 			WHERE archived = '0' AND spam = '0'
 			AND deleted = '0'";
 
-		return $wpdb->get_col( $sql );
+		return $wpdb->get_col($sql);
 
 	}
 
@@ -240,18 +240,18 @@ 
 	 */
 	private static function single_activate() {
 
-		$curr_version = get_option( 'lasso_version' );
+		$curr_version = get_option('lasso_version');
 
 		// update upgraded from
-		if ( $curr_version ) {
-			update_option( 'lasso_updated_from', $curr_version );
+		if ($curr_version) {
+			update_option('lasso_updated_from', $curr_version);
 		}
 
 		// update lasso version option
-		update_option( 'lasso_version', LASSO_VERSION );
+		update_option('lasso_version', LASSO_VERSION);
 
 		// set transietn for activation welcome
-		set_transient( '_lasso_welcome_redirect', true, 30 );
+		set_transient('_lasso_welcome_redirect', true, 30);
 
 
 	}
@@ -273,15 +273,15 @@ 
 	public function load_plugin_textdomain() {
 
 		$domain = $this->plugin_slug;
-		$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+		$locale = apply_filters('plugin_locale', get_locale(), $domain);
 
-		$out = load_textdomain( $domain, trailingslashit( LASSO_DIR ). 'languages/' . $domain . '-' . $locale . '.mo' );
+		$out = load_textdomain($domain, trailingslashit(LASSO_DIR).'languages/'.$domain.'-'.$locale.'.mo');
 	}
 	
     // new ajax function to lock post for editing
 	public function editus_lock_post()
 	{
-		$post_id= $_POST["postid"];
+		$post_id = $_POST["postid"];
 		$locked = wp_check_post_lock($post_id);
 		
 		if (!$locked) {
@@ -289,17 +289,17 @@ 
 			echo "true";
 		} else {
 			$user_info = get_userdata($locked);
-			echo _e( 'Post being edited by ', 'lasso' ).$user_info->first_name .  " " . $user_info->last_name;
+			echo _e('Post being edited by ', 'lasso').$user_info->first_name." ".$user_info->last_name;
 		}
 		exit;
 	}
 	
 	public function editus_unlock_post()
 	{
-		$post_id= $_POST["postid"];
+		$post_id = $_POST["postid"];
 		$locked = wp_check_post_lock($post_id);
         if (!$locked) {
-            delete_post_meta( $post_id, '_edit_lock');
+            delete_post_meta($post_id, '_edit_lock');
         }
 		echo "true";
 		
@@ -311,7 +311,7 @@ 
 	{
 		$user_id = get_current_user_ID();
 				
-		update_user_meta( $user_id, 'lasso_hide_tour', true );
+		update_user_meta($user_id, 'lasso_hide_tour', true);
 		exit;
 	}
 	
@@ -320,51 +320,51 @@ 
 		$data = array();
 		parse_str($_POST['data'], $data);
 		
-		if (!wp_verify_nonce( $data[ 'nonce' ], 'lasso-update-post-settings' )) {
+		if (!wp_verify_nonce($data['nonce'], 'lasso-update-post-settings')) {
 			wp_send_json_error();
 			exit;
 		}
 		
-		$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;
+		$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;
 	
 
 		$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)
 		);
 		
 		
 
-		wp_update_post( apply_filters( 'lasso_object_status_update_args', $args ) );
+		wp_update_post(apply_filters('lasso_object_status_update_args', $args));
 		
 		// update categories
-		$cats  = isset( $data['story_cats'] ) ? $data['story_cats'] : false;
+		$cats = isset($data['story_cats']) ? $data['story_cats'] : false;
 		
-		self::set_post_terms( $postid, $cats, 'category' );
+		self::set_post_terms($postid, $cats, 'category');
 		
 		// update tags
-		$tags = isset( $data['story_tags'] ) ? $data['story_tags'] : false;
-		self::set_post_terms( $postid, $tags, 'post_tag' );
+		$tags = isset($data['story_tags']) ? $data['story_tags'] : false;
+		self::set_post_terms($postid, $tags, 'post_tag');
 		
 		// update custom taxonomy
-		$custom_taxonomies = isset( $data['story_custom_taxonomies'] ) ? json_decode($data['story_custom_taxonomies']) : false;
+		$custom_taxonomies = isset($data['story_custom_taxonomies']) ? json_decode($data['story_custom_taxonomies']) : false;
         
 		foreach ($custom_taxonomies as $x => $x_value) {
-			self::set_post_terms( $postid, $x_value, $x );
+			self::set_post_terms($postid, $x_value, $x);
 		}
 		
 		//update date
-		$date  = isset( $data['post_date'] ) ? $data['post_date'] : false;
-		self::set_date( $postid, $date );
+		$date = isset($data['post_date']) ? $data['post_date'] : false;
+		self::set_date($postid, $date);
 		
-		do_action( 'lasso_post_updated', $postid, $slug, $status, get_current_user_ID() );
-		$response= array(
-			'link'   => get_permalink($postid). (($status=='publish') ? '' : '&preview=true')
+		do_action('lasso_post_updated', $postid, $slug, $status, get_current_user_ID());
+		$response = array(
+			'link'   => get_permalink($postid).(($status == 'publish') ? '' : '&preview=true')
 		);
 		wp_send_json_success($response);
 		exit;
@@ -372,11 +372,11 @@ 
 	
 	public static function enable_metasave($type)
 	{
-		register_rest_field( $type, 'metadata', array(
-			'get_callback' => function ( $data ) {
-				return get_post_meta( $data['id']);//, '', '' );
+		register_rest_field($type, 'metadata', array(
+			'get_callback' => function($data) {
+				return get_post_meta($data['id']); //, '', '' );
 			}, 
-			'update_callback' => function( $data, $post ) {
+			'update_callback' => function($data, $post) {
 				foreach ($data as $key => $value) {
 					update_post_meta($post->ID, $key, $value);
 				}
@@ -388,13 +388,13 @@ 
 	public function editus_do_shortcode()
 	{
 		
-		$code= $_POST["code"];
+		$code = $_POST["code"];
 		$code = str_replace('\"', '"', $code);
 		
-		$code_wrapped = lasso_wrap_shortcodes( $code);
-		$out =  do_shortcode($code);
+		$code_wrapped = lasso_wrap_shortcodes($code);
+		$out = do_shortcode($code);
 		if ($out != '') {
-			$out =  do_shortcode($code_wrapped);
+			$out = do_shortcode($code_wrapped);
 			echo $out;
 			exit;
 		}
@@ -404,7 +404,7 @@ 
 		/** @var \WP_Embed $wp_embed */
 		global $wp_embed;
 		$wp_embed->post_ID = $_POST["ID"];
-		$out =$wp_embed->run_shortcode( $code_wrapped );
+		$out = $wp_embed->run_shortcode($code_wrapped);
 		
 		echo $out;
 		exit;
@@ -413,9 +413,9 @@ 
     public function editus_do_block()
 	{
 		
-		$code= $_POST["code"];
+		$code = $_POST["code"];
 
-        $out = do_blocks( $code );
+        $out = do_blocks($code);
 		
 		echo $out;
 		exit;
@@ -425,56 +425,56 @@ 
 	{
 		
 		
-		$code= $_POST["code"];
+		$code = $_POST["code"];
 		$atts = array(
 		 );
 		foreach ($_POST as $key => $value) {
-			if ($key !="code" && $key !="action") {
+			if ($key != "code" && $key != "action") {
 				$atts[$key] = $value;
 			}
 		}
 		if ($code == "aesop_video") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
+		    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');
+		    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');
+		    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');
+		    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');
+		    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');
+		    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');
+		    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');
+		    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');
+		    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');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-document.php');
 		    echo aesop_document_shortcode($atts);
 		}
         /*else if ($code == "aesop_content") {
@@ -506,24 +506,24 @@ 
         $extra = "";
         
         // 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' );
+		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") {
+        if ($atts['align'] == "left") {
             $extra .= 'class="alignleft';
-        } else if ($atts['align']=="right") {
+        } else if ($atts['align'] == "right") {
             $extra .= 'class="alignright';
         } else {
             $extra .= 'class="aligncenter';
         }
         if ($atts['imgwidth'] || $atts['imgheight']) {
             if ($atts['imgwidth']) {
-                $extra .= 'width:'. $atts['imgwidth'].';';
+                $extra .= 'width:'.$atts['imgwidth'].';';
             }
             if ($atts['imgheight']) {
-                $extra .= 'height:'. $atts['imgheight'].';';
+                $extra .= 'height:'.$atts['imgheight'].';';
             }
             
         }
@@ -535,15 +535,15 @@ 
         //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" ))
+        if ($atts['link'] != '' && (!isset($atts['linkoption']) || $atts['linkoption'] == "url"))
         {
-            echo '<a href="' . $atts['link'] . '">';
+            echo '<a href="'.$atts['link'].'">';
             $hrefset = true;
-        } else if (isset($atts['linkoption']) && $atts['linkoption'] == 'img' ) {
-            echo '<a href="' . $atts['img'] . '">';
+        } else if (isset($atts['linkoption']) && $atts['linkoption'] == 'img') {
+            echo '<a href="'.$atts['img'].'">';
             $hrefset = true;
         }
-        echo '<img src="' . $atts['img'] . '" alt="'. $atts['alt']  .  '" '. $extra. '>';
+        echo '<img src="'.$atts['img'].'" alt="'.$atts['alt'].'" '.$extra.'>';
         if ($hrefset)
         {
             echo '</a>';
@@ -563,9 +563,9 @@ 
 			$imgextra = 'class="wp-image-'.$atts['id'].'"';
 		}
         $figclass = 'aligncenter';
-        if ($atts['align']=="left") {
+        if ($atts['align'] == "left") {
             $figclass = 'alignleft';
-        } else if ($atts['align']=="right") {
+        } else if ($atts['align'] == "right") {
             $figclass = 'alignright';
         } else {
             $figclass = 'aligncenter';
@@ -576,7 +576,7 @@ 
         if (!empty($atts['link'])) {
             echo '<a href="'.$atts['link'].'">';
         }        
-        echo '<img src="' . $atts['img'] . '" alt="'. $atts['alt']  . '"' . $imgextra . ' >';
+        echo '<img src="'.$atts['img'].'" alt="'.$atts['alt'].'"'.$imgextra.' >';
         if ($atts['caption'])
         {
             echo '<figcaption>'.$atts['caption'].'</figcaption>';
@@ -593,20 +593,20 @@ 
 	public function get_ase_options()
 	{
 		$blob = lasso_editor_options_blob();
-		$code= $_POST["component"];
+		$code = $_POST["component"];
 		echo $blob[$code];
 		exit; 
 	}
 	
 	public function delete_post( ) {
 
-		$postid = isset( $_POST['postid'] ) ? $_POST['postid'] : false;
+		$postid = isset($_POST['postid']) ? $_POST['postid'] : false;
 
 		// bail out if the current user can't publish posts
-		if ( !lasso_user_can( 'delete_post', $postid ) )
+		if (!lasso_user_can('delete_post', $postid))
 			return;
 		
-		if (!wp_verify_nonce( $_POST[ 'nonce' ], 'lasso_delete_post' )) {
+		if (!wp_verify_nonce($_POST['nonce'], 'lasso_delete_post')) {
 			wp_send_json_error();
 			exit;
 		}
@@ -616,9 +616,9 @@ 
 			'post_status' 	=> 'trash'
 		);
 
-		wp_update_post( apply_filters( 'lasso_object_deleted_args', $args ) );
+		wp_update_post(apply_filters('lasso_object_deleted_args', $args));
 
-		do_action( 'lasso_object_deleted', $postid, get_current_user_ID() );
+		do_action('lasso_object_deleted', $postid, get_current_user_ID());
 
 		exit;
 	}
@@ -626,40 +626,40 @@ 
     /* 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;
+		$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;
 	}
 	
 	public function set_featured_img( ) {
 
-		$postid  	= isset( $_POST['postid'] ) ? $_POST['postid'] : false;
-		$image_id  	= isset( $_POST['image_id'] ) ? absint( $_POST['image_id'] ) : false;
-		if (!wp_verify_nonce( $_POST[ 'nonce' ], 'lasso_gallery' )) {
+		$postid = isset($_POST['postid']) ? $_POST['postid'] : false;
+		$image_id = isset($_POST['image_id']) ? absint($_POST['image_id']) : false;
+		if (!wp_verify_nonce($_POST['nonce'], 'lasso_gallery')) {
 			wp_send_json_error();
 			exit;
 		}	
 
-		set_post_thumbnail( $postid, $image_id );
+		set_post_thumbnail($postid, $image_id);
 
-		do_action( 'lasso_featured_image_set', $postid, $image_id, get_current_user_ID() );
+		do_action('lasso_featured_image_set', $postid, $image_id, get_current_user_ID());
 
 		exit;
 	}
 	
 	public function del_featured_img( ) {
 
-		$postid  = isset( $_POST['postid'] ) ? $_POST['postid'] : false;
-		if (!wp_verify_nonce( $_POST[ 'nonce' ], 'lasso_gallery' )) {
+		$postid = isset($_POST['postid']) ? $_POST['postid'] : false;
+		if (!wp_verify_nonce($_POST['nonce'], 'lasso_gallery')) {
 			wp_send_json_error();
 			exit;
 		}	
 
-		delete_post_thumbnail( $postid );
+		delete_post_thumbnail($postid);
 
-		do_action( 'lasso_featured_image_deleted', $postid, get_current_user_ID() );
+		do_action('lasso_featured_image_deleted', $postid, get_current_user_ID());
 
 		exit;
 	}
@@ -680,17 +680,17 @@ 
 		return self::$revisions;
 	}*/
 	
-	public function set_post_terms( $postid, $value, $taxonomy ) {
-		if( $value ) {
-			$value = explode( ',', $value );
-			$allow_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
+	public function set_post_terms($postid, $value, $taxonomy) {
+		if ($value) {
+			$value = explode(',', $value);
+			$allow_new_category = lasso_editor_get_option('allow_new_category', 'lasso_editor');
 			
-			if ($taxonomy =='category') {
+			if ($taxonomy == 'category') {
                 // convert from names to category ids
 				$cats = array();
 				foreach ($value as $cat) {
 					$cat_id = get_cat_ID($cat);
-					if ($cat_id !=0) {
+					if ($cat_id != 0) {
 						$cats [] = $cat_id;
 					} else if ($allow_new_category) {
 					    $cats [] = wp_create_category($cat);
@@ -699,71 +699,71 @@ 
 				$value = $cats;
 			}
 	
-			$result = wp_set_object_terms( $postid, $value, $taxonomy );
+			$result = wp_set_object_terms($postid, $value, $taxonomy);
 		}
-		else  {
+		else {
 			//remove all terms from post
-			$result = wp_set_object_terms( $postid, null, $taxonomy );
+			$result = wp_set_object_terms($postid, null, $taxonomy);
 		}
 
-		if ( ! is_wp_error( $result ) ) {
+		if (!is_wp_error($result)) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
     
     public function create_gallery( ) {
 
-		$postid  	= isset( $_POST['postid'] ) ? $_POST['postid'] : false;
+		$postid = isset($_POST['postid']) ? $_POST['postid'] : false;
         
-		if (!wp_verify_nonce( $_POST[ 'nonce' ], 'lasso_gallery' )) {
+		if (!wp_verify_nonce($_POST['nonce'], 'lasso_gallery')) {
 			wp_send_json_error();
 			exit;
 		}	
 
-		if (  ! lasso_user_can( 'publish_posts' ) ) {
+		if (!lasso_user_can('publish_posts')) {
 			return false;
 
 		}
 
-		$gallery_ids = isset( $_POST['gallery_ids'] ) ? $_POST['gallery_ids'] : false;
+		$gallery_ids = isset($_POST['gallery_ids']) ? $_POST['gallery_ids'] : false;
 
 		// bail if no gallery ids
-		if ( empty( $gallery_ids ) ) {
+		if (empty($gallery_ids)) {
 			return false;
 		}
 
-		$type   		 = isset( $_POST['gallery_type'] ) ? $_POST['gallery_type'] : false;
-		$edgallerytitle	 = isset( $_POST['edgallerytitle'] ) ? $_POST['edgallerytitle'] : $postid.'-'.rand();
+		$type = isset($_POST['gallery_type']) ? $_POST['gallery_type'] : false;
+		$edgallerytitle = isset($_POST['edgallerytitle']) ? $_POST['edgallerytitle'] : $postid.'-'.rand();
 
 		// insert a new gallery
 		$args = array(
-			'post_title'    => $edgallerytitle ,
+			'post_title'    => $edgallerytitle,
 			'post_status'   => 'publish',
 			'post_type'     => 'ai_galleries'
 		);
 
-		$postid = wp_insert_post( apply_filters( 'lasso_insert_gallery_args', $args ) );
+		$postid = wp_insert_post(apply_filters('lasso_insert_gallery_args', $args));
 
 		// update gallery ids
-		if ( $gallery_ids ) {
+		if ($gallery_ids) {
 
-			update_post_meta( $postid, '_ase_gallery_images', $gallery_ids );
+			update_post_meta($postid, '_ase_gallery_images', $gallery_ids);
 
 		}
 
 		// update the gallery type
-		if ( !empty( $type ) ) {
+		if (!empty($type)) {
 
-			update_post_meta( $postid, 'aesop_gallery_type', $type );
+			update_post_meta($postid, 'aesop_gallery_type', $type);
 
 		}
 
-		do_action( 'lasso_gallery_published', $postid, $gallery_ids, get_current_user_ID() );
+		do_action('lasso_gallery_published', $postid, $gallery_ids, get_current_user_ID());
 
 
-		echo json_encode( array(
+		echo json_encode(array(
 			'message' => 'gallery-created',
 			'id' => $postid)
 		);
@@ -772,114 +772,114 @@ 
     
     public function update_gallery( ) {
         
-		$options      = isset( $_POST['fields'] ) ? $_POST['fields'] : false;
+		$options      = isset($_POST['fields']) ? $_POST['fields'] : false;
         
-		$postid   	  = !empty( $options ) ? (int) $options['id'] : false;
-		$gallery_ids  = isset( $_POST['gallery_ids'] ) ? $_POST['gallery_ids'] : false;
-		if ( $_POST[ 'gallery_type' ] ) {
-			$type = $_POST[ 'gallery_type' ];
-		}elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) {
-			$type = $options[ 'galleryType' ];
-		}else{
+		$postid = !empty($options) ? (int) $options['id'] : false;
+		$gallery_ids  = isset($_POST['gallery_ids']) ? $_POST['gallery_ids'] : false;
+		if ($_POST['gallery_type']) {
+			$type = $_POST['gallery_type'];
+		}elseif (!empty($options) && $options['galleryType']) {
+			$type = $options['galleryType'];
+		} else {
 			$type = false;
 		}
 
-		self::save_gallery_options( $postid, $gallery_ids, $options, $type );
+		self::save_gallery_options($postid, $gallery_ids, $options, $type);
 
-        echo json_encode( array('message' => 'gallery-updated') );
+        echo json_encode(array('message' => 'gallery-updated'));
 
         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;
+		$gallery_width = isset($options['width']) ? $options['width'] : false;
 
 		// gallery grid item width
-		$item_width = isset( $options['itemwidth'] ) ? $options['itemwidth'] : false;
+		$item_width = isset($options['itemwidth']) ? $options['itemwidth'] : false;
 
 		// caption
-		$caption = isset( $options['caption'] ) ? $options['caption'] : false;
+		$caption = isset($options['caption']) ? $options['caption'] : false;
 
 		// gallery transition
-		$transition = isset( $options['transition'] ) ? $options['transition'] : false;
+		$transition = isset($options['transition']) ? $options['transition'] : false;
 
 		// gallery transition speed
-		$transitionSpeed = isset( $options['speed'] ) ? $options['speed'] : false;
+		$transitionSpeed = isset($options['speed']) ? $options['speed'] : false;
 
 		// gallery hide thumbs
-		$hideThumbs = isset( $options['hideThumbs'] ) ? $options['hideThumbs'] : false;
+		$hideThumbs = isset($options['hideThumbs']) ? $options['hideThumbs'] : false;
 
 		// photoset layout hardwired to on for now
-		$psLayout = isset( $options['pslayout'] ) ? $options['pslayout'] : false;
+		$psLayout = isset($options['pslayout']) ? $options['pslayout'] : false;
 
 		// photoset layout
-		$psLightbox = 'on';//isset( $options['pslightbox'] ) ? $options['pslightbox'] : false;
+		$psLightbox = 'on'; //isset( $options['pslightbox'] ) ? $options['pslightbox'] : false;
 		
 		// hero gallery height
-		$gallery_height = isset( $options['height'] ) ? $options['height'] : false;
+		$gallery_height = isset($options['height']) ? $options['height'] : false;
 
 		// update gallery ids
-		if ( !empty( $gallery_ids ) ) {
+		if (!empty($gallery_ids)) {
 
-			update_post_meta( $postid, '_ase_gallery_images', $gallery_ids );
+			update_post_meta($postid, '_ase_gallery_images', $gallery_ids);
 
 		}
 
-		update_post_meta( $postid, 'aesop_gallery_type', sanitize_text_field( trim( $type ) ) );
+		update_post_meta($postid, 'aesop_gallery_type', sanitize_text_field(trim($type)));
 
-		update_post_meta( $postid, 'aesop_gallery_width', sanitize_text_field( trim( $gallery_width ) ) );
+		update_post_meta($postid, 'aesop_gallery_width', sanitize_text_field(trim($gallery_width)));
 
-		update_post_meta( $postid, 'aesop_grid_gallery_width', sanitize_text_field( trim( $item_width ) ) );
+		update_post_meta($postid, 'aesop_grid_gallery_width', sanitize_text_field(trim($item_width)));
 
-		update_post_meta( $postid, 'aesop_gallery_caption', sanitize_text_field( trim( $caption ) ) );
+		update_post_meta($postid, 'aesop_gallery_caption', sanitize_text_field(trim($caption)));
 
-		update_post_meta( $postid, 'aesop_thumb_gallery_transition', sanitize_text_field( trim( $transition ) ) );
+		update_post_meta($postid, 'aesop_thumb_gallery_transition', sanitize_text_field(trim($transition)));
 
-		update_post_meta( $postid, 'aesop_thumb_gallery_transition_speed', absint( trim( $transitionSpeed ) ) );
+		update_post_meta($postid, 'aesop_thumb_gallery_transition_speed', absint(trim($transitionSpeed)));
 
-		update_post_meta( $postid, 'aesop_thumb_gallery_hide_thumbs', sanitize_text_field( trim( $hideThumbs ) ) );
+		update_post_meta($postid, 'aesop_thumb_gallery_hide_thumbs', sanitize_text_field(trim($hideThumbs)));
 
-		update_post_meta( $postid, 'aesop_photoset_gallery_layout', sanitize_text_field( trim( $psLayout ) ) );
+		update_post_meta($postid, 'aesop_photoset_gallery_layout', sanitize_text_field(trim($psLayout)));
 
-		update_post_meta( $postid, 'aesop_photoset_gallery_lightbox', sanitize_text_field( trim( $psLightbox ) ) );
+		update_post_meta($postid, 'aesop_photoset_gallery_lightbox', sanitize_text_field(trim($psLightbox)));
 		
-		update_post_meta( $postid, 'aesop_hero_gallery_height', sanitize_text_field( trim( $gallery_height ) ) );
+		update_post_meta($postid, 'aesop_hero_gallery_height', sanitize_text_field(trim($gallery_height)));
 		
 		//hardwired for now
 		
-		update_post_meta( $postid, 'aesop_hero_gallery_transition_speed', 300 );
+		update_post_meta($postid, 'aesop_hero_gallery_transition_speed', 300);
 
 	}
 	
-	function getEnglishMonthName($foreignMonthName){
+	function getEnglishMonthName($foreignMonthName) {
 
 		  setlocale(LC_ALL, 'en_US');
 
-		  $month_numbers = range(1,12);
+		  $month_numbers = range(1, 12);
 
-		  foreach($month_numbers as $month)
-			$english_months[] = strftime('%B',mktime(0,0,0,$month,1,2011));
+		  foreach ($month_numbers as $month)
+			$english_months[] = strftime('%B', mktime(0, 0, 0, $month, 1, 2011));
 
 		  setlocale(LC_ALL, get_locale());
 
-		  foreach($month_numbers as $month)
-			$foreign_months[] = utf8_encode(strftime('%B',mktime(0,0,0,$month,1,2011)));
+		  foreach ($month_numbers as $month)
+			$foreign_months[] = utf8_encode(strftime('%B', mktime(0, 0, 0, $month, 1, 2011)));
 
 		  return str_replace($foreign_months, $english_months, $foreignMonthName);
 	}
 
 
 	
-	public function set_date( $postid, $value) {
-		if( $value ) {
-			$value = self::getEnglishMonthName($value)." ".date("H:i:s", current_time( 'timestamp', 1 ));
+	public function set_date($postid, $value) {
+		if ($value) {
+			$value = self::getEnglishMonthName($value)." ".date("H:i:s", current_time('timestamp', 1));
             wp_update_post(
-				array (
+				array(
 					'ID'            => $postid, // ID of the post to update
-					'post_date'     => date( 'Y-m-d H:i:s',  strtotime($value) ),
-					'post_date_gmt'     => gmdate( 'Y-m-d H:i:s',  strtotime($value) ),
+					'post_date'     => date('Y-m-d H:i:s', strtotime($value)),
+					'post_date_gmt'     => gmdate('Y-m-d H:i:s', strtotime($value)),
 				)
 			);
 		}

public/includes/assets.php

Indentation +86 added lines, -86 removed lines

@@ -15,29 +15,29 @@ 
 		add_action('wp_enqueue_scripts', array($this,'scripts'));
 	}
     
-    function is_multipage()
-    {
-        global $post;
-        $pos = strpos($post->post_content, "<!--nextpage-->");
-        if (!$pos) return -1;
+	function is_multipage()
+	{
+		global $post;
+		$pos = strpos($post->post_content, "<!--nextpage-->");
+		if (!$pos) return -1;
         
-        global $wp;
-        $url =  home_url( $wp->request );
-        $index = intval(basename($url)) == 0 ? 0 : intval(basename($url))-1;
-        return $index;        
-    }
+		global $wp;
+		$url =  home_url( $wp->request );
+		$index = intval(basename($url)) == 0 ? 0 : intval(basename($url))-1;
+		return $index;        
+	}
 
 	public function scripts(){
 
 	
 		global $post;
 		if ( lasso_user_can('edit_posts') 
-		     /* uncomment this line to disable Editus on Gutenberg posts*/
-             /* && !( function_exists( 'has_blocks' ) && has_blocks( $post->post_content)  && !is_home()) */              
-             ) {
+			 /* uncomment this line to disable Editus on Gutenberg posts*/
+			 /* && !( function_exists( 'has_blocks' ) && has_blocks( $post->post_content)  && !is_home()) */              
+			 ) {
 			
 			/**    Returns the time offset from UTC
-			*/
+			 */
 			function get_UTC_offset() {
 				$timezone_string = get_option( 'timezone_string' );
 				if (empty( $timezone_string ) ) {
@@ -52,7 +52,7 @@ 
 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
-            //don't load autocomplete if it's a stockholm theme
+			//don't load autocomplete if it's a stockholm theme
 			$themename  	= wp_get_theme()->get('Name');
 			if ($themename !='Stockholm' ) {
 				wp_enqueue_script('jquery-ui-autocomplete');
@@ -90,11 +90,11 @@ 
 			$bold_tag = lasso_editor_get_option('bold_tag', 'lasso_editor','b');
 			$i_tag = lasso_editor_get_option('i_tag', 'lasso_editor','i');
             
-            $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');
             
-            $use_wpimgblock = false;
+			$use_wpimgblock = false;
             
-            $link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor', 'off');
+			$link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor', 'off');
 
 			
 			//text alignement
@@ -109,7 +109,7 @@ 
 			// allow change date for post
 			$allow_change_date = lasso_editor_get_option('allow_change_date', 'lasso_editor');
             
-            // support custom taxonomy
+			// support custom taxonomy
 			$support_custom_taxonomy = lasso_editor_get_option('support_custom_taxonomy', 'lasso_editor');
 			
 			if ($show_color) {
@@ -135,7 +135,7 @@ 
 			$tz_offset = get_UTC_offset();
 			$post_date = get_the_time('U', $postid);
 			$time = (time()+$tz_offset);
-            $delta = $time - $post_date;
+			$delta = $time - $post_date;
             
 			$strings = array(
 				'save' 				=> __('Save','lasso'),
@@ -179,7 +179,7 @@ 
 				
 				'catsPlaceholder'     => __('add categories...'),
 				'tagsPlaceholder'     => __('add tags...'),
-                'taxoPlaceholder'     => __('add taxonomy terms...'),
+				'taxoPlaceholder'     => __('add taxonomy terms...'),
 				
 				
 			);
@@ -191,11 +191,11 @@ 
 			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
 			
 			
-            if ($allow_change_date) {
-			    $permalink = get_site_url().'/?p='.$postid;
-            } else {
-                $permalink = get_permalink($postid);
-            }
+			if ($allow_change_date) {
+				$permalink = get_site_url().'/?p='.$postid;
+			} else {
+				$permalink = get_permalink($postid);
+			}
 			
 			// rest api
 			$rest_nonce = '';
@@ -215,17 +215,17 @@ 
 				}
 			}
             
-            //excerpt
-            $post_excerpt = "";
-            $post_excerpt = wp_strip_all_tags($post->post_excerpt,true);
+			//excerpt
+			$post_excerpt = "";
+			$post_excerpt = wp_strip_all_tags($post->post_excerpt,true);
             
-            //find if this is multi page. -1 if not
-            $multipage = self::is_multipage();
-            $post_content = "";
-            //pass post_content if we need to process multipage. In future we may need to pass this for other purposes
-            //if ($multipage != -1) {
-               $post_content = $post->post_content;
-            //}
+			//find if this is multi page. -1 if not
+			$multipage = self::is_multipage();
+			$post_content = "";
+			//pass post_content if we need to process multipage. In future we may need to pass this for other purposes
+			//if ($multipage != -1) {
+			   $post_content = $post->post_content;
+			//}
 			
 			//get custom taxonomy
 			$custom_taxonomies         = array_diff(get_object_taxonomies( get_post_type( $postid ), 'names' ), ['category','post_tag','post_format']);
@@ -238,8 +238,8 @@ 
 				$existing_taxo_arr[$taxonomy] = lasso_get_objects( $taxonomy );
 			}
             
-            $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')));
 
 
 			// localized objects
@@ -319,19 +319,19 @@ 
 				'customFields'      => $custom_fields,
 				'clickToInsert'     => ($insert_comp_ui =='click'),
 				'buttonOnEmptyP'     => ($insert_comp_ui =='mediumcom'),      // auto show a button to insert components on an empty paragraph      
-                'rtl'               => is_rtl(),				
+				'rtl'               => is_rtl(),				
 				'skipToEdit'        =>( $delta < 10 && $delta >=0 ), // if it's a new post, skip to edit mode
 				'linksEditable'    => $links_editable,
 				'supportPendingStatus' => !$no_pending_status,
 				'tableCode' => apply_filters( 'lasso_table_html_code','<table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table><p></p>'),
-                'hasGutenberg' => (function_exists( 'has_blocks' ) && has_blocks( $post->post_content)) || self::gutenberg_active(),//,
-                'multipages'=> $multipage,
-                'post_content'=>$post_content,
-                'post_excerpt'=>$post_excerpt,
-                'supCustTaxo' => $support_custom_taxonomy == 'on',
-                'oldWPimg'=> $use_old_wpimg =='on',
-                'useWPImgBlk'=> $use_wpimgblock,
-                'prefixHTTP'=> $link_prefix_http =='on'
+				'hasGutenberg' => (function_exists( 'has_blocks' ) && has_blocks( $post->post_content)) || self::gutenberg_active(),//,
+				'multipages'=> $multipage,
+				'post_content'=>$post_content,
+				'post_excerpt'=>$post_excerpt,
+				'supCustTaxo' => $support_custom_taxonomy == 'on',
+				'oldWPimg'=> $use_old_wpimg =='on',
+				'useWPImgBlk'=> $use_wpimgblock,
+				'prefixHTTP'=> $link_prefix_http =='on'
 			);
 
 
@@ -339,7 +339,7 @@ 
 			
 			
 			if (!$using_restapiv2) {
-               // enqueue REST API V1
+			   // enqueue REST API V1
 			   wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
 			   $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
 			   wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
@@ -355,7 +355,7 @@ 
 			if ($show_color) {
 				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api','iris'), LASSO_VERSION, true);
 			} else {
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
+				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
 			}
 			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
 
@@ -364,44 +364,44 @@ 
 
 	}
     
-    function gutenberg_active() {
+	function gutenberg_active() {
         
-        // Gutenberg plugin is installed and activated.
-        $gutenberg = ! ( false === has_filter( 'replace_editor', 'gutenberg_init' ) );
-
-        // Block editor since 5.0.
-        $block_editor = version_compare( $GLOBALS['wp_version'], '5.0-beta', '>' );
-
-        if ( ! $gutenberg && ! $block_editor ) {
-            return false;
-        }
-
-        if ( self::is_classic_editor_plugin_active() ) {
-            $editor_option       = get_option( 'classic-editor-replace' );
-            $block_editor_active = array( 'no-replace', 'block' );
-
-            return in_array( $editor_option, $block_editor_active, true );
-        }
-
-        return true;
-    }
-
-    /**
-     * Check if Classic Editor plugin is active.
-     *
-     * @return bool
-     */
-    function is_classic_editor_plugin_active() {
-        if ( ! function_exists( 'is_plugin_active' ) ) {
-            include_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-
-        if ( is_plugin_active( 'classic-editor/classic-editor.php' ) ) {
-            return true;
-        }
-
-        return false;
-    }
+		// Gutenberg plugin is installed and activated.
+		$gutenberg = ! ( false === has_filter( 'replace_editor', 'gutenberg_init' ) );
+
+		// Block editor since 5.0.
+		$block_editor = version_compare( $GLOBALS['wp_version'], '5.0-beta', '>' );
+
+		if ( ! $gutenberg && ! $block_editor ) {
+			return false;
+		}
+
+		if ( self::is_classic_editor_plugin_active() ) {
+			$editor_option       = get_option( 'classic-editor-replace' );
+			$block_editor_active = array( 'no-replace', 'block' );
+
+			return in_array( $editor_option, $block_editor_active, true );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if Classic Editor plugin is active.
+	 *
+	 * @return bool
+	 */
+	function is_classic_editor_plugin_active() {
+		if ( ! function_exists( 'is_plugin_active' ) ) {
+			include_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+
+		if ( is_plugin_active( 'classic-editor/classic-editor.php' ) ) {
+			return true;
+		}
+
+		return false;
+	}
 
 }
 

Spacing +116 added lines, -116 removed lines

@@ -10,9 +10,9 @@ 
 
 class assets {
 
-	public function __construct(){
+	public function __construct() {
 
-		add_action('wp_enqueue_scripts', array($this,'scripts'));
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
 	}
     
     function is_multipage()
@@ -22,16 +22,16 @@ 
         if (!$pos) return -1;
         
         global $wp;
-        $url =  home_url( $wp->request );
-        $index = intval(basename($url)) == 0 ? 0 : intval(basename($url))-1;
+        $url = home_url($wp->request);
+        $index = intval(basename($url)) == 0 ? 0 : intval(basename($url)) - 1;
         return $index;        
     }
 
-	public function scripts(){
+	public function scripts() {
 
 	
 		global $post;
-		if ( lasso_user_can('edit_posts') 
+		if (lasso_user_can('edit_posts') 
 		     /* uncomment this line to disable Editus on Gutenberg posts*/
              /* && !( function_exists( 'has_blocks' ) && has_blocks( $post->post_content)  && !is_home()) */              
              ) {
@@ -39,9 +39,9 @@ 
 			/**    Returns the time offset from UTC
 			*/
 			function get_UTC_offset() {
-				$timezone_string = get_option( 'timezone_string' );
-				if (empty( $timezone_string ) ) {
-					return get_option('gmt_offset')*3600;
+				$timezone_string = get_option('timezone_string');
+				if (empty($timezone_string)) {
+					return get_option('gmt_offset') * 3600;
 				}
 				
 				$origin_dtz = new \DateTimeZone($timezone_string);				
@@ -53,8 +53,8 @@ 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
             //don't load autocomplete if it's a stockholm theme
-			$themename  	= wp_get_theme()->get('Name');
-			if ($themename !='Stockholm' ) {
+			$themename = wp_get_theme()->get('Name');
+			if ($themename != 'Stockholm') {
 				wp_enqueue_script('jquery-ui-autocomplete');
 			}
 			wp_enqueue_script('jquery-ui-draggable');
@@ -67,30 +67,30 @@ 
 			// url for json api
 			$home_url = function_exists('json_get_url_prefix') ? json_get_url_prefix() : false;
 
-			$article_object 	= lasso_editor_get_option('article_class','lasso_editor');
+			$article_object 	= lasso_editor_get_option('article_class', 'lasso_editor');
 
-			$article_object 	= empty( $article_object ) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
+			$article_object 	= empty($article_object) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
 
-			$featImgClass 		= lasso_editor_get_option('featimg_class','lasso_editor');
-			if (empty( $featImgClass )) {
+			$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+			if (empty($featImgClass)) {
 				$featImgClass = lasso_get_supported_theme_featured_image_class();
 			}
-			$titleClass 		= lasso_editor_get_option('title_class','lasso_editor');
-			if (empty( $titleClass )) {
+			$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
+			if (empty($titleClass)) {
 				$titleClass = lasso_get_supported_theme_title_class();
 			}
-			$toolbar_headings  	= lasso_editor_get_option('toolbar_headings', 'lasso_editor');
-			$toolbar_headings_h4  	= lasso_editor_get_option('toolbar_headings_h4', 'lasso_editor');
+			$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+			$toolbar_headings_h4 = lasso_editor_get_option('toolbar_headings_h4', 'lasso_editor');
 			$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
-			$objectsNonEditable  	= lasso_editor_get_option('non_editable', 'lasso_editor');
+			$objectsNonEditable = lasso_editor_get_option('non_editable', 'lasso_editor');
 			$disableRESTSave = lasso_editor_get_option('save_using_rest_disabled', 'lasso_editor');
-			$save_to_post_disabled  = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
-			$edit_post_disabled  = lasso_editor_get_option( 'post_edit_disabled', 'lasso_editor' );
+			$save_to_post_disabled = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
+			$edit_post_disabled = lasso_editor_get_option('post_edit_disabled', 'lasso_editor');
 			
-			$bold_tag = lasso_editor_get_option('bold_tag', 'lasso_editor','b');
-			$i_tag = lasso_editor_get_option('i_tag', 'lasso_editor','i');
+			$bold_tag = lasso_editor_get_option('bold_tag', 'lasso_editor', 'b');
+			$i_tag = lasso_editor_get_option('i_tag', 'lasso_editor', 'i');
             
-            $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');
             
             $use_wpimgblock = false;
             
@@ -114,8 +114,8 @@ 
 			
 			if ($show_color) {
 				//color picker
-				wp_enqueue_style( 'wp-color-picker' );
-				wp_enqueue_script( 'iris', admin_url( 'js/iris.min.js' ), array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), false, 1 );
+				wp_enqueue_style('wp-color-picker');
+				wp_enqueue_script('iris', admin_url('js/iris.min.js'), array('jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch'), false, 1);
 			}
 			
 			// click to insert components, not drag and drop
@@ -127,54 +127,54 @@ 
 			
 			// custom fields
 			
-			$custom_fields = apply_filters( 'editus_custom_fields', null ); 
+			$custom_fields = apply_filters('editus_custom_fields', null); 
 
 
 			// post id reference
 			$postid 			= get_the_ID();
 			$tz_offset = get_UTC_offset();
 			$post_date = get_the_time('U', $postid);
-			$time = (time()+$tz_offset);
+			$time = (time() + $tz_offset);
             $delta = $time - $post_date;
             
 			$strings = array(
-				'save' 				=> __('Save','lasso'),
-				'selectText'	  	=> __('Please Select Text First.','lasso'),
-				'cancel' 			=> __('Cancel','lasso'),
-				'exiteditor' 		=> __('Exit Editor','lasso'),
-				'saving' 			=> __('Saving...','lasso'),
-				'saved'				=> __('Saved!','lasso'),
-				'adding' 			=> __('Adding...','lasso'),
-				'added'				=> __('Added!','lasso'),
-				'loading' 			=> __('Loading...','lasso'),
-				'loadMore'			=> __('Load More','lasso'),
-				'close'			=> __('Close','lasso'),
-				'noPostsFound'		=> __('No more posts found','lasso'),
-				'fetchFail'	    	=> __('Fetching failed.','lasso'),
-				'galleryCreated' 	=> __('Gallery Created!','lasso'),
-				'galleryUpdated' 	=> __('Gallery Updated!','lasso'),
-				'justWrite'			=> __('Just write...','lasso'),
-				'chooseImage'		=> __('Choose an image','lasso'),
-				'updateImage'		=> __('Update Image','lasso'),
-				'insertImage'		=> __('Insert Image','lasso'),
-				'selectImage'		=> __('Select Image','lasso'),
-				'removeFeatImg'     => __('Remove featured image?','lasso'),
-				'updateSelectedImg' => __('Update Selected Image','lasso'),
-				'chooseImages'		=> __('Choose images','lasso'),
-				'editImage'			=> __('Edit Image','lasso'),
-				'addImages'			=> __('Add Images','lasso'),
-				'addNewGallery'		=> __('Add New Gallery','lasso'),
-				'selectGallery'		=> __('Select Editus Gallery Image','lasso'),
-				'useSelectedImages' => __('Use Selected Images','lasso'),
-				'publishPost'		=> __('Publish Post?','lasso'),
-				'publishYes'		=> __('Yes, publish it!','lasso'),
-				'deletePost'		=> __('Trash Post?','lasso'),
-				'deleteYes'			=> __('Yes, trash it!','lasso'),
-				'warning'			=> __('Oh snap!','laso'),
-				'cancelText'		=> __('O.K. got it!','lasso'),
-				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.','lasso'),
+				'save' 				=> __('Save', 'lasso'),
+				'selectText'	  	=> __('Please Select Text First.', 'lasso'),
+				'cancel' 			=> __('Cancel', 'lasso'),
+				'exiteditor' 		=> __('Exit Editor', 'lasso'),
+				'saving' 			=> __('Saving...', 'lasso'),
+				'saved'				=> __('Saved!', 'lasso'),
+				'adding' 			=> __('Adding...', 'lasso'),
+				'added'				=> __('Added!', 'lasso'),
+				'loading' 			=> __('Loading...', 'lasso'),
+				'loadMore'			=> __('Load More', 'lasso'),
+				'close'			=> __('Close', 'lasso'),
+				'noPostsFound'		=> __('No more posts found', 'lasso'),
+				'fetchFail'	    	=> __('Fetching failed.', 'lasso'),
+				'galleryCreated' 	=> __('Gallery Created!', 'lasso'),
+				'galleryUpdated' 	=> __('Gallery Updated!', 'lasso'),
+				'justWrite'			=> __('Just write...', 'lasso'),
+				'chooseImage'		=> __('Choose an image', 'lasso'),
+				'updateImage'		=> __('Update Image', 'lasso'),
+				'insertImage'		=> __('Insert Image', 'lasso'),
+				'selectImage'		=> __('Select Image', 'lasso'),
+				'removeFeatImg'     => __('Remove featured image?', 'lasso'),
+				'updateSelectedImg' => __('Update Selected Image', 'lasso'),
+				'chooseImages'		=> __('Choose images', 'lasso'),
+				'editImage'			=> __('Edit Image', 'lasso'),
+				'addImages'			=> __('Add Images', 'lasso'),
+				'addNewGallery'		=> __('Add New Gallery', 'lasso'),
+				'selectGallery'		=> __('Select Editus Gallery Image', 'lasso'),
+				'useSelectedImages' => __('Use Selected Images', 'lasso'),
+				'publishPost'		=> __('Publish Post?', 'lasso'),
+				'publishYes'		=> __('Yes, publish it!', 'lasso'),
+				'deletePost'		=> __('Trash Post?', 'lasso'),
+				'deleteYes'			=> __('Yes, trash it!', 'lasso'),
+				'warning'			=> __('Oh snap!', 'laso'),
+				'cancelText'		=> __('O.K. got it!', 'lasso'),
+				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.', 'lasso'),
 				'missingConfirm'	=> __('Update Settings', 'lasso'),
-				'helperText'		=> __('one more letter','lasso'),
+				'helperText'		=> __('one more letter', 'lasso'),
 				'editingBackup'  	=> __('You are currently editing a backup copy of this post.'),
 				
 				'catsPlaceholder'     => __('add categories...'),
@@ -184,11 +184,11 @@ 
 				
 			);
 
-			$api_url = trailingslashit( home_url() ) . 'lasso-internal-api';
+			$api_url = trailingslashit(home_url()).'lasso-internal-api';
 
 			$gallery_class = new gallery();
 			$gallery_nonce_action = $gallery_class->nonce_action;
-			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
+			$gallery_nonce = wp_create_nonce($gallery_nonce_action);
 			
 			
             if ($allow_change_date) {
@@ -203,13 +203,13 @@ 
 			  
 			if (function_exists('rest_url')) {
 				//$rest_root = esc_url_raw( rest_url());
-				$rest_nonce = wp_create_nonce( 'wp_rest' );
-				$settings = array( 'root' => $rest_root, 'nonce' => $rest_nonce );
-				wp_enqueue_script( 'wp-api', '', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
-				wp_localize_script( 'wp-api', 'wpApiSettings', $settings );
-				wp_localize_script( 'wp-api', 'WP_API_Settings', $settings );
+				$rest_nonce = wp_create_nonce('wp_rest');
+				$settings = array('root' => $rest_root, 'nonce' => $rest_nonce);
+				wp_enqueue_script('wp-api', '', array('jquery', 'underscore', 'backbone'), LASSO_VERSION, true);
+				wp_localize_script('wp-api', 'wpApiSettings', $settings);
+				wp_localize_script('wp-api', 'WP_API_Settings', $settings);
 				
-				if ( class_exists( 'WP_REST_Controller' )) {
+				if (class_exists('WP_REST_Controller')) {
 					// we are using REST API V2
 					$using_restapiv2 = true;
 				}
@@ -217,7 +217,7 @@ 
             
             //excerpt
             $post_excerpt = "";
-            $post_excerpt = wp_strip_all_tags($post->post_excerpt,true);
+            $post_excerpt = wp_strip_all_tags($post->post_excerpt, true);
             
             //find if this is multi page. -1 if not
             $multipage = self::is_multipage();
@@ -228,24 +228,24 @@ 
             //}
 			
 			//get custom taxonomy
-			$custom_taxonomies         = array_diff(get_object_taxonomies( get_post_type( $postid ), 'names' ), ['category','post_tag','post_format']);
-			$post_taxo_arr    = array();
+			$custom_taxonomies         = array_diff(get_object_taxonomies(get_post_type($postid), 'names'), ['category', 'post_tag', 'post_format']);
+			$post_taxo_arr = array();
 			foreach ($custom_taxonomies as $taxonomy) {
-				$post_taxo_arr[$taxonomy] = lasso_get_post_objects( $postid, $taxonomy );
+				$post_taxo_arr[$taxonomy] = lasso_get_post_objects($postid, $taxonomy);
 			}
-			$existing_taxo_arr    = array();
+			$existing_taxo_arr = array();
 			foreach ($custom_taxonomies as $taxonomy) {
-				$existing_taxo_arr[$taxonomy] = lasso_get_objects( $taxonomy );
+				$existing_taxo_arr[$taxonomy] = lasso_get_objects($taxonomy);
 			}
             
-            $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')));
 
 
 			// localized objects
 			$objects = array(
-				'ajaxurl' 			=> esc_url( $api_url ),
-				'ajaxurl2' 			=> esc_url( admin_url( 'admin-ajax.php' )),
+				'ajaxurl' 			=> esc_url($api_url),
+				'ajaxurl2' 			=> esc_url(admin_url('admin-ajax.php')),
 				'siteUrl'           => site_url(),
 				'rest_root'         => $rest_root,
 				'rest_nonce'        => $rest_nonce,
@@ -254,13 +254,13 @@ 
 				'featImgClass'		=> $featImgClass,
 				'titleClass'		=> $titleClass,
 				'strings'			=> $strings,
-				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url( 'settings.php?page=lasso-editor' ) : admin_url( 'admin.php?page=lasso-editor-settings' ),
-				'post_status'		=> get_post_status( $postid ),
+				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url('settings.php?page=lasso-editor') : admin_url('admin.php?page=lasso-editor-settings'),
+				'post_status'		=> get_post_status($postid),
 				'postid'			=> $postid,
 				'permalink'			=> $permalink,
 				'edit_others_pages'	=> current_user_can('edit_others_pages') ? true : false,
 				'edit_others_posts'	=> current_user_can('edit_others_posts') ? true : false,
-				'userCanEdit'		=> current_user_can('edit_post', $postid ),
+				'userCanEdit'		=> current_user_can('edit_post', $postid),
 				'can_publish'		=> is_page() ? current_user_can('publish_pages') : current_user_can('publish_posts'),
 				//'can_publish_posts'	=> current_user_can('publish_posts'),
 				//'can_publish_pages'	=> current_user_can('publish_pages'),
@@ -299,39 +299,39 @@ 
 				'extCusTaxonomies' => $existing_taxo_arr,
 				'noResultsDiv'		=> lasso_editor_empty_results(),
 				'noRevisionsDiv'	=> lasso_editor_empty_results('revision'),
-				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider( $postid ) : false,
-				'mapLocations'		=> get_post_meta( $postid, 'ase_map_component_locations' ),
-				'mapStart'			=> get_post_meta( $postid, 'ase_map_component_start_point', true ),
-				'mapZoom'			=> get_post_meta( $postid, 'ase_map_component_zoom', true ),
+				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider($postid) : false,
+				'mapLocations'		=> get_post_meta($postid, 'ase_map_component_locations'),
+				'mapStart'			=> get_post_meta($postid, 'ase_map_component_start_point', true),
+				'mapZoom'			=> get_post_meta($postid, 'ase_map_component_zoom', true),
 				'revisionModal' 	=> lasso_editor_revision_modal(),
 				'isMobile'          => wp_is_mobile(),
-				'enableAutoSave'    => lasso_editor_get_option( 'enable_autosave', 'lasso_editor' ),
+				'enableAutoSave'    => lasso_editor_get_option('enable_autosave', 'lasso_editor'),
 				'showColor'         => $show_color,
 				'showAlignment'     => $show_align,
 				'showIgnoredItems'  => lasso_editor_get_option('show_ignored_items', 'lasso_editor'),
 				'restapi2'          => $using_restapiv2,
 				'saveusingrest'     => $using_restapiv2 && !$disableRESTSave,
-				'newObjectContent'  => '<p class="editus-firstp" placeholder="'. $new_post_text . '"></p>',
+				'newObjectContent'  => '<p class="editus-firstp" placeholder="'.$new_post_text.'"></p>',
 				'disableSavePost'   => $save_to_post_disabled,
 				'disableEditPost'   => $edit_post_disabled,
 				'boldTag'           => $bold_tag,
 				'iTag'           	=> $i_tag, 
 				'customFields'      => $custom_fields,
-				'clickToInsert'     => ($insert_comp_ui =='click'),
-				'buttonOnEmptyP'     => ($insert_comp_ui =='mediumcom'),      // auto show a button to insert components on an empty paragraph      
+				'clickToInsert'     => ($insert_comp_ui == 'click'),
+				'buttonOnEmptyP'     => ($insert_comp_ui == 'mediumcom'), // auto show a button to insert components on an empty paragraph      
                 'rtl'               => is_rtl(),				
-				'skipToEdit'        =>( $delta < 10 && $delta >=0 ), // if it's a new post, skip to edit mode
+				'skipToEdit'        =>($delta < 10 && $delta >= 0), // if it's a new post, skip to edit mode
 				'linksEditable'    => $links_editable,
 				'supportPendingStatus' => !$no_pending_status,
-				'tableCode' => apply_filters( 'lasso_table_html_code','<table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table><p></p>'),
-                'hasGutenberg' => (function_exists( 'has_blocks' ) && has_blocks( $post->post_content)) || self::gutenberg_active(),//,
+				'tableCode' => apply_filters('lasso_table_html_code', '<table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table><p></p>'),
+                'hasGutenberg' => (function_exists('has_blocks') && has_blocks($post->post_content)) || self::gutenberg_active(), //,
                 'multipages'=> $multipage,
                 'post_content'=>$post_content,
                 'post_excerpt'=>$post_excerpt,
                 'supCustTaxo' => $support_custom_taxonomy == 'on',
-                'oldWPimg'=> $use_old_wpimg =='on',
+                'oldWPimg'=> $use_old_wpimg == 'on',
                 'useWPImgBlk'=> $use_wpimgblock,
-                'prefixHTTP'=> $link_prefix_http =='on'
+                'prefixHTTP'=> $link_prefix_http == 'on'
 			);
 
 
@@ -340,9 +340,9 @@ 
 			
 			if (!$using_restapiv2) {
                // enqueue REST API V1
-			   wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
-			   $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
-			   wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
+			   wp_enqueue_script('wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array('jquery', 'underscore', 'backbone'), LASSO_VERSION, true);
+			   $settings = array('root' => home_url($home_url), 'nonce' => wp_create_nonce('wp_json'));
+			   wp_localize_script('wp-api-js', 'WP_API_Settings', $settings);
 			}
 			
 			if ($allow_change_date) {
@@ -351,13 +351,13 @@ 
 				wp_enqueue_style('jquery-ui');
 			}
 
-			$postfix = ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ) ? '' : '.min';
+			$postfix = (defined('SCRIPT_DEBUG') && true === SCRIPT_DEBUG) ? '' : '.min';
 			if ($show_color) {
-				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api','iris'), LASSO_VERSION, true);
+				wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api', 'iris'), LASSO_VERSION, true);
 			} else {
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
+			    wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
 			}
-			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
+			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects));
 
 
 		}
@@ -367,20 +367,20 @@ 
     function gutenberg_active() {
         
         // Gutenberg plugin is installed and activated.
-        $gutenberg = ! ( false === has_filter( 'replace_editor', 'gutenberg_init' ) );
+        $gutenberg = !(false === has_filter('replace_editor', 'gutenberg_init'));
 
         // Block editor since 5.0.
-        $block_editor = version_compare( $GLOBALS['wp_version'], '5.0-beta', '>' );
+        $block_editor = version_compare($GLOBALS['wp_version'], '5.0-beta', '>');
 
-        if ( ! $gutenberg && ! $block_editor ) {
+        if (!$gutenberg && !$block_editor) {
             return false;
         }
 
-        if ( self::is_classic_editor_plugin_active() ) {
-            $editor_option       = get_option( 'classic-editor-replace' );
-            $block_editor_active = array( 'no-replace', 'block' );
+        if (self::is_classic_editor_plugin_active()) {
+            $editor_option       = get_option('classic-editor-replace');
+            $block_editor_active = array('no-replace', 'block');
 
-            return in_array( $editor_option, $block_editor_active, true );
+            return in_array($editor_option, $block_editor_active, true);
         }
 
         return true;
@@ -392,11 +392,11 @@ 
      * @return bool
      */
     function is_classic_editor_plugin_active() {
-        if ( ! function_exists( 'is_plugin_active' ) ) {
-            include_once ABSPATH . 'wp-admin/includes/plugin.php';
+        if (!function_exists('is_plugin_active')) {
+            include_once ABSPATH.'wp-admin/includes/plugin.php';
         }
 
-        if ( is_plugin_active( 'classic-editor/classic-editor.php' ) ) {
+        if (is_plugin_active('classic-editor/classic-editor.php')) {
             return true;
         }
 

admin/includes/menus/settings.php

Indentation +8 added lines, -8 removed lines

@@ -98,8 +98,8 @@ 
 		if ( !is_user_logged_in() )
 			return;
         
-        // check for lasso story engine and add a class doniting this
-        $ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
+		// check for lasso story engine and add a class doniting this
+		$ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
 
 		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
 		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );
@@ -110,7 +110,7 @@ 
 		$edit_post_disabled  = lasso_editor_get_option( 'post_edit_disabled', 'lasso_editor' );
 		$post_settings_disabled = lasso_editor_get_option( 'post_settings_disabled', 'lasso_editor' );
 		$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' );
 		$allow_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
 		$shortcodify_disabled  = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
 		$enable_autosave  = lasso_editor_get_option( 'enable_autosave', 'lasso_editor' );
@@ -135,7 +135,7 @@ 
 		$bold_tag = lasso_editor_get_option( 'bold_tag', 'lasso_editor',  "b");
 		$i_tag = lasso_editor_get_option( 'i_tag', 'lasso_editor',  "i");
         
-        $add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
+		$add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
 		
 		// do we support pending status
 		$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');
@@ -147,14 +147,14 @@ 
 			$insert_comp_ui = 'drag';
 		}
         
-        $link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor');
+		$link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor');
         
-        $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');
+		$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');
 		
 		$support_custom_taxonomy   = lasso_editor_get_option( 'support_custom_taxonomy', 'lasso_editor' );
         
-        $new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );
+		$new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );
 
 ?>
 		<div class="wrap">

Spacing +180 added lines, -180 removed lines

@@ -9,9 +9,9 @@ 
 
 	function __construct() {
 
-		add_action( 'admin_menu',     array( $this, 'menu' ) );
-		add_action( 'network_admin_menu',   array( $this, 'menu' ) );
-		add_action( 'wp_ajax_lasso-editor-settings', array( $this, 'process_settings' ) );
+		add_action('admin_menu', array($this, 'menu'));
+		add_action('network_admin_menu', array($this, 'menu'));
+		add_action('wp_ajax_lasso-editor-settings', array($this, 'process_settings'));
 
 	}
 
@@ -23,7 +23,7 @@ 
 	function menu() {
 
 		// CHANGED Removed condition.
-		add_submenu_page( 'lasso-editor', __( 'Settings', 'lasso' ), __( 'Settings', 'lasso' ), 'manage_options', 'lasso-editor-settings', array( $this, 'settings' ) );
+		add_submenu_page('lasso-editor', __('Settings', 'lasso'), __('Settings', 'lasso'), 'manage_options', 'lasso-editor-settings', array($this, 'settings'));
 
 	}
 
@@ -45,26 +45,26 @@ 
 	function process_settings() {
 
 		// bail out if current user isn't and administrator and they are not logged in
-		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() )
+		if (!current_user_can('manage_options') || !is_user_logged_in())
 			return;
 
-		if ( isset( $_POST['action'] ) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer( 'nonce', 'lasso_editor_settings' ) ) {
+		if (isset($_POST['action']) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer('nonce', 'lasso_editor_settings')) {
 
-			$options = isset( $_POST['lasso_editor'] ) ? $_POST['lasso_editor'] : false;
+			$options = isset($_POST['lasso_editor']) ? $_POST['lasso_editor'] : false;
 			
 			$arr = $options['allowed_post_types'];
-			$options = array_map( 'sanitize_text_field', $options );
-			$options['allowed_post_types'] = array_keys( $arr);
+			$options = array_map('sanitize_text_field', $options);
+			$options['allowed_post_types'] = array_keys($arr);
 
 			
 
-			if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+			if (function_exists('is_multisite') && is_multisite()) {
 
-				update_site_option( 'lasso_editor', $options );
+				update_site_option('lasso_editor', $options);
 
 			} else {
 
-				update_option( 'lasso_editor', $options );
+				update_option('lasso_editor', $options);
 			}
 
 			wp_send_json_success();
@@ -80,7 +80,7 @@ 
 	}
 	
 	function create_section_for_color_picker($id, $title, $defvalue) { 
-		$color_value = lasso_editor_get_option( $id, 'lasso_editor',$defvalue );
+		$color_value = lasso_editor_get_option($id, 'lasso_editor', $defvalue);
 	 
 		echo '<div lass="lasso-editor-settings--option-inner">'."\n";
 		echo '<label>'.$title.'</label>';
@@ -95,45 +95,45 @@ 
 	 */
 	function lasso_editor_settings_form() {
 
-		if ( !is_user_logged_in() )
+		if (!is_user_logged_in())
 			return;
         
         // check for lasso story engine and add a class doniting this
-        $ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
-
-		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
-		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );
-		$titleClass    = lasso_editor_get_option( 'title_class', 'lasso_editor' );
-
-		$post_new_disabled   = lasso_editor_get_option( 'post_adding_disabled', 'lasso_editor' );
-		$save_to_post_disabled  = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
-		$edit_post_disabled  = lasso_editor_get_option( 'post_edit_disabled', 'lasso_editor' );
-		$post_settings_disabled = lasso_editor_get_option( 'post_settings_disabled', 'lasso_editor' );
-		$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_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
-		$shortcodify_disabled  = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
-		$enable_autosave  = lasso_editor_get_option( 'enable_autosave', 'lasso_editor' );
-
-		$use_old_ui      = lasso_editor_get_option( 'use_old_ui', 'lasso_editor' );
-		$toolbar_headings      = lasso_editor_get_option( 'toolbar_headings', 'lasso_editor' );
-		$toolbar_headings_h4      = lasso_editor_get_option( 'toolbar_headings_h4', 'lasso_editor' );
-		$toolbar_list      = lasso_editor_get_option( 'toolbar_list', 'lasso_editor' );
-		$toolbar_show_color      = lasso_editor_get_option( 'toolbar_show_color', 'lasso_editor' );
-		$toolbar_show_alignment  = lasso_editor_get_option( 'toolbar_show_alignment', 'lasso_editor' );
+        $ase_status = class_exists('Aesop_Core') || defined('LASSO_CUSTOM') ? 'ase-active' : 'ase-not-active';
+
+		$article_object   = lasso_editor_get_option('article_class', 'lasso_editor');
+		$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+		$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
+
+		$post_new_disabled   = lasso_editor_get_option('post_adding_disabled', 'lasso_editor');
+		$save_to_post_disabled  = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
+		$edit_post_disabled  = lasso_editor_get_option('post_edit_disabled', 'lasso_editor');
+		$post_settings_disabled = lasso_editor_get_option('post_settings_disabled', 'lasso_editor');
+		$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_new_category = lasso_editor_get_option('allow_new_category', 'lasso_editor');
+		$shortcodify_disabled = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
+		$enable_autosave = lasso_editor_get_option('enable_autosave', 'lasso_editor');
+
+		$use_old_ui = lasso_editor_get_option('use_old_ui', 'lasso_editor');
+		$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+		$toolbar_headings_h4 = lasso_editor_get_option('toolbar_headings_h4', 'lasso_editor');
+		$toolbar_list = lasso_editor_get_option('toolbar_list', 'lasso_editor');
+		$toolbar_show_color      = lasso_editor_get_option('toolbar_show_color', 'lasso_editor');
+		$toolbar_show_alignment  = lasso_editor_get_option('toolbar_show_alignment', 'lasso_editor');
 		
-		$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
-		$objectsNonEditable  	= lasso_editor_get_option('non_editable', 'lasso_editor');
+		$objectsNoSave = lasso_editor_get_option('dont_save', 'lasso_editor');
+		$objectsNonEditable = lasso_editor_get_option('non_editable', 'lasso_editor');
 		$disable_tour = lasso_editor_get_option('disable_tour', 'lasso_editor');
 		$show_ignored_items = lasso_editor_get_option('show_ignored_items', 'lasso_editor');
 		$save_using_rest_disabled = lasso_editor_get_option('save_using_rest_disabled', 'lasso_editor');
 		
-		$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);
+		$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);
 		
 		$links_editable = lasso_editor_get_option('links_editable', 'lasso_editor', false);
-		$bold_tag = lasso_editor_get_option( 'bold_tag', 'lasso_editor',  "b");
-		$i_tag = lasso_editor_get_option( 'i_tag', 'lasso_editor',  "i");
+		$bold_tag = lasso_editor_get_option('bold_tag', 'lasso_editor', "b");
+		$i_tag = lasso_editor_get_option('i_tag', 'lasso_editor', "i");
         
         $add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
 		
@@ -149,41 +149,41 @@ 
         
         $link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor');
         
-        $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');
+        $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');
 		
-		$support_custom_taxonomy   = lasso_editor_get_option( 'support_custom_taxonomy', 'lasso_editor' );
+		$support_custom_taxonomy = lasso_editor_get_option('support_custom_taxonomy', 'lasso_editor');
         
-        $new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );
+        $new_post_text = lasso_editor_get_option('new_post_text', 'lasso_editor');
 
 ?>
 		<div class="wrap">
         
-	    	<h2><?php _e( 'Editus Settings', 'lasso' );?></h2>
+	    	<h2><?php _e('Editus Settings', 'lasso'); ?></h2>
             
 			<form id="lasso-editor-settings-form" class="lasso--form-settings" method="post" enctype="multipart/form-data">
 
-				<?php do_action('lasso_settings_before');?>
+				<?php do_action('lasso_settings_before'); ?>
 				
 				
 				
-				<h3><?php _e( 'Enable for:', 'lasso' );?></h3>
+				<h3><?php _e('Enable for:', 'lasso'); ?></h3>
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
 						
-						<span class="lasso--setting-description"><?php _e( 'Enable Editus for the following post types.', 'lasso' );?></span>
+						<span class="lasso--setting-description"><?php _e('Enable Editus for the following post types.', 'lasso'); ?></span>
 						<?php
 						$args = array(
 							'public'   => true
 						);
 						 
-						$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
-						$post_types = get_post_types( $args, 'objects' );
+						$allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
+						$post_types = get_post_types($args, 'objects');
 						 
-						foreach ( $post_types  as $post_type ) {
+						foreach ($post_types  as $post_type) {
 						   if ($post_type->name == 'attachment') continue;
-						   $checked ="";
-						   if (  in_array( $post_type->name, $allowed_post_types )  ) {
+						   $checked = "";
+						   if (in_array($post_type->name, $allowed_post_types)) {
 								$checked = 'checked="checked"';
 						   }
 						   echo '<label><input type="checkbox" '.$checked.' name="lasso_editor[allowed_post_types]['.$post_type->name.']" id="lasso_editor[allowed_post_types]['.$post_type->name.']" >'.$post_type->name.'</label>';
@@ -193,126 +193,126 @@ 
 				</div>
 				
 
-				<h3><?php _e( 'Internal Settings', 'lasso' );?></h3>
+				<h3><?php _e('Internal Settings', 'lasso'); ?></h3>
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<label><?php _e( 'Article Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr( $article_object );?>" placeholder=".entry-content">
+						<label><?php _e('Article Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr($article_object); ?>" placeholder=".entry-content">
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<label><?php _e( 'Featured Image Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr( $featImgClass );?>" placeholder=".entry-content">
+						<label><?php _e('Featured Image Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr($featImgClass); ?>" placeholder=".entry-content">
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<label><?php _e( 'Article Title Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr( $titleClass );?>" placeholder=".entry-content">
+						<label><?php _e('Article Title Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr($titleClass); ?>" placeholder=".entry-content">
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<label><?php _e( 'Ignored Items to Save', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso' );?></span>
-						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr( $objectsNoSave );?></textarea>
+						<label><?php _e('Ignored Items to Save', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso'); ?></span>
+						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr($objectsNoSave); ?></textarea>
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<label><?php _e( 'Read Only Items', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'If your post has items that should not be editable, list the css class names (comma separated, including the dot) of those items.', 'lasso' );?></span>
-						<textarea name="lasso_editor[non_editable]" id="lasso_editor[non_editable]" placeholder=".classname, .another-class"><?php echo esc_attr( $objectsNonEditable );?></textarea>
+						<label><?php _e('Read Only Items', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('If your post has items that should not be editable, list the css class names (comma separated, including the dot) of those items.', 'lasso'); ?></span>
+						<textarea name="lasso_editor[non_editable]" id="lasso_editor[non_editable]" placeholder=".classname, .another-class"><?php echo esc_attr($objectsNonEditable); ?></textarea>
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" >
-						<input type="checkbox" class="checkbox" name="lasso_editor[show_ignored_items]" id="lasso_editor[show_ignored_items]" <?php echo checked( $show_ignored_items, 'on' );?> >
-						<label for="lasso_editor[show_ignored_items]"> <?php _e( 'Show Ignored Items', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'By default the ignored items are hidden. Check this to show ignored items while keeping them uneditable.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[show_ignored_items]" id="lasso_editor[show_ignored_items]" <?php echo checked($show_ignored_items, 'on'); ?> >
+						<label for="lasso_editor[show_ignored_items]"> <?php _e('Show Ignored Items', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('By default the ignored items are hidden. Check this to show ignored items while keeping them uneditable.', 'lasso'); ?></span>
 					</div>
 				</div>
 
-				<h3><?php _e( 'Editor UI', 'lasso' );?></h3>
+				<h3><?php _e('Editor UI', 'lasso'); ?></h3>
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="checkbox" class="checkbox" name="lasso_editor[use_old_ui]" id="lasso_editor_use_old_ui" <?php echo checked( $use_old_ui, 'on' );?> >
-						<label for="lasso_editor[use_old_ui]"><?php _e( 'Use the Old Toolbar', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Use this option to disable the new color options and use the pre-1.0 toolbar.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[use_old_ui]" id="lasso_editor_use_old_ui" <?php echo checked($use_old_ui, 'on'); ?> >
+						<label for="lasso_editor[use_old_ui]"><?php _e('Use the Old Toolbar', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Use this option to disable the new color options and use the pre-1.0 toolbar.', 'lasso'); ?></span>
 					</div>
 				    <div id="lasso-editor-settings--colors">
 					<?php
-					self::create_section_for_color_picker('button-color1', _e( 'Editor Bar Color Top', 'lasso' ), '#0000ff');
-					self::create_section_for_color_picker('button-color2', _e( 'Editor Bar Color Bottom', 'lasso' ), '#000030');
-					self::create_section_for_color_picker('dialog-color', _e( 'Dialog Color', 'lasso' ), '#000055');
-					self::create_section_for_color_picker('text-color', _e( 'Icon/Text Color', 'lasso' ), '#ffffff');
+					self::create_section_for_color_picker('button-color1', _e('Editor Bar Color Top', 'lasso'), '#0000ff');
+					self::create_section_for_color_picker('button-color2', _e('Editor Bar Color Bottom', 'lasso'), '#000030');
+					self::create_section_for_color_picker('dialog-color', _e('Dialog Color', 'lasso'), '#000055');
+					self::create_section_for_color_picker('text-color', _e('Icon/Text Color', 'lasso'), '#ffffff');
 					?>
-					<button type="button" id="lasso-editor-settings--default-colors" ><?php _e( 'Default Colors', 'lasso' );?></button>
+					<button type="button" id="lasso-editor-settings--default-colors" ><?php _e('Default Colors', 'lasso'); ?></button>
 				    <div style="height:50px;"></div>
 					</div>
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked( $toolbar_headings, 'on' );?> >
-						<label for="lasso_editor[toolbar_headings]"><?php _e( 'Enable H2 and H3 Buttons', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Show the buttons to set H2 and H3 settings.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked($toolbar_headings, 'on'); ?> >
+						<label for="lasso_editor[toolbar_headings]"><?php _e('Enable H2 and H3 Buttons', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Show the buttons to set H2 and H3 settings.', 'lasso'); ?></span>
 
 					</div>
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings_h4]" id="lasso_editor[toolbar_headings_h4]" <?php echo checked( $toolbar_headings_h4, 'on' );?> >
-						<label for="lasso_editor[toolbar_headings_h4]"><?php _e( 'Enable H4/H5/H6 Buttons', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Show the buttons to set H4/H5/H6 settings.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings_h4]" id="lasso_editor[toolbar_headings_h4]" <?php echo checked($toolbar_headings_h4, 'on'); ?> >
+						<label for="lasso_editor[toolbar_headings_h4]"><?php _e('Enable H4/H5/H6 Buttons', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Show the buttons to set H4/H5/H6 settings.', 'lasso'); ?></span>
 
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_list]" id="lasso_editor[toolbar_list]" <?php echo checked( $toolbar_list, 'on' );?> >
-						<label for="lasso_editor[toolbar_list]"><?php _e( 'Enable OL/UL Buttons', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Show the buttons to create Ordered and Unordered Lists from text selection.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_list]" id="lasso_editor[toolbar_list]" <?php echo checked($toolbar_list, 'on'); ?> >
+						<label for="lasso_editor[toolbar_list]"><?php _e('Enable OL/UL Buttons', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Show the buttons to create Ordered and Unordered Lists from text selection.', 'lasso'); ?></span>
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_show_color]" id="lasso_editor[toolbar_show_color]" <?php echo checked( $toolbar_show_color, 'on' );?> >
-						<label for="lasso_editor[toolbar_show_color]"><?php _e( 'Enable Text Color Buttons', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Show the buttons to set text colors.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_show_color]" id="lasso_editor[toolbar_show_color]" <?php echo checked($toolbar_show_color, 'on'); ?> >
+						<label for="lasso_editor[toolbar_show_color]"><?php _e('Enable Text Color Buttons', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Show the buttons to set text colors.', 'lasso'); ?></span>
 
 					</div>
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_show_alignment]" id="lasso_editor[toolbar_show_alignment]" <?php echo checked( $toolbar_show_alignment, 'on' );?> >
-						<label for="lasso_editor[toolbar_show_alignment]"><?php _e( 'Enable Text Align Buttons', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Show the buttons to set text alignment.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_show_alignment]" id="lasso_editor[toolbar_show_alignment]" <?php echo checked($toolbar_show_alignment, 'on'); ?> >
+						<label for="lasso_editor[toolbar_show_alignment]"><?php _e('Enable Text Align Buttons', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Show the buttons to set text alignment.', 'lasso'); ?></span>
 
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="checkbox" class="checkbox" name="lasso_editor[links_editable]" id="lasso_editor[links_editable]" <?php echo checked( $links_editable, 'on' );?> >
-						<label for="lasso_editor[links_editable]"><?php _e( 'Make links editable under the Editing Mode', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Make links editable under the Editing Mode. Turning this on will make the links non-clickable while editing.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[links_editable]" id="lasso_editor[links_editable]" <?php echo checked($links_editable, 'on'); ?> >
+						<label for="lasso_editor[links_editable]"><?php _e('Make links editable under the Editing Mode', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Make links editable under the Editing Mode. Turning this on will make the links non-clickable while editing.', 'lasso'); ?></span>
 
 					</div>
 					<div class="lasso-editor-settings--option-inner">
-					    <label for="lasso_editor[insert_comp_ui]"> <?php _e( 'Insert Component UI', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'UI mechanism to insert components', 'lasso' );?></span>
+					    <label for="lasso_editor[insert_comp_ui]"> <?php _e('Insert Component UI', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('UI mechanism to insert components', 'lasso'); ?></span>
 						<div class="lasso-editor-settings--option-inner" style="border:none;">
-					       <input type="radio" name="lasso_editor[insert_comp_ui]" value='drag' <?php echo checked( $insert_comp_ui, 'drag' );?>> <?php _e( 'Drag and Drop', 'lasso' );?>
+					       <input type="radio" name="lasso_editor[insert_comp_ui]" value='drag' <?php echo checked($insert_comp_ui, 'drag'); ?>> <?php _e('Drag and Drop', 'lasso'); ?>
 						</div>
 						<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="radio" name="lasso_editor[insert_comp_ui]" value="click" <?php echo checked( $insert_comp_ui, 'click' );?>> <?php _e( 'Click', 'lasso' );?>
+						<input type="radio" name="lasso_editor[insert_comp_ui]" value="click" <?php echo checked($insert_comp_ui, 'click'); ?>> <?php _e('Click', 'lasso'); ?>
 						</div>
 						<div class="lasso-editor-settings--option-inner" style="border:none;">
-						<input type="radio" name="lasso_editor[insert_comp_ui]" value="mediumcom" <?php echo checked( $insert_comp_ui, 'mediumcom' );?>> <?php _e( 'Auto Button on Empty Paragraph. medium.com-like UI.', 'lasso' );?>
+						<input type="radio" name="lasso_editor[insert_comp_ui]" value="mediumcom" <?php echo checked($insert_comp_ui, 'mediumcom'); ?>> <?php _e('Auto Button on Empty Paragraph. medium.com-like UI.', 'lasso'); ?>
 						</div>
 					</div>
                     
 				</div>
 				
-				<h3><?php _e( 'Component', 'lasso' );?></h3>
+				<h3><?php _e('Component', 'lasso'); ?></h3>
                 <div class="lasso-editor-settings--option-wrap" style="border:none;" >
                     <div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[add_table]" id="lasso_editor[add_table]" <?php echo checked( $add_table, 'on' );?> >
-						<label for="lasso_editor[add_table]"><?php _e( 'Additional Component: Table', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Allow user to add and edit tables.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[add_table]" id="lasso_editor[add_table]" <?php echo checked($add_table, 'on'); ?> >
+						<label for="lasso_editor[add_table]"><?php _e('Additional Component: Table', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Allow user to add and edit tables.', 'lasso'); ?></span>
 
 					</div>
                 
-                <?php if ( 'ase-active' != $ase_status ) { ?>
+                <?php if ('ase-active' != $ase_status) { ?>
                     <script>
                     $(document).ready(function(){
                         $("#lasso_editor\\[use_old_wpimg\\]").on('change', function(){                        
@@ -338,143 +338,143 @@ 
                     </script>
                 
                     <div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[use_old_wpimg]" id="lasso_editor[use_old_wpimg]" <?php echo checked( $use_old_wpimg, 'on' );?> >
-						<label for="lasso_editor[use_old_wpimg]"><?php _e( 'Use Simple Image', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Use Simple Image Component without Extra Options.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[use_old_wpimg]" id="lasso_editor[use_old_wpimg]" <?php echo checked($use_old_wpimg, 'on'); ?> >
+						<label for="lasso_editor[use_old_wpimg]"><?php _e('Use Simple Image', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Use Simple Image Component without Extra Options.', 'lasso'); ?></span>
 
 					</div>
                 
                 
                     <div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[use_wp_block_image]" id="lasso_editor[use_wp_block_image]" <?php echo checked( $use_wp_block_image, 'on' );?> >
-						<label for="lasso_editor[use_wp_block_image]"><?php _e( 'Use WP Image Block', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Use WP Image Block as the image component. Gutenberg Block Editor needs to be enabled.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[use_wp_block_image]" id="lasso_editor[use_wp_block_image]" <?php echo checked($use_wp_block_image, 'on'); ?> >
+						<label for="lasso_editor[use_wp_block_image]"><?php _e('Use WP Image Block', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Use WP Image Block as the image component. Gutenberg Block Editor needs to be enabled.', 'lasso'); ?></span>
 
 					</div>
                 <?php }?>
                 </div>
 				
 
-				<h3><?php _e( 'Post Settings UI', 'lasso' );?></h3>
+				<h3><?php _e('Post Settings UI', 'lasso'); ?></h3>
 				<div class="lasso-editor-settings--option-wrap"  >
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked( $post_settings_disabled, 'on' );?> >
-						<label for="lasso_editor[post_settings_disabled]"> <?php _e( 'Disable Post Settings', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this to disable users from being able to edit post settings from the front-end.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked($post_settings_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_settings_disabled]"> <?php _e('Disable Post Settings', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this to disable users from being able to edit post settings from the front-end.', 'lasso'); ?></span>
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[allow_change_date]" id="lasso_editor[allow_change_date]" <?php echo checked( $allow_change_date, 'on' );?> >
-						<label for="lasso_editor[allow_change_date]"> <?php _e( 'Allow Changing Post Date', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Add the date selector to change the post\'s date to the Post Setting dialog', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[allow_change_date]" id="lasso_editor[allow_change_date]" <?php echo checked($allow_change_date, 'on'); ?> >
+						<label for="lasso_editor[allow_change_date]"> <?php _e('Allow Changing Post Date', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Add the date selector to change the post\'s date to the Post Setting dialog', 'lasso'); ?></span>
 					</div>
                     
                     <div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[allow_edit_excerpt]" id="lasso_editor[allow_edit_excerpt]" <?php echo checked( $allow_edit_excerpt, 'on' );?> >
-						<label for="lasso_editor[allow_edit_excerpt]"> <?php _e( 'Allow Editing Excerpt', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Allow the post\'s excerpt to be edited in the Post Setting dialog', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[allow_edit_excerpt]" id="lasso_editor[allow_edit_excerpt]" <?php echo checked($allow_edit_excerpt, 'on'); ?> >
+						<label for="lasso_editor[allow_edit_excerpt]"> <?php _e('Allow Editing Excerpt', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Allow the post\'s excerpt to be edited in the Post Setting dialog', 'lasso'); ?></span>
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[allow_new_category]" id="lasso_editor[allow_new_category]" <?php echo checked( $allow_new_category, 'on' );?> >
-						<label for="lasso_editor[allow_new_category]"> <?php _e( 'Allow Adding New Category', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Add the user to create new, previously non-existing categories for posts.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[allow_new_category]" id="lasso_editor[allow_new_category]" <?php echo checked($allow_new_category, 'on'); ?> >
+						<label for="lasso_editor[allow_new_category]"> <?php _e('Allow Adding New Category', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Add the user to create new, previously non-existing categories for posts.', 'lasso'); ?></span>
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[no_pending_status]" id="lasso_editor[no_pending_status]" <?php echo checked( $no_pending_status, 'on' );?> >
-						<label for="lasso_editor[no_pending_status]"> <?php _e( 'Do Not Allow "Pending" Status', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Remove the Option to Set the Status to Pending.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[no_pending_status]" id="lasso_editor[no_pending_status]" <?php echo checked($no_pending_status, 'on'); ?> >
+						<label for="lasso_editor[no_pending_status]"> <?php _e('Do Not Allow "Pending" Status', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Remove the Option to Set the Status to Pending.', 'lasso'); ?></span>
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[no_url_setting]" id="lasso_editor[no_slug_setting]" <?php echo checked( $no_url_setting, 'on' );?> >
-						<label for="lasso_editor[no_url_setting]"> <?php _e( 'Remove POST URL Option', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Remove the Option to Set the URL for the Post.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[no_url_setting]" id="lasso_editor[no_slug_setting]" <?php echo checked($no_url_setting, 'on'); ?> >
+						<label for="lasso_editor[no_url_setting]"> <?php _e('Remove POST URL Option', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Remove the Option to Set the URL for the Post.', 'lasso'); ?></span>
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked( $post_new_disabled, 'on' );?> >
-						<label for="lasso_editor[post_adding_disabled]"><?php _e( 'Disable Post Adding', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable users from being able to add new posts from the front-end.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked($post_new_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_adding_disabled]"><?php _e('Disable Post Adding', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to disable users from being able to add new posts from the front-end.', 'lasso'); ?></span>
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" >
-						<input type="checkbox" class="checkbox" name="lasso_editor[support_custom_taxonomy]" id="lasso_editor[support_custom_taxonomy]" <?php echo checked( $support_custom_taxonomy, 'on' );?> >
-						<label for="lasso_editor[support_custom_taxonomy]"><?php _e( 'Support Custom Taxonomy', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Allow editing custom taxonomies.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[support_custom_taxonomy]" id="lasso_editor[support_custom_taxonomy]" <?php echo checked($support_custom_taxonomy, 'on'); ?> >
+						<label for="lasso_editor[support_custom_taxonomy]"><?php _e('Support Custom Taxonomy', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Allow editing custom taxonomies.', 'lasso'); ?></span>
 					</div>
 					
 
 				</div>
 				
-				<h3><?php _e( 'Misc', 'lasso' );?></h3>
+				<h3><?php _e('Misc', 'lasso'); ?></h3>
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[disable_tour]" id="lasso_editor[disable_tour]" <?php echo checked( $disable_tour, 'on' );?> >
-						<label for="lasso_editor[disable_tour]"> <?php _e( 'Do Not Show Tour Dialog', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable the tour dialog box for all users.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[disable_tour]" id="lasso_editor[disable_tour]" <?php echo checked($disable_tour, 'on'); ?> >
+						<label for="lasso_editor[disable_tour]"> <?php _e('Do Not Show Tour Dialog', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to disable the tour dialog box for all users.', 'lasso'); ?></span>
 					</div>
                     
                     <div class="lasso-editor-settings--option-inner" style="border:none;">
-						<label><?php _e( 'Placeholder Text for New Post', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Placeholder text to be displayed when a new post is created.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[new_post_text]" id="lasso_editor[new_post_text]" value="<?php echo esc_attr( $new_post_text );?>" placeholder="<?php $def = wp_strip_all_tags(apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso')));echo $def;?>", true)>
+						<label><?php _e('Placeholder Text for New Post', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Placeholder text to be displayed when a new post is created.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[new_post_text]" id="lasso_editor[new_post_text]" value="<?php echo esc_attr($new_post_text); ?>" placeholder="<?php $def = wp_strip_all_tags(apply_filters('lasso_new_object_content', __('Once upon a time...', 'lasso'))); echo $def; ?>", true)>
 					</div>
 
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-					    <label for="lasso_editor[bold_tag]"> <?php _e( '"Bold" Tag', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Choose the HTML tag used for the "Bold" style.', 'lasso' );?></span>
-					    <input type="radio" name="lasso_editor[bold_tag]" value='b' <?php echo checked( $bold_tag, 'b' );?>> b
-						<input type="radio" name="lasso_editor[bold_tag]" value="strong" <?php echo checked( $bold_tag, 'strong' );?>> strong
+					    <label for="lasso_editor[bold_tag]"> <?php _e('"Bold" Tag', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Choose the HTML tag used for the "Bold" style.', 'lasso'); ?></span>
+					    <input type="radio" name="lasso_editor[bold_tag]" value='b' <?php echo checked($bold_tag, 'b'); ?>> b
+						<input type="radio" name="lasso_editor[bold_tag]" value="strong" <?php echo checked($bold_tag, 'strong'); ?>> strong
 					</div>
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-					    <label for="lasso_editor[i_tag]"> <?php _e( '"Italic" Tag', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Choose the HTML tag used for the "Italic" style.', 'lasso' );?></span>
-					    <input type="radio" name="lasso_editor[i_tag]" value='i' <?php echo checked( $i_tag, 'i' );?>> i
-						<input type="radio" name="lasso_editor[i_tag]" value="em" <?php echo checked( $i_tag, 'em' );?>> em
+					    <label for="lasso_editor[i_tag]"> <?php _e('"Italic" Tag', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Choose the HTML tag used for the "Italic" style.', 'lasso'); ?></span>
+					    <input type="radio" name="lasso_editor[i_tag]" value='i' <?php echo checked($i_tag, 'i'); ?>> i
+						<input type="radio" name="lasso_editor[i_tag]" value="em" <?php echo checked($i_tag, 'em'); ?>> em
 					</div>
                     <div class="lasso-editor-settings--option-inner" >
-						<input type="checkbox" class="checkbox" name="lasso_editor[link_prefix_http]" id="lasso_editor[link_prefix_http]" <?php echo checked( $link_prefix_http, 'on' );?> >
-						<label for="lasso_editor[link_prefix_http]"><?php _e( 'Auto Prefix HTTP to links', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'When user adds a hyperlink, automatically add http:// if the user does not specify it explicitly.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[link_prefix_http]" id="lasso_editor[link_prefix_http]" <?php echo checked($link_prefix_http, 'on'); ?> >
+						<label for="lasso_editor[link_prefix_http]"><?php _e('Auto Prefix HTTP to links', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('When user adds a hyperlink, automatically add http:// if the user does not specify it explicitly.', 'lasso'); ?></span>
 					</div>
 				</div>
 
-				<h3><?php _e( 'Advanced Options', 'lasso' );?></h3>
-                <span class="lasso--setting-description"><?php _e( 'Suggested not to turn these options on without consulting the developer.', 'lasso' );?></span>
+				<h3><?php _e('Advanced Options', 'lasso'); ?></h3>
+                <span class="lasso--setting-description"><?php _e('Suggested not to turn these options on without consulting the developer.', 'lasso'); ?></span>
                 <span class="lasso--setting-description"> </span>
 				<div class="lasso-editor-settings--option-wrap ">
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked( $shortcodify_disabled, 'on' );?> >
-						<label for="lasso_editor[shortcodify_disabled]"><?php _e( 'Disable Aesop Component Conversion', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked($shortcodify_disabled, 'on'); ?> >
+						<label for="lasso_editor[shortcodify_disabled]"><?php _e('Disable Aesop Component Conversion', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso'); ?></span>
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[enable_autosave]" id="lasso_editor[enable_autosave]" <?php echo checked( $enable_autosave, 'on' );?> >
-						<label for="lasso_editor[enable_autosave]"><?php _e( 'Enable Auto Save', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to enable auto save.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[enable_autosave]" id="lasso_editor[enable_autosave]" <?php echo checked($enable_autosave, 'on'); ?> >
+						<label for="lasso_editor[enable_autosave]"><?php _e('Enable Auto Save', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to enable auto save.', 'lasso'); ?></span>
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked( $save_to_post_disabled, 'on' );?> >
-						<label for="lasso_editor[post_save_disabled]"><?php _e( 'Disable Post Saving', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked($save_to_post_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_save_disabled]"><?php _e('Disable Post Saving', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso'); ?></span>
 
 					</div>
 					
 					<div class="lasso-editor-settings--option-inner" style="border:none">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_edit_disabled]" id="lasso_editor[post_edit_disabled]" <?php echo checked( $edit_post_disabled, 'on' );?> >
-						<label for="lasso_editor[post_edit_disabled]"><?php _e( 'Disable Post Editing', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'You may use this option if you only want to edit custom fields. Refer <a href="https://edituswp.com/editing-and-updating-custom-fields-from-frontend/">here</a> for more information. The custom fields you specify will be still editable under the editing mode.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_edit_disabled]" id="lasso_editor[post_edit_disabled]" <?php echo checked($edit_post_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_edit_disabled]"><?php _e('Disable Post Editing', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('You may use this option if you only want to edit custom fields. Refer <a href="https://edituswp.com/editing-and-updating-custom-fields-from-frontend/">here</a> for more information. The custom fields you specify will be still editable under the editing mode.', 'lasso'); ?></span>
 
 					</div>
 				
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[save_using_rest_disabled]" id="lasso_editor[save_using_rest_disabled]" <?php echo checked( $save_using_rest_disabled, 'on' );?> >
-						<label for="lasso_editor[save_using_rest_disabled]"><?php _e( "Don't Use REST API to Save", 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'By default the editor will use REST API to save posts. Check this box to use custom AJAX calls instead.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[save_using_rest_disabled]" id="lasso_editor[save_using_rest_disabled]" <?php echo checked($save_using_rest_disabled, 'on'); ?> >
+						<label for="lasso_editor[save_using_rest_disabled]"><?php _e("Don't Use REST API to Save", 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('By default the editor will use REST API to save posts. Check this box to use custom AJAX calls instead.', 'lasso'); ?></span>
 
 					</div>
 				</div>
@@ -484,11 +484,11 @@ 
 
 				<div class="lasso-editor-settings--submit">
 				    <input type="hidden" name="action" value="lasso-editor-settings" />
-				    <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Save Settings', 'lasso' );?>" />
-					<?php wp_nonce_field( 'nonce', 'lasso_editor_settings' ); ?>
+				    <input type="submit" class="button-primary" value="<?php esc_attr_e('Save Settings', 'lasso'); ?>" />
+					<?php wp_nonce_field('nonce', 'lasso_editor_settings'); ?>
 				</div>
 				
-				<?php do_action('lasso_settings_after');?>
+				<?php do_action('lasso_settings_after'); ?>
 			</form>
 
 		</div><?php

lasso.php

Spacing +49 added lines, -49 removed lines

@@ -18,27 +18,27 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
 // Set some constants
-define( 'LASSO_VERSION', '1.4.1' );
-define( 'LASSO_DIR', plugin_dir_path( __FILE__ ) );
-define( 'LASSO_URL', plugins_url( '', __FILE__ ) );
-define( 'LASSO_FILE', __FILE__ );
+define('LASSO_VERSION', '1.4.1');
+define('LASSO_DIR', plugin_dir_path(__FILE__));
+define('LASSO_URL', plugins_url('', __FILE__));
+define('LASSO_FILE', __FILE__);
 
 /**
  * Load plugin if PHP version is 5.4 or later.
  */
-if ( version_compare( PHP_VERSION, '5.4.0', '>=' ) ) {
+if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
 
-	include_once( LASSO_DIR . '/bootstrap.php' );
+	include_once(LASSO_DIR.'/bootstrap.php');
 
 } else {
 
 	add_action('admin_head', 'lasso_fail_notice');
-	function lasso_fail_notice(){
+	function lasso_fail_notice() {
 
 		printf('<div class="error"><p>Editus requires PHP 5.4 or higher.</p></div>');
 
@@ -46,11 +46,11 @@ 
 }
 
 add_filter('register_post_type_args', 'lasso_show_in_rest', 10, 2);
-function lasso_show_in_rest($args, $post_type){
+function lasso_show_in_rest($args, $post_type) {
  
-    $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)) {
+    $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;
 		if ($post_type != 'post' && $post_type != 'page') {
 			$args['rest_base'] = $post_type;
@@ -61,21 +61,21 @@ 
 }
 
 
-function lasso_editor_get_option( $option, $section, $default = '' ) {
+function lasso_editor_get_option($option, $section, $default = '') {
 
-	if ( empty( $option ) )
+	if (empty($option))
 		return;
 
-	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+	if (function_exists('is_multisite') && is_multisite()) {
 
-		$options = get_site_option( $section );
+		$options = get_site_option($section);
 
 	} else {
 
-		$options = get_option( $section );
+		$options = get_option($section);
 	}
 
-	if ( isset( $options[$option] ) ) {
+	if (isset($options[$option])) {
 		return $options[$option];
 	}
 
@@ -88,17 +88,17 @@ 
 ));
 
 // Gutenberg
-if( function_exists( 'is_gutenberg_page' ) ) {
-	function add_raw_to_post( $response, $post, $request ) {
+if (function_exists('is_gutenberg_page')) {
+	function add_raw_to_post($response, $post, $request) {
 		$response_data = $response->get_data();
-		if ( is_array( $response_data['content'] )) {
-			$response_data['content']['raw'] =  $post->post_content ;
-			$response->set_data( $response_data );
+		if (is_array($response_data['content'])) {
+			$response_data['content']['raw'] = $post->post_content;
+			$response->set_data($response_data);
 		}
 
 		return $response;
 	}
-	add_filter( "rest_prepare_post", 'add_raw_to_post', 10, 3 );
+	add_filter("rest_prepare_post", 'add_raw_to_post', 10, 3);
 }
 
 
@@ -106,32 +106,32 @@ 
 //table codes to be added
 class editus_table {
     
-    public function __construct(){
+    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'));
+            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 );
+        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()
     { ?>
 
         <ul class='editus-table-menu'>
-          <li data-action="insertcol"><?php echo __('Insert Column','lasso')?></li>
-          <li data-action="insertrow"><?php echo __('Insert Row','lasso')?></li>
-          <li data-action="delcol"><?php echo __('Delete Column','lasso')?></li>
-          <li data-action="delrow"><?php echo __('Delete Row','lasso')?></li>
-          <li data-action="deltable"><?php echo __('Delete Table','lasso')?></li
+          <li data-action="insertcol"><?php echo __('Insert Column', 'lasso')?></li>
+          <li data-action="insertrow"><?php echo __('Insert Row', 'lasso')?></li>
+          <li data-action="delcol"><?php echo __('Delete Column', 'lasso')?></li>
+          <li data-action="delrow"><?php echo __('Delete Row', 'lasso')?></li>
+          <li data-action="deltable"><?php echo __('Delete Table', 'lasso')?></li
         </ul>
     <?php
     }
@@ -143,20 +143,20 @@ 
     }
 
 
-    function editus_components_add_table( $array ){
+    function editus_components_add_table($array) {
         $custom = array(
                'htmltable' => array(
-                         'name'    => __('HTML Table','lasso'),
+                         'name'    => __('HTML Table', 'lasso'),
                           'content' => self::editus_html_table(),
                 )
         );
-        return array_merge( $array, $custom );
+        return array_merge($array, $custom);
     }
 
 
     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>
+          <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,27 +169,27 @@ 
 //table codes to be added
 class editus_paragraph {
     
-    public function __construct(){
-        add_action('wp_enqueue_scripts', array($this,'scripts'));
+    public function __construct() {
+        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 );
+            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 ){
+    function editus_components_add_paragraph($array) {
         $custom = array(
                'htmlparagraph' => array(
-                         'name'    => __('HTML Paragraph','lasso'),
+                         'name'    => __('HTML Paragraph', 'lasso'),
                           'content' => self::editus_html_paragraph(),
                 )
         );
-        return array_merge( $array, $custom );
+        return array_merge($array, $custom);
     }
     
     
@@ -213,7 +213,7 @@ 
 
     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>
+          <li data-type="htmlparagraph" title="<?php esc_attr_e('HTML Paragraph', 'lasso'); ?>" class="quote lasso-toolbar--component__htmlparagraph dashicons dashicons-editor-paragraph"></li>
           <?php
     }
 }

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(

Spacing +12 added lines, -12 removed lines

@@ -28,29 +28,29 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function post( $data ) {
+	public function post($data) {
 
-		$title  = $data[ 'story_title' ];
+		$title  = $data['story_title'];
 
-		$object = is_null( $data[ 'object'] ) ? false : $data[ 'object' ];
+		$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(
 			'post_title'    => $title,
 			'post_status'   => 'draft',
 			'post_type'    	=> $object,
-			'post_content'  =>'<p class="editus-firstp" placeholder="'. $new_post_text. '"></p>' 
+			'post_content'  =>'<p class="editus-firstp" placeholder="'.$new_post_text.'"></p>' 
 		);
 
-		$postid = wp_insert_post( apply_filters( 'lasso_insert_object_args', $args ) );
+		$postid = wp_insert_post(apply_filters('lasso_insert_object_args', $args));
 
-		do_action( 'lasso_new_object', $postid, $object, $title, get_current_user_ID() );
+		do_action('lasso_new_object', $postid, $object, $title, get_current_user_ID());
 
 		return array(
-			'postlink' => get_permalink( $postid )
+			'postlink' => get_permalink($postid)
 		);
 
 	}
@@ -63,8 +63,8 @@ 
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
 	public static function params() {
-		$params[ 'process_new_object_post' ] = array(
-			'story_title' => array( 'wp_strip_all_tags', 'trim' ),
+		$params['process_new_object_post'] = array(
+			'story_title' => array('wp_strip_all_tags', 'trim'),
 			'object' => 'trim'
 		);
 
@@ -80,7 +80,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_new_object_post' ] = array();
+		$params['process_new_object_post'] = array();
 
 		return $params;