AesopInteractive / lasso

public/includes/tour.php

Indentation +8 added lines, -8 removed lines

@@ -11,16 +11,16 @@ 
 
 	public function __construct() {
 
-	    $disable_tour = lasso_editor_get_option('disable_tour', 'lasso_editor');
+		$disable_tour = lasso_editor_get_option('disable_tour', 'lasso_editor');
 		if (!$disable_tour) {
-		    add_action( 'wp_footer',       array( $this, 'draw_tour' ) );
+			add_action( 'wp_footer',       array( $this, 'draw_tour' ) );
 		}
 	}
 
 	/**
-	*	Draw the modal used to house the walk through
-	*	@since 0.6
-	*/
+	 *	Draw the modal used to house the walk through
+	 *	@since 0.6
+	 */
 	public function draw_tour() {
 
 		$tour_hidden = get_user_meta( get_current_user_ID(), 'lasso_hide_tour', true );
@@ -80,9 +80,9 @@ 
 	}
 
 	/**
-	*	Draw the inner slides for the welcome walkthrough
-	*	@since 0.6
-	*/
+	 *	Draw the inner slides for the welcome walkthrough
+	 *	@since 0.6
+	 */
 	public function tour_slides() { ?>
 
 		<div id="lasso--loading" class="lasso--loading"><div class="lasso--loader"></div></div>

Spacing +19 added lines, -19 removed lines

@@ -13,7 +13,7 @@ 
 
 	    $disable_tour = lasso_editor_get_option('disable_tour', 'lasso_editor');
 		if (!$disable_tour) {
-		    add_action( 'wp_footer',       array( $this, 'draw_tour' ) );
+		    add_action('wp_footer', array($this, 'draw_tour'));
 		}
 	}
 
@@ -23,19 +23,19 @@ 
 	*/
 	public function draw_tour() {
 
-		$tour_hidden = get_user_meta( get_current_user_ID(), 'lasso_hide_tour', true );
+		$tour_hidden = get_user_meta(get_current_user_ID(), 'lasso_hide_tour', true);
 
-		if ( lasso_user_can() && !$tour_hidden ) {
+		if (lasso_user_can() && !$tour_hidden) {
 
 			global $post;
 
-			$nonce = wp_create_nonce( 'lasso-editor-tour' );
+			$nonce = wp_create_nonce('lasso-editor-tour');
 
 			// let users add custom css classes
-			$custom_classes = apply_filters( 'lasso_modal_tour_classes', '' );
+			$custom_classes = apply_filters('lasso_modal_tour_classes', '');
 
 			?>
-			<div id="lasso--tour__modal" class="lasso--modal lasso--tour__modal lasso--modal__checkbox <?php echo sanitize_html_class( $custom_classes );?>">
+			<div id="lasso--tour__modal" class="lasso--modal lasso--tour__modal lasso--modal__checkbox <?php echo sanitize_html_class($custom_classes); ?>">
 			    <script>
 				(function( $ ) {
 					$(document).ready(function(){
@@ -56,19 +56,19 @@ 
 				</script>
 				<div class="lasso--modal__inner">
 
-					<?php echo self::tour_slides();?>
+					<?php echo self::tour_slides(); ?>
 
 					<div class="lasso--postsettings__footer">
 
 						<div class="lasso--postsettings__option">
 							<label for="hide_tour" class="checkbox-control checkbox">
-					        	<input type="checkbox" id="hide_tour" name="hide_tour" <?php checked( $tour_hidden, 1 ); ?>>
+					        	<input type="checkbox" id="hide_tour" name="hide_tour" <?php checked($tour_hidden, 1); ?>>
 					        	<span class="control-indicator"></span>
-								<?php _e('Don\'t show this again','lasso');?>
+								<?php _e('Don\'t show this again', 'lasso'); ?>
 					        </label>
 						</div>
 
-						<input id ="editus_tour_submit" type="submit" value="<?php _e( 'Okay, got it!', 'lasso' );?>" data-nonce="<?php echo $nonce;?>" >
+						<input id ="editus_tour_submit" type="submit" value="<?php _e('Okay, got it!', 'lasso'); ?>" data-nonce="<?php echo $nonce; ?>" >
 					</div>
 
 				</div>
@@ -92,20 +92,20 @@ 
 			<?php
 
 			$out = '<ul><li>';
-			$out .= sprintf( '<img src="%s">', LASSO_URL.'/public/assets/img/s-1.jpg' );
-			$out .= '<p>'.__('Access posts by clicking the list icon. Create a new post by clicking the new post icon.','lasso').'</p>';
+			$out .= sprintf('<img src="%s">', LASSO_URL.'/public/assets/img/s-1.jpg');
+			$out .= '<p>'.__('Access posts by clicking the list icon. Create a new post by clicking the new post icon.', 'lasso').'</p>';
 			$out .= '</li><li>';
-			$out .= sprintf( '<img src="%s">', LASSO_URL.'/public/assets/img/s-2.jpg' );
-			$out .= '<p>'.__('While on a single post, edit by clicking the Pen icon. Access post settings with the settings icon. Press escape to exit any modal.','lasso').'</p>';
+			$out .= sprintf('<img src="%s">', LASSO_URL.'/public/assets/img/s-2.jpg');
+			$out .= '<p>'.__('While on a single post, edit by clicking the Pen icon. Access post settings with the settings icon. Press escape to exit any modal.', 'lasso').'</p>';
 			$out .= '</li><li>';
-			$out .= sprintf( '<img src="%s">', LASSO_URL.'/public/assets/img/s-3.jpg' );
-			$out .= '<p>'.__('Highlight a piece of text, and click on a formatting option to style it. Click the Disk icon or CMD-S to save. Click the orange "X" button to exit the editor.','lasso').'</p>';
+			$out .= sprintf('<img src="%s">', LASSO_URL.'/public/assets/img/s-3.jpg');
+			$out .= '<p>'.__('Highlight a piece of text, and click on a formatting option to style it. Click the Disk icon or CMD-S to save. Click the orange "X" button to exit the editor.', 'lasso').'</p>';
 			$out .= '</li><li>';
-			$out .= sprintf( '<img src="%s">', LASSO_URL.'/public/assets/img/s-4.jpg' );
-			$out .= '<p>'.__('Story components can be added by clicking the plus icon, and dragging any component from the component tray into the story.','lasso').'</p>';
+			$out .= sprintf('<img src="%s">', LASSO_URL.'/public/assets/img/s-4.jpg');
+			$out .= '<p>'.__('Story components can be added by clicking the plus icon, and dragging any component from the component tray into the story.', 'lasso').'</p>';
 			$out .= '</li></ul>';
 
-			echo apply_filters( 'lasso_tour_slides', $out );
+			echo apply_filters('lasso_tour_slides', $out);
 
 		?></div><?php
 

public/includes/underscore-templates.php

Indentation +4 added lines, -4 removed lines

@@ -11,8 +11,8 @@ 
 		
 		// only run on posts and pages if user is logged in
 		if ( is_user_logged_in() && lasso_user_can('edit_posts') ) { 
-		    if ( !class_exists( 'WP_REST_Controller' ) ) {
-			    // using rest api v1 
+			if ( !class_exists( 'WP_REST_Controller' ) ) {
+				// using rest api v1 
 				?>
 				<script type="text/html" id="lasso-tmpl--post">
 					<li>
@@ -31,7 +31,7 @@ 
 			<?php
 			} else {
 				// using rest api v2 
-		    ?>
+			?>
 				<script type="text/html" id="lasso-tmpl--post">
 					<li>
 						<a href="<%= post.link %>" class="lasso--post-list__item <?php echo $can_delete_class;?> <%= post.status %>" data-postid="<%= post.id %>" >
@@ -47,7 +47,7 @@ 
 					</li>
 				</script>
 		<?php 
-		    }
+			}
 		}
 
 	}

Spacing +12 added lines, -12 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 
-if ( !function_exists( 'lasso_backbone_templates' ) ):
+if (!function_exists('lasso_backbone_templates')):
 
 	add_action('wp_footer', 'lasso_backbone_templates');
-	function lasso_backbone_templates(){
+	function lasso_backbone_templates() {
 
 		$can_delete = lasso_user_can('delete_posts');
 		$can_delete_class = $can_delete ? false : 'no-delete';
 
 		
 		// only run on posts and pages if user is logged in
-		if ( is_user_logged_in() && lasso_user_can('edit_posts') ) { 
-		    if ( !class_exists( 'WP_REST_Controller' ) ) {
+		if (is_user_logged_in() && lasso_user_can('edit_posts')) { 
+		    if (!class_exists('WP_REST_Controller')) {
 			    // using rest api v1 
 				?>
 				<script type="text/html" id="lasso-tmpl--post">
 					<li>
-						<a href="<%= post.link %>" class="lasso--post-list__item <?php echo $can_delete_class;?> <%= post.status %>" data-postid="<%= post.ID %>" >
+						<a href="<%= post.link %>" class="lasso--post-list__item <?php echo $can_delete_class; ?> <%= post.status %>" data-postid="<%= post.ID %>" >
 							<%= post.title %>
 
 							<div class="lasso--post-list__controls">
-								<span title="<?php echo esc_attr_e('Edit Post','lasso');?>" id="lasso--post__edit"></span>
-								<?php if( $can_delete ): ?>
-								<span title="<?php echo esc_attr_e('Delete Post','lasso');?>" id="lasso--post__delete"></span>
+								<span title="<?php echo esc_attr_e('Edit Post', 'lasso'); ?>" id="lasso--post__edit"></span>
+								<?php if ($can_delete): ?>
+								<span title="<?php echo esc_attr_e('Delete Post', 'lasso'); ?>" id="lasso--post__delete"></span>
 								<?php endif; ?>
 							</div>
 						</a>
@@ -34,13 +34,13 @@ 
 		    ?>
 				<script type="text/html" id="lasso-tmpl--post">
 					<li>
-						<a href="<%= post.link %>" class="lasso--post-list__item <?php echo $can_delete_class;?> <%= post.status %>" data-postid="<%= post.id %>" >
+						<a href="<%= post.link %>" class="lasso--post-list__item <?php echo $can_delete_class; ?> <%= post.status %>" data-postid="<%= post.id %>" >
 							<%= post.title.rendered %>
 
 							<div class="lasso--post-list__controls">
-								<span title="<?php echo esc_attr_e('Edit Post','lasso');?>" id="lasso--post__edit"></span>
-								<?php if( $can_delete ): ?>
-								<span title="<?php echo esc_attr_e('Delete Post','lasso');?>" id="lasso--post__delete"></span>
+								<span title="<?php echo esc_attr_e('Edit Post', 'lasso'); ?>" id="lasso--post__edit"></span>
+								<?php if ($can_delete): ?>
+								<span title="<?php echo esc_attr_e('Delete Post', 'lasso'); ?>" id="lasso--post__delete"></span>
 								<?php endif; ?>
 							</div>
 						</a>

includes/process/save.php

Doc Comments +3 added lines

@@ -163,6 +163,9 @@
 		return $content;
 	}
 	
+	/**
+	 * @param string $content
+	 */
 	protected function remove_comments($content) {
 		return preg_replace('/<!--(.*)-->/Uis', '', $content);
 	}

Indentation +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	 */
 	protected function replace_rendered_shortcodes( $content ) {
 		//debug line
-        //file_put_contents(WP_PLUGIN_DIR."/file1.txt", $content);
+		//file_put_contents(WP_PLUGIN_DIR."/file1.txt", $content);
 		
 
 		if ( false === strpos( $content, '--EDITUS_OTHER_SHORTCODE_START|' ) ) {

Spacing +24 added lines, -24 removed lines

@@ -19,27 +19,27 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function content( $data ) {
+	public function content($data) {
 
 		$save_to_post_disabled = $this->save_to_post_disables();
 
-		$postid = (int) $data[ 'post_id' ];
-		$content = $this->replace_rendered_shortcodes( $data[ 'content' ] );
-		$content = $this->remove_comments( $content );
+		$postid = (int) $data['post_id'];
+		$content = $this->replace_rendered_shortcodes($data['content']);
+		$content = $this->remove_comments($content);
 
-		if ( 'off' == $save_to_post_disabled || empty( $save_to_post_disabled ) ) {
+		if ('off' == $save_to_post_disabled || empty($save_to_post_disabled)) {
 
 			$args = array(
 				'ID'           => (int) $postid,
 				'post_content' => $content
 			);
 
-			wp_update_post( apply_filters( 'lasso_object_save_args', $args ) );
+			wp_update_post(apply_filters('lasso_object_save_args', $args));
 
 		}
 
 		// run save action
-		do_action( 'lasso_post_saved', $postid, $content, get_current_user_ID() );
+		do_action('lasso_post_saved', $postid, $content, get_current_user_ID());
 
 		return true;
 
@@ -54,25 +54,25 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function publish_content( $data ) {
+	public function publish_content($data) {
 		$save_to_post_disabled = $this->save_to_post_disables();
 
-		$postid = (int) $data[ 'post_id' ];
-		$content = $this->replace_rendered_shortcodes( $data[ 'content' ] );
-		$content = $this->remove_comments( $content );
+		$postid = (int) $data['post_id'];
+		$content = $this->replace_rendered_shortcodes($data['content']);
+		$content = $this->remove_comments($content);
 
-		if ( 'off' == $save_to_post_disabled || empty( $save_to_post_disabled ) ) {
+		if ('off' == $save_to_post_disabled || empty($save_to_post_disabled)) {
 
-			$args = array (
+			$args = array(
 				'ID'           	=> $postid,
 				'post_content' 	=> $content,
 				'post_status' 	=> 'publish'
 			);
-			wp_update_post( apply_filters( 'lasso_object_publish_args', $args ) );
+			wp_update_post(apply_filters('lasso_object_publish_args', $args));
 
 		}
 
-		do_action( 'lasso_post_published', $postid, $content, get_current_user_ID() );
+		do_action('lasso_post_published', $postid, $content, get_current_user_ID());
 
 		return true;
 
@@ -85,13 +85,13 @@ 
 	 *
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_save_content' ] = array(
+	public static function params() {
+		$params['process_save_content'] = array(
 			'post_id' => 'absint',
 			'content' => 'wp_kses_post'
 		);
 
-		$params[ 'process_save_publish_content' ] = array(
+		$params['process_save_publish_content'] = array(
 			'post_id' => 'absint',
 			'content' => 'wp_kses_post'
 		);
@@ -107,11 +107,11 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_save_content' ] = array(
+		$params['process_save_content'] = array(
 			'lasso_user_can'
 		);
 
-		$params[ 'process_save_publish_content' ] = array();
+		$params['process_save_publish_content'] = array();
 
 		return $params;
 
@@ -127,7 +127,7 @@ 
 	 * @return bool
 	 */
 	protected function save_to_post_disables() {
-		$save_to_post_disabled = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
+		$save_to_post_disabled = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
 
 		return $save_to_post_disabled;
 
@@ -144,15 +144,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function replace_rendered_shortcodes( $content ) {
+	protected function replace_rendered_shortcodes($content) {
 		//debug line
         //file_put_contents(WP_PLUGIN_DIR."/file1.txt", $content);
 		
 
-		if ( false === strpos( $content, '--EDITUS_OTHER_SHORTCODE_START|' ) ) {
+		if (false === strpos($content, '--EDITUS_OTHER_SHORTCODE_START|')) {
 			return $content;
 		}
-		$content = htmlspecialchars_decode ($content);
+		$content = htmlspecialchars_decode($content);
 
 		$content = preg_replace(
 			'/<!--EDITUS_OTHER_SHORTCODE_START\|\[(.*?)\]-->(.*?)<!--EDITUS_OTHER_SHORTCODE_END-->/s',

public/includes/helpers.php

Indentation +10 added lines, -10 removed lines

@@ -243,7 +243,7 @@ 
 		'public' => true,
 	), 'objects' );
 	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
-    unset( $post_types[ 'attachment' ] );
+	unset( $post_types[ 'attachment' ] );
 
 	/**
 	 * Set which post types are allowed
@@ -270,7 +270,7 @@ 
 	$post_types = get_post_types( array(
 		'public' => true,
 	), 'names' );
-    unset( $post_types[ 'attachment' ] );
+	unset( $post_types[ 'attachment' ] );
 
 	/**
 	 * Set which post types are allowed
@@ -382,7 +382,7 @@ 
  */
 if ( !function_exists( 'lasso_user_can' ) ):
 	function lasso_user_can( $action = '', $postid = 0 ) {
-        $result = false;
+		$result = false;
 		if ( empty( $action ) )
 			$action = 'edit_posts';
 
@@ -397,17 +397,17 @@ 
 				$allowed_post_types = array_diff($allowed_post_types,array('page'));
 			}
 			
-            if (!empty($allowed_post_types) && !empty($postid)) {
+			if (!empty($allowed_post_types) && !empty($postid)) {
 				$type = get_post_type( $postid );
-                $allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
+				$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
 				
-                if ( in_array( $type, $allowed_post_types ) ) {
+				if ( in_array( $type, $allowed_post_types ) ) {
 				   $result =  true;
-			    }
-            } else {
-                //we are not checking against a post, return true
+				}
+			} else {
+				//we are not checking against a post, return true
 				$result =  true;
-        	}
+			}
 		} else {
 			$result = false;
 		}

Braces +27 added lines, -19 removed lines

@@ -15,8 +15,9 @@ 
 if( !function_exists('lasso_editor_get_option')):
 	function lasso_editor_get_option( $option, $section, $default = '' ) {
 
-		if ( empty( $option ) )
-			return;
+		if ( empty( $option ) ) {
+					return;
+		}
 
 		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 
@@ -44,11 +45,12 @@ 
 
 	$q = new wp_query( array( 'post_type' => 'ai_galleries', 'post_status' => 'publish' ) );
 
-	if ( $q->have_posts() )
-		return true;
-	else
-		return false;
-}
+	if ( $q->have_posts() ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Return a CSS class of an automatically supported theme
@@ -194,13 +196,15 @@ 
 */
 function lasso_get_post_objects( $postid = '', $taxonomy = 'category') {
 
-	if ( empty( $postid ) )
-		$postid = get_the_ID();
+	if ( empty( $postid ) ) {
+			$postid = get_the_ID();
+	}
 
 	$objects = 'category' == $taxonomy ? get_the_category( $postid ) : get_the_tags( $postid );
 
-	if ( empty( $objects) )
-		return;
+	if ( empty( $objects) ) {
+			return;
+	}
 
 	$out = '';
 	foreach( $objects as $object ) {
@@ -222,8 +226,9 @@ 
 
 	$objects = 'category' == $taxonomy ? get_categories(array('hide_empty' => 0)) : get_tags(array('hide_empty' => 0));
 
-	if ( empty( $objects) )
-		return;
+	if ( empty( $objects) ) {
+			return;
+	}
 
 	$out = "";
 	foreach( $objects as $object ) {
@@ -345,8 +350,9 @@ 
 */
 function lasso_clean_string( $string = '' ) {
 
-	if ( empty( $string ) )
-		return;
+	if ( empty( $string ) ) {
+			return;
+	}
 
 	return sanitize_text_field( strtolower( preg_replace('/[\s_]/', '-', $string ) ) );
 }
@@ -385,11 +391,13 @@ 
 if ( !function_exists( 'lasso_user_can' ) ):
 	function lasso_user_can( $action = '', $postid = 0 ) {
         $result = false;
-		if ( empty( $action ) )
-			$action = 'edit_posts';
+		if ( empty( $action ) ) {
+					$action = 'edit_posts';
+		}
 
-		if ( empty( $postid ) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts')
-			$postid = get_the_ID();
+		if ( empty( $postid ) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts') {
+					$postid = get_the_ID();
+		}
 
 		if ( is_user_logged_in() && current_user_can( $action, $postid ) ) {
 			// check against post types:

Doc Comments +6 added lines, -2 removed lines

@@ -13,6 +13,10 @@ 
  * @since 1.0
  */
 if( !function_exists('lasso_editor_get_option')):
+
+	/**
+	 * @param string $section
+	 */
 	function lasso_editor_get_option( $option, $section, $default = '' ) {
 
 		if ( empty( $option ) )
@@ -216,7 +220,7 @@ 
  *	Return an array of categories for autocomplete
  *
  *	@since 0.9.3
- *	@return array all categoiries
+ *	@return null|string all categoiries
 */
 function lasso_get_objects( $taxonomy = 'category' ) {
 
@@ -309,7 +313,7 @@ 
 *	Used internally as a callback to build a tab or content area for modal addons
 *
 *	@param $tab object
-*	@param $type string tab or content
+*	@param string $type string tab or content
 *	@uses lasso_modal_addons()
 *	@since 0.9.4
 */

Spacing +84 added lines, -84 removed lines

@@ -12,24 +12,24 @@ 
  * @return the option value
  * @since 1.0
  */
-if( !function_exists('lasso_editor_get_option')):
-	function lasso_editor_get_option( $option, $section, $default = '' ) {
+if (!function_exists('lasso_editor_get_option')):
+	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);
 		}
 		
-		$options = apply_filters( 'editus_filter_options', $options );
+		$options = apply_filters('editus_filter_options', $options);
 
-		if ( isset( $options[$option] ) ) {
+		if (isset($options[$option])) {
 			return $options[$option];
 		}
 
@@ -44,9 +44,9 @@ 
  */
 function lasso_editor_galleries_exist() {
 
-	$q = new wp_query( array( 'post_type' => 'ai_galleries', 'post_status' => 'publish' ) );
+	$q = new wp_query(array('post_type' => 'ai_galleries', 'post_status' => 'publish'));
 
-	if ( $q->have_posts() )
+	if ($q->have_posts())
 		return true;
 	else
 		return false;
@@ -61,9 +61,9 @@ 
 function lasso_get_supported_theme_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	switch ( $slug ) {
+	switch ($slug) {
 		case 'aesop-story-theme': // aesop
 			$out = '.aesop-entry-content';
 			break;
@@ -112,16 +112,16 @@ 
 
 	}
 
-	return apply_filters('lasso_content_class', !empty( $out ) ? $out : false);
+	return apply_filters('lasso_content_class', !empty($out) ? $out : false);
 	//return !empty( $out ) ? $out : false;
 }
 
 function lasso_get_supported_theme_title_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	switch ( $slug ) {
+	switch ($slug) {
 
 		case 'aesop-story-theme': // aesop
 			$out = '.aesop-entry-title';
@@ -149,16 +149,16 @@ 
 			break;
 	}
 
-	return apply_filters('lasso_title_class', !empty( $out ) ? $out : false);
+	return apply_filters('lasso_title_class', !empty($out) ? $out : false);
 }
 
 //since 0.9.9.6
 function lasso_get_supported_theme_featured_image_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	return apply_filters('lasso_featured_image_class', !empty( $out ) ? $out : false);
+	return apply_filters('lasso_featured_image_class', !empty($out) ? $out : false);
 }
 
 
@@ -169,7 +169,7 @@ 
 *	@since 0.8.7
 *	@return string of comma separated classes
 */
-function lasso_supported_no_save(){
+function lasso_supported_no_save() {
 
 	return apply_filters('lasso_dont_save', '.lasso--ignore,.sharedaddy,.us_wrapper,.meta,.edit-link,.ssba,.addtoany_share_save_container,.mashsb-container,.heateor_sss_sharing_container,.nc_socialPanel,.jp-relatedposts,.fb-comments,.adsbygoogle,.swp_social_panel');
 }
@@ -183,8 +183,8 @@ 
  *
  * @return array|mixed|object|string|void
  */
-function lasso_sanitize_data( $data ) {
-	return \lasso\sanatize::do_sanitize( $data );
+function lasso_sanitize_data($data) {
+	return \lasso\sanatize::do_sanitize($data);
 
 }
 
@@ -194,18 +194,18 @@ 
  *	@since 0.9.3
  *	@return string of comma delimited category slugs
 */
-function lasso_get_post_objects( $postid = '', $taxonomy = 'category') {
+function lasso_get_post_objects($postid = '', $taxonomy = 'category') {
 
-	if ( empty( $postid ) )
+	if (empty($postid))
 		$postid = get_the_ID();
 
-	$objects = 'category' == $taxonomy ? get_the_category( $postid ) : get_the_tags( $postid );
+	$objects = 'category' == $taxonomy ? get_the_category($postid) : get_the_tags($postid);
 
-	if ( empty( $objects) )
+	if (empty($objects))
 		return;
 
 	$out = '';
-	foreach( $objects as $object ) {
+	foreach ($objects as $object) {
 		//$out .= $object->slug.', ';
 		$out .= $object->name.',';
 	}
@@ -220,15 +220,15 @@ 
  *	@since 0.9.3
  *	@return array all categoiries
 */
-function lasso_get_objects( $taxonomy = 'category' ) {
+function lasso_get_objects($taxonomy = 'category') {
 
 	$objects = 'category' == $taxonomy ? get_categories(array('hide_empty' => 0)) : get_tags(array('hide_empty' => 0));
 
-	if ( empty( $objects) )
+	if (empty($objects))
 		return;
 
 	$out = "";
-	foreach( $objects as $object ) {
+	foreach ($objects as $object) {
 		$out .= $object->name.',';
 	}
 
@@ -243,11 +243,11 @@ 
  * @since 0.9.4
  */
 function lasso_post_types_names() {
-	$post_types = get_post_types( array(
+	$post_types = get_post_types(array(
 		'public' => true,
-	), 'objects' );
-	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
-    unset( $post_types[ 'attachment' ] );
+	), 'objects');
+	$post_types = array_combine(array_keys($post_types), wp_list_pluck($post_types, 'label'));
+    unset($post_types['attachment']);
 
 	/**
 	 * Set which post types are allowed
@@ -256,14 +256,14 @@ 
 	 *
 	 * @param array $allowed_post_types Array of names (not labels) of allowed post types. Must be registered.
 	 */
-	$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( 'post', 'page') );
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
+	$allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array('post', 'page'));
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
 	if (!current_user_can('edit_pages')) {
-		$allowed_post_types = array_diff($allowed_post_types,array('page'));
+		$allowed_post_types = array_diff($allowed_post_types, array('page'));
 	}
-	foreach( $post_types as $name => $label ) {
-		if ( ! in_array( $name, $allowed_post_types ) ) {
-			unset( $post_types[ $name ] );
+	foreach ($post_types as $name => $label) {
+		if (!in_array($name, $allowed_post_types)) {
+			unset($post_types[$name]);
 		}
 	}
 	return $post_types;
@@ -271,10 +271,10 @@ 
 
 
 function lasso_post_types() {
-	$post_types = get_post_types( array(
+	$post_types = get_post_types(array(
 		'public' => true,
-	), 'names' );
-    unset( $post_types[ 'attachment' ] );
+	), 'names');
+    unset($post_types['attachment']);
 
 	/**
 	 * Set which post types are allowed
@@ -283,11 +283,11 @@ 
 	 *
 	 * @param array $allowed_post_types Array of names (not labels) of allowed post types. Must be registered.
 	 */
-	$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( 'post') );
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
-	foreach( $post_types as $name => $label ) {
-		if ( ! in_array( $name, $allowed_post_types ) ) {
-			unset( $post_types[ $name ] );
+	$allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array('post'));
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
+	foreach ($post_types as $name => $label) {
+		if (!in_array($name, $allowed_post_types)) {
+			unset($post_types[$name]);
 		}
 	}
 	return $post_types;
@@ -297,7 +297,7 @@ 
 	global $wp_post_types;
 	$post_types = lasso_post_types();
 	$rest_base = array();
-	foreach ( $post_types as $post_type) {
+	foreach ($post_types as $post_type) {
 		$rest_base[$post_type] = $wp_post_types[$post_type]->rest_base;
 	}
     
@@ -315,22 +315,22 @@ 
 *	@uses lasso_modal_addons()
 *	@since 0.9.4
 */
-function lasso_modal_addons_content( $tab = '', $type ){
+function lasso_modal_addons_content($tab = '', $type) {
 
-	$name = lasso_clean_string( $tab['name'] );
+	$name = lasso_clean_string($tab['name']);
 
-	if ( 'tab' == $type ) {
+	if ('tab' == $type) {
 
-		$out = sprintf( '<li data-addon-name="%s">%s</li>', $name, $tab['name'] );
+		$out = sprintf('<li data-addon-name="%s">%s</li>', $name, $tab['name']);
 
-	} else if ( 'content' == $type ){
+	} else if ('content' == $type) {
 
-		$content = isset( $tab['content'] ) && is_callable( $tab['content'] ) ? call_user_func( $tab['content'] ) : false;
-		$options = isset( $tab['options'] ) && is_callable( $tab['options'] ) ? call_user_func( $tab['options'] ) : false;
+		$content = isset($tab['content']) && is_callable($tab['content']) ? call_user_func($tab['content']) : false;
+		$options = isset($tab['options']) && is_callable($tab['options']) ? call_user_func($tab['options']) : false;
 
-		$out = sprintf( '<div class="lasso--modal__content not-visible" data-addon-content="%s">
+		$out = sprintf('<div class="lasso--modal__content not-visible" data-addon-content="%s">
 			%s%s
-			</div>', $name, $content, lasso_option_form( $name, $options ) );
+			</div>', $name, $content, lasso_option_form($name, $options));
 
 	}
 
@@ -345,12 +345,12 @@ 
 *
 * @return void|string
 */
-function lasso_clean_string( $string = '' ) {
+function lasso_clean_string($string = '') {
 
-	if ( empty( $string ) )
+	if (empty($string))
 		return;
 
-	return sanitize_text_field( strtolower( preg_replace('/[\s_]/', '-', $string ) ) );
+	return sanitize_text_field(strtolower(preg_replace('/[\s_]/', '-', $string)));
 }
 
 /**
@@ -363,13 +363,13 @@ 
  *
  * @return void|string
  */
-function lasso_unclean_string( $string = '' ) {
+function lasso_unclean_string($string = '') {
 
-	if ( empty( $string ) ) {
+	if (empty($string)) {
 		return;
 	}
 
-	return sanitize_text_field( strtolower( str_replace( '-', '_', $string ) ) );
+	return sanitize_text_field(strtolower(str_replace('-', '_', $string)));
 }
 
 
@@ -384,40 +384,40 @@ 
  * @param unknown $postid int the id of the post object to check against
  * @since 0.9.9.7 added filter 'lasso_user_can_filter'
  */
-if ( !function_exists( 'lasso_user_can' ) ):
-	function lasso_user_can( $action = '', $postid = 0 ) {
+if (!function_exists('lasso_user_can')):
+	function lasso_user_can($action = '', $postid = 0) {
         $result = false;
-		if ( empty( $action ) )
+		if (empty($action))
 			$action = 'edit_posts';
 
-		if ( empty( $postid ) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts')
+		if (empty($postid) && $action != 'edit_posts' && $action != 'publish_posts' && $action != 'delete_posts')
 			$postid = get_the_ID();
 
-		if ( is_user_logged_in() && current_user_can( $action, $postid ) ) {
+		if (is_user_logged_in() && current_user_can($action, $postid)) {
 			// check against post types:
-			$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( 'post', 'page') );
+			$allowed_post_types = lasso_editor_get_option('allowed_post_types', 'lasso_editor', array('post', 'page'));
 			
 			if (!current_user_can('edit_pages')) {
-				$allowed_post_types = array_diff($allowed_post_types,array('page'));
+				$allowed_post_types = array_diff($allowed_post_types, array('page'));
 			}
 			
             if (!empty($allowed_post_types) && !empty($postid)) {
-				$type = get_post_type( $postid );
-                $allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
+				$type = get_post_type($postid);
+                $allowed_post_types = apply_filters('lasso_allowed_post_types', $allowed_post_types);
 				
-                if ( in_array( $type, $allowed_post_types ) ) {
-				   $result =  true;
+                if (in_array($type, $allowed_post_types)) {
+				   $result = true;
 			    }
             } else {
                 //we are not checking against a post, return true
-				$result =  true;
+				$result = true;
         	}
 		} else {
 			$result = false;
 		}
 		//if ( function_exists( 'is_gutenberg_page' ) && has_blocks() ) return false;
 		
-		return apply_filters( 'lasso_user_can_filter', $result,  $action, $postid);
+		return apply_filters('lasso_user_can_filter', $result, $action, $postid);
 	}
 endif;
 
@@ -426,25 +426,25 @@ 
 *
 *	@since 0.9.5
 */
-if ( !function_exists('lasso_editor_empty_results') ):
+if (!function_exists('lasso_editor_empty_results')):
 
-	function lasso_editor_empty_results( $type = 'posts' ){
+	function lasso_editor_empty_results($type = 'posts') {
 
-		if ( 'posts' == $type ) {
+		if ('posts' == $type) {
 
-			$string = apply_filters('lasso_empty_state_message', __('No posts to show', 'lasso') );
+			$string = apply_filters('lasso_empty_state_message', __('No posts to show', 'lasso'));
 			$icon = 'lasso-icon-file-text2';
 			$button = false;
 
-		} elseif ( 'revision' == $type ) {
+		} elseif ('revision' == $type) {
 
-			$string = apply_filters('lasso_empty_state_message', __('No revisions found', 'lasso') );
+			$string = apply_filters('lasso_empty_state_message', __('No revisions found', 'lasso'));
 			$icon = 'lasso-icon-history';
-			$button = sprintf('<a href="#" class="lasso--btn-secondary" id="lasso--close-modal">%s</a>', __('Close','lasso') );
+			$button = sprintf('<a href="#" class="lasso--btn-secondary" id="lasso--close-modal">%s</a>', __('Close', 'lasso'));
 
 		}
 
-		return sprintf('<div id="lasso--empty-state" class="lasso--empty-state"><i class="lasso--empty-state-icon lasso-icon %s"></i><p>%s</p>%s</div>', $icon, $string, $button );
+		return sprintf('<div id="lasso--empty-state" class="lasso--empty-state"><i class="lasso--empty-state-icon lasso-icon %s"></i><p>%s</p>%s</div>', $icon, $string, $button);
 	}
 
 endif;

public/includes/components.php

Doc Comments +3 added lines

@@ -279,6 +279,9 @@
 endif;
 
 // helper function to retrieve one id for default option
+/**
+ * @param string $type
+ */
 function editus_get_one_id($type)
 {
 	$args = array( 'posts_per_page' => 1, 'post_type' => $type );

Indentation +6 added lines, -6 removed lines

@@ -232,12 +232,12 @@
 if ( !function_exists('lasso_wp_image') ):
 
 	function lasso_wp_image(){
-        $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
-        if ($use_old_wpimg != 'on') {
-        	return '<figure data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></div>';
-        } else {
-            return '<figure data-component-type="wpimg" data-linkoption="img" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></div>';
-        }
+		$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+		if ($use_old_wpimg != 'on') {
+			return '<figure data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></div>';
+		} else {
+			return '<figure data-component-type="wpimg" data-linkoption="img" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></div>';
+		}
 	}
 
 endif;

Spacing +59 added lines, -59 removed lines

@@ -16,80 +16,80 @@ 
 
 	$array = array(
 		'quote' => array(
-			'name'    => __('Quote','lasso'),
+			'name'    => __('Quote', 'lasso'),
 			'content' => lasso_quote_component(),
 		),
 		'image' => array(
-			'name'    => __('Image','lasso'),
+			'name'    => __('Image', 'lasso'),
 			'content' => lasso_image_component(),
 		),
 		'parallax' => array(
-			'name'    => __('Parallax','lasso'),
+			'name'    => __('Parallax', 'lasso'),
 			'content' => lasso_parallax_component(),
 		),
 		'audio' => array(
-			'name'    => __('Audio','lasso'),
+			'name'    => __('Audio', 'lasso'),
 			'content' => lasso_audio_component(),
 		),
 		'content' => array(
-			'name'    => __('Content','lasso'),
+			'name'    => __('Content', 'lasso'),
 			'content' => lasso_content_component(),
 		),
 		'character' => array(
-			'name'    => __('Character','lasso'),
+			'name'    => __('Character', 'lasso'),
 			'content' => lasso_character_component(),
 		),
 		'collection' => array(
-			'name'    => __('Collection','lasso'),
+			'name'    => __('Collection', 'lasso'),
 			'content' => lasso_collections_component(),
 		),
 		'document' => array(
-			'name'    => __('Document','lasso'),
+			'name'    => __('Document', 'lasso'),
 			'content' => lasso_document_component(),
 		),
 		'gallery' => array(
-			'name'    => __('Gallery','lasso'),
+			'name'    => __('Gallery', 'lasso'),
 			'content' => lasso_gallery_component(),
 		),
 		'chapter' => array(
-			'name'    => __('Chapter','lasso'),
+			'name'    => __('Chapter', 'lasso'),
 			'content' => lasso_heading_component(),
 		),
 		'map' => array(
-			'name'    => __('Map','lasso'),
+			'name'    => __('Map', 'lasso'),
 			'content' => lasso_map_component(),
 		),
 		'timeline_stop' => array(
-			'name'    => __('Timeline','lasso'),
+			'name'    => __('Timeline', 'lasso'),
 			'content' => lasso_timeline_component(),
 		),
 		'video' => array(
-			'name'    => __('Video','lasso'),
+			'name'    => __('Video', 'lasso'),
 			'content' => lasso_video_component(),
 		),
 		'wpimg' => array(
-			'name'    => __('WordPress Image','lasso'),
+			'name'    => __('WordPress Image', 'lasso'),
 			'content' => lasso_wp_image(),
 		),
 		'wpquote' => array(
-			'name'    => __('WordPress Quote','lasso'),
+			'name'    => __('WordPress Quote', 'lasso'),
 			'content' => lasso_wp_quote(),
 		),
 		'gallery_pop' => array(
-			'name'    => __('Gallery Pop','lasso'),
+			'name'    => __('Gallery Pop', 'lasso'),
 			'content' => lasso_gallery_pop_component(),
 		),
 		'events' => array(
-			'name'    => __('Events','lasso'),
+			'name'    => __('Events', 'lasso'),
 			'content' => lasso_event_component(),
 		),
 		'wpvideo' => array(
-			'name'    => __('WordPress Image','lasso'),
+			'name'    => __('WordPress Image', 'lasso'),
 			'content' => lasso_wp_video(),
 		),
 	);
 
-	return apply_filters( 'lasso_components', $array );
+	return apply_filters('lasso_components', $array);
 }
 
 /**
@@ -115,124 +115,124 @@ 
  */
 
 // 1
-if ( !function_exists( 'lasso_quote_component' ) ):
+if (!function_exists('lasso_quote_component')):
 	function lasso_quote_component() {
 
-		return do_shortcode( '[aesop_quote quote="The Universe is made of stories, not of atoms."]' );
+		return do_shortcode('[aesop_quote quote="The Universe is made of stories, not of atoms."]');
 	}
 endif;
 
 // 2
-if ( !function_exists( 'lasso_image_component' ) ):
+if (!function_exists('lasso_image_component')):
 	function lasso_image_component() {
 
-		return do_shortcode( '[aesop_image img="'.LASSO_URL.'/public/assets/img/empty-img.png" align="center" imgwidth="100%"]' );
+		return do_shortcode('[aesop_image img="'.LASSO_URL.'/public/assets/img/empty-img.png" align="center" imgwidth="100%"]');
 	}
 endif;
 
 // 3
-if ( !function_exists( 'lasso_parallax_component' ) ):
+if (!function_exists('lasso_parallax_component')):
 	function lasso_parallax_component() {
 
-		return do_shortcode( '[aesop_parallax img="'.LASSO_URL.'/public/assets/img/empty-img.png"]' );
+		return do_shortcode('[aesop_parallax img="'.LASSO_URL.'/public/assets/img/empty-img.png"]');
 	}
 endif;
 
 // 4
-if ( !function_exists( 'lasso_audio_component' ) ):
+if (!function_exists('lasso_audio_component')):
 	function lasso_audio_component() {
 
-		return do_shortcode( '[aesop_audio src="http://users.skynet.be/fa046054/home/P22/track06.mp3"]' );
+		return do_shortcode('[aesop_audio src="http://users.skynet.be/fa046054/home/P22/track06.mp3"]');
 
 	}
 endif;
 
 // 5
-if ( !function_exists( 'lasso_content_component' ) ):
+if (!function_exists('lasso_content_component')):
 	function lasso_content_component() {
 
-		return do_shortcode( '[aesop_content]Start typing here...[/aesop_content]' );
+		return do_shortcode('[aesop_content]Start typing here...[/aesop_content]');
 	}
 endif;
 
 // 6
-if ( !function_exists( 'lasso_character_component' ) ):
+if (!function_exists('lasso_character_component')):
 	function lasso_character_component() {
 
-		return do_shortcode( '[aesop_character img="'.LASSO_URL.'/public/assets/img/empty-img.png" name="Joes Apartment" width="150px"]' );
+		return do_shortcode('[aesop_character img="'.LASSO_URL.'/public/assets/img/empty-img.png" name="Joes Apartment" width="150px"]');
 
 	}
 endif;
 
 // 7
-if ( !function_exists( 'lasso_collections_component' ) ):
+if (!function_exists('lasso_collections_component')):
 	function lasso_collections_component() {
 
-		return do_shortcode( '[aesop_collection]' );
+		return do_shortcode('[aesop_collection]');
 	}
 endif;
 
 // 8
-if ( !function_exists( 'lasso_document_component' ) ):
+if (!function_exists('lasso_document_component')):
 	function lasso_document_component() {
 
-		return do_shortcode( '[aesop_document src="'.LASSO_URL.'/public/assets/img/empty-img.png" ]' );
+		return do_shortcode('[aesop_document src="'.LASSO_URL.'/public/assets/img/empty-img.png" ]');
 
 	}
 endif;
 
 // 9
-if ( !function_exists( 'lasso_gallery_component' ) ):
+if (!function_exists('lasso_gallery_component')):
 	function lasso_gallery_component() {
 
-		return do_shortcode( '[aesop_gallery]' );
+		return do_shortcode('[aesop_gallery]');
 
 	}
 endif;
 
 // 10
-if ( !function_exists( 'lasso_heading_component' ) ):
+if (!function_exists('lasso_heading_component')):
 	function lasso_heading_component() {
 
-		return do_shortcode( '[aesop_chapter title="Chapter One" img="'.LASSO_URL.'/public/assets/img/empty-img.png" full="on"]' );
+		return do_shortcode('[aesop_chapter title="Chapter One" img="'.LASSO_URL.'/public/assets/img/empty-img.png" full="on"]');
 	}
 endif;
 
 // 11
-if ( !function_exists( 'lasso_map_component' ) ):
+if (!function_exists('lasso_map_component')):
 	function lasso_map_component() {
 
 		return '<form id="lasso--map-form" class="aesop-component aesop-map-component lasso--map-drag-holder" enctype="multipart/form-data">
 				'.lasso_map_form_footer().'
-				'.do_shortcode( '[aesop_map sticky="off"]' ).'
+				'.do_shortcode('[aesop_map sticky="off"]').'
 			</form>';
 
 	}
 endif;
 
 // 12
-if ( !function_exists( 'lasso_timeline_component' ) ):
+if (!function_exists('lasso_timeline_component')):
 	function lasso_timeline_component() {
 
-		return do_shortcode( '[aesop_timeline_stop num="Title" title="2014"]' );
+		return do_shortcode('[aesop_timeline_stop num="Title" title="2014"]');
 
 	}
 endif;
 
 // 13
-if ( !function_exists( 'lasso_video_component' ) ):
+if (!function_exists('lasso_video_component')):
 	function lasso_video_component() {
 
-		return do_shortcode( '[aesop_video src="vimeo" id="59940289" width="100%" align="center"]' );
+		return do_shortcode('[aesop_video src="vimeo" id="59940289" width="100%" align="center"]');
 
 	}
 endif;
 
 // 14 - since 0.9.1
-if ( !function_exists('lasso_wp_image') ):
+if (!function_exists('lasso_wp_image')):
 
-	function lasso_wp_image(){
-        $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+	function lasso_wp_image() {
+        $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor', 'off');
         if ($use_old_wpimg != 'on') {
         	return '<figure data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></div>';
         } else {
@@ -243,9 +243,9 @@ 
 endif;
 
 // 15 - since 0.9.2
-if ( !function_exists('lasso_wp_quote') ):
+if (!function_exists('lasso_wp_quote')):
 
-	function lasso_wp_quote(){
+	function lasso_wp_quote() {
 		return '<blockquote data-component-type="wpquote" class="lasso--wpquote lasso-component"><p>The universe is made of stories.</p></blockquote>';
 	}
 
@@ -253,15 +253,15 @@ 
 
 // 16 gallery pop added but not fully supported as of 0.9.9.11 
 
-if ( !function_exists( 'lasso_gallery_pop_component' ) ):
+if (!function_exists('lasso_gallery_pop_component')):
 	function lasso_gallery_pop_component() {
-		return do_shortcode( '[aesop_gallery_pop]' );
+		return do_shortcode('[aesop_gallery_pop]');
 	}
 endif;
 
 // 17 - work in progress
 
-if ( !function_exists( 'lasso_event_component' ) ):
+if (!function_exists('lasso_event_component')):
 	function lasso_event_component() {
 		$id = editus_get_one_id('aesop_events');
 		return '<div data-component-type="events" class="aesop-component lasso-component"><p>Aesop Event: After setting the event, save and reload the page.</p></div>';
@@ -269,9 +269,9 @@ 
 endif;
 
 // 18 - work in progress
-if ( !function_exists('lasso_wp_video') ):
+if (!function_exists('lasso_wp_video')):
 
-	function lasso_wp_video(){
+	function lasso_wp_video() {
 		return '<div data-component-type="wpvideo" class="lasso--wpvideo__wrap lasso-component"><video class="wp-video-0"></video>';
 	}
 
@@ -280,10 +280,10 @@ 
 // helper function to retrieve one id for default option
 function editus_get_one_id($type)
 {
-	$args = array( 'posts_per_page' => 1, 'post_type' => $type );
-	$posts = get_posts( $args );
-	if ( $posts ) {
-		foreach ( $posts as $post ) {
+	$args = array('posts_per_page' => 1, 'post_type' => $type);
+	$posts = get_posts($args);
+	if ($posts) {
+		foreach ($posts as $post) {
 			return $post->ID;
 		}
 	}

lasso.php

Braces +3 added lines, -2 removed lines

@@ -63,8 +63,9 @@
 
 function lasso_editor_get_option( $option, $section, $default = '' ) {
 
-	if ( empty( $option ) )
-		return;
+	if ( empty( $option ) ) {
+			return;
+	}
 
 	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 

Doc Comments +3 added lines

@@ -61,6 +61,9 @@
 }
 
 
+/**
+ * @param string $section
+ */
 function lasso_editor_get_option( $option, $section, $default = '' ) {
 
 	if ( empty( $option ) )

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>
@@ -134,31 +134,31 @@ 
           <li data-action="deltable"><?php echo __('Delete Table','lasso')?></li
         </ul>
     <?php
-    }
+	}
     
     
-    function editus_html_table()
-    {   
-        return '<figure class="wp-block-table"><table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table></figure><p></p>';
-    }
+	function editus_html_table()
+	{   
+		return '<figure class="wp-block-table"><table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table></figure><p></p>';
+	}
 
 
-    function editus_components_add_table( $array ){
-        $custom = array(
-               'htmltable' => array(
-                         'name'    => __('HTML Table','lasso'),
-                          'content' => self::editus_html_table(),
-                )
-        );
-        return array_merge( $array, $custom );
-    }
+	function editus_components_add_table( $array ){
+		$custom = array(
+			   'htmltable' => array(
+						 'name'    => __('HTML Table','lasso'),
+						  'content' => self::editus_html_table(),
+				)
+		);
+		return array_merge( $array, $custom );
+	}
 
 
-    function editus_toolbar_components_add_table( ) {
-          ?>
+	function editus_toolbar_components_add_table( ) {
+		  ?>
           <li data-type="htmltable" title="<?php esc_attr_e( 'HTML Table', 'lasso' );?>" class="quote lasso-toolbar--component__htmltable dashicons dashicons-grid-view"></li>
           <?php
-    }
+	}
 }
 
 

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

includes/process/update_object.php

Doc Comments +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
      *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
 	 *                                      The first item is the name of taxonomy
 	 *
-	 *  @return bool True if update was successful, false if not.
+	 *  @return boolean|null True if update was successful, false if not.
 	 */
 	public function set_custom_taxonomy( $postid, $value) {
 		

Indentation +5 added lines, -5 removed lines

@@ -134,7 +134,7 @@ 
 	 *  @since    0.9.3
 	 *
 	 *  @param    int    	$postid       	The current postid
-     *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
+	 *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
 	 *  @param    string     $taxonomy    	The name of the taxonomy to which the term belongs.
 	 *
 	 *  @return bool True if update was successful, false if not.
@@ -147,7 +147,7 @@ 
 			}
 			
 			if ($taxonomy =='category') {
-                // convert from names to category ids
+				// convert from names to category ids
 				$cats = array();
 				if (is_array($value)) {
 					foreach ($value as $cat) {
@@ -179,7 +179,7 @@ 
 	 *
 	 *
 	 *  @param    int    	$postid       	The current postid
-     *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
+	 *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
 	 *                                      The first item is the name of taxonomy
 	 *
 	 *  @return bool True if update was successful, false if not.
@@ -192,7 +192,7 @@ 
 				$value = explode( ',', $value );
 			}
 						
-            // Deleting first array item
+			// Deleting first array item
 			$taxonomy = array_shift($value);
 			$cats = array();
 			foreach ($value as $cat) {
@@ -214,7 +214,7 @@ 
 		
 		if( $value ) {
 			$time = current_time('mysql');
-            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 +42 added lines, -42 removed lines

@@ -9,7 +9,7 @@ 
 
 use lasso\internal_api\api_action;
 
-class update_object implements api_action{
+class update_object implements api_action {
 
 	/**
 	 * The nonce action for this request.
@@ -29,11 +29,11 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function post( $data ) {
+	public function post($data) {
 
-		$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;
 
 
 
@@ -43,28 +43,28 @@ 
 			'post_status' 	=> $status
 		);
 
-		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;
-		self::set_post_terms( $postid, $cats, 'category' );
+		$cats = isset($data['story_cats']) ? $data['story_cats'] : false;
+		self::set_post_terms($postid, $cats, 'category');
 
 
 		// update tags
-		$tags = isset( $data['story_tags'] ) ? $data['story_tags'] : false;
-		self::set_post_terms( $postid, $tags, 'post_tag' );
+		$tags = isset($data['story_tags']) ? $data['story_tags'] : false;
+		self::set_post_terms($postid, $tags, 'post_tag');
 		
 		// update custom taxonomy
-		$taxs  = isset( $data['story_custom_taxonomy'] ) ? $data['story_custom_taxonomy'] : false;
-		self::set_custom_taxonomy( $postid, $taxs );
+		$taxs = isset($data['story_custom_taxonomy']) ? $data['story_custom_taxonomy'] : false;
+		self::set_custom_taxonomy($postid, $taxs);
 		
 		//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() );
+		do_action('lasso_post_updated', $postid, $slug, $status, get_current_user_ID());
 
 		return true;
 
@@ -78,8 +78,8 @@ 
 	 *
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_update_object_post' ] = array(
+	public static function params() {
+		$params['process_update_object_post'] = array(
 			'postid' => 'absint',
 			'status' => 'strip_tags',
 			'story_slug' => array(
@@ -117,7 +117,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_update_object_post' ] = array(
+		$params['process_update_object_post'] = array(
 			'lasso_user_can'
 		);
 
@@ -139,14 +139,14 @@ 
 	 *
 	 *  @return bool True if update was successful, false if not.
 	 */
-	public function set_post_terms( $postid, $value, $taxonomy ) {
-		if( $value ) {
+	public function set_post_terms($postid, $value, $taxonomy) {
+		if ($value) {
 			// first check if multiple, make array if so.
-			if ( self::has_multiple_objects( $value ) ) {	
-				$value = explode( ',', $value );
+			if (self::has_multiple_objects($value)) {	
+				$value = explode(',', $value);
 			}
 			
-			if ($taxonomy =='category') {
+			if ($taxonomy == 'category') {
                 // convert from names to category ids
 				$cats = array();
 				if (is_array($value)) {
@@ -159,17 +159,17 @@ 
 				}
 			}
 	
-			$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;
 		}
 	}
@@ -184,12 +184,12 @@ 
 	 *
 	 *  @return bool True if update was successful, false if not.
 	 */
-	public function set_custom_taxonomy( $postid, $value) {
+	public function set_custom_taxonomy($postid, $value) {
 		
-		if( $value ) {
+		if ($value) {
 			// first check if multiple, make array if so.
-			if ( self::has_multiple_objects( $value ) ) {	
-				$value = explode( ',', $value );
+			if (self::has_multiple_objects($value)) {	
+				$value = explode(',', $value);
 			}
 						
             // Deleting first array item
@@ -201,24 +201,24 @@ 
 			$value = $cats;
 			
 	
-			$result = wp_set_object_terms( $postid, $cats, $taxonomy );
-			if ( ! is_wp_error( $result ) ) {
+			$result = wp_set_object_terms($postid, $cats, $taxonomy);
+			if (!is_wp_error($result)) {
 				return true;
-			}else{
+			} else {
 				return false;
 			}
 		}
 	}
 	
-	public function set_date( $postid, $value) {
+	public function set_date($postid, $value) {
 		
-		if( $value ) {
+		if ($value) {
 			$time = current_time('mysql');
             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)),
 				)
 			);
 		}
@@ -232,9 +232,9 @@ 
 	 *  @return   bool               True if there are multiple terms; otherwise, false.
 	 *	@since   0.9.3
 	 */
-	public function has_multiple_objects( $value ) {
+	public function has_multiple_objects($value) {
 
-		return 0 < strpos( $value, ',' );
+		return 0 < strpos($value, ',');
 
 	}
 

Braces +3 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
 			}
 	
 			$result = wp_set_object_terms( $postid, $value, $taxonomy );
-		}
-		else  {
+		} else  {
 			//remove all terms from post
 			$result = wp_set_object_terms( $postid, null, $taxonomy );
 
@@ -169,7 +168,7 @@ 
 
 		if ( ! is_wp_error( $result ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -204,7 +203,7 @@ 
 			$result = wp_set_object_terms( $postid, $cats, $taxonomy );
 			if ( ! is_wp_error( $result ) ) {
 				return true;
-			}else{
+			} else{
 				return false;
 			}
 		}

includes/process/new_object.php

Spacing +10 added lines, -10 removed lines

@@ -28,26 +28,26 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function post( $data ) {
+	public function post($data) {
 
-		$title  = $data[ 'story_title' ];
+		$title  = $data['story_title'];
 
-		$object = is_null( $data[ 'object'] ) ? false : $data[ 'object' ];
+		$object = is_null($data['object']) ? false : $data['object'];
 
 		// insert a new post
 		$args = array(
 			'post_title'    => $title,
 			'post_status'   => 'draft',
 			'post_type'    	=> $object,
-			'post_content'  => apply_filters( 'lasso_new_object_content', '<p>'.__( 'Once upon a time...','lasso').'</p>' )
+			'post_content'  => apply_filters('lasso_new_object_content', '<p>'.__('Once upon a time...', 'lasso').'</p>')
 		);
 
-		$postid = wp_insert_post( apply_filters( 'lasso_insert_object_args', $args ) );
+		$postid = wp_insert_post(apply_filters('lasso_insert_object_args', $args));
 
-		do_action( 'lasso_new_object', $postid, $object, $title, get_current_user_ID() );
+		do_action('lasso_new_object', $postid, $object, $title, get_current_user_ID());
 
 		return array(
-			'postlink' => get_permalink( $postid )
+			'postlink' => get_permalink($postid)
 		);
 
 	}
@@ -60,8 +60,8 @@ 
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
 	public static function params() {
-		$params[ 'process_new_object_post' ] = array(
-			'story_title' => array( 'wp_strip_all_tags', 'trim' ),
+		$params['process_new_object_post'] = array(
+			'story_title' => array('wp_strip_all_tags', 'trim'),
 			'object' => 'trim'
 		);
 
@@ -77,7 +77,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_new_object_post' ] = array();
+		$params['process_new_object_post'] = array();
 
 		return $params;
 

public/includes/editor-modules.php

Braces +8 added lines, -4 removed lines

@@ -188,8 +188,11 @@ 
 						<?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>
+					<?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-->
 					<?php endif; ?>
@@ -712,8 +715,9 @@ 
 
 	$blob = array();
 
-	if ( empty( $codes ) )
-		return;
+	if ( empty( $codes ) ) {
+			return;
+	}
 
 	foreach ( $codes as $slug => $shortcode ) {
 		$return = '';

Doc Comments +1 added lines

@@ -923,6 +923,7 @@
  * Takes a color code and returns an adjusted value
  * @since 1.0.0
  * Steps should be between -255 and 255. Negative = darker, positive = lighter
+ * @param integer $steps
  * @return string
  */
 function lasso_editor_adjustBrightness($hex, $steps) { 

Indentation +118 added lines, -118 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
@@ -456,7 +456,7 @@ 
 	
 	//editor options
 	$allow_change_date = lasso_editor_get_option('allow_change_date', 'lasso_editor');
-    $allow_edit_excerpt = lasso_editor_get_option('allow_edit_excerpt', 'lasso_editor');
+	$allow_edit_excerpt = lasso_editor_get_option('allow_edit_excerpt', 'lasso_editor');
 	$no_url_setting = lasso_editor_get_option('no_url_setting', 'lasso_editor');
 
 	// are we singular
@@ -469,7 +469,7 @@ 
 	// do we support pending status
 	$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');
     
-    $excerpt = $post->post_excerpt;
+	$excerpt = $post->post_excerpt;
 
 ?>
 	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
@@ -548,7 +548,7 @@ 
 						}?>
 						<?php 
 						if ($allow_change_date) { 
-						    $dateformat = get_option( 'date_format' ); 
+							$dateformat = get_option( 'date_format' ); 
 						?>
 						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
 							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
@@ -663,7 +663,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 ) ) );		
 						}
@@ -691,8 +691,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();
 
@@ -752,7 +752,7 @@ 
 	ob_start();
 
 
-    $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+	$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
     
 	// let users add custom css classes
 	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
@@ -840,8 +840,8 @@ 
 function lasso_editor_options_blob() {
 
 	$codes   = function_exists( 'aesop_shortcodes' ) ? aesop_shortcodes() : array();
-    $codes   = add_wpimg_options( $codes );
-    $codes   = apply_filters( 'lasso_custom_options', $codes );
+	$codes   = add_wpimg_options( $codes );
+	$codes   = apply_filters( 'lasso_custom_options', $codes );
 	$galleries  = function_exists( 'lasso_editor_galleries_exist' ) && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
 
 	$nonce = wp_create_nonce( 'lasso_gallery' );
@@ -943,9 +943,9 @@ 
 		$return .= '</form>';
 
 		// extra JS codes
-        if (isset($shortcode['codes'])) {
-		    $return .= $shortcode['codes'];
-        }
+		if (isset($shortcode['codes'])) {
+			$return .= $shortcode['codes'];
+		}
 		$blob[$slug] = $return;
 	}
 
@@ -954,95 +954,95 @@ 
 
 
 function add_wpimg_options( $shortcodes ) {
-    $custom = array(
-        'wpimg'    => array(
-            'name'     => __( 'Image', 'lasso' ),
-            'type'     => 'single',
-            'atts'     => array(
-                'img'    => array(
-                    'type'  => 'media_upload',
-                    'default'  => '',
-                    'desc'   => __( 'Image URL', 'lasso' ),
-                    'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
-                ),
-                'align'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'center',
-                            'name' => __( 'Center', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'left',
-                            'name' => __( 'Left', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'right',
-                            'name' => __( 'Right', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'center',
-                    'desc'   => __( 'Alignment', 'lasso' ),
-                    'tip'=>''
-                ),			
+	$custom = array(
+		'wpimg'    => array(
+			'name'     => __( 'Image', 'lasso' ),
+			'type'     => 'single',
+			'atts'     => array(
+				'img'    => array(
+					'type'  => 'media_upload',
+					'default'  => '',
+					'desc'   => __( 'Image URL', 'lasso' ),
+					'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
+				),
+				'align'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'center',
+							'name' => __( 'Center', 'aesop-core' )
+						),
+						array(
+							'value' => 'left',
+							'name' => __( 'Left', 'aesop-core' )
+						),
+						array(
+							'value' => 'right',
+							'name' => __( 'Right', 'aesop-core' )
+						),
+					),
+					'default'  => 'center',
+					'desc'   => __( 'Alignment', 'lasso' ),
+					'tip'=>''
+				),			
                 
-                'imgwidth'    => array(
-                    'type'  => 'text_small',
-                    'default'  => '300px',
-                    'desc'   => __( 'Image Width', 'lasso' ),
-                    'tip'  => __( 'Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core' )
-                ),
-                'imgheight'    => array(
-                    'type'  => 'text_small',
-                    'default'  => '',
-                    'desc'   => __( 'Image Height', 'lasso' ),
-                    'tip'  => __( 'Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core' )
-                ),	
-                'linkoption'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'none',
-                            'name' => __( 'None', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'img',
-                            'name' => __( 'Image', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'url',
-                            'name' => __( 'URL', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'none',
-                    'desc'   => __( 'Link', 'lasso' ),
-                    'tip'  => __( 'Click leads to:', 'lasso' )
-                ),				
+				'imgwidth'    => array(
+					'type'  => 'text_small',
+					'default'  => '300px',
+					'desc'   => __( 'Image Width', 'lasso' ),
+					'tip'  => __( 'Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core' )
+				),
+				'imgheight'    => array(
+					'type'  => 'text_small',
+					'default'  => '',
+					'desc'   => __( 'Image Height', 'lasso' ),
+					'tip'  => __( 'Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core' )
+				),	
+				'linkoption'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'none',
+							'name' => __( 'None', 'aesop-core' )
+						),
+						array(
+							'value' => 'img',
+							'name' => __( 'Image', 'aesop-core' )
+						),
+						array(
+							'value' => 'url',
+							'name' => __( 'URL', 'aesop-core' )
+						),
+					),
+					'default'  => 'none',
+					'desc'   => __( 'Link', 'lasso' ),
+					'tip'  => __( 'Click leads to:', 'lasso' )
+				),				
                 
-                'link'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'URL Link', 'lasso' ),
-                    'tip'  => __( 'URL link', 'lasso' )
-                ),
-                'alt'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Image ALT', 'lasso' ),
-                    'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
-                ),
+				'link'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'URL Link', 'lasso' ),
+					'tip'  => __( 'URL link', 'lasso' )
+				),
+				'alt'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Image ALT', 'lasso' ),
+					'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
+				),
                 
-                'caption'    => array(
-                    'type'  => 'text_area',
-                    'default'  => '',
-                    'desc'   => __( 'Caption', 'lasso' ),
-                    'tip'  => __( 'Optional caption for the image.', 'lasso' )
-                ),
+				'caption'    => array(
+					'type'  => 'text_area',
+					'default'  => '',
+					'desc'   => __( 'Caption', 'lasso' ),
+					'tip'  => __( 'Optional caption for the image.', 'lasso' )
+				),
                 
 
-            ),
-            'desc'     => __( 'An image.', 'aesop-core' ),
-            'codes'    => '<script>	            
+			),
+			'desc'     => __( 'An image.', 'aesop-core' ),
+			'codes'    => '<script>	            
 						jQuery(document).ready(function($){
                             function linkSetting(l){								
 							    if ( l=="url") {
@@ -1062,10 +1062,10 @@ 
 							})
 						});
 			           </script>'
-        )
-    );
+		)
+	);
 
-    return array_merge( $shortcodes, $custom );
+	return array_merge( $shortcodes, $custom );
 }
 
 /**
@@ -1110,23 +1110,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 +293 added lines, -293 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 || $ase_status == 'ase-not-active')  ? 'shortcodify-disabled' : 'shortcodify-enabled';
+	$sc_saving_class = ('on' == $shortcodify_disabled || $ase_status == 'ase-not-active') ? '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 editus-center <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li class="lasso-component--settings__trigger  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 editus-center <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li class="lasso-component--settings__trigger  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,19 +440,19 @@ 
 
 	$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');
@@ -460,11 +460,11 @@ 
 	$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');
@@ -472,26 +472,26 @@ 
     $excerpt = $post->post_excerpt;
 
 ?>
-	<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>
@@ -501,15 +501,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>
@@ -517,10 +517,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; ?>
 
@@ -529,30 +529,30 @@ 
 					<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_edit_excerpt) { 
 						?>
                         <div class="lasso--postsettings__option story-excerpt-option">
-							<label><?php _e( 'Excerpt', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Edit excerpt', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input id="lasso--excerpt" class="lasso--modal__trigger-footer" type="text" name="excerpt" value="<?php echo $excerpt;?>" style="width:100%">
+							<label><?php _e('Excerpt', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Edit excerpt', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input id="lasso--excerpt" class="lasso--modal__trigger-footer" type="text" name="excerpt" value="<?php echo $excerpt; ?>" style="width:100%">
 						</div>
                         <?php
 						}?>
 						<?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
 						}?>
 
@@ -574,23 +574,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>
 
@@ -612,41 +612,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)));
 									}
 
 								}
@@ -657,19 +657,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>
@@ -697,18 +697,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>
@@ -722,18 +722,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>
@@ -752,21 +752,21 @@ 
 	ob_start();
 
 
-    $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+    $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor', 'off');
     
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
+	$custom_classes = apply_filters('lasso_wpimg_classes', '');
 
 	?>
-	<ul class="lasso-component--controls editus-center <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-        <?php if ($use_old_wpimg=='on') {?>
-            <li  class="lasso--wpimg-edit lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls editus-center <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+        <?php if ($use_old_wpimg == 'on') {?>
+            <li  class="lasso--wpimg-edit lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
         <?php } else {?>
-            <li  class="lasso-component--settings__trigger lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
+            <li  class="lasso-component--settings__trigger lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
         <?php } ?>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" title="<?php esc_attr_e( 'Delete', '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();
@@ -778,14 +778,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 editus-center <?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 editus-center <?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();
@@ -798,16 +798,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();
@@ -825,7 +825,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();
@@ -839,45 +839,45 @@ 
  */
 function lasso_editor_options_blob() {
 
-	$codes   = function_exists( 'aesop_shortcodes' ) ? aesop_shortcodes() : array();
-    $codes   = add_wpimg_options( $codes );
-    $codes   = apply_filters( 'lasso_custom_options', $codes );
-	$galleries  = function_exists( 'lasso_editor_galleries_exist' ) && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
+	$codes = function_exists('aesop_shortcodes') ? aesop_shortcodes() : array();
+    $codes   = add_wpimg_options($codes);
+    $codes   = apply_filters('lasso_custom_options', $codes);
+	$galleries  = function_exists('lasso_editor_galleries_exist') && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
 
-	$nonce = wp_create_nonce( 'lasso_gallery' );
+	$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++;
 					}
@@ -886,24 +886,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>';
@@ -914,9 +914,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();
 
@@ -927,13 +927,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>';
@@ -953,95 +953,95 @@ 
 }
 
 
-function add_wpimg_options( $shortcodes ) {
+function add_wpimg_options($shortcodes) {
     $custom = array(
         'wpimg'    => array(
-            'name'     => __( 'Image', 'lasso' ),
+            'name'     => __('Image', 'lasso'),
             'type'     => 'single',
             'atts'     => array(
                 'img'    => array(
                     'type'  => 'media_upload',
                     'default'  => '',
-                    'desc'   => __( 'Image URL', 'lasso' ),
-                    'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
+                    'desc'   => __('Image URL', 'lasso'),
+                    'tip'  => __('URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core')
                 ),
                 'align'    => array(
                     'type'  => 'select',
                     'values'  => array(						
                         array(
                             'value' => 'center',
-                            'name' => __( 'Center', 'aesop-core' )
+                            'name' => __('Center', 'aesop-core')
                         ),
                         array(
                             'value' => 'left',
-                            'name' => __( 'Left', 'aesop-core' )
+                            'name' => __('Left', 'aesop-core')
                         ),
                         array(
                             'value' => 'right',
-                            'name' => __( 'Right', 'aesop-core' )
+                            'name' => __('Right', 'aesop-core')
                         ),
                     ),
                     'default'  => 'center',
-                    'desc'   => __( 'Alignment', 'lasso' ),
+                    'desc'   => __('Alignment', 'lasso'),
                     'tip'=>''
                 ),			
                 
                 'imgwidth'    => array(
                     'type'  => 'text_small',
                     'default'  => '300px',
-                    'desc'   => __( 'Image Width', 'lasso' ),
-                    'tip'  => __( 'Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core' )
+                    'desc'   => __('Image Width', 'lasso'),
+                    'tip'  => __('Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core')
                 ),
                 'imgheight'    => array(
                     'type'  => 'text_small',
                     'default'  => '',
-                    'desc'   => __( 'Image Height', 'lasso' ),
-                    'tip'  => __( 'Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core' )
+                    'desc'   => __('Image Height', 'lasso'),
+                    'tip'  => __('Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core')
                 ),	
                 'linkoption'    => array(
                     'type'  => 'select',
                     'values'  => array(						
                         array(
                             'value' => 'none',
-                            'name' => __( 'None', 'aesop-core' )
+                            'name' => __('None', 'aesop-core')
                         ),
                         array(
                             'value' => 'img',
-                            'name' => __( 'Image', 'aesop-core' )
+                            'name' => __('Image', 'aesop-core')
                         ),
                         array(
                             'value' => 'url',
-                            'name' => __( 'URL', 'aesop-core' )
+                            'name' => __('URL', 'aesop-core')
                         ),
                     ),
                     'default'  => 'none',
-                    'desc'   => __( 'Link', 'lasso' ),
-                    'tip'  => __( 'Click leads to:', 'lasso' )
+                    'desc'   => __('Link', 'lasso'),
+                    'tip'  => __('Click leads to:', 'lasso')
                 ),				
                 
                 'link'    => array(
                     'type'  => 'text',
                     'default'  => '',
-                    'desc'   => __( 'URL Link', 'lasso' ),
-                    'tip'  => __( 'URL link', 'lasso' )
+                    'desc'   => __('URL Link', 'lasso'),
+                    'tip'  => __('URL link', 'lasso')
                 ),
                 'alt'    => array(
                     'type'  => 'text',
                     'default'  => '',
-                    'desc'   => __( 'Image ALT', 'lasso' ),
-                    'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
+                    'desc'   => __('Image ALT', 'lasso'),
+                    'tip'  => __('ALT tag used for the image. Primarily used for SEO purposes.', 'lasso')
                 ),
                 
                 'caption'    => array(
                     'type'  => 'text_area',
                     'default'  => '',
-                    'desc'   => __( 'Caption', 'lasso' ),
-                    'tip'  => __( 'Optional caption for the image.', 'lasso' )
+                    'desc'   => __('Caption', 'lasso'),
+                    'tip'  => __('Optional caption for the image.', 'lasso')
                 ),
                 
 
             ),
-            'desc'     => __( 'An image.', 'aesop-core' ),
+            'desc'     => __('An image.', 'aesop-core'),
             'codes'    => '<script>	            
 						jQuery(document).ready(function($){
                             function linkSetting(l){								
@@ -1065,7 +1065,7 @@ 
         )
     );
 
-    return array_merge( $shortcodes, $custom );
+    return array_merge($shortcodes, $custom);
 }
 
 /**
@@ -1085,14 +1085,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>
 
@@ -1115,7 +1115,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
@@ -1124,7 +1124,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
     }