AesopInteractive / lasso

admin/includes/menus/welcome.php

Spacing +79 added lines, -79 removed lines

@@ -10,30 +10,30 @@ 
 
 	function __construct() {
 
-		add_action( 'admin_init',   array( $this, 'redirect' ) );
-		add_action( 'admin_menu',   array( $this, 'lasso_welcome' ) );
-		add_action( 'network_admin_menu',   array( $this, 'lasso_welcome' ) );  // CHANGED Added hook.
+		add_action('admin_init', array($this, 'redirect'));
+		add_action('admin_menu', array($this, 'lasso_welcome'));
+		add_action('network_admin_menu', array($this, 'lasso_welcome')); // CHANGED Added hook.
 
-		add_action( 'tgmpa_register',  array( $this,'required_plugins' ));
+		add_action('tgmpa_register', array($this, 'required_plugins'));
 
 	}
 
 	function redirect() {
 
 		// Bail if no activation redirect
-		if ( !get_transient( '_lasso_welcome_redirect' ) ) {
+		if (!get_transient('_lasso_welcome_redirect')) {
 			return;
 		}
 
 		// Delete the redirect transient
-		delete_transient( '_lasso_welcome_redirect' );
+		delete_transient('_lasso_welcome_redirect');
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-		wp_safe_redirect( esc_url_raw( add_query_arg( array( 'page' => 'lasso-editor' ), admin_url( 'admin.php' ) ) ) );
+		wp_safe_redirect(esc_url_raw(add_query_arg(array('page' => 'lasso-editor'), admin_url('admin.php'))));
 
 	}
 
@@ -45,8 +45,8 @@ 
 	function lasso_welcome() {
 
 		// CHANGED Removed condition.
-		add_menu_page( __( 'Editus', 'lasso' ), __( 'Editus', 'lasso' ), 'manage_options', 'lasso-editor', '', LASSO_URL.'/admin/assets/img/menu-icon.png' );
-		add_submenu_page( 'lasso-editor', __( 'Welcome', 'lasso' ), __( 'Status', 'lasso' ), 'manage_options', 'lasso-editor', array( $this, 'welcome' ) );
+		add_menu_page(__('Editus', 'lasso'), __('Editus', 'lasso'), 'manage_options', 'lasso-editor', '', LASSO_URL.'/admin/assets/img/menu-icon.png');
+		add_submenu_page('lasso-editor', __('Welcome', 'lasso'), __('Status', 'lasso'), 'manage_options', 'lasso-editor', array($this, 'welcome'));
 
 	}
 
@@ -60,24 +60,24 @@ 
 		?>
 		  <div class="wrap lasso--welcome">
 
-		  		<?php self::header();?>
+		  		<?php self::header(); ?>
 
 		  		<ul class="lasso--welcome__steps">
 
 		  		<?php // CHANGED Added the is_network_admin condition. ?>
-			  		<?php if ( is_network_admin() ) : ?>
+			  		<?php if (is_network_admin()) : ?>
 
 			  			<li>
-			  				<p><?php _e( 'We will check the current theme on every site in your network and give you a quick status feedback here. You can see the status by visiting the Editus menu on each site.', 'lasso' );?></p>
+			  				<p><?php _e('We will check the current theme on every site in your network and give you a quick status feedback here. You can see the status by visiting the Editus menu on each site.', 'lasso'); ?></p>
 			  			</li>
 
 			  		<?php else :
 
 					$checks = self::lasso_preflight_check();
 
-					if ( $checks && !defined( 'LASSO_AGENCY_MODE' ) ):
+					if ($checks && !defined('LASSO_AGENCY_MODE')):
 
-						foreach ( (array) $checks as $key => $check ) {
+						foreach ((array) $checks as $key => $check) {
 
 							echo $check;
 						}
@@ -87,11 +87,11 @@ 
 							// pre-flight is go for flight
 						?>
 						<li class="success">
-							<h3><?php _e( 'You\'re Ready to Rock!', 'lasso' );?></h3>
-							<?php if ( lasso_get_supported_theme_class() ) { ?>
-							<p><?php _e( 'Your theme is automatically supported. No additional setup is needed.', 'lasso' );?></p>
+							<h3><?php _e('You\'re Ready to Rock!', 'lasso'); ?></h3>
+							<?php if (lasso_get_supported_theme_class()) { ?>
+							<p><?php _e('Your theme is automatically supported. No additional setup is needed.', 'lasso'); ?></p>
 							<?php } ?>
-			  				<p><?php _e( 'Editus will place a small menu on the bottom of your site. While on a single post or page, click the "pen" icon to go into edit mode. Press escape to get out of edit mode.', 'lasso' );?></p>
+			  				<p><?php _e('Editus will place a small menu on the bottom of your site. While on a single post or page, click the "pen" icon to go into edit mode. Press escape to get out of edit mode.', 'lasso'); ?></p>
 			  			</li>
 			  			<?php
 			  			endif;
@@ -113,16 +113,16 @@ 
 
 	  		<div class="lasso--welcome__top">
 
-	  			<img style="width:125px;" src="<?php echo LASSO_URL.'/admin/assets/img/logo.png';?>">
-	    		<h1><?php _e( 'Welcome to Editus', 'lasso' );?></h1>
-	    		<p><?php _e( 'Version', 'lasso' );echo '<span> '.LASSO_VERSION.'</span>';?></p>
+	  			<img style="width:125px;" src="<?php echo LASSO_URL.'/admin/assets/img/logo.png'; ?>">
+	    		<h1><?php _e('Welcome to Editus', 'lasso'); ?></h1>
+	    		<p><?php _e('Version', 'lasso'); echo '<span> '.LASSO_VERSION.'</span>'; ?></p>
 
-	    		<?php if ( !defined( 'LASSO_AGENCY_MODE' ) ): ?>
+	    		<?php if (!defined('LASSO_AGENCY_MODE')): ?>
 
 			    	<ul class="lasso--welcome__social">
-			    		<li><a href="https://edituswp.com/help" target="_blank"><i class="dashicons dashicons-sos"></i> <?php _e( 'Help', 'lasso' );?></a></li>
-			    		<li><a href="http://twitter.com/aesopinteractiv" target="_blank"><i class="dashicons dashicons-twitter"></i> <?php _e( 'Twitter', 'lasso' );?></a></li>
-			    		<li><a href="http://facebook.com/aesopinteractive" target="_blank"><i class="dashicons dashicons-facebook"></i> <?php _e( 'Facebook', 'lasso' );?></a></li>
+			    		<li><a href="https://edituswp.com/help" target="_blank"><i class="dashicons dashicons-sos"></i> <?php _e('Help', 'lasso'); ?></a></li>
+			    		<li><a href="http://twitter.com/aesopinteractiv" target="_blank"><i class="dashicons dashicons-twitter"></i> <?php _e('Twitter', 'lasso'); ?></a></li>
+			    		<li><a href="http://facebook.com/aesopinteractive" target="_blank"><i class="dashicons dashicons-facebook"></i> <?php _e('Facebook', 'lasso'); ?></a></li>
 			    	</ul>
 
 			    <?php endif; ?>
@@ -139,62 +139,62 @@ 
 	 */
 	function lasso_preflight_check() {
 
-		$notices 		= array();
+		$notices = array();
 
-		$article_object = lasso_editor_get_option( 'article_class', 'lasso_editor' );
+		$article_object = lasso_editor_get_option('article_class', 'lasso_editor');
 
-		$theme_name  	= wp_get_theme()->get('Name');
-		$theme_class  	= lasso_get_supported_theme_class();
+		$theme_name = wp_get_theme()->get('Name');
+		$theme_class = lasso_get_supported_theme_class();
 
-		$license   		= get_option( 'lasso_license_key' );
-		$status   		= get_option( 'lasso_license_status' );
+		$license = get_option('lasso_license_key');
+		$status = get_option('lasso_license_status');
 		
 
 		// if the required CSS class has not been saved
-		if ( empty( $article_object ) && false == $theme_class ) {
+		if (empty($article_object) && false == $theme_class) {
 
 			// we dont automatically support this theme so show them otherwise
 			$notices[] = sprintf('<li class="error">
-							<h3>'.__( 'Article CSS Class Needed!', 'lasso' ).'</h3>
-							<p>'.__( 'Before using Editus,', 'lasso' ).' <a href="%s">'.__( 'enter and save', 'lasso' ).'</a> '.__( 'the CSS class of the container that holds your post and page content. You can <a href="https://dl.dropboxusercontent.com/u/5594632/lasso-media/doc-movies/using-inspector-lasso.gif" target="_blank">use a tool like inspector</a> in Chrome or Firefox to find this CSS class, or ', 'lasso' ).' <a href="mailto:editus@aesopinteractive.com">'.__( 'email us.', 'lasso' ).'</a> '.__( 'with a link to a public URL with the theme and we\'ll find it for you.', 'lasso' ).'</p>
-							</li>', admin_url( 'admin.php?page=lasso-editor-settings' ) );
+							<h3>'.__('Article CSS Class Needed!', 'lasso').'</h3>
+							<p>'.__('Before using Editus,', 'lasso').' <a href="%s">'.__('enter and save', 'lasso').'</a> '.__('the CSS class of the container that holds your post and page content. You can <a href="https://dl.dropboxusercontent.com/u/5594632/lasso-media/doc-movies/using-inspector-lasso.gif" target="_blank">use a tool like inspector</a> in Chrome or Firefox to find this CSS class, or ', 'lasso').' <a href="mailto:editus@aesopinteractive.com">'.__('email us.', 'lasso').'</a> '.__('with a link to a public URL with the theme and we\'ll find it for you.', 'lasso').'</p>
+							</li>', admin_url('admin.php?page=lasso-editor-settings'));
 		}
 
 		// WP REST API not active
-		if ( !function_exists( 'json_get_url_prefix' ) &&  !function_exists( 'rest_url' )) {
+		if (!function_exists('json_get_url_prefix') && !function_exists('rest_url')) {
 			$notices[] = '<li class="info"><h3>WP REST API not Activated!</h3>
-							<p>'.__( 'Just a heads up that the WP REST API isn\'t activated. This is required to list the posts and pages on the front-end.', 'lasso' ).'</p>
+							<p>'.__('Just a heads up that the WP REST API isn\'t activated. This is required to list the posts and pages on the front-end.', 'lasso').'</p>
 							</li>';
 		}
 
 		// aesop story engine isnt active
-		if ( !class_exists( 'Aesop_Core' ) ) {
-			$notices[] = sprintf( '<li class="info"><h3>Aesop Story Engine not Activated!</h3>
-							<p>'.__( 'Just a heads up that ', 'lasso' ).'<a href="%s" target="_blank
-							">'.__( 'Aesop Story Engine', 'lasso' ).'</a> '.__( 'isn\'t activated. It\'s not required to use Editus, but you won\'t get the cool drag and drop components without it activated. It\'s free!', 'lasso' ).'</p>
-							</li>', admin_url('plugin-install.php?tab=search&s=aesop+story+engine') );
+		if (!class_exists('Aesop_Core')) {
+			$notices[] = sprintf('<li class="info"><h3>Aesop Story Engine not Activated!</h3>
+							<p>'.__('Just a heads up that ', 'lasso').'<a href="%s" target="_blank
+							">'.__('Aesop Story Engine', 'lasso').'</a> '.__('isn\'t activated. It\'s not required to use Editus, but you won\'t get the cool drag and drop components without it activated. It\'s free!', 'lasso').'</p>
+							</li>', admin_url('plugin-install.php?tab=search&s=aesop+story+engine'));
 		}
 
 		// we dont really get along with wp side comments because of the section ids that get applied dynamically. since we save our html, it'll get saved along with the post as HTML
-		if ( class_exists( 'WP_Side_Comments' ) ) {
-			$notices[] = '<li class="error"><h3>'.__( 'WP Side Comments Compatibility Warning!', 'lasso' ).'</h3>
-							<p>'.__( 'Since Editus saves the HTML of a post, this may cause undesired issues. We\'re working to resolve incompatibilities faster than a jack rabbit in a hot greasy griddle in the middle of August.', 'lasso' ).'</p>
+		if (class_exists('WP_Side_Comments')) {
+			$notices[] = '<li class="error"><h3>'.__('WP Side Comments Compatibility Warning!', 'lasso').'</h3>
+							<p>'.__('Since Editus saves the HTML of a post, this may cause undesired issues. We\'re working to resolve incompatibilities faster than a jack rabbit in a hot greasy griddle in the middle of August.', 'lasso').'</p>
 							</li>';
 		}
 
 		// if the license key isnt activated
-		if ( empty( $license ) ) {
-			$notices[] = '<li class="info"><h3>'.__( 'License Key Not Activated', 'lasso' ).'</h3>
-							<p>'.__( 'Just a heads up, your license key isn\'t activated. Enter your license key into the License tab on the left in order to receive plugin update notifications.', 'lasso' ).'</p>
+		if (empty($license)) {
+			$notices[] = '<li class="info"><h3>'.__('License Key Not Activated', 'lasso').'</h3>
+							<p>'.__('Just a heads up, your license key isn\'t activated. Enter your license key into the License tab on the left in order to receive plugin update notifications.', 'lasso').'</p>
 							</li>';
 		}
-		if ( !empty( $license ) && 'invalid' == $status ) {
-			$notices[] = '<li class="error"><h3>'.__( 'License Key Invalid', 'lasso' ).'</h3>
-							<p>'.__( 'The license key that you entered is ', 'lasso' ).'<strong>'.__( 'invalid', 'lasso' ).'</strong>'.__( '. It may have been entered incorreclty, or may have expired.', 'lasso' ).'</p>
+		if (!empty($license) && 'invalid' == $status) {
+			$notices[] = '<li class="error"><h3>'.__('License Key Invalid', 'lasso').'</h3>
+							<p>'.__('The license key that you entered is ', 'lasso').'<strong>'.__('invalid', 'lasso').'</strong>'.__('. It may have been entered incorreclty, or may have expired.', 'lasso').'</p>
 							</li>';
 		}
 
-		return apply_filters( 'lasso_preflight_notices', $notices );
+		return apply_filters('lasso_preflight_notices', $notices);
 
 	}
 
@@ -208,7 +208,7 @@ 
 	    $plugins = array(
 
 	        array(
-	            'name'      => __('Aesop Story Engine','lasso'),
+	            'name'      => __('Aesop Story Engine', 'lasso'),
 	            'slug'      => 'aesop-story-engine',
 	            'required'  => false,
 	        ),
@@ -216,38 +216,38 @@ 
 	    );
 
 	    $config = array(
-	        'default_path' => '',                      // Default absolute path to pre-packaged plugins.
+	        'default_path' => '', // Default absolute path to pre-packaged plugins.
 	        'menu'         => 'lasso-install-plugins', // Menu slug.
-	        'has_notices'  => true,                    // Show admin notices or not.
-	        'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
-	        'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
-	        'is_automatic' => false,                   // Automatically activate plugins after installation or not.
-	        'message'      => '',                      // Message to output right before the plugins table.
+	        'has_notices'  => true, // Show admin notices or not.
+	        'dismissable'  => true, // If false, a user cannot dismiss the nag message.
+	        'dismiss_msg'  => '', // If 'dismissable' is false, this message will be output at top of nag.
+	        'is_automatic' => false, // Automatically activate plugins after installation or not.
+	        'message'      => '', // Message to output right before the plugins table.
 	        'strings'      => array(
-	            'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
-	            'menu_title'                      => __( 'Install Plugins', 'lasso' ),
-	            'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
-	            'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
-	            'notice_can_install_required'     => _n_noop( 'This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.' ), // %1$s = plugin name(s).
-	            'notice_can_install_recommended'  => _n_noop( 'This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.' ), // %1$s = plugin name(s).
-	            'notice_cannot_install'           => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s).
-	            'notice_can_activate_required'    => _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
-	            'notice_can_activate_recommended' => _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
-	            'notice_cannot_activate'          => _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s).
-	            'notice_ask_to_update'            => _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.' ), // %1$s = plugin name(s).
-	            'notice_cannot_update'            => _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s).
-	            'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
-	            'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
-	            'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
-	            'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
-	            'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
+	            'page_title'                      => __('Install Required Plugins', 'lasso'),
+	            'menu_title'                      => __('Install Plugins', 'lasso'),
+	            'installing'                      => __('Installing Plugin: %s', 'lasso'), // %s = plugin name.
+	            'oops'                            => __('Something went wrong with the plugin API.', 'lasso'),
+	            'notice_can_install_required'     => _n_noop('This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.'), // %1$s = plugin name(s).
+	            'notice_can_install_recommended'  => _n_noop('This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.'), // %1$s = plugin name(s).
+	            'notice_cannot_install'           => _n_noop('Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.'), // %1$s = plugin name(s).
+	            'notice_can_activate_required'    => _n_noop('The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.'), // %1$s = plugin name(s).
+	            'notice_can_activate_recommended' => _n_noop('The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.'), // %1$s = plugin name(s).
+	            'notice_cannot_activate'          => _n_noop('Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.'), // %1$s = plugin name(s).
+	            'notice_ask_to_update'            => _n_noop('The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.'), // %1$s = plugin name(s).
+	            'notice_cannot_update'            => _n_noop('Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.'), // %1$s = plugin name(s).
+	            'install_link'                    => _n_noop('Begin installing plugin', 'Begin installing plugins'),
+	            'activate_link'                   => _n_noop('Begin activating plugin', 'Begin activating plugins'),
+	            'return'                          => __('Return to Required Plugins Installer', 'lasso'),
+	            'plugin_activated'                => __('Plugin activated successfully.', 'lasso'),
+	            'complete'                        => __('All plugins installed and activated successfully. %s', 'lasso'), // %s = dashboard link.
 	            'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
 	        )
 	    );
 		
-		$plugins = apply_filters( 'lasso_required_plugins', $plugins );
+		$plugins = apply_filters('lasso_required_plugins', $plugins);
 
-	    tgmpa( $plugins, $config );
+	    tgmpa($plugins, $config);
 
 	}
 }

admin/includes/menus/settings.php

Indentation +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 		$bold_tag = lasso_editor_get_option( 'bold_tag', 'lasso_editor',  "b");
 		$i_tag = lasso_editor_get_option( 'i_tag', 'lasso_editor',  "i");
         
-        $add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
+		$add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
 		
 		// do we support pending status
 		$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');

Spacing +153 added lines, -153 removed lines

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

lasso.php

Indentation +34 added lines, -34 removed lines

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

Spacing +39 added lines, -39 removed lines

@@ -18,27 +18,27 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
 // Set some constants
-define( 'LASSO_VERSION', '1.2.7' );
-define( 'LASSO_DIR', plugin_dir_path( __FILE__ ) );
-define( 'LASSO_URL', plugins_url( '', __FILE__ ) );
-define( 'LASSO_FILE', __FILE__ );
+define('LASSO_VERSION', '1.2.7');
+define('LASSO_DIR', plugin_dir_path(__FILE__));
+define('LASSO_URL', plugins_url('', __FILE__));
+define('LASSO_FILE', __FILE__);
 
 /**
  * Load plugin if PHP version is 5.4 or later.
  */
-if ( version_compare( PHP_VERSION, '5.4.0', '>=' ) ) {
+if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
 
-	include_once( LASSO_DIR . '/bootstrap.php' );
+	include_once(LASSO_DIR.'/bootstrap.php');
 
 } else {
 
 	add_action('admin_head', 'lasso_fail_notice');
-	function lasso_fail_notice(){
+	function lasso_fail_notice() {
 
 		printf('<div class="error"><p>Editus requires PHP 5.4 or higher.</p></div>');
 
@@ -46,11 +46,11 @@ 
 }
 
 add_filter('register_post_type_args', 'lasso_show_in_rest', 10, 2);
-function lasso_show_in_rest($args, $post_type){
+function lasso_show_in_rest($args, $post_type) {
  
-    $allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
-	if (in_array( $post_type,$allowed_post_types)) {
+    $allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array( ));
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
+	if (in_array($post_type, $allowed_post_types)) {
 		$args['show_in_rest'] = true;
 		if ($post_type != 'post' && $post_type != 'page') {
 			$args['rest_base'] = $post_type;
@@ -61,21 +61,21 @@ 
 }
 
 
-function lasso_editor_get_option( $option, $section, $default = '' ) {
+function lasso_editor_get_option($option, $section, $default = '') {
 
-	if ( empty( $option ) )
+	if (empty($option))
 		return;
 
-	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+	if (function_exists('is_multisite') && is_multisite()) {
 
-		$options = get_site_option( $section );
+		$options = get_site_option($section);
 
 	} else {
 
-		$options = get_option( $section );
+		$options = get_option($section);
 	}
 
-	if ( isset( $options[$option] ) ) {
+	if (isset($options[$option])) {
 		return $options[$option];
 	}
 
@@ -88,17 +88,17 @@ 
 ));
 
 // Gutenberg
-if( function_exists( 'is_gutenberg_page' ) ) {
-	function add_raw_to_post( $response, $post, $request ) {
+if (function_exists('is_gutenberg_page')) {
+	function add_raw_to_post($response, $post, $request) {
 		$response_data = $response->get_data();
-		if ( is_array( $response_data['content'] )) {
-			$response_data['content']['raw'] =  $post->post_content ;
-			$response->set_data( $response_data );
+		if (is_array($response_data['content'])) {
+			$response_data['content']['raw'] = $post->post_content;
+			$response->set_data($response_data);
 		}
 
 		return $response;
 	}
-	add_filter( "rest_prepare_post", 'add_raw_to_post', 10, 3 );
+	add_filter("rest_prepare_post", 'add_raw_to_post', 10, 3);
 }
 
 
@@ -106,31 +106,31 @@ 
 //table codes to be added
 class editus_table {
     
-    public function __construct(){
+    public function __construct() {
         $add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
         if ($add_table) {
-            add_action('wp_enqueue_scripts', array($this,'scripts'));
+            add_action('wp_enqueue_scripts', array($this, 'scripts'));
             
         }
 	}
     
     function scripts()
     {
-        add_action('lasso_editor_controls_after_outside', array($this,'editus_table_edit_menu'));
-            add_filter('lasso_components',array($this,'editus_components_add_table'),10,1);
-            add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_table'), 10 );
-            wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
-            wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
+        add_action('lasso_editor_controls_after_outside', array($this, 'editus_table_edit_menu'));
+            add_filter('lasso_components', array($this, 'editus_components_add_table'), 10, 1);
+            add_action('lasso_toolbar_components', array($this, 'editus_toolbar_components_add_table'), 10);
+            wp_enqueue_style('editus-table-style', LASSO_URL.'/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true);
+            wp_enqueue_script('editus_table', LASSO_URL.'/public/assets/js/editus-table-edit-public.js', array('jquery'), LASSO_VERSION, true);
     }
     
     function editus_table_edit_menu()
     { ?>
 
         <ul class='editus-table-menu'>
-          <li data-action="insertcol"><?php echo __('Insert Column','lasso')?></li>
-          <li data-action="insertrow"><?php echo __('Insert Row','lasso')?></li>
-          <li data-action="delcol"><?php echo __('Delete Column','lasso')?></li>
-          <li data-action="delrow"><?php echo __('Delete Row','lasso')?></li>
+          <li data-action="insertcol"><?php echo __('Insert Column', 'lasso')?></li>
+          <li data-action="insertrow"><?php echo __('Insert Row', 'lasso')?></li>
+          <li data-action="delcol"><?php echo __('Delete Column', 'lasso')?></li>
+          <li data-action="delrow"><?php echo __('Delete Row', 'lasso')?></li>
         </ul>
     <?php
     }
@@ -142,20 +142,20 @@ 
     }
 
 
-    function editus_components_add_table( $array ){
+    function editus_components_add_table($array) {
         $custom = array(
                'htmltable' => array(
-                         'name'    => __('HTML Table','lasso'),
+                         'name'    => __('HTML Table', 'lasso'),
                           'content' => self::editus_html_table(),
                 )
         );
-        return array_merge( $array, $custom );
+        return array_merge($array, $custom);
     }
 
 
     function editus_toolbar_components_add_table( ) {
           ?>
-          <li data-type="htmltable" title="<?php esc_attr_e( 'HTML Table', 'lasso' );?>" class="quote lasso-toolbar--component__htmltable dashicons dashicons-grid-view"></li>
+          <li data-type="htmltable" title="<?php esc_attr_e('HTML Table', 'lasso'); ?>" class="quote lasso-toolbar--component__htmltable dashicons dashicons-grid-view"></li>
           <?php
     }
 }

public/includes/editor-modules.php

Indentation +26 added lines, -26 removed lines

@@ -114,7 +114,7 @@ 
 				height: 42px;
 			}
 		<?php
-            } 
+			} 
 		} else { 
 		?> 
 
@@ -123,8 +123,8 @@ 
             }
             
         <?php
-        }
-        ?>
+		}
+		?>
         </style>
 		<div id="lasso--controls" class="lasso-post-status--<?php echo sanitize_html_class( $status );?> <?php echo sanitize_html_class( $custom_classes );?>" data-post-id="<?php echo get_the_ID();?>" >
 
@@ -233,7 +233,7 @@ 
 	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
 	
 	// mobile styles
-    $mobile_class = $is_mobile ? 'lasso-mobile' : false;
+	$mobile_class = $is_mobile ? 'lasso-mobile' : false;
 	$mobile_style =$is_mobile ? 'style="bottom:0px;"' : null;
 	
 	//show color
@@ -536,7 +536,7 @@ 
 						</div>
 						<?php 
 						if ($allow_change_date) { 
-						    $dateformat = get_option( 'date_format' ); 
+							$dateformat = get_option( 'date_format' ); 
 						?>
 						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
 							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
@@ -651,7 +651,7 @@ 
 						if ( !empty( $types ) ) {
 							// get the first element
 							$keys = array_keys($types);
-						    $type =$keys[0];						
+							$type =$keys[0];						
 							$type = preg_replace( '/s\b/','', $type );
 							printf( '<input type="hidden" name="object" value="%s">', lcfirst( esc_attr( $type ) ) );		
 						}
@@ -679,8 +679,8 @@ 
 	global $post;
 	
 	global $wp_post_types;
-    $labels = &$wp_post_types['post']->labels;
-    $labels->name = 'Articles';
+	$labels = &$wp_post_types['post']->labels;
+	$labels->name = 'Articles';
 
 	ob_start();
 
@@ -923,9 +923,9 @@ 
 		$return .= '</form>';
 
 		// extra JS codes
-        if (isset($shortcode['codes'])) {
-		    $return .= $shortcode['codes'];
-        }
+		if (isset($shortcode['codes'])) {
+			$return .= $shortcode['codes'];
+		}
 		$blob[$slug] = $return;
 	}
 
@@ -974,23 +974,23 @@ 
  * @return string
  */
 function lasso_editor_adjustBrightness($hex, $steps) { 
-    $steps = max(-255, min(255, $steps));
+	$steps = max(-255, min(255, $steps));
 
-    // Normalize into a six character long hex string
-    $hex = str_replace('#', '', $hex);
-    if (strlen($hex) == 3) {
-        $hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
-    }
+	// Normalize into a six character long hex string
+	$hex = str_replace('#', '', $hex);
+	if (strlen($hex) == 3) {
+		$hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
+	}
 
-    // Split into three parts: R, G and B
-    $color_parts = str_split($hex, 2);
-    $return = '#';
+	// Split into three parts: R, G and B
+	$color_parts = str_split($hex, 2);
+	$return = '#';
 
-    foreach ($color_parts as $color) {
-        $color   = hexdec($color); // Convert to decimal
-        $color   = max(0,min(255,$color + $steps)); // Adjust color
-        $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
-    }
+	foreach ($color_parts as $color) {
+		$color   = hexdec($color); // Convert to decimal
+		$color   = max(0,min(255,$color + $steps)); // Adjust color
+		$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
+	}
 
-    return $return;
+	return $return;
 }

Spacing +260 added lines, -260 removed lines

@@ -11,39 +11,39 @@ 
  *
  * @since 1.0
  */
-add_action( 'wp_footer', 'lasso_editor_controls' );
+add_action('wp_footer', 'lasso_editor_controls');
 function lasso_editor_controls() {
 
 	global $post;
 
-	if ( lasso_user_can('edit_posts') ) {
+	if (lasso_user_can('edit_posts')) {
 
-		$status = get_post_status( get_the_ID() );
-		$use_old_ui   = lasso_editor_get_option( 'use_old_ui', 'lasso_editor' );
-		$button_color1 = lasso_editor_get_option('button-color1', 'lasso_editor','#0000ff');
-		$button_color2 = lasso_editor_get_option('button-color2', 'lasso_editor','#000000');
-		$dialog_color = lasso_editor_get_option('dialog-color', 'lasso_editor','#000055');
-		$text_color = lasso_editor_get_option('text-color', 'lasso_editor','#ffffff');
+		$status = get_post_status(get_the_ID());
+		$use_old_ui   = lasso_editor_get_option('use_old_ui', 'lasso_editor');
+		$button_color1 = lasso_editor_get_option('button-color1', 'lasso_editor', '#0000ff');
+		$button_color2 = lasso_editor_get_option('button-color2', 'lasso_editor', '#000000');
+		$dialog_color = lasso_editor_get_option('dialog-color', 'lasso_editor', '#000055');
+		$text_color = lasso_editor_get_option('text-color', 'lasso_editor', '#ffffff');
 		$hover_color1 = lasso_editor_adjustBrightness($button_color1, 50);
 		$hover_color2 = lasso_editor_adjustBrightness($button_color2, 50);
 
 		// let users add custom css classes
-		$custom_classes = apply_filters( 'lasso_control_classes', '' );
+		$custom_classes = apply_filters('lasso_control_classes', '');
 
 		$post_access_class   = '';
-		$post_new_disabled   = lasso_editor_get_option( 'post_adding_disabled', 'lasso_editor' );
-		$post_settings_disabled = lasso_editor_get_option( 'post_settings_disabled', 'lasso_editor' );
-		$shortcodify_disabled = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
+		$post_new_disabled   = lasso_editor_get_option('post_adding_disabled', 'lasso_editor');
+		$post_settings_disabled = lasso_editor_get_option('post_settings_disabled', 'lasso_editor');
+		$shortcodify_disabled = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
 
 
 		// CSS class if adding new post objects is disabled
-		if ( 'on' == $post_new_disabled ) { $post_access_class = 'lasso--post-new-disabled'; }
+		if ('on' == $post_new_disabled) { $post_access_class = 'lasso--post-new-disabled'; }
 
 		// CSS class if adjust settings is disabled
-		if ( 'on' == $post_settings_disabled ) { $post_access_class = 'lasso--post-settings-disabled'; }
+		if ('on' == $post_settings_disabled) { $post_access_class = 'lasso--post-settings-disabled'; }
 
 		// CSS class if adding new post objects AND settings are disabled
-		if ( 'on' == $post_new_disabled && 'on' == $post_settings_disabled ) { $post_access_class = 'lasso--post-all-disabled'; }
+		if ('on' == $post_new_disabled && 'on' == $post_settings_disabled) { $post_access_class = 'lasso--post-all-disabled'; }
 
 		// CSS class if shortcodify or (Aesop Shortcode Conversion) is disabled
 		$sc_saving_class = 'on' == $shortcodify_disabled ? 'shortcodify-disabled' : 'shortcodify-enabled';
@@ -57,7 +57,7 @@ 
 		?>
 		<style>
 		#lasso-html--table:before {
-			content: "<?php esc_attr_e( 'Table', 'lasso' );?>";
+			content: "<?php esc_attr_e('Table', 'lasso'); ?>";
 		}
 		
 		
@@ -67,32 +67,32 @@ 
 		?>
 		
 		.lasso-editor-controls--wrap, #lasso--post-settings2,#lasso--save,#lasso--post-delete,#lasso--exit,#lasso--publish {
-			background-image: -webkit-linear-gradient(top,<?php echo $button_color1;?> 0,<?php echo $button_color2;?> 100%);
-			background-image: -o-linear-gradient(top,<?php echo $button_color1;?> 0,<?php echo $button_color2;?> 100%);
-			background-image: linear-gradient(to bottom,<?php echo $button_color1;?> 0,<?php echo $button_color2;?> 100%);
-			color: <?php echo $text_color;?>;
+			background-image: -webkit-linear-gradient(top,<?php echo $button_color1; ?> 0,<?php echo $button_color2; ?> 100%);
+			background-image: -o-linear-gradient(top,<?php echo $button_color1; ?> 0,<?php echo $button_color2; ?> 100%);
+			background-image: linear-gradient(to bottom,<?php echo $button_color1; ?> 0,<?php echo $button_color2; ?> 100%);
+			color: <?php echo $text_color; ?>;
 		}
 		
 		.lasso--controls__right a:before, #lasso-toolbar--html__footer_desc, ul.lasso-editor-controls li:before,#lasso-side-comp-button.toolbar--side li:before
         {
-			color: <?php echo $text_color;?> !important;
+			color: <?php echo $text_color; ?> !important;
 		}
 		
 		
 		
 		ul.lasso-editor-controls li:hover, #lasso--exit:hover,#lasso--post-settings2:hover,#lasso--post-delete:hover,#lasso--publish:hover,#lasso--save:hover {
-			background-image: -webkit-linear-gradient(top,<?php echo $hover_color1;?> 0,<?php echo $hover_color2;?> 100%);
-			background-image: -o-linear-gradient(top,<?php echo $hover_color1;?> 0,<?php echo $hover_color2;?> 100%);
-			background-image: linear-gradient(to bottom,<?php echo $hover_color1;?> 0,<?php echo $hover_color2;?> 100%);
+			background-image: -webkit-linear-gradient(top,<?php echo $hover_color1; ?> 0,<?php echo $hover_color2; ?> 100%);
+			background-image: -o-linear-gradient(top,<?php echo $hover_color1; ?> 0,<?php echo $hover_color2; ?> 100%);
+			background-image: linear-gradient(to bottom,<?php echo $hover_color1; ?> 0,<?php echo $hover_color2; ?> 100%);
 		}
 		
 		.lasso--modal__inner,.sweet-alert,#lasso-toolbar--components.toolbar--drop-up ul,#lasso-toolbar--components__list,#lasso-toolbar--html.html--drop-up #lasso-toolbar--html__wrap,
 		#lasso-toolbar--link.link--drop-up #lasso-toolbar--link__wrap		{
-			background: <?php echo $dialog_color;?>;
-			color: <?php echo $text_color;?>;
+			background: <?php echo $dialog_color; ?>;
+			color: <?php echo $text_color; ?>;
 		}
 		.sweet-alert p,.lasso--modal__inner label,.lasso--toolbar__inner label {
-			color: <?php echo $text_color;?> !important;
+			color: <?php echo $text_color; ?> !important;
 		}
 		
 		<?php if (!$is_mobile) { ?>
@@ -126,48 +126,48 @@ 
         }
         ?>
         </style>
-		<div id="lasso--controls" class="lasso-post-status--<?php echo sanitize_html_class( $status );?> <?php echo sanitize_html_class( $custom_classes );?>" data-post-id="<?php echo get_the_ID();?>" >
+		<div id="lasso--controls" class="lasso-post-status--<?php echo sanitize_html_class($status); ?> <?php echo sanitize_html_class($custom_classes); ?>" data-post-id="<?php echo get_the_ID(); ?>" >
 
-			<ul class="lasso--controls__center lasso-editor-controls lasso-editor-controls--wrap <?php echo $post_access_class;?> "  <?php echo $mobile_style ?> >
+			<ul class="lasso--controls__center lasso-editor-controls lasso-editor-controls--wrap <?php echo $post_access_class; ?> "  <?php echo $mobile_style ?> >
 
-				<?php do_action( 'lasso_editor_controls_before' );
+				<?php do_action('lasso_editor_controls_before');
 
-				if ( $is_capable ) { ?>
+				if ($is_capable) { ?>
 
-					<li id="lasso--edit" title="<?php esc_attr_e( 'Edit Post', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+					<li id="lasso--edit" title="<?php esc_attr_e('Edit Post', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 
-					<?php if ( 'off' == $post_settings_disabled || empty( $post_settings_disabled ) ) { ?>
-						<li id="lasso--post-settings" title="<?php esc_attr_e( 'Post Settings', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+					<?php if ('off' == $post_settings_disabled || empty($post_settings_disabled)) { ?>
+						<li id="lasso--post-settings" title="<?php esc_attr_e('Post Settings', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 					<?php }
 
 				} ?>
 
-				<li id="lasso--post-all" title="<?php esc_attr_e( 'All Posts', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+				<li id="lasso--post-all" title="<?php esc_attr_e('All Posts', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 
-				<?php if ( $is_capable && wp_revisions_enabled( $post ) ) { ?>
-					<li id="lasso--post-revisions" title="<?php esc_attr_e( 'Revisions', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+				<?php if ($is_capable && wp_revisions_enabled($post)) { ?>
+					<li id="lasso--post-revisions" title="<?php esc_attr_e('Revisions', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 				<?php } ?>
 
-				<?php if ( ( 'off' == $post_new_disabled || empty( $post_new_disabled ) && lasso_user_can('edit_posts') ) ) { ?>
-					<li id="lasso--post-new" title="<?php esc_attr_e( 'Add Post', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+				<?php if (('off' == $post_new_disabled || empty($post_new_disabled) && lasso_user_can('edit_posts'))) { ?>
+					<li id="lasso--post-new" title="<?php esc_attr_e('Add Post', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 				<?php } ?>
 
-				<?php do_action( 'lasso_editor_controls_after' );?>
+				<?php do_action('lasso_editor_controls_after'); ?>
 
 			</ul>
 
-			<?php if ( is_singular() && !$is_mobile ) { ?>
+			<?php if (is_singular() && !$is_mobile) { ?>
 
-				<div class="lasso--controls__right" data-posttype="<?php echo get_post_type( get_the_ID() );?>" data-status="<?php echo $status;?>">
+				<div class="lasso--controls__right" data-posttype="<?php echo get_post_type(get_the_ID()); ?>" data-status="<?php echo $status; ?>">
 				
-					<a href="#" title="<?php esc_attr_e( 'Delete Post', 'lasso' );?>" id="lasso--post-delete" class="lasso-save-post lasso--button <?php echo $sc_saving_class;?>"></a>
-					<a href="#" title="<?php esc_attr_e( 'Post Settings', 'lasso' );?>" id="lasso--post-settings2" class="lasso-save-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<a href="#" title="<?php esc_attr_e('Delete Post', 'lasso'); ?>" id="lasso--post-delete" class="lasso-save-post lasso--button <?php echo $sc_saving_class; ?>"></a>
+					<a href="#" title="<?php esc_attr_e('Post Settings', 'lasso'); ?>" id="lasso--post-settings2" class="lasso-save-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 
 
-					<a href="#" title="<?php esc_attr_e( 'Save Post', 'lasso' );?>" id="lasso--save" class="lasso-save-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<a href="#" title="<?php esc_attr_e('Save Post', 'lasso'); ?>" id="lasso--save" class="lasso-save-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 
-					<?php if ( ('draft' == $status ) || ('pending' == $status && $can_publish) ) { ?>
-						<a href="#" title="<?php $can_publish ? esc_attr_e( 'Publish Post', 'lasso' ) : esc_attr_e( 'Submit For Review', 'lasso' );?>" id="lasso--publish" class="lasso-publish-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<?php if (('draft' == $status) || ('pending' == $status && $can_publish)) { ?>
+						<a href="#" title="<?php $can_publish ? esc_attr_e('Publish Post', 'lasso') : esc_attr_e('Submit For Review', 'lasso'); ?>" id="lasso--publish" class="lasso-publish-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 					<?php } ?>
 					
 
@@ -178,7 +178,7 @@ 
 		</div>
 		
 		
-		<?php do_action( 'lasso_editor_controls_after_outside' );?>
+		<?php do_action('lasso_editor_controls_after_outside'); ?>
 
 	<?php }
 }
@@ -196,9 +196,9 @@ 
 
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_sidebar_classes', '' );
+	$custom_classes = apply_filters('lasso_sidebar_classes', '');
 	?>
-	<div id="lasso--sidebar" class="<?php echo sanitize_html_class( $custom_classes );?>" >
+	<div id="lasso--sidebar" class="<?php echo sanitize_html_class($custom_classes); ?>" >
 		<div class="lasso--sidebar__inner">
 			<div id="aesop-generator-settings"><div id="lasso--component__settings"></div></div>
 		</div>
@@ -220,21 +220,21 @@ 
 	$is_mobile = wp_is_mobile();
 
 	// check for lasso story engine and add a class doniting this
-	$ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
+	$ase_status = class_exists('Aesop_Core') || defined('LASSO_CUSTOM') ? 'ase-active' : 'ase-not-active';
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_toolbar_classes', '' );
+	$custom_classes = apply_filters('lasso_toolbar_classes', '');
 
 	// are toolbar headings enabled
-	$toolbar_headings      = lasso_editor_get_option( 'toolbar_headings', 'lasso_editor' );
-	$toolbar_headings_h4      = lasso_editor_get_option( 'toolbar_headings_h4', 'lasso_editor' );
-	$toolbar_list      = lasso_editor_get_option( 'toolbar_list', 'lasso_editor' );
+	$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+	$toolbar_headings_h4 = lasso_editor_get_option('toolbar_headings_h4', 'lasso_editor');
+	$toolbar_list = lasso_editor_get_option('toolbar_list', 'lasso_editor');
 
-	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
+	$toolbar_class = $toolbar_headings ? 'toolbar-extended' : false;
 	
 	// mobile styles
     $mobile_class = $is_mobile ? 'lasso-mobile' : false;
-	$mobile_style =$is_mobile ? 'style="bottom:0px;"' : null;
+	$mobile_style = $is_mobile ? 'style="bottom:0px;"' : null;
 	
 	//show color
 	$show_color = lasso_editor_get_option('toolbar_show_color', 'lasso_editor');
@@ -242,126 +242,126 @@ 
 	//show alignment
 	$show_align = lasso_editor_get_option('toolbar_show_alignment', 'lasso_editor');
 	
-	$status = get_post_status( get_the_ID() );
+	$status = get_post_status(get_the_ID());
 	
-	$shortcodify_disabled = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
+	$shortcodify_disabled = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
 	
 	$sc_saving_class = 'on' == $shortcodify_disabled ? 'shortcodify-disabled' : 'shortcodify-enabled';
 
 
 	?>
-	<div class="lasso--toolbar_wrap lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$mobile_class.' '.$ase_status.' '.sanitize_html_class( $custom_classes );?>" <?php echo $mobile_style ?>>
-		<ul class="lasso--toolbar__inner lasso-editor-controls" <?php if ($is_mobile) {echo 'style="float:left;"';}?>>
-			<?php do_action( 'lasso_toolbar_components_before' );?>
-		    <li id="lasso-toolbar--bold" title="<?php esc_attr_e( 'Bold', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--underline" title="<?php esc_attr_e( 'Underline', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--italic" title="<?php esc_attr_e( 'Italicize', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--strike" title="<?php esc_attr_e( 'Strikethrough', 'lasso' );?>"></li>
-			<li id="lasso-toolbar--components" class="lasso-toolbar--components" title="<?php esc_attr_e( 'Insert Component', 'lasso' );?>" style="color:#ffffa0;">
+	<div class="lasso--toolbar_wrap lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$mobile_class.' '.$ase_status.' '.sanitize_html_class($custom_classes); ?>" <?php echo $mobile_style ?>>
+		<ul class="lasso--toolbar__inner lasso-editor-controls" <?php if ($is_mobile) {echo 'style="float:left;"'; }?>>
+			<?php do_action('lasso_toolbar_components_before'); ?>
+		    <li id="lasso-toolbar--bold" title="<?php esc_attr_e('Bold', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--underline" title="<?php esc_attr_e('Underline', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--italic" title="<?php esc_attr_e('Italicize', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--strike" title="<?php esc_attr_e('Strikethrough', 'lasso'); ?>"></li>
+			<li id="lasso-toolbar--components" class="lasso-toolbar--components" title="<?php esc_attr_e('Insert Component', 'lasso'); ?>" style="color:#ffffa0;">
 			    <ul id="lasso-toolbar--components__list" style="display:none;color:white;">
-			    	<?php if ( 'ase-active' == $ase_status ): ?>
-						<li data-type="image" title="<?php esc_attr_e( 'Image', 'lasso' );?>" class="lasso-toolbar--component__image"></li>
-						<li data-type="character" title="<?php esc_attr_e( 'Character', 'lasso' );?>" class="lasso-toolbar--component__character"></li>
-						<li data-type="quote" title="<?php esc_attr_e( 'Quote', 'lasso' );?>"  class="lasso-toolbar--component__quote"></li>
-						<li data-type="content" title="<?php esc_attr_e( 'Content', 'lasso' );?>"  class="lasso-toolbar--component__content"></li>
-						<li data-type="chapter" title="<?php esc_attr_e( 'Chapter', 'lasso' );?>"  class="lasso-toolbar--component__chapter"></li>
-						<li data-type="parallax" title="<?php esc_attr_e( 'Parallax', 'lasso' );?>"  class="lasso-toolbar--component__parallax"></li>
-						<li data-type="audio" title="<?php esc_attr_e( 'Audio', 'lasso' );?>"  class="lasso-toolbar--component__audio"></li>
-						<li data-type="video" title="<?php esc_attr_e( 'Video', 'lasso' );?>"  class="lasso-toolbar--component__video"></li>
-						<li data-type="map" title="<?php esc_attr_e( 'Map', 'lasso' );?>"  class="lasso-toolbar--component__map"></li>
-						<li data-type="timeline_stop" title="<?php esc_attr_e( 'Timeline', 'lasso' );?>"  class="lasso-toolbar--component__timeline"></li>
-						<li data-type="document" title="<?php esc_attr_e( 'Document', 'lasso' );?>"  class="lasso-toolbar--component__document"></li>
-						<li data-type="collection" title="<?php esc_attr_e( 'Collection', 'lasso' );?>"  class="lasso-toolbar--component__collection"></li>
-						<li data-type="gallery" title="<?php esc_attr_e( 'Gallery', 'lasso' );?>"  class="lasso-toolbar--component__gallery"></li>
-						<?php if ( class_exists ('Aesop_GalleryPop') ) { ?>
-						     <li data-type="gallery" title="<?php esc_attr_e( 'Gallery Pop', 'lasso' );?>"  class="lasso-toolbar--component__gallerypop"></li>
+			    	<?php if ('ase-active' == $ase_status): ?>
+						<li data-type="image" title="<?php esc_attr_e('Image', 'lasso'); ?>" class="lasso-toolbar--component__image"></li>
+						<li data-type="character" title="<?php esc_attr_e('Character', 'lasso'); ?>" class="lasso-toolbar--component__character"></li>
+						<li data-type="quote" title="<?php esc_attr_e('Quote', 'lasso'); ?>"  class="lasso-toolbar--component__quote"></li>
+						<li data-type="content" title="<?php esc_attr_e('Content', 'lasso'); ?>"  class="lasso-toolbar--component__content"></li>
+						<li data-type="chapter" title="<?php esc_attr_e('Chapter', 'lasso'); ?>"  class="lasso-toolbar--component__chapter"></li>
+						<li data-type="parallax" title="<?php esc_attr_e('Parallax', 'lasso'); ?>"  class="lasso-toolbar--component__parallax"></li>
+						<li data-type="audio" title="<?php esc_attr_e('Audio', 'lasso'); ?>"  class="lasso-toolbar--component__audio"></li>
+						<li data-type="video" title="<?php esc_attr_e('Video', 'lasso'); ?>"  class="lasso-toolbar--component__video"></li>
+						<li data-type="map" title="<?php esc_attr_e('Map', 'lasso'); ?>"  class="lasso-toolbar--component__map"></li>
+						<li data-type="timeline_stop" title="<?php esc_attr_e('Timeline', 'lasso'); ?>"  class="lasso-toolbar--component__timeline"></li>
+						<li data-type="document" title="<?php esc_attr_e('Document', 'lasso'); ?>"  class="lasso-toolbar--component__document"></li>
+						<li data-type="collection" title="<?php esc_attr_e('Collection', 'lasso'); ?>"  class="lasso-toolbar--component__collection"></li>
+						<li data-type="gallery" title="<?php esc_attr_e('Gallery', 'lasso'); ?>"  class="lasso-toolbar--component__gallery"></li>
+						<?php if (class_exists('Aesop_GalleryPop')) { ?>
+						     <li data-type="gallery" title="<?php esc_attr_e('Gallery Pop', 'lasso'); ?>"  class="lasso-toolbar--component__gallerypop"></li>
 						<?php }?>
-						<?php if ( class_exists ('Aesop_Events') ) { ?>
-						     <li data-type="events" title="<?php esc_attr_e( 'Event', 'lasso' );?>"  class="lasso-toolbar--component__event"></li>
+						<?php if (class_exists('Aesop_Events')) { ?>
+						     <li data-type="events" title="<?php esc_attr_e('Event', 'lasso'); ?>"  class="lasso-toolbar--component__event"></li>
 						<?php }?>
 					<?php else: ?>
-						<li data-type="wpimg" title="<?php esc_attr_e( 'WordPress Image', 'lasso' );?>" class="image lasso-toolbar--component__image"></li>
-						<li data-type="wpquote" title="<?php esc_attr_e( 'WordPress Quote', 'lasso' );?>" class="quote lasso-toolbar--component__quote"></li>
-						<!--li data-type="wpvideo" title="<?php esc_attr_e( 'WordPress Video', 'lasso' );?>" class="video lasso-toolbar--component__video"></li-->
+						<li data-type="wpimg" title="<?php esc_attr_e('WordPress Image', 'lasso'); ?>" class="image lasso-toolbar--component__image"></li>
+						<li data-type="wpquote" title="<?php esc_attr_e('WordPress Quote', 'lasso'); ?>" class="quote lasso-toolbar--component__quote"></li>
+						<!--li data-type="wpvideo" title="<?php esc_attr_e('WordPress Video', 'lasso'); ?>" class="video lasso-toolbar--component__video"></li-->
 					<?php endif; ?>
-					<?php do_action( 'lasso_toolbar_components' );?>
+					<?php do_action('lasso_toolbar_components'); ?>
 			    </ul>
 			</li>
-		    <?php if ( $toolbar_headings ): ?>
-		    <li id="lasso-toolbar--h2" title="<?php esc_attr_e( 'H2 Heading', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--h3" title="<?php esc_attr_e( 'H3 Heading', 'lasso' );?>"></li>
+		    <?php if ($toolbar_headings): ?>
+		    <li id="lasso-toolbar--h2" title="<?php esc_attr_e('H2 Heading', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--h3" title="<?php esc_attr_e('H3 Heading', 'lasso'); ?>"></li>
 			<?php endif; ?>
 			
 			
 			
-			<?php if ( $toolbar_headings_h4 ): ?>
-		    <li id="lasso-toolbar--h4" title="<?php esc_attr_e( 'H4 Heading', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--h5" title="<?php esc_attr_e( 'H5 Heading', 'lasso' );?>"></li>
-			<li id="lasso-toolbar--h6" title="<?php esc_attr_e( 'H6 Heading', 'lasso' );?>"></li>
+			<?php if ($toolbar_headings_h4): ?>
+		    <li id="lasso-toolbar--h4" title="<?php esc_attr_e('H4 Heading', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--h5" title="<?php esc_attr_e('H5 Heading', 'lasso'); ?>"></li>
+			<li id="lasso-toolbar--h6" title="<?php esc_attr_e('H6 Heading', 'lasso'); ?>"></li>
 			<?php endif; ?>
 			
-			<?php if ( $show_color ): ?>
-		    <li id="lasso-toolbar--color-set" title="<?php esc_attr_e( 'Set Color for Selected Text', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--color-pick" title="<?php esc_attr_e( 'Choose Color', 'lasso' );?>"></li>
+			<?php if ($show_color): ?>
+		    <li id="lasso-toolbar--color-set" title="<?php esc_attr_e('Set Color for Selected Text', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--color-pick" title="<?php esc_attr_e('Choose Color', 'lasso'); ?>"></li>
 			<?php endif; ?>
 			
-			<?php if ( $toolbar_list ): ?>
-		    <li id="lasso-toolbar--ol" title="<?php esc_attr_e( 'Ordered List', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--ul" title="<?php esc_attr_e( 'Unordered List', 'lasso' );?>"></li>
+			<?php if ($toolbar_list): ?>
+		    <li id="lasso-toolbar--ol" title="<?php esc_attr_e('Ordered List', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--ul" title="<?php esc_attr_e('Unordered List', 'lasso'); ?>"></li>
 			<?php endif; ?>
 					
 		    
-			<li id="lasso-toolbar--link" title="<?php esc_attr_e( 'Anchor Link', 'lasso' );?>">
+			<li id="lasso-toolbar--link" title="<?php esc_attr_e('Anchor Link', 'lasso'); ?>">
 		    	<div id="lasso-toolbar--link__wrap" <?php echo $mobile_style ?> >
-		    		<div id="lasso-toolbar--link__inner" contenteditable="true" placeholder="<?php esc_attr_e( 'http://url.com', 'lasso' );?>"></div>
-		    		<a href="#" title="<?php esc_attr_e( 'Create Link', 'lasso' );?>" class="lasso-toolbar--link__control" id="lasso-toolbar--link__create" ></a>
+		    		<div id="lasso-toolbar--link__inner" contenteditable="true" placeholder="<?php esc_attr_e('http://url.com', 'lasso'); ?>"></div>
+		    		<a href="#" title="<?php esc_attr_e('Create Link', 'lasso'); ?>" class="lasso-toolbar--link__control" id="lasso-toolbar--link__create" ></a>
 					<input class="styled-checkbox" type="checkbox" id="aesop-toolbar--link_newtab" checked/>
-                    <label for="aesop-toolbar--link_newtab"><?php esc_attr_e( 'Open in a New Tab', 'lasso' );?></label>
+                    <label for="aesop-toolbar--link_newtab"><?php esc_attr_e('Open in a New Tab', 'lasso'); ?></label>
 		    	</div>
 		    </li>
-		    <?php do_action( 'lasso_toolbar_components_after' );?>
-		    <li id="lasso-toolbar--html" title="<?php esc_attr_e( 'Insert HTML or Code', 'lasso' );?>">
+		    <?php do_action('lasso_toolbar_components_after'); ?>
+		    <li id="lasso-toolbar--html" title="<?php esc_attr_e('Insert HTML or Code', 'lasso'); ?>">
 		    	<div id="lasso-toolbar--html__wrap" <?php echo $mobile_style ?>>
-		    		<div id="lasso-toolbar--html__inner" contenteditable="true" placeholder="<?php esc_attr_e( 'Enter HTML to insert', 'lasso' );?>"></div>
+		    		<div id="lasso-toolbar--html__inner" contenteditable="true" placeholder="<?php esc_attr_e('Enter HTML to insert', 'lasso'); ?>"></div>
 		    		<div id="lasso-toolbar--html__footer">
 					<div id="lasso-toolbar--html__footer_desc" >
-					<?php esc_attr_e( 'Enter HTML to insert', 'lasso' );?><br>
-					<?php esc_attr_e( 'You can also use Shortcodes', 'lasso' );?><br>
-					<?php esc_attr_e( 'You can also enter a URL to embed, such as Youtube, Vimeo and Twitter URLs.', 'lasso' );?>
+					<?php esc_attr_e('Enter HTML to insert', 'lasso'); ?><br>
+					<?php esc_attr_e('You can also use Shortcodes', 'lasso'); ?><br>
+					<?php esc_attr_e('You can also enter a URL to embed, such as Youtube, Vimeo and Twitter URLs.', 'lasso'); ?>
 					</div>
 		    			<ul class="lasso-toolbar--html-snips">
 						
-		    				<?php if ( !$toolbar_headings ): ?>
-		    				<li id="lasso-html--h2" title="<?php esc_attr_e( 'H2 Heading', 'lasso' );?>">
-		    				<li id="lasso-html--h3" title="<?php esc_attr_e( 'H3 Heading', 'lasso' );?>">
+		    				<?php if (!$toolbar_headings): ?>
+		    				<li id="lasso-html--h2" title="<?php esc_attr_e('H2 Heading', 'lasso'); ?>">
+		    				<li id="lasso-html--h3" title="<?php esc_attr_e('H3 Heading', 'lasso'); ?>">
 		    				<?php endif; ?>
-		    				<li id="lasso-html--ol" title="<?php esc_attr_e( 'Ordered List', 'lasso' );?>">
-							<li id="lasso-html--ul" title="<?php esc_attr_e( 'Unordered List', 'lasso' );?>">
+		    				<li id="lasso-html--ol" title="<?php esc_attr_e('Ordered List', 'lasso'); ?>">
+							<li id="lasso-html--ul" title="<?php esc_attr_e('Unordered List', 'lasso'); ?>">
 							
-							<li id="lasso-html--table" title="<?php esc_attr_e( 'Table', 'lasso' );?>">
+							<li id="lasso-html--table" title="<?php esc_attr_e('Table', 'lasso'); ?>">
 		    			</ul>
-		    			<a class="lasso-toolbar--html__control lasso-toolbar--html__cancel" href="#"><?php _e( 'Cancel', 'lasso' );?></a>
-		    			<a href="#" title="<?php esc_attr_e( 'Insert HTML or Code', 'lasso' );?>" class="lasso-toolbar--html__control" id="lasso-toolbar--html__insert" ><?php _e( 'Insert', 'lasso' );?></a>
+		    			<a class="lasso-toolbar--html__control lasso-toolbar--html__cancel" href="#"><?php _e('Cancel', 'lasso'); ?></a>
+		    			<a href="#" title="<?php esc_attr_e('Insert HTML or Code', 'lasso'); ?>" class="lasso-toolbar--html__control" id="lasso-toolbar--html__insert" ><?php _e('Insert', 'lasso'); ?></a>
 		    		</div>
 		    	</div>
 		    </li>
-			<?php if ( $show_align ): ?>
-		    <li id="lasso-toolbar--left-align" title="<?php esc_attr_e( 'Text Left Align', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--center-align" title="<?php esc_attr_e( 'Text Center Align', 'lasso' );?>"></li>
-			<li id="lasso-toolbar--right-align" title="<?php esc_attr_e( 'Text Right Align', 'lasso' );?>"></li>
+			<?php if ($show_align): ?>
+		    <li id="lasso-toolbar--left-align" title="<?php esc_attr_e('Text Left Align', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--center-align" title="<?php esc_attr_e('Text Center Align', 'lasso'); ?>"></li>
+			<li id="lasso-toolbar--right-align" title="<?php esc_attr_e('Text Right Align', 'lasso'); ?>"></li>
 			<?php endif; ?>
 		</ul>
-		<?php if ( is_singular() && $is_mobile ) { ?>
+		<?php if (is_singular() && $is_mobile) { ?>
 
-				<div class="lasso--controls__right" data-posttype="<?php echo get_post_type( get_the_ID() );?>" data-status="<?php echo $status;?>" style="position:static;bottom:0px;right;0px;left:auto;">
+				<div class="lasso--controls__right" data-posttype="<?php echo get_post_type(get_the_ID()); ?>" data-status="<?php echo $status; ?>" style="position:static;bottom:0px;right;0px;left:auto;">
 
-					<a href="#" title="<?php esc_attr_e( 'Delete Post', 'lasso' );?>" id="lasso--post-delete" class="lasso-save-post lasso--button <?php echo $sc_saving_class;?>"></a>
-					<a href="#" title="<?php esc_attr_e( 'Post Settings', 'lasso' );?>" id="lasso--post-settings2" class="lasso-save-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<a href="#" title="<?php esc_attr_e('Delete Post', 'lasso'); ?>" id="lasso--post-delete" class="lasso-save-post lasso--button <?php echo $sc_saving_class; ?>"></a>
+					<a href="#" title="<?php esc_attr_e('Post Settings', 'lasso'); ?>" id="lasso--post-settings2" class="lasso-save-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 
-					<a href="#" title="<?php esc_attr_e( 'Save Post', 'lasso' );?>" id="lasso--save" class="lasso-save-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<a href="#" title="<?php esc_attr_e('Save Post', 'lasso'); ?>" id="lasso--save" class="lasso-save-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 
-					<?php if ( 'draft' == $status && ( lasso_user_can('publish_posts') || lasso_user_can('publish_pages') )  ) { ?>
-						<a href="#" title="<?php esc_attr_e( 'Publish Post', 'lasso' );?>" id="lasso--publish" class="lasso-publish-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<?php if ('draft' == $status && (lasso_user_can('publish_posts') || lasso_user_can('publish_pages'))) { ?>
+						<a href="#" title="<?php esc_attr_e('Publish Post', 'lasso'); ?>" id="lasso--publish" class="lasso-publish-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 					<?php } ?>
 
 				</div>
@@ -379,20 +379,20 @@ 
  */
 function lasso_editor_settings_toolbar() {
 
-	$delete_nonce = wp_create_nonce( 'lasso-delete-nonce' );
+	$delete_nonce = wp_create_nonce('lasso-delete-nonce');
 
 	ob_start();
 
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_component_classes', '' );
+	$custom_classes = apply_filters('lasso_component_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso-component--settings__trigger" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" data-postid="<?php echo get_the_ID();?>" data-nonce="<?php echo $delete_nonce;?>" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso-component--settings__trigger" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" data-postid="<?php echo get_the_ID(); ?>" data-nonce="<?php echo $delete_nonce; ?>" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -410,13 +410,13 @@ 
 
 
 	// has post thumbnail
-	$has_thumbnail = has_post_thumbnail( get_the_ID() ) ? 'class="lasso--featImg--has-thumb"' : false;
+	$has_thumbnail = has_post_thumbnail(get_the_ID()) ? 'class="lasso--featImg--has-thumb"' : false;
 
 	?>
-	<ul id="lasso--featImgControls" <?php echo $has_thumbnail;?>>
-		<li id="lasso--featImgUpload"><a title="<?php esc_attr_e( 'Replace Image', 'lasso' );?>" href="#"><i class="lasso-icon-image"></i></a></li>
-		<li id="lasso--featImgDelete"><a title="<?php esc_attr_e( 'Delete Image', 'lasso' );?>" href="#"><i class="lasso-icon-bin2"></i></a></li>
-		<li id="lasso--featImgSave"><a href="#"><?php esc_attr_e( 'save', 'lasso' );?></a></li>
+	<ul id="lasso--featImgControls" <?php echo $has_thumbnail; ?>>
+		<li id="lasso--featImgUpload"><a title="<?php esc_attr_e('Replace Image', 'lasso'); ?>" href="#"><i class="lasso-icon-image"></i></a></li>
+		<li id="lasso--featImgDelete"><a title="<?php esc_attr_e('Delete Image', 'lasso'); ?>" href="#"><i class="lasso-icon-bin2"></i></a></li>
+		<li id="lasso--featImgSave"><a href="#"><?php esc_attr_e('save', 'lasso'); ?></a></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -440,55 +440,55 @@ 
 
 	$postid = get_the_ID();
 
-	$status = get_post_status( $postid );
-	$nonce = wp_create_nonce( 'lasso-update-post-settings' );
+	$status = get_post_status($postid);
+	$nonce = wp_create_nonce('lasso-update-post-settings');
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_modal_settings_classes', '' );
+	$custom_classes = apply_filters('lasso_modal_settings_classes', '');
 
 	// objects categories
-	$categories 		= lasso_get_post_objects( $postid, 'category' );
-	$tags 				= lasso_get_post_objects( $postid, 'tag' );
+	$categories = lasso_get_post_objects($postid, 'category');
+	$tags = lasso_get_post_objects($postid, 'tag');
 
 	// modal tabs
-	$tabs  				= lasso_modal_addons('tab');
-	$content 			= lasso_modal_addons('content');
+	$tabs = lasso_modal_addons('tab');
+	$content = lasso_modal_addons('content');
 	
 	//editor options
 	$allow_change_date = lasso_editor_get_option('allow_change_date', 'lasso_editor');
 	$no_url_setting = lasso_editor_get_option('no_url_setting', 'lasso_editor');
 
 	// are we singular
-	$is_singular 		= is_singular();
+	$is_singular = is_singular();
 	$is_singular_class 	= $is_singular ? 'lasso--postsettings__2col' : 'lasso--postsettings__1col';
 	$has_thumb_class    = has_post_thumbnail() ? 'has-thumbnail' : 'no-thumbnail';
 	$theme_supports     = current_theme_supports('post-thumbnails');
-	$default_image 		= LASSO_URL.'/admin/assets/img/empty-img.png';
+	$default_image = LASSO_URL.'/admin/assets/img/empty-img.png';
 	
 	// do we support pending status
 	$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');
 
 ?>
-	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
+	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class($custom_classes); ?>">
 		<div class="lasso--modal__inner">
 
-			<?php if( $tabs ) { echo $tabs; } ?>
+			<?php if ($tabs) { echo $tabs; } ?>
 
 			<div class="lasso--modal__content modal__content--core visible" data-addon-content="core">
-				<form id="lasso--postsettings__form" enctype="multipart/form-data" class="lasso--post-form <?php echo $is_singular_class.' '.$has_thumb_class;?>" >
+				<form id="lasso--postsettings__form" enctype="multipart/form-data" class="lasso--post-form <?php echo $is_singular_class.' '.$has_thumb_class; ?>" >
 
-					<?php if ( $is_singular && $theme_supports ) : ?>
+					<?php if ($is_singular && $theme_supports) : ?>
 					<div class="lasso--postsettings__left">
-						<label><?php _e( 'Featured Image', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Change the featured image for this post.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-						<div class="lasso--post-thumb" data-default-thumb="<?php echo esc_url( $default_image );?>">
+						<label><?php _e('Featured Image', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Change the featured image for this post.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+						<div class="lasso--post-thumb" data-default-thumb="<?php echo esc_url($default_image); ?>">
 
 							<div id="lasso--post-thumb__controls" class="lasso--post-thumb__controls">
-								<i id="lasso--post-thumb__add" title="<?php _e('Change Featured Image','lasso');?>" class="dashicons dashicons-edit"></i>
-								<i id="lasso--post-thumb__delete" title="<?php _e('Delete Featured Image','lasso');?>" class="dashicons dashicons-no-alt"></i>
+								<i id="lasso--post-thumb__add" title="<?php _e('Change Featured Image', 'lasso'); ?>" class="dashicons dashicons-edit"></i>
+								<i id="lasso--post-thumb__delete" title="<?php _e('Delete Featured Image', 'lasso'); ?>" class="dashicons dashicons-no-alt"></i>
 								<i id="lasso--save-status" class="lasso-icon lasso-icon-spinner6 not-visible"></i>
 							</div>
 
-							<?php echo has_post_thumbnail() ? get_the_post_thumbnail( $post->ID, 'medium' ) : '<img src="'.$default_image.'">'; ?>
+							<?php echo has_post_thumbnail() ? get_the_post_thumbnail($post->ID, 'medium') : '<img src="'.$default_image.'">'; ?>
 
 						</div>
 						<div id="lasso--featImgSave"><a href="#" class="not-visible">Save</a></div>
@@ -498,15 +498,15 @@ 
 
 					<div class="lasso--postsettings__right">
 
-						<?php if( lasso_user_can('publish_posts') || lasso_user_can('publish_pages') ): ?>
+						<?php if (lasso_user_can('publish_posts') || lasso_user_can('publish_pages')): ?>
 						<div class="lasso--postsettings__option story-status-option">
-							<label><?php _e( 'Status', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Change the status of the post to draft or publish.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<ul class="story-status story-status-<?php echo sanitize_html_class( $status );?>">
-								<li id="lasso--status-draft"><?php _e( 'Draft', 'lasso' );?></li>
-								<?php if( !$no_pending_status ): ?>								
-								<li id="lasso--status-pending"><?php _e( 'Pending', 'lasso' );?></li>
+							<label><?php _e('Status', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Change the status of the post to draft or publish.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<ul class="story-status story-status-<?php echo sanitize_html_class($status); ?>">
+								<li id="lasso--status-draft"><?php _e('Draft', 'lasso'); ?></li>
+								<?php if (!$no_pending_status): ?>								
+								<li id="lasso--status-pending"><?php _e('Pending', 'lasso'); ?></li>
 								<?php endif; ?>
-								<li id="lasso--status-publish"><?php _e( 'Publish', 'lasso' );?></li>
+								<li id="lasso--status-publish"><?php _e('Publish', 'lasso'); ?></li>
 							</ul>
 							<div class="lasso--slider_wrap">
 								<div id="lasso--slider"></div>
@@ -514,10 +514,10 @@ 
 						</div>
 						<?php endif; ?>
 
-						<?php if ( 'publish' == $status  && !$no_url_setting): ?>
+						<?php if ('publish' == $status && !$no_url_setting): ?>
 						<div class="lasso--postsettings__option story-slug-option">
-							<label><?php _e( 'Post URL', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Change the URL (slug) of this post.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input class="lasso--modal__trigger-footer" type="text" name="story_slug" value="<?php echo isset( $post ) ? esc_attr( $post->post_name ) : false;?>">
+							<label><?php _e('Post URL', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Change the URL (slug) of this post.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input class="lasso--modal__trigger-footer" type="text" name="story_slug" value="<?php echo isset($post) ? esc_attr($post->post_name) : false; ?>">
 						</div>
 						<?php endif; ?>
 
@@ -526,21 +526,21 @@ 
 					<div class="lasso--postsettings__middle">
 
 						<div class="lasso--postsettings__option story-categories-option">
-							<label style="width:120px;"><?php _e( 'Categories', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Type a category name and press enter.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input id="lasso--cat-select" class="lasso--modal__trigger-footer" type="hidden" name="story_cats" value="<?php echo $categories;?>">
+							<label style="width:120px;"><?php _e('Categories', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Type a category name and press enter.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input id="lasso--cat-select" class="lasso--modal__trigger-footer" type="hidden" name="story_cats" value="<?php echo $categories; ?>">
 						</div>
 
 						<div class="lasso--postsettings__option story-tags-option">
-							<label><?php _e( 'Tags', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Type a tag name and press enter.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input id="lasso--tag-select" class="lasso--modal__trigger-footer" type="hidden" name="story_tags" value="<?php echo $tags;?>">
+							<label><?php _e('Tags', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Type a tag name and press enter.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input id="lasso--tag-select" class="lasso--modal__trigger-footer" type="hidden" name="story_tags" value="<?php echo $tags; ?>">
 						</div>
 						<?php 
 						if ($allow_change_date) { 
-						    $dateformat = get_option( 'date_format' ); 
+						    $dateformat = get_option('date_format'); 
 						?>
-						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
-							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
-							<a href="#" id="lasso--postsettings-setnow"><?php _e( 'Set to Now', 'lasso' ); ?></a>
+						    <label><?php _e('Post Date', 'lasso'); ?></label>
+							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid); ?>"/>
+							<a href="#" id="lasso--postsettings-setnow"><?php _e('Set to Now', 'lasso'); ?></a>
 						<?php
 						}?>
 
@@ -562,23 +562,23 @@ 
 					?>
 					<!--/div-->
 
-					<?php do_action( 'lasso_modal_post_form' ); // action ?>
+					<?php do_action('lasso_modal_post_form'); // action ?>
 
 					<div class="lasso--postsettings__footer" >
-						<a href="#" class="lasso--postsettings-cancel"><?php _e( 'Cancel', 'lasso' );?></a>
+						<a href="#" class="lasso--postsettings-cancel"><?php _e('Cancel', 'lasso'); ?></a>
 						<input type="hidden" name="status" value="">
 						<input type="hidden" name="categories" value="">
-						<input type="hidden" name="postid" value="<?php echo get_the_ID();?>">
+						<input type="hidden" name="postid" value="<?php echo get_the_ID(); ?>">
 						<input type="hidden" name="action" value="process_update-object_post">
-						<input type="hidden" name="nonce" value="<?php echo $nonce;?>">
-						<?php do_action( 'lasso_modal_post_form_footer' ); // action ?>
-						<input type="submit" id="lasso--postsettings-submit" value="<?php esc_attr_e( 'Save', 'lasso' );?>">
+						<input type="hidden" name="nonce" value="<?php echo $nonce; ?>">
+						<?php do_action('lasso_modal_post_form_footer'); // action ?>
+						<input type="submit" id="lasso--postsettings-submit" value="<?php esc_attr_e('Save', 'lasso'); ?>">
 					</div>
 
 				</form>
 			</div>
 
-			<?php if( $tabs ) { echo $content; } ?>
+			<?php if ($tabs) { echo $content; } ?>
 
 		</div>
 
@@ -600,41 +600,41 @@ 
 	ob_start();
 
 
-	$status = get_post_status( get_the_ID() );
+	$status = get_post_status(get_the_ID());
 
-	$nonce = wp_create_nonce( 'lasso-editor-new-post' );
+	$nonce = wp_create_nonce('lasso-editor-new-post');
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_modal_post_classes', '' );
+	$custom_classes = apply_filters('lasso_modal_post_classes', '');
 
 	// return the post type
-	$type = get_post_type( get_the_ID() );
+	$type = get_post_type(get_the_ID());
 
 	$mobile_style = "";
 	if (wp_is_mobile()) {
 		//$mobile_style = 'style="top:140px !important;"';
 	}
 	?>
-	<div id="lasso--post-new__modal" class="lasso--modal lasso--modal__med lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>" <?php echo $mobile_style;?>">
+	<div id="lasso--post-new__modal" class="lasso--modal lasso--modal__med lassoShowAnimate <?php echo sanitize_html_class($custom_classes); ?>" <?php echo $mobile_style; ?>">
 		<div class="lasso--modal__inner lasso--hasnewform">
 
 			<form id="lasso--postnew__form" enctype="multipart/form-data" class="lasso--post-form">
 
 				<div class="lasso--postsettings__option story-slug-option lasso--last-option">
-					<label><?php esc_attr_e( 'New <span>post</span> title', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Specify title for new post, then save to edit.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-					<input class="lasso--modal__trigger-footer" type="text" required name="story_title" value="" placeholder="<?php esc_attr_e( 'Type Your Title Here', 'lasso' );?>">
+					<label><?php esc_attr_e('New <span>post</span> title', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Specify title for new post, then save to edit.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+					<input class="lasso--modal__trigger-footer" type="text" required name="story_title" value="" placeholder="<?php esc_attr_e('Type Your Title Here', 'lasso'); ?>">
 						<div class="lasso--select-wrap" style="width:90px">
 						<select id="lasso--select-type" name="story_type">
 
 							<?php
 								$types = lasso_post_types_names();
-								if ( !empty( $types ) ) {
-									foreach( $types as $name => $label ) {										
-										$type = preg_replace( '/s\b/','', $name );
+								if (!empty($types)) {
+									foreach ($types as $name => $label) {										
+										$type = preg_replace('/s\b/', '', $name);
 										if ($type == 'page' && !current_user_can('edit_pages')) {
 											continue;
 										}
-										printf( '<option value="%s">%s</option>', lcfirst( esc_attr( $type ) ) , ucfirst( esc_attr( $label ) ) );
+										printf('<option value="%s">%s</option>', lcfirst(esc_attr($type)), ucfirst(esc_attr($label)));
 									}
 
 								}
@@ -645,19 +645,19 @@ 
 				</div>
 
 				<div class="lasso--postsettings__footer">
-					<a href="#" class="lasso--postsettings-cancel"><?php _e( 'Cancel', 'lasso' );?></a>
+					<a href="#" class="lasso--postsettings-cancel"><?php _e('Cancel', 'lasso'); ?></a>
 					<input type="hidden" name="action" value="process_new-object_post">
 					<?php
-						if ( !empty( $types ) ) {
+						if (!empty($types)) {
 							// get the first element
 							$keys = array_keys($types);
-						    $type =$keys[0];						
-							$type = preg_replace( '/s\b/','', $type );
-							printf( '<input type="hidden" name="object" value="%s">', lcfirst( esc_attr( $type ) ) );		
+						    $type = $keys[0];						
+							$type = preg_replace('/s\b/', '', $type);
+							printf('<input type="hidden" name="object" value="%s">', lcfirst(esc_attr($type)));		
 						}
 					?>
-					<input type="hidden" name="nonce" value="<?php echo $nonce;?>">
-					<input type="submit" value="<?php esc_attr_e( 'Create', 'lasso' );?>">
+					<input type="hidden" name="nonce" value="<?php echo $nonce; ?>">
+					<input type="submit" value="<?php esc_attr_e('Create', 'lasso'); ?>">
 				</div>
 
 			</form>
@@ -685,18 +685,18 @@ 
 	ob_start();
 
 	// post status
-	$status = get_post_status( get_the_ID() );
+	$status = get_post_status(get_the_ID());
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_modal_all_post_classes', '' );
+	$custom_classes = apply_filters('lasso_modal_all_post_classes', '');
 
 	?>
-	<div id="lasso--all-posts__modal" class="lasso--modal lasso--modal__full lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>" style="max-height:100%">
+	<div id="lasso--all-posts__modal" class="lasso--modal lasso--modal__full lassoShowAnimate <?php echo sanitize_html_class($custom_classes); ?>" style="max-height:100%">
 		<div class="lasso--modal__inner">
 
 			<div class="lasso--post-filtering not-visible">
 				<div class="lasso--search__results">
-					<span id="lasso--results-found"></span><?php _e('results found','lasso');?>
+					<span id="lasso--results-found"></span><?php _e('results found', 'lasso'); ?>
 				</div>
 				<div class="lasso--search">
 					<i id="lasso--search__toggle" class="dashicons dashicons-search"></i>
@@ -710,18 +710,18 @@ 
 				$post_types = lasso_post_types_names();
 				$rest_bases = lasso_post_types_rest_base();
 
-				if ( ! empty( $post_types ) ) {
+				if (!empty($post_types)) {
 					$first = 'active';
-					foreach( $post_types as $name => $label ) {
+					foreach ($post_types as $name => $label) {
 						if (array_key_exists($name, $rest_bases)) {
-							printf( '<li class="%1s lasso--show-objects" data-post-type="%2s">%3s</li>', esc_attr( $first), esc_attr( $rest_bases[$name] ), esc_attr( $label ) );
+							printf('<li class="%1s lasso--show-objects" data-post-type="%2s">%3s</li>', esc_attr($first), esc_attr($rest_bases[$name]), esc_attr($label));
 						}
 						$first = '';
 					}
 
 				}
 
-				do_action('lasso_modal_post_objects');?>
+				do_action('lasso_modal_post_objects'); ?>
 
 			</ul>
 			<div id="lasso--loading" class="lasso--loading"><div class="lasso--loader"></div></div>
@@ -741,14 +741,14 @@ 
 
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
+	$custom_classes = apply_filters('lasso_wpimg_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso--wpimg-edit" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso--wpimg-edit" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -760,14 +760,14 @@ 
 
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
+	$custom_classes = apply_filters('lasso_wpimg_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso--wpvideo-edit" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso--wpvideo-edit" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -780,16 +780,16 @@ 
  */
 function lasso_map_form_footer() {
 
-	$nonce = wp_create_nonce( 'lasso-process-map' );
+	$nonce = wp_create_nonce('lasso-process-map');
 
 	ob_start();
 
 	?>
 	<div class="lasso--map-form__footer">
-		<input type="hidden" name="postid" value="<?php echo get_the_ID();?>">
-		<input type="hidden" name="nonce" value="<?php echo $nonce;?>">
+		<input type="hidden" name="postid" value="<?php echo get_the_ID(); ?>">
+		<input type="hidden" name="nonce" value="<?php echo $nonce; ?>">
 		<input type="hidden" name="action" value="process_map_save">
-		<input type="submit" class="lasso--map-form__submit" value="<?php esc_attr_e( 'Save Locations', 'lasso' );?>">
+		<input type="submit" class="lasso--map-form__submit" value="<?php esc_attr_e('Save Locations', 'lasso'); ?>">
 	</div>
 
 	<?php return ob_get_clean();
@@ -807,7 +807,7 @@ 
 
 	?>
 	<div id="lasso--pagerefresh" class="visible">
-		<?php _e( 'Save this post and refesh the page to see these changes.', 'lasso' );?>
+		<?php _e('Save this post and refesh the page to see these changes.', 'lasso'); ?>
 	</div>
 
 	<?php return ob_get_clean();
@@ -821,43 +821,43 @@ 
  */
 function lasso_editor_options_blob() {
 
-	$codes   = function_exists( 'aesop_shortcodes' ) ? aesop_shortcodes() : apply_filters( 'lasso_custom_options', '' );
-	$galleries  = function_exists( 'lasso_editor_galleries_exist' ) && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
+	$codes = function_exists('aesop_shortcodes') ? aesop_shortcodes() : apply_filters('lasso_custom_options', '');
+	$galleries = function_exists('lasso_editor_galleries_exist') && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
 
-	$nonce = wp_create_nonce( 'lasso_gallery' );
+	$nonce = wp_create_nonce('lasso_gallery');
 
 	$blob = array();
 
-	if ( empty( $codes ) )
+	if (empty($codes))
 		return;
 
-	foreach ( $codes as $slug => $shortcode ) {
+	foreach ($codes as $slug => $shortcode) {
 		$return = '';
 		// Shortcode has atts
 
-		if ( count( $shortcode['atts'] ) && $shortcode['atts'] ) {
+		if (count($shortcode['atts']) && $shortcode['atts']) {
 
-			foreach ( $shortcode['atts'] as $attr_name => $attr_info ) {
+			foreach ($shortcode['atts'] as $attr_name => $attr_info) {
 
 
-				$prefix = isset( $attr_info['prefix'] ) ? sprintf( '<span class="lasso-option-prefix">%s</span>', $attr_info['prefix'] ) : null;
+				$prefix = isset($attr_info['prefix']) ? sprintf('<span class="lasso-option-prefix">%s</span>', $attr_info['prefix']) : null;
 
 				$return .= '<form id="aesop-generator-settings" class="lasso--component-settings-form" class="'.$galleries.'" method="post">';
 				$return .= '<p data-option="'.$attr_name.'" class="lasso-option aesop-'.$slug.'-'.$attr_name.'">';
-				$return .= '<label for="aesop-generator-attr-' . $attr_name . '">' . $attr_info['desc'] . '</label>';
+				$return .= '<label for="aesop-generator-attr-'.$attr_name.'">'.$attr_info['desc'].'</label>';
 				$return .= '<small class="lasso-option-desc">'.$attr_info['tip'].'</small>';
 				// Select
 
-				if ( isset( $attr_info['values'] ) ) {
+				if (isset($attr_info['values'])) {
 
-					$return .= '<select name="' . $attr_name . '" id="aesop-generator-attr-' . $attr_name . '" class="lasso-generator-attr">';
+					$return .= '<select name="'.$attr_name.'" id="aesop-generator-attr-'.$attr_name.'" class="lasso-generator-attr">';
 
-					$i=0;
+					$i = 0;
 
-					foreach ( $attr_info['values'] as $attr_value ) {
+					foreach ($attr_info['values'] as $attr_value) {
 						$attr_value_selected = $attr_info['default'] == $attr_value ? ' selected="selected"' : '';
 
-						$return .= '<option value="'.$attr_info['values'][$i]['value'].'" ' . $attr_value_selected . '>'.$attr_info['values'][$i]['name'].'</option>';
+						$return .= '<option value="'.$attr_info['values'][$i]['value'].'" '.$attr_value_selected.'>'.$attr_info['values'][$i]['name'].'</option>';
 
 						$i++;
 					}
@@ -866,24 +866,24 @@ 
 
 				} else {
 
-					$attr_field_type = isset( $attr_info['type'] ) ? $attr_info['type'] : 'text';
+					$attr_field_type = isset($attr_info['type']) ? $attr_info['type'] : 'text';
 
 					// image upload
-					if ( 'media_upload' == $attr_info['type'] ) {
+					if ('media_upload' == $attr_info['type']) {
 
-						$return .= '<input type="' . $attr_field_type . '" name="' . $attr_name . '" value="'.$attr_info['default'].'" id="aesop-generator-attr-' . $attr_name . '" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" />';
+						$return .= '<input type="'.$attr_field_type.'" name="'.$attr_name.'" value="'.$attr_info['default'].'" id="aesop-generator-attr-'.$attr_name.'" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" />';
 						$return .= '<a href="#" id="lasso-upload-img" class="lasso-option-button" /></a>';
 
-					} elseif ( 'color' == $attr_info['type'] ) {
+					} elseif ('color' == $attr_info['type']) {
 
-						$return .= '<input type="color" name="' . $attr_name . '" value="'.$attr_info['default'].'" id="aesop-generator-attr-' . $attr_name . '" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" />';
+						$return .= '<input type="color" name="'.$attr_name.'" value="'.$attr_info['default'].'" id="aesop-generator-attr-'.$attr_name.'" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" />';
 
-					} elseif ( 'text_area' == $attr_info['type'] ) {
+					} elseif ('text_area' == $attr_info['type']) {
 
-						$return .= '<textarea name="' . $attr_name . '" id="aesop-generator-attr-' . $attr_name . '" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" placeholder="'.$attr_info['default'].'" /></textarea>'.$prefix.'';
+						$return .= '<textarea name="'.$attr_name.'" id="aesop-generator-attr-'.$attr_name.'" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" placeholder="'.$attr_info['default'].'" /></textarea>'.$prefix.'';
 
 					} else {
-						$return .= '<input type="' . $attr_field_type . '" name="' . $attr_name . '" value="'.$attr_info['default'].'" id="aesop-generator-attr-' . $attr_name . '" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" />'.$prefix.'';
+						$return .= '<input type="'.$attr_field_type.'" name="'.$attr_name.'" value="'.$attr_info['default'].'" id="aesop-generator-attr-'.$attr_name.'" class="lasso-generator-attr aesop-generator-attr-'.$attr_field_type.'" />'.$prefix.'';
 					}
 				}
 				$return .= '</p>';
@@ -894,9 +894,9 @@ 
 		///////////////////////////
 		// START GALLERY AND MAP FRONT END STUFFS
 		///////////////////////////
-		if ( isset( $shortcode['front'] ) && true == $shortcode['front'] ) {
+		if (isset($shortcode['front']) && true == $shortcode['front']) {
 
-			if ( 'gallery' == $shortcode['front_type'] ) {
+			if ('gallery' == $shortcode['front_type']) {
 
 				$return .= lasso_gallery_editor_module();
 
@@ -907,13 +907,13 @@ 
 		///////////////////////////
 
 		// Single shortcode (not closed)
-		if ( 'single' == $shortcode['type'] ) {
+		if ('single' == $shortcode['type']) {
 
 			$return .= '<input type="hidden" name="lasso-generator-content" id="lasso-generator-content" value="false" />';
 
 		} else {
 
-			$return .= '<p data-option="content" class="lasso-option lasso-c-comp-text"><label>' . __( 'Content', 'lasso' ) . '</label><textarea type="text" name="lasso-generator-content" id="lasso-generator-content" value="' . $shortcode['content'] . '" /></textarea></p>';
+			$return .= '<p data-option="content" class="lasso-option lasso-c-comp-text"><label>'.__('Content', 'lasso').'</label><textarea type="text" name="lasso-generator-content" id="lasso-generator-content" value="'.$shortcode['content'].'" /></textarea></p>';
 		}
 
 		$return .= '<p class="lasso-buttoninsert-wrap"><a href="#" class="lasso-generator-cancel" id="lasso--sidebar__close">Cancel</a><input type="submit" id="lasso-generator-insert" value="Save Settings"></p>';
@@ -949,14 +949,14 @@ 
 				<div id="lasso--loading" class="lasso--loading"><div class="lasso--loader"></div></div>
 				<div id="lasso--hide" style="display:none;" class="lasso--post-form">
 					<i class="lasso-icon lasso-icon-move"></i>
-					<label><?php _e( 'Revisions', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Use the slider to view the revision live on the page.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
+					<label><?php _e('Revisions', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Use the slider to view the revision live on the page.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
 					<div class="lasso--slider_wrap">
 						<div id="lasso--slider"></div>
 					</div>
 					<ul id="lasso--revision-list"></ul>
 					<div class="lasso--btn-group lasso--btn-group-small">
-						<a href="#" class="lasso--btn-secondary" id="lasso--close-modal"><?php _e( 'Cancel', 'lasso' );?></a>
-						<a href="#" class="lasso--btn-primary" id="lasso--select-revision"><?php _e( 'Select', 'lasso' );?></a>
+						<a href="#" class="lasso--btn-secondary" id="lasso--close-modal"><?php _e('Cancel', 'lasso'); ?></a>
+						<a href="#" class="lasso--btn-primary" id="lasso--select-revision"><?php _e('Select', 'lasso'); ?></a>
 					</div>
 				</div>
 
@@ -979,7 +979,7 @@ 
     // Normalize into a six character long hex string
     $hex = str_replace('#', '', $hex);
     if (strlen($hex) == 3) {
-        $hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
+        $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2);
     }
 
     // Split into three parts: R, G and B
@@ -988,7 +988,7 @@ 
 
     foreach ($color_parts as $color) {
         $color   = hexdec($color); // Convert to decimal
-        $color   = max(0,min(255,$color + $steps)); // Adjust color
+        $color   = max(0, min(255, $color + $steps)); // Adjust color
         $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
     }
 

public/includes/lasso.php

Indentation +44 added lines, -44 removed lines

@@ -68,10 +68,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');
@@ -271,14 +271,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);
@@ -291,9 +291,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;
@@ -405,59 +405,59 @@ 
 		 );
 		foreach ($_POST as $key => $value) {
 			if ($key !="code" && $key !="action") {
-			    //$shortcode = $shortcode.$key.'="'.$value.'" ';
+				//$shortcode = $shortcode.$key.'="'.$value.'" ';
 				$atts[$key] = $value;
 			}
 		}
 		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 {
 			$code = '['.$code.' ';
 			foreach ($atts as $key => $value) {
-			    $code = ''.$key.'="'.$value.'" ';
+				$code = ''.$key.'="'.$value.'" ';
 			}
 			$code = $code.']';
 			echo do_shortcode($code);
-		    //require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
-		    //echo aesop_audio_shortcode($atts);
+			//require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
+			//echo aesop_audio_shortcode($atts);
 		}
 		
 		exit; 
@@ -497,12 +497,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;
 	}
@@ -560,14 +560,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;
@@ -587,7 +587,7 @@ 
 		}
 	}
     
-    public function create_gallery( ) {
+	public function create_gallery( ) {
 
 		$postid  	= isset( $_POST['postid'] ) ? $_POST['postid'] : false;
         
@@ -641,10 +641,10 @@ 
 			'message' => 'gallery-created',
 			'id' => $postid)
 		);
-        exit;
+		exit;
 	}
     
-    public function update_gallery( ) {
+	public function update_gallery( ) {
         
 		$options      = isset( $_POST['fields'] ) ? $_POST['fields'] : false;
         
@@ -660,12 +660,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;
@@ -749,7 +749,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 +166 added lines, -166 removed lines

@@ -52,26 +52,26 @@ 
 		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_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_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');
@@ -102,7 +102,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;
 		}
 
@@ -119,18 +119,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();
 				}
 
@@ -156,18 +156,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();
 
 				}
@@ -191,13 +191,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();
 
@@ -222,7 +222,7 @@ 
 			WHERE archived = '0' AND spam = '0'
 			AND deleted = '0'";
 
-		return $wpdb->get_col( $sql );
+		return $wpdb->get_col($sql);
 
 	}
 
@@ -233,18 +233,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);
 
 
 	}
@@ -266,15 +266,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) {
@@ -282,17 +282,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";
 		
@@ -304,7 +304,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;
 	}
 	
@@ -315,14 +315,14 @@ 
 		$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;
+		$status = isset($data['status']) ? $data['status'] : false;
+		$postid = isset($data['postid']) ? $data['postid'] : false;
+		$slug   = isset($data['story_slug']) ? $data['story_slug'] : false;
 	
 
 		$args = array(
@@ -333,24 +333,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;
@@ -358,11 +358,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);
 				}
@@ -374,13 +374,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;
 		}
@@ -390,7 +390,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;
@@ -400,53 +400,53 @@ 
 	{
 		
 		
-		$code= $_POST["code"];
+		$code = $_POST["code"];
 		$atts = array(
 		 );
 		foreach ($_POST as $key => $value) {
-			if ($key !="code" && $key !="action") {
+			if ($key != "code" && $key != "action") {
 			    //$shortcode = $shortcode.$key.'="'.$value.'" ';
 				$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 {
@@ -467,20 +467,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;
 		}
@@ -490,9 +490,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;
 	}
@@ -500,40 +500,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;
 	}
@@ -554,17 +554,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);
@@ -573,71 +573,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)
 		);
@@ -646,114 +646,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 +23 added lines, -31 removed lines

@@ -412,44 +412,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 {
+		} else {
 			$code = '['.$code.' ';
 			foreach ($atts as $key => $value) {
 			    $code = ''.$key.'="'.$value.'" ';
@@ -477,8 +467,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();
@@ -574,15 +565,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;
 		}
 	}
@@ -652,9 +642,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;
 		}
 
@@ -733,13 +723,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/assets.php

Indentation +71 added lines, -71 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');
@@ -126,7 +126,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'),
@@ -181,11 +181,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 = '';
@@ -205,13 +205,13 @@ 
 				}
 			}
             
-            //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(
@@ -287,14 +287,14 @@ 
 				'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>'),
-                'hasGutenberg' => (function_exists( 'has_blocks' ) && has_blocks( $post->post_content)) || self::gutenberg_active(),//,
-                'multipages'=> $multipage,
-                'post_content'=>$post_content
+				'hasGutenberg' => (function_exists( 'has_blocks' ) && has_blocks( $post->post_content)) || self::gutenberg_active(),//,
+				'multipages'=> $multipage,
+				'post_content'=>$post_content
 			);
 
 
@@ -302,7 +302,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 );
@@ -318,7 +318,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 ) );
 
@@ -327,44 +327,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 +105 added lines, -105 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,28 +67,28 @@ 
 			// 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');
 
 			
 			//text alignement
@@ -105,8 +105,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
@@ -118,54 +118,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...'),
@@ -174,11 +174,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) {
@@ -193,13 +193,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;
 				}
@@ -215,8 +215,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,
@@ -225,13 +225,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'),
@@ -267,32 +267,32 @@ 
 				'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>'),
-                '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>'),
+                'hasGutenberg' => (function_exists('has_blocks') && has_blocks($post->post_content)) || self::gutenberg_active(), //,
                 'multipages'=> $multipage,
                 'post_content'=>$post_content
 			);
@@ -303,9 +303,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) {
@@ -314,13 +314,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));
 
 
 		}
@@ -330,20 +330,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;
@@ -355,11 +355,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>