AesopInteractive / lasso

admin/includes/load_admin.php

Indentation +15 added lines, -15 removed lines

@@ -99,8 +99,8 @@ 
 
 		foreach ( $pages as $page ) {
 			wp_enqueue_media();
-            wp_enqueue_style( 'wp-color-picker');
-            wp_enqueue_script( 'wp-color-picker');
+			wp_enqueue_style( 'wp-color-picker');
+			wp_enqueue_script( 'wp-color-picker');
 		
 			wp_enqueue_script( 'lasso-editor-settings-script', LASSO_URL.'/admin/assets/js/lasso-editor-settings.js', array( 'jquery','wp-color-picker' ), LASSO_VERSION, true );
 			wp_enqueue_style( 'lasso-editor-settings-style', LASSO_URL.'/admin/assets/css/lasso-editor-settings.css', LASSO_VERSION );
@@ -131,11 +131,11 @@ 
 	}
 
 	/**
-	*	Adds an admin notice reminding the user if their license key has not been saved
-	*
-	*	@since 0.9.7
-	*	@todo make dismissible
-	*/
+	 *	Adds an admin notice reminding the user if their license key has not been saved
+	 *
+	 *	@since 0.9.7
+	 *	@todo make dismissible
+	 */
 	public function license_nag(){
 
 		$screen 	= get_current_screen();
@@ -156,26 +156,26 @@ 
 
 			if ( empty( $license ) ) {
 
-        		printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
+				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
 
-        	} else if ( 'invalid' == $status ){ // license key entered wrong or something
+			} else if ( 'invalid' == $status ){ // license key entered wrong or something
 
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link , $dismiss_link );
 
-        	} else if ( empty( $status ) ){ // license key saved but not activated
+			} else if ( empty( $status ) ){ // license key saved but not activated
 
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link );
 
-        	}
+			}
 		}
 
 	}
 
 	/**
-	*  Process hiding the dimiss
-	*
-	* @since 0.9.7
-	*/
+	 *  Process hiding the dimiss
+	 *
+	 * @since 0.9.7
+	 */
 	public function dismiss_nag() {
 
 		if ( isset( $_GET['lasso-notice'] ) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options') ) {

Spacing +36 added lines, -36 removed lines

@@ -43,23 +43,23 @@ 
 		$plugin = lasso::get_instance();
 		$this->plugin_slug = $plugin->get_plugin_slug();
 
-		add_action( 'admin_head',  			array( $this, 'admin_assets' ) );
-		add_action( 'admin_notices', 		array( $this, 'license_nag' ) );
-		add_action( 'admin_head', 			array( $this, 'dismiss_nag' ) );
-		add_filter( 'plugin_row_meta',    	array( $this, 'plugin_meta' ), 10, 2 );
+		add_action('admin_head', array($this, 'admin_assets'));
+		add_action('admin_notices', array($this, 'license_nag'));
+		add_action('admin_head', array($this, 'dismiss_nag'));
+		add_filter('plugin_row_meta', array($this, 'plugin_meta'), 10, 2);
 
-		if ( !class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+		if (!class_exists('EDD_SL_Plugin_Updater')) {
 			include LASSO_DIR.'admin/includes/EDD_SL_Plugin_Updater.php';
 		}
 
-		if ( !class_exists( 'TGM_Plugin_Activation' ) ) {
+		if (!class_exists('TGM_Plugin_Activation')) {
 			include LASSO_DIR.'admin/includes/class-tgm-plugin-activation.php';
 		}
 
 		new menus\welcome();
 		new menus\settings();
 
-		if ( !defined( 'LASSO_AGENCY_MODE' ) ) {
+		if (!defined('LASSO_AGENCY_MODE')) {
 			new menus\license();
 		}
 
@@ -75,7 +75,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;
 		}
 
@@ -97,13 +97,13 @@ 
 			'dashboard_page_lasso-welcome-screen'
 		);
 
-		foreach ( $pages as $page ) {
+		foreach ($pages as $page) {
 			wp_enqueue_media();
-            wp_enqueue_style( 'wp-color-picker');
-            wp_enqueue_script( 'wp-color-picker');
+            wp_enqueue_style('wp-color-picker');
+            wp_enqueue_script('wp-color-picker');
 		
-			wp_enqueue_script( 'lasso-editor-settings-script', LASSO_URL.'/admin/assets/js/lasso-editor-settings.js', array( 'jquery','wp-color-picker' ), LASSO_VERSION, true );
-			wp_enqueue_style( 'lasso-editor-settings-style', LASSO_URL.'/admin/assets/css/lasso-editor-settings.css', LASSO_VERSION );
+			wp_enqueue_script('lasso-editor-settings-script', LASSO_URL.'/admin/assets/js/lasso-editor-settings.js', array('jquery', 'wp-color-picker'), LASSO_VERSION, true);
+			wp_enqueue_style('lasso-editor-settings-style', LASSO_URL.'/admin/assets/css/lasso-editor-settings.css', LASSO_VERSION);
 		}
 	}
 
@@ -116,15 +116,15 @@ 
 	 *
 	 * @return array new array of links for our plugin listing on plugins.php
 	 */
-	public function plugin_meta( $links, $file ) {
+	public function plugin_meta($links, $file) {
 
-		if ( strpos( $file, 'lasso.php' ) !== false && !defined( 'LASSO_AGENCY_MODE' ) ) {
+		if (strpos($file, 'lasso.php') !== false && !defined('LASSO_AGENCY_MODE')) {
 
 			$new_links = array(
 				'<a href="http://edituswp.com/help" target="_blank">Help</a>'
 			);
 
-			$links = array_merge( $links, $new_links );
+			$links = array_merge($links, $new_links);
 		}
 
 		return $links;
@@ -136,35 +136,35 @@ 
 	*	@since 0.9.7
 	*	@todo make dismissible
 	*/
-	public function license_nag(){
+	public function license_nag() {
 
-		$screen 	= get_current_screen();
-		$welcome    = 'toplevel_page_lasso-editor' == $screen->id;
-		$license  	= get_option( 'lasso_license_key' );
-		$status   	= get_option( 'lasso_license_status' );
+		$screen = get_current_screen();
+		$welcome = 'toplevel_page_lasso-editor' == $screen->id;
+		$license  	= get_option('lasso_license_key');
+		$status   	= get_option('lasso_license_status');
 
-		$message_empty    = apply_filters('lasso_empty_license_message','Your license key for support and automatic updates for Editus is missing!');
-		$message_invalid  = apply_filters('lasso_invalid_license_message','Oh snap! It looks like your Editus license key is invalid. Might check here to see if its been added correctly.');
-		$message_inactive  = apply_filters('lasso_inactive_license_message','It looks like your license key has not yet been activated.');
+		$message_empty    = apply_filters('lasso_empty_license_message', 'Your license key for support and automatic updates for Editus is missing!');
+		$message_invalid  = apply_filters('lasso_invalid_license_message', 'Oh snap! It looks like your Editus license key is invalid. Might check here to see if its been added correctly.');
+		$message_inactive = apply_filters('lasso_inactive_license_message', 'It looks like your license key has not yet been activated.');
 
-		$license_link 	  = sprintf('<a href="%s">Update License</a>', esc_url( add_query_arg( array( 'page' => 'lasso-license' ), admin_url('admin.php') ) ) );
-		$dismiss_link     = sprintf('<a style="text-decoration:none;" href="%s" id="lasso-dismiss-notice" class="notice-dismiss"><span class="screen-reader-text">%s</span></a>', esc_url( add_query_arg( 'lasso-notice', 'dismiss' ) ), __('Dismiss this notice.','lasso') );
+		$license_link = sprintf('<a href="%s">Update License</a>', esc_url(add_query_arg(array('page' => 'lasso-license'), admin_url('admin.php'))));
+		$dismiss_link     = sprintf('<a style="text-decoration:none;" href="%s" id="lasso-dismiss-notice" class="notice-dismiss"><span class="screen-reader-text">%s</span></a>', esc_url(add_query_arg('lasso-notice', 'dismiss')), __('Dismiss this notice.', 'lasso'));
 
-		$not_hidden       = get_user_meta( get_current_user_ID(), 'lasso_license_nag_dismissed', true );
+		$not_hidden       = get_user_meta(get_current_user_ID(), 'lasso_license_nag_dismissed', true);
 
-		if ( current_user_can('manage_options') && !$welcome && !defined( 'LASSO_AGENCY_MODE') && !$not_hidden ) {
+		if (current_user_can('manage_options') && !$welcome && !defined('LASSO_AGENCY_MODE') && !$not_hidden) {
 
-			if ( empty( $license ) ) {
+			if (empty($license)) {
 
-        		printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
+        		printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link);
 
-        	} else if ( 'invalid' == $status ){ // license key entered wrong or something
+        	} else if ('invalid' == $status) { // license key entered wrong or something
 
-				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link , $dismiss_link );
+				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link, $dismiss_link);
 
-        	} else if ( empty( $status ) ){ // license key saved but not activated
+        	} else if (empty($status)) { // license key saved but not activated
 
-				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link );
+				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link);
 
         	}
 		}
@@ -178,8 +178,8 @@ 
 	*/
 	public function dismiss_nag() {
 
-		if ( isset( $_GET['lasso-notice'] ) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options') ) {
-			update_user_meta( get_current_user_id(), 'lasso_license_nag_dismissed', 1 );
+		if (isset($_GET['lasso-notice']) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options')) {
+			update_user_meta(get_current_user_id(), 'lasso_license_nag_dismissed', 1);
 		}
 	}
 }

public/includes/lasso.php

Doc Comments +7 added lines, -1 removed lines

@@ -80,7 +80,7 @@ 
 	 *
 	 * @since    0.0.1
 	 *
-	 * @return    Plugin slug variable.
+	 * @return    string slug variable.
 	 */
 	public function get_plugin_slug() {
 		return $this->plugin_slug;
@@ -338,6 +338,9 @@ 
 		exit;
 	}
 	
+	/**
+	 * @param string $type
+	 */
 	public static function enable_metasave($type)
 	{
 		register_rest_field( $type, 'metadata', array(
@@ -526,6 +529,9 @@ 
 		return self::$revisions;
 	}*/
 	
+	/**
+	 * @param string $taxonomy
+	 */
 	public function set_post_terms( $postid, $value, $taxonomy ) {
 		if( $value ) {
 			$value = explode( ',', $value );

Indentation +98 added lines, -98 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,10 +69,10 @@ 
 		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');
@@ -272,14 +272,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);
@@ -292,9 +292,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;
@@ -324,14 +324,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'  => $excerpt
+			'post_excerpt'  => $excerpt
 		);
 		
 		
@@ -399,12 +399,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;
@@ -423,60 +423,60 @@ 
 			}
 		}
 		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 {
 			$code = '['.$code.' ';
 			foreach ($atts as $key => $value) {
-			    $code = ''.$key.'="'.$value.'" ';
+				$code = ''.$key.'="'.$value.'" ';
 			}
 			$code = $code.']';
 			echo do_shortcode($code);
@@ -485,63 +485,63 @@ 
 		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> </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> </p>';
+		return;
+	}
 	
 	
 	public function get_ase_options()
@@ -577,12 +577,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;
 	}
@@ -640,14 +640,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;
@@ -667,7 +667,7 @@ 
 		}
 	}
     
-    public function create_gallery( ) {
+	public function create_gallery( ) {
 
 		$postid  	= isset( $_POST['postid'] ) ? $_POST['postid'] : false;
         
@@ -721,10 +721,10 @@ 
 			'message' => 'gallery-created',
 			'id' => $postid)
 		);
-        exit;
+		exit;
 	}
     
-    public function update_gallery( ) {
+	public function update_gallery( ) {
         
 		$options      = isset( $_POST['fields'] ) ? $_POST['fields'] : false;
         
@@ -740,12 +740,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;
@@ -829,7 +829,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 +183 added lines, -183 removed lines

@@ -52,27 +52,27 @@ 
 		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');
@@ -103,7 +103,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;
 		}
 
@@ -120,18 +120,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();
 				}
 
@@ -157,18 +157,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();
 
 				}
@@ -192,13 +192,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();
 
@@ -223,7 +223,7 @@ 
 			WHERE archived = '0' AND spam = '0'
 			AND deleted = '0'";
 
-		return $wpdb->get_col( $sql );
+		return $wpdb->get_col($sql);
 
 	}
 
@@ -234,18 +234,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);
 
 
 	}
@@ -267,15 +267,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) {
@@ -283,17 +283,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";
 		
@@ -305,7 +305,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;
 	}
 	
@@ -316,15 +316,15 @@ 
 		$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(
@@ -336,24 +336,24 @@ 
 		
 		
 
-		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 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;
@@ -361,11 +361,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);
 				}
@@ -377,13 +377,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;
 		}
@@ -393,7 +393,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;
@@ -402,9 +402,9 @@ 
     public function editus_do_block()
 	{
 		
-		$code= $_POST["code"];
+		$code = $_POST["code"];
 
-        $out = do_blocks( $code );
+        $out = do_blocks($code);
 		
 		echo $out;
 		exit;
@@ -414,56 +414,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") {
@@ -492,24 +492,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'].';';
             }
             
         }
@@ -521,15 +521,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>';
@@ -547,20 +547,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;
 		}
@@ -570,9 +570,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;
 	}
@@ -580,40 +580,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;
 	}
@@ -634,17 +634,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);
@@ -653,71 +653,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)
 		);
@@ -726,114 +726,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)),
 				)
 			);
 		}

Braces +24 added lines, -33 removed lines

@@ -425,44 +425,34 @@ 
 		if ($code == "aesop_video") {
 		    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") {
+		} 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);
-		}
-		else if ($code == "aesop_quote") {
+		} 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);
-		}
-		else if ($code == "aesop_parallax") {
+		} 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);
-		}
-		else if ($code == "aesop_character") {
+		} 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);
-		}
-		else if ($code == "aesop_collection") {
+		} 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);
-		}
-		else if ($code == "aesop_chapter") {
+		} 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);
-		}
-		else if ($code == "aesop_content") {
+		} 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']);
-		}
-		else if ($code == "aesop_gallery") {
+		} 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"].'"]');
-		}
-		else if ($code == "aesop_audio") {
+		} 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);
-		}
-		else if ($code == "aesop_document") {
+		} 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);
 		}
@@ -472,8 +462,7 @@ 
 		}*/
         else if ($code == "aesop_wpimg") {
             self::wpimg($atts);
-		}
-		else {
+		} else {
 			$code = '['.$code.' ';
 			foreach ($atts as $key => $value) {
 			    $code = ''.$key.'="'.$value.'" ';
@@ -557,8 +546,9 @@ 
 		$postid = isset( $_POST['postid'] ) ? $_POST['postid'] : false;
 
 		// bail out if the current user can't publish posts
-		if ( !lasso_user_can( 'delete_post', $postid ) )
-			return;
+		if ( !lasso_user_can( 'delete_post', $postid ) ) {
+					return;
+		}
 		
 		if (!wp_verify_nonce( $_POST[ 'nonce' ], 'lasso_delete_post' )) {
 			wp_send_json_error();
@@ -654,15 +644,14 @@ 
 			}
 	
 			$result = wp_set_object_terms( $postid, $value, $taxonomy );
-		}
-		else  {
+		} else  {
 			//remove all terms from post
 			$result = wp_set_object_terms( $postid, null, $taxonomy );
 		}
 
 		if ( ! is_wp_error( $result ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -732,9 +721,9 @@ 
 		$gallery_ids  = isset( $_POST['gallery_ids'] ) ? $_POST['gallery_ids'] : false;
 		if ( $_POST[ 'gallery_type' ] ) {
 			$type = $_POST[ 'gallery_type' ];
-		}elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) {
+		} elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) {
 			$type = $options[ 'galleryType' ];
-		}else{
+		} else{
 			$type = false;
 		}
 
@@ -813,13 +802,15 @@ 
 
 		  $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/includes/register_meta_field.php

Spacing +6 added lines, -6 removed lines

@@ -15,21 +15,21 @@
 	 *
 	 * @param array $fields
 	 */
-	public function __construct( $fields ) {
+	public function __construct($fields) {
 		$this->fields = $fields;
-		add_filter( 'lasso_api_params', function( $params ) {
-			foreach( $this->fields as $field => $cbs ) {
+		add_filter('lasso_api_params', function($params) {
+			foreach ($this->fields as $field => $cbs) {
 				//$field = lasso_clean_string( $field );
-				$params[ 'process_meta_update' ][ $field ] = $cbs;
+				$params['process_meta_update'][$field] = $cbs;
 			}
 
 			return $params;
 
 		});
 
-		add_filter( 'lasso_meta_fields', function( $allowed ) {
+		add_filter('lasso_meta_fields', function($allowed) {
 
-			foreach( array_keys( $this->fields ) as $field  ) {
+			foreach (array_keys($this->fields) as $field) {
 				//$field = lasso_clean_string( $field );
 				$allowed[] = $field;
 

public/includes/option-engine.php

Braces +9 added lines, -6 removed lines

@@ -119,8 +119,9 @@ 
 
 	ob_start();
 
-	if ( empty( $name ) || empty( $options ) || !is_array( $options ) )
-		return;
+	if ( empty( $name ) || empty( $options ) || !is_array( $options ) ) {
+			return;
+	}
 
 	$nonce = wp_create_nonce('lasso-process-post-meta');
 	$key   = sprintf('_lasso_%s_settings', $name );
@@ -198,8 +199,9 @@ 
 	$before = '<div class="lasso--postsettings__option">';
 	$after 	= '</div>';
 
-	if ( empty( $name ) || empty( $options ) )
-		return;
+	if ( empty( $name ) || empty( $options ) ) {
+			return;
+	}
 
 	foreach ( (array) $options as $option ) {
 
@@ -225,8 +227,9 @@ 
 */
 function lasso_option_engine_option( $name = '', $option = '', $type = '') {
 
-	if ( empty( $type ) || empty( $option ) )
-		return;
+	if ( empty( $type ) || empty( $option ) ) {
+			return;
+	}
 
 	$id = isset( $option['id'] ) ? $option['id'] : false;
 	//$id = $id ? lasso_clean_string( $id ) : false;

Spacing +44 added lines, -44 removed lines

@@ -43,7 +43,7 @@ 
 *	Get an array of addon data for the settings modal
 *	@since 0.9.4
 */
-function lasso_get_modal_tabs(){
+function lasso_get_modal_tabs() {
 
 	$tabs = array();
 
@@ -60,34 +60,34 @@ 
 *	@uses lasso_modal_addons_content()
 *	@since 0.9.4
 */
-function lasso_modal_addons( $type = 'tab' ){
+function lasso_modal_addons($type = 'tab') {
 
 	$tabs = lasso_get_modal_tabs();
 	$out = '';
 
-	if ( $tabs ):
+	if ($tabs):
 
-		if ( 'tab' == $type ) {
+		if ('tab' == $type) {
 
 			$out = '<ul class="lasso--modal__tabs">';
 
 				$out .= '<li class="active-tab" data-addon-name="core">Editus</li>';
 
-				foreach ( $tabs as $tab ) {
+				foreach ($tabs as $tab) {
 
-					if ( isset( $tab ) ) {
+					if (isset($tab)) {
 
-						$out .= lasso_modal_addons_content( $tab, $type );
+						$out .= lasso_modal_addons_content($tab, $type);
 					}
 				}
 
 			$out .= '</ul>';
 
-		} elseif ( 'content' == $type ) {
-			foreach ( $tabs as $tab ) {
+		} elseif ('content' == $type) {
+			foreach ($tabs as $tab) {
 
-				if ( isset( $tab ) ) {
-					$out .= lasso_modal_addons_content( $tab , $type );
+				if (isset($tab)) {
+					$out .= lasso_modal_addons_content($tab, $type);
 				}
 			}
 
@@ -95,7 +95,7 @@ 
 
 	endif;
 
-	return !empty( $out ) ? $out : false;
+	return !empty($out) ? $out : false;
 }
 
 /**
@@ -115,26 +115,26 @@ 
 *	@since 0.9.5
 *	@subpackage lasso_modal_addons_content
 */
-function lasso_option_form( $name = '', $options = array() ){
+function lasso_option_form($name = '', $options = array()) {
 
 	ob_start();
 
-	if ( empty( $name ) || empty( $options ) || !is_array( $options ) )
+	if (empty($name) || empty($options) || !is_array($options))
 		return;
 
 	$nonce = wp_create_nonce('lasso-process-post-meta');
-	$key   = sprintf('_lasso_%s_settings', $name );
+	$key   = sprintf('_lasso_%s_settings', $name);
 
-	$out = sprintf('<form id="lasso--custom-field-form" class="lasso--post-form">' );
+	$out = sprintf('<form id="lasso--custom-field-form" class="lasso--post-form">');
 
-		$out .= lasso_option_fields( $name, $options );
-		$out .='<div class="form--bottom">';
-			$out .='<input type="submit" value="'.__( 'Save', 'lasso' ).'">';
-			$out .='<input type="hidden" name="tab_name" value="'.$key.'">';
-			$out .='<input type="hidden" name="post_id" value="'.get_the_ID().'">';
-			$out .='<input type="hidden" name="nonce" value="'.$nonce.'">';
-			$out .='<input type="hidden" name="action" value="process_meta_update">';
-		$out .='</div>';
+		$out .= lasso_option_fields($name, $options);
+		$out .= '<div class="form--bottom">';
+			$out .= '<input type="submit" value="'.__('Save', 'lasso').'">';
+			$out .= '<input type="hidden" name="tab_name" value="'.$key.'">';
+			$out .= '<input type="hidden" name="post_id" value="'.get_the_ID().'">';
+			$out .= '<input type="hidden" name="nonce" value="'.$nonce.'">';
+			$out .= '<input type="hidden" name="action" value="process_meta_update">';
+		$out .= '</div>';
 
 	$out .= '</form>';
 	
@@ -192,20 +192,20 @@ 
 *	@since 0.9.5
 *	@subpackage lasso_modal_addons_content
 */
-function lasso_option_fields( $name = '', $options = array() ){
+function lasso_option_fields($name = '', $options = array()) {
 
-	$out 	= '';
+	$out = '';
 	$before = '<div class="lasso--postsettings__option">';
 	$after 	= '</div>';
 
-	if ( empty( $name ) || empty( $options ) )
+	if (empty($name) || empty($options))
 		return;
 
-	foreach ( (array) $options as $option ) {
+	foreach ((array) $options as $option) {
 
-		$type = isset( $option['type'] ) ? $option['type'] : 'text';
+		$type = isset($option['type']) ? $option['type'] : 'text';
 		
-		$out .= sprintf('%s%s%s', $before, lasso_option_engine_option( $name, $option,$type ), $after );
+		$out .= sprintf('%s%s%s', $before, lasso_option_engine_option($name, $option, $type), $after);
 
 	}
 	
@@ -223,44 +223,44 @@ 
 *	@param $type string text, textarea, checkbox, color
 *	@since 5.0
 */
-function lasso_option_engine_option( $name = '', $option = '', $type = '') {
+function lasso_option_engine_option($name = '', $option = '', $type = '') {
 
-	if ( empty( $type ) || empty( $option ) )
+	if (empty($type) || empty($option))
 		return;
 
-	$id = isset( $option['id'] ) ? $option['id'] : false;
+	$id = isset($option['id']) ? $option['id'] : false;
 	//$id = $id ? lasso_clean_string( $id ) : false;
 
-	$desc = isset( $option['desc'] ) ? $option['desc'] : false;
+	$desc = isset($option['desc']) ? $option['desc'] : false;
 
-	$value = get_post_meta( get_the_id(), $option[ 'id' ], true );
+	$value = get_post_meta(get_the_id(), $option['id'], true);
 
-	switch ( $type ) {
+	switch ($type) {
 		case 'text':
-			$out = sprintf('<label for="lasso--post-option-%s">%s</label><input id="lasso--post-option-%s" class="editus-custom-field-text" name="%s" type="text" value="%s">',$id, esc_html( $desc ), $id, $id, $value );
+			$out = sprintf('<label for="lasso--post-option-%s">%s</label><input id="lasso--post-option-%s" class="editus-custom-field-text" name="%s" type="text" value="%s">', $id, esc_html($desc), $id, $id, $value);
 			break;
 		case 'textarea':
-			$out = sprintf('<label for="lasso--post-option-%s">%s</label><textarea id="lasso--post-option-%s" name="%s">%s</textarea>',$id, esc_html( $desc ), $id, $id, $value );
+			$out = sprintf('<label for="lasso--post-option-%s">%s</label><textarea id="lasso--post-option-%s" name="%s">%s</textarea>', $id, esc_html($desc), $id, $id, $value);
 			break;
 		case 'imgurl':
-			$out = sprintf('<label for="lasso--post-option-%s">%s</label><img src="%s" style="height:80px;"><input id="lasso--post-option-%s" class="editus-custom-field-text" name="%s" type="text" value="%s" style="display:none;"><div title="Replace Image"  class="editus-customtab-image-control" style="float:left;"><i class="lasso-icon-image" style="font-size:20px;padding:5px;"></i></div><div title="Remove Image"  class="editus-customtab-image-remove" style="float:left;"><i class="lasso-icon-bin2" style="font-size:20px;padding:5px;"></i></div>',$id, esc_html( $desc ), $value, $id, $id,  $value );
+			$out = sprintf('<label for="lasso--post-option-%s">%s</label><img src="%s" style="height:80px;"><input id="lasso--post-option-%s" class="editus-custom-field-text" name="%s" type="text" value="%s" style="display:none;"><div title="Replace Image"  class="editus-customtab-image-control" style="float:left;"><i class="lasso-icon-image" style="font-size:20px;padding:5px;"></i></div><div title="Remove Image"  class="editus-customtab-image-remove" style="float:left;"><i class="lasso-icon-bin2" style="font-size:20px;padding:5px;"></i></div>', $id, esc_html($desc), $value, $id, $id, $value);
 			break;
 		case 'checkbox':
-			$out = sprintf('<label for="lasso--post-option-%s" class="checkbox-control checkbox"><input id="lasso--post-option-%s" type="checkbox" name="%s" class="checkbox"><span class="control-indicator"></span>%s',$id, $id, $id ,esc_html( $desc ) );
+			$out = sprintf('<label for="lasso--post-option-%s" class="checkbox-control checkbox"><input id="lasso--post-option-%s" type="checkbox" name="%s" class="checkbox"><span class="control-indicator"></span>%s', $id, $id, $id, esc_html($desc));
 			break;
 		case 'dropdown':
-			$out = sprintf('<label for="lasso--post-option-%s">%s</label><select id="lasso--post-option-%s" name="%s">',$id, esc_html( $desc ), $id, $id);
+			$out = sprintf('<label for="lasso--post-option-%s">%s</label><select id="lasso--post-option-%s" name="%s">', $id, esc_html($desc), $id, $id);
 			$options = explode(";", $option['options']);
 			foreach ($options as &$opt) {
 				$opts = explode(":", $opt);
 				if ($opts[0] == $value) {
-					$out .= sprintf('<option value = "%s" selected>%s</option>',$opts[0], $opts[1]);
+					$out .= sprintf('<option value = "%s" selected>%s</option>', $opts[0], $opts[1]);
 				} else {
-					$out .= sprintf('<option value = "%s">%s</option>',$opts[0], $opts[1]);
+					$out .= sprintf('<option value = "%s">%s</option>', $opts[0], $opts[1]);
 				}
 			}
 			
-			$out .='</select>';
+			$out .= '</select>';
 			break;
 	}
 

includes/process/meta.php

Indentation +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 		 */
 		$allowed_fields = apply_filters( 'lasso_meta_fields', array() );
         
-        file_put_contents(WP_PLUGIN_DIR."/file1.txt", print_r($data,true));
+		file_put_contents(WP_PLUGIN_DIR."/file1.txt", print_r($data,true));
         
 		if ( ! empty( $allowed_fields ) ) {
 			foreach( $allowed_fields as $field ) {
@@ -54,7 +54,7 @@ 
 			}
 		}
 
-        do_action( 'editus_after_meta_update', $post_id, $data );
+		do_action( 'editus_after_meta_update', $post_id, $data );
 
 
 		return true;

Spacing +12 added lines, -12 removed lines

@@ -28,9 +28,9 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function update( $data ) {
+	public function update($data) {
 
-		$post_id = isset( $data['post_id'] ) ? $data['post_id'] : false;
+		$post_id = isset($data['post_id']) ? $data['post_id'] : false;
 
 			
 		/**
@@ -40,21 +40,21 @@ 
 		 *
 		 * @param array $allowed_fields The fields
 		 */
-		$allowed_fields = apply_filters( 'lasso_meta_fields', array() );
+		$allowed_fields = apply_filters('lasso_meta_fields', array());
         
-        file_put_contents(WP_PLUGIN_DIR."/file1.txt", print_r($data,true));
+        file_put_contents(WP_PLUGIN_DIR."/file1.txt", print_r($data, true));
         
-		if ( ! empty( $allowed_fields ) ) {
-			foreach( $allowed_fields as $field ) {
-				if ( isset( $data[ $field ] ) ) {
+		if (!empty($allowed_fields)) {
+			foreach ($allowed_fields as $field) {
+				if (isset($data[$field])) {
 					//this original line changed dash to underscore
 					//update_post_meta( $post_id, lasso_unclean_string( $field ), $data[ $field ]  );
-					update_post_meta( $post_id,  $field, $data[ $field ]  );
+					update_post_meta($post_id, $field, $data[$field]);
 				}
 			}
 		}
 
-        do_action( 'editus_after_meta_update', $post_id, $data );
+        do_action('editus_after_meta_update', $post_id, $data);
 
 
 		return true;
@@ -68,8 +68,8 @@ 
 	 *
 	 * @return array Array of keys to pull from $data per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_meta_update' ] = array(
+	public static function params() {
+		$params['process_meta_update'] = array(
 			'post_id' 	=> 'absint',
 			'tab_name'	=> 'trim'
 		);
@@ -86,7 +86,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_meta_update' ] = array(
+		$params['process_meta_update'] = array(
 			'lasso_user_can'
 		);
 

includes/process/map.php

Indentation +1 added lines, -1 removed lines

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

Spacing +16 added lines, -16 removed lines

@@ -28,28 +28,28 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function save( $data ) {
+	public function save($data) {
 
-		$postid     	= isset( $data['postid'] ) ? $data['postid'] : false;
-		$locations    	= isset( $data['ase-map-component-locations'] ) ? $data['ase-map-component-locations'] : false;
-		$start_point    = isset( $data['ase-map-component-start-point'] ) ? $data['ase-map-component-start-point']: false;
-		$zoom       	= isset( $data['ase-map-component-zoom'] ) ? $data['ase-map-component-zoom' ] : false;
+		$postid     	= isset($data['postid']) ? $data['postid'] : false;
+		$locations = isset($data['ase-map-component-locations']) ? $data['ase-map-component-locations'] : false;
+		$start_point = isset($data['ase-map-component-start-point']) ? $data['ase-map-component-start-point'] : false;
+		$zoom       	= isset($data['ase-map-component-zoom']) ? $data['ase-map-component-zoom'] : false;
         
-		if ( is_array( $locations ) ) {
-			delete_post_meta( $postid, 'ase_map_component_locations' );
+		if (is_array($locations)) {
+			delete_post_meta($postid, 'ase_map_component_locations');
 
 			// update locations if set
-			foreach ( $locations as $location ) {
-				$point = json_decode( urldecode( $location ), true );
-				add_post_meta( $postid, 'ase_map_component_locations', $point );
+			foreach ($locations as $location) {
+				$point = json_decode(urldecode($location), true);
+				add_post_meta($postid, 'ase_map_component_locations', $point);
 			}
 
 			// udpate start point
-            $point = json_decode( $start_point, true );
-			update_post_meta( $postid, 'ase_map_component_start_point', $point );
+            $point = json_decode($start_point, true);
+			update_post_meta($postid, 'ase_map_component_start_point', $point);
 
 			// update zoom
-			update_post_meta( $postid, 'ase_map_component_zoom', $zoom );
+			update_post_meta($postid, 'ase_map_component_zoom', $zoom);
 		}
 
 		return true;
@@ -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_map_save' ] = array(
+	public static function params() {
+		$params['process_map_save'] = array(
 			'postid' => 'absint',
 			'ase-map-component-locations' => 'lasso_sanitize_data',
 			'ase-map-component-start-point' => array(
@@ -88,7 +88,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_map_save' ] = array(
+		$params['process_map_save'] = array(
 			'lasso_user_can'
 		);
 

public/includes/assets.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
     {
         global $post;
         $pos = strpos($post->post_content, "<!--nextpage-->");
-        if (!$pos) return -1;
+        if (!$pos) {
+        	return -1;
+        }
         
         global $wp;
         $url =  home_url( $wp->request );

Indentation +79 added lines, -79 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,9 +90,9 @@ 
 			$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');
             
-            $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
@@ -130,7 +130,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'),
@@ -185,11 +185,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 = '';
@@ -209,17 +209,17 @@ 
 				}
 			}
             
-            //excerpt
-            $post_excerpt = "";
-            $post_excerpt = $post->post_excerpt;
+			//excerpt
+			$post_excerpt = "";
+			$post_excerpt = $post->post_excerpt;
             
-            //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;
+			}
 
 			// localized objects
 			$objects = array(
@@ -295,17 +295,17 @@ 
 				'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,
-                'oldWPimg'=> $use_old_wpimg =='on',
-                '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,
+				'oldWPimg'=> $use_old_wpimg =='on',
+				'prefixHTTP'=> $link_prefix_http =='on'
 			);
 
 
@@ -313,7 +313,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 );
@@ -329,7 +329,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 ) );
 
@@ -338,44 +338,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 +108 added lines, -108 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');
             
             $link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor', 'off');
 
@@ -109,8 +109,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
@@ -122,54 +122,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...'),
@@ -178,11 +178,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) {
@@ -197,13 +197,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;
 				}
@@ -223,8 +223,8 @@ 
 
 			// 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,
@@ -233,13 +233,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'),
@@ -275,37 +275,37 @@ 
 				'postTags'    		=> lasso_get_objects('tag'),
 				'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>'.apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso') ).'</p>',
+				'newObjectContent'  => '<p>'.apply_filters('lasso_new_object_content', __('Once upon a time...', 'lasso')).'</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,
-                'oldWPimg'=> $use_old_wpimg =='on',
-                'prefixHTTP'=> $link_prefix_http =='on'
+                'oldWPimg'=> $use_old_wpimg == 'on',
+                'prefixHTTP'=> $link_prefix_http == 'on'
 			);
 
 
@@ -314,9 +314,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) {
@@ -325,13 +325,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));
 
 
 		}
@@ -341,20 +341,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;
@@ -366,11 +366,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;
         }
 

public/includes/editor-modules--gallery.php

Spacing +35 added lines, -35 removed lines

@@ -11,12 +11,12 @@ 
 
 	ob_start();
 
-	if ( $galleries ) { ?>
+	if ($galleries) { ?>
 	
-		<?php if ( lasso_user_can( 'publish_posts' ) ): ?>
+		<?php if (lasso_user_can('publish_posts')): ?>
 			<div class="ase-gallery-opts ase-gallery-opts--create-gallery" style="display:inline !important; postion:relative !important;left:12px !important">
 				<div class="ase-gallery-opts--single lasso-option">
-				<a href="#" class="editor-btn-secondary" id="lasso--gallery__create"><?php _e( 'Create gallery', 'lasso' );?></a>
+				<a href="#" class="editor-btn-secondary" id="lasso--gallery__create"><?php _e('Create gallery', 'lasso'); ?></a>
 				</div>
 			</div>
 		<?php endif; ?>
@@ -24,11 +24,11 @@ 
 		<div class="ase-gallery-opts ase-gallery-opts--edit-gallery" >
 			<div class="ase-gallery-opts--single lasso-option">
 
-				<label><?php _e( 'Manage Images', 'lasso' );?>
-					<a href="#" id="ase-gallery-add-image" class="lasso-editor-tiny-btn" title="<?php esc_attr_e( 'Add Images', 'lasso' );?>"><i class="lasso-icon-pencil"></i></a>
+				<label><?php _e('Manage Images', 'lasso'); ?>
+					<a href="#" id="ase-gallery-add-image" class="lasso-editor-tiny-btn" title="<?php esc_attr_e('Add Images', 'lasso'); ?>"><i class="lasso-icon-pencil"></i></a>
 
 				</label>
-				<small class="lasso-option-desc"><?php _e( 'Rearrange or edit the images in this gallery.', 'lasso' );?></small>
+				<small class="lasso-option-desc"><?php _e('Rearrange or edit the images in this gallery.', 'lasso'); ?></small>
 
 				<div id="lasso--gallery__images"><span class="lasso-icon-spinner6"></span></div>
 
@@ -38,22 +38,22 @@ 
 
 	<?php }
 
-	if ( lasso_user_can( 'publish_posts' ) ): ?>
+	if (lasso_user_can('publish_posts')): ?>
 
 		<div class="ase-gallery-opts ase-gallery-opts--create-gallery2" style="display:none;">
 
 			<div class="ase-gallery-opts--single lasso-option">
 
-				<label><?php _e( 'Create a Gallery', 'lasso' );?></label>
+				<label><?php _e('Create a Gallery', 'lasso'); ?></label>
 				<small class="lasso-option-desc">Gallery Name:</small>
                 <input type="text" id="lasso--gallery__galleryname" value="New Gallery"><br>
 				
-				<small class="lasso-option-desc"><?php _e( 'Select images to create a gallery.', 'lasso' );?></small>
-				<a href="#" class="editor-btn-secondary" id="lasso--gallery__selectImages"><?php _e( 'Select Images', 'lasso' );?></a>
+				<small class="lasso-option-desc"><?php _e('Select images to create a gallery.', 'lasso'); ?></small>
+				<a href="#" class="editor-btn-secondary" id="lasso--gallery__selectImages"><?php _e('Select Images', 'lasso'); ?></a>
 
 				<div id="ase-gallery-images"></div>
 
-				<a style="display:none;" class="editor-btn-secondary" data-post-title="<?php echo esc_attr( strtolower( the_title_attribute() ) );?>" id="lasso--gallery__save" href="#"><?php _e( 'Create Gallery', 'lasso' );?></a>
+				<a style="display:none;" class="editor-btn-secondary" data-post-title="<?php echo esc_attr(strtolower(the_title_attribute())); ?>" id="lasso--gallery__save" href="#"><?php _e('Create Gallery', 'lasso'); ?></a>
 
 			</div>
 
@@ -64,14 +64,14 @@ 
 	<!-- Gallery Layout/Type Chooser -->
 	<div class="ase-gallery-opts ase-gallery-opts--type" >
 		<div data-option="gallery-type" class="ase-gallery-opts--single lasso-option">
-			<label><?php _e( 'Gallery Type', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Select the type of gallery.', 'lasso' );?></small>
+			<label><?php _e('Gallery Type', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Select the type of gallery.', 'lasso'); ?></small>
 			<fieldset>
-	      		<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="grid"><?php _e( 'Grid', 'lasso' );?></label>
-	        	<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="thumbnail"><?php _e( 'Thumbnail', 'lasso' );?></label>
+	      		<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="grid"><?php _e('Grid', 'lasso'); ?></label>
+	        	<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="thumbnail"><?php _e('Thumbnail', 'lasso'); ?></label>
 				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="sequence">Sequence</label>
-				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="photoset"><?php _e( 'Photoset', 'lasso' );?></label>
-				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="stacked"><?php _e( 'Parallax', 'lasso' );?></label>
+				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="photoset"><?php _e('Photoset', 'lasso'); ?></label>
+				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="stacked"><?php _e('Parallax', 'lasso'); ?></label>
 				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="hero">Hero</label>
 			</fieldset>
 		</div>
@@ -81,8 +81,8 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--grid" style="display:none;">
 
 		<div data-option="itemwidth" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_grid_gallery_width"><?php _e( 'Grid Item Width', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Adjust the width of the individual grid items, only if using Grid gallery style. Default is 400.', 'lasso' );?></small>
+			<label for="lasso_grid_gallery_width"><?php _e('Grid Item Width', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Adjust the width of the individual grid items, only if using Grid gallery style. Default is 400.', 'lasso'); ?></small>
 			<input type="text_small" class="lasso-generator-attr" name="lasso_grid_gallery_width" value="">
 		</div>
 
@@ -92,24 +92,24 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--thumb" style="display:none;">
 
 		<div data-option="transition" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_thumb_gallery_transition"><?php _e( 'Gallery Transition', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Adjust the transition effect for the Thumbnail gallery. Default is slide.', 'lasso' );?></small>
+			<label for="lasso_thumb_gallery_transition"><?php _e('Gallery Transition', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Adjust the transition effect for the Thumbnail gallery. Default is slide.', 'lasso'); ?></small>
 		   	<select name="lasso_thumb_gallery_transition" class="lasso-generator-attr">
-		      <option value="crossfade"><?php _e( 'Fade', 'lasso' );?></option>
-		      <option value="slide"><?php _e( 'Slide', 'lasso' );?></option>
-		      <option value="dissolve"><?php _e( 'Dissolve', 'lasso' );?></option>
+		      <option value="crossfade"><?php _e('Fade', 'lasso'); ?></option>
+		      <option value="slide"><?php _e('Slide', 'lasso'); ?></option>
+		      <option value="dissolve"><?php _e('Dissolve', 'lasso'); ?></option>
 		    </select>
 		</div>
 
 		<div data-option="speed" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_thumb_gallery_transition_speed"><?php _e( 'Gallery Transition Speed', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Activate slideshow by setting a speed for the transition.5000 = 5 seconds.', 'lasso' );?></small>
+			<label for="lasso_thumb_gallery_transition_speed"><?php _e('Gallery Transition Speed', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Activate slideshow by setting a speed for the transition.5000 = 5 seconds.', 'lasso'); ?></small>
 			<input type="text" class="lasso-generator-attr" name="lasso_thumb_gallery_transition_speed" value="">
 		</div>
 
 		<div data-option="hide-thumbs" class="ase-gallery-opts--single lasso-option">
 			<input class="lasso-generator-attr" type="checkbox" name="lasso_thumb_gallery_hide_thumbs">
-			<label for="lasso_thumb_gallery_hide_thumbs"><?php _e( 'Hide Gallery Thumbnails', 'lasso' );?></label>
+			<label for="lasso_thumb_gallery_hide_thumbs"><?php _e('Hide Gallery Thumbnails', 'lasso'); ?></label>
 		</div>
 
 	</div>
@@ -118,8 +118,8 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--photoset" style="display:none;">
 
 		<div data-option="pslayout" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso-photoset-gallery-layout"><?php _e( 'Gallery Layout', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Let\'s say you have 4 images in this gallery. If you enter 121 you will have one image on the top row, two images on the second row, and one image on the third row.', 'lasso' );?></small>
+			<label for="lasso-photoset-gallery-layout"><?php _e('Gallery Layout', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Let\'s say you have 4 images in this gallery. If you enter 121 you will have one image on the top row, two images on the second row, and one image on the third row.', 'lasso'); ?></small>
 			<input type="text" class="lasso-generator-attr" name="lasso_photoset_gallery_layout" value="">
 		</div>
 
@@ -134,8 +134,8 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--hero" style="display:none;">
 
 		<div data-option="height" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_gallery_height"><?php _e( 'Main Gallery Height', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Adjust the overall height of the gallery. Acceptable values include 500px or 50% etc.', 'lasso' );?></small>
+			<label for="lasso_gallery_height"><?php _e('Main Gallery Height', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Adjust the overall height of the gallery. Acceptable values include 500px or 50% etc.', 'lasso'); ?></small>
 			<input type="text_small" class="lasso-generator-attr" name="lasso_gallery_height" value="">
 		</div>
 
@@ -145,13 +145,13 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--global">
 
 		<div data-option="width" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_gallery_width"><?php _e( 'Main Gallery Width', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Adjust the overall width of the gallery. Acceptable values include 500px or 50% etc.', 'lasso' );?></small>
+			<label for="lasso_gallery_width"><?php _e('Main Gallery Width', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Adjust the overall width of the gallery. Acceptable values include 500px or 50% etc.', 'lasso'); ?></small>
 			<input type="text_small" class="lasso-generator-attr" name="lasso_gallery_width" value="">
 		</div>
 		<div data-option="caption" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_gallery_caption"><?php _e( 'Gallery Caption', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Add an optional caption for the gallery.', 'lasso' );?></small>
+			<label for="lasso_gallery_caption"><?php _e('Gallery Caption', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Add an optional caption for the gallery.', 'lasso'); ?></small>
 			<textarea name="lasso_gallery_caption" class="lasso-generator-attr"></textarea>
 		</div>