AesopInteractive / lasso

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 );

Spacing +58 added lines, -58 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,132 +115,132 @@ 
  */
 
 // 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="800px"]' );
+		return do_shortcode('[aesop_image img="'.LASSO_URL.'/public/assets/img/empty-img.png" align="center" imgwidth="800px"]');
 	}
 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(){
+	function lasso_wp_image() {
 		return '<div data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img class="wp-image-0" src="'.LASSO_URL.'/public/assets/img/empty-img.png"></div>';
 	}
 
 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>';
 	}
 
@@ -248,15 +248,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>';
@@ -264,9 +264,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>';
 	}
 
@@ -275,10 +275,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;
 		}
 	}

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;
 			}
 		}

public/includes/lasso.php

Doc Comments +8 added lines, -1 removed lines

@@ -76,7 +76,7 @@ 
 	 *
 	 * @since    0.0.1
 	 *
-	 * @return    Plugin slug variable.
+	 * @return    string slug variable.
 	 */
 	public function get_plugin_slug() {
 		return $this->plugin_slug;
@@ -330,6 +330,9 @@ 
 		exit;
 	}
 	
+	/**
+	 * @param string $type
+	 */
 	public static function enable_metasave($type)
 	{
 		register_rest_field( $type, 'metadata', array(
@@ -422,6 +425,10 @@ 
 		
 		exit; 
 	}
+
+	/**
+	 * @param string $taxonomy
+	 */
 	public function set_post_terms( $postid, $value, $taxonomy ) {
 		if( $value ) {
 			$value = explode( ',', $value );

Braces +12 added lines, -23 removed lines

@@ -372,44 +372,34 @@ 
 		if ($code == "aesop_video") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
 		    echo aesop_video_shortcode($atts);
-		}
-		else if ($code == "aesop_image") {
+		} else if ($code == "aesop_image") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
 		    echo aesop_image_shortcode($atts);
-		}
-		else if ($code == "aesop_quote") {
+		} else if ($code == "aesop_quote") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
 		    echo aesop_quote_shortcode($atts);
-		}
-		else if ($code == "aesop_parallax") {
+		} else if ($code == "aesop_parallax") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
 		    echo aesop_parallax_shortcode($atts);
-		}
-		else if ($code == "aesop_character") {
+		} else if ($code == "aesop_character") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
 		    echo aesop_character_shortcode($atts);
-		}
-		else if ($code == "aesop_collection") {
+		} else if ($code == "aesop_collection") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
 		    echo aesop_collection_shortcode($atts);
-		}
-		else if ($code == "aesop_chapter") {
+		} else if ($code == "aesop_chapter") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
 		    echo aesop_chapter_shortcode($atts);
-		}
-		else if ($code == "aesop_content") {
+		} else if ($code == "aesop_content") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
 		    echo aesop_content_shortcode($atts, $atts['content_data']);
-		}
-		else if ($code == "aesop_gallery") {
+		} else if ($code == "aesop_gallery") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
 		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
-		}
-		else if ($code == "aesop_audio") {
+		} else if ($code == "aesop_audio") {
 		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
 		    echo aesop_audio_shortcode($atts);
-		}
-		else {
+		} else {
 			$code = '['.$code.' ';
 			foreach ($atts as $key => $value) {
 			    $code = ''.$key.'="'.$value.'" ';
@@ -436,15 +426,14 @@ 
 			}
 	
 			$result = wp_set_object_terms( $postid, $value, $taxonomy );
-		}
-		else  {
+		} else  {
 			//remove all terms from post
 			$result = wp_set_object_terms( $postid, null, $taxonomy );
 		}
 
 		if ( ! is_wp_error( $result ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

Indentation +29 added lines, -29 removed lines

@@ -261,14 +261,14 @@ 
 		$out = load_textdomain( $domain, trailingslashit( LASSO_DIR ). 'languages/' . $domain . '-' . $locale . '.mo' );
 	}
 	
-    // new ajax function to lock post for editing
+	// new ajax function to lock post for editing
 	public function editus_lock_post()
 	{
 		$post_id= $_POST["postid"];
 		$locked = wp_check_post_lock($post_id);
 		
 		if (!$locked) {
-		    wp_set_post_lock($post_id);
+			wp_set_post_lock($post_id);
 			echo "true";
 		} else {
 			$user_info = get_userdata($locked);
@@ -366,59 +366,59 @@ 
 		 );
 		foreach ($_POST as $key => $value) {
 			if ($key !="code" && $key !="action") {
-			    //$shortcode = $shortcode.$key.'="'.$value.'" ';
+				//$shortcode = $shortcode.$key.'="'.$value.'" ';
 				$atts[$key] = $value;
 			}
 		}
 		if ($code == "aesop_video") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
-		    echo aesop_video_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
+			echo aesop_video_shortcode($atts);
 		}
 		else if ($code == "aesop_image") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
-		    echo aesop_image_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
+			echo aesop_image_shortcode($atts);
 		}
 		else if ($code == "aesop_quote") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
-		    echo aesop_quote_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
+			echo aesop_quote_shortcode($atts);
 		}
 		else if ($code == "aesop_parallax") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
-		    echo aesop_parallax_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
+			echo aesop_parallax_shortcode($atts);
 		}
 		else if ($code == "aesop_character") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
-		    echo aesop_character_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
+			echo aesop_character_shortcode($atts);
 		}
 		else if ($code == "aesop_collection") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
-		    echo aesop_collection_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
+			echo aesop_collection_shortcode($atts);
 		}
 		else if ($code == "aesop_chapter") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
-		    echo aesop_chapter_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
+			echo aesop_chapter_shortcode($atts);
 		}
 		else if ($code == "aesop_content") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
-		    echo aesop_content_shortcode($atts, $atts['content_data']);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
+			echo aesop_content_shortcode($atts, $atts['content_data']);
 		}
 		else if ($code == "aesop_gallery") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
-		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
+			echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
 		}
 		else if ($code == "aesop_audio") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
-		    echo aesop_audio_shortcode($atts);
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
+			echo aesop_audio_shortcode($atts);
 		}
 		else {
 			$code = '['.$code.' ';
 			foreach ($atts as $key => $value) {
-			    $code = ''.$key.'="'.$value.'" ';
+				$code = ''.$key.'="'.$value.'" ';
 			}
 			$code = $code.']';
 			echo do_shortcode($code);
-		    //require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
-		    //echo aesop_audio_shortcode($atts);
+			//require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
+			//echo aesop_audio_shortcode($atts);
 		}
 		
 		exit; 
@@ -429,14 +429,14 @@ 
 			$allow_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
 			
 			if ($taxonomy =='category') {
-                // convert from names to category ids
+				// convert from names to category ids
 				$cats = array();
 				foreach ($value as $cat) {
 					$cat_id = get_cat_ID($cat);
 					if ($cat_id !=0) {
 						$cats [] = $cat_id;
 					} else if ($allow_new_category) {
-					    $cats [] = wp_create_category($cat);
+						$cats [] = wp_create_category($cat);
 					}
 				}
 				$value = $cats;
@@ -458,7 +458,7 @@ 
 	
 	public function set_date( $postid, $value) {
 		if( $value ) {
-            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 +82 added lines, -82 removed lines

@@ -52,16 +52,16 @@ 
 		require_once LASSO_DIR.'/public/includes/wrap-shortcodes.php';
 
 		// Activate plugin when new blog is added
-		add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) );
+		add_action('wpmu_new_blog', array($this, 'activate_new_site'));
 
 		// Load plugin text domain
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
+		add_action('init', array($this, 'load_plugin_textdomain'));
 		
-		add_action( 'wp_ajax_get_aesop_component',     array( $this, 'get_aesop_component' ) );
-		add_action( 'wp_ajax_editus_do_shortcode',     array( $this, 'editus_do_shortcode' ) );
-		add_action( 'wp_ajax_editus_lock_post',     array( $this, 'editus_lock_post' ) );
-		add_action( 'wp_ajax_editus_hide_tour',     array( $this, 'editus_hide_tour' ) );
-		add_action( 'wp_ajax_editus_set_post_setting',     array( $this, 'editus_set_post_setting' ) );
+		add_action('wp_ajax_get_aesop_component', array($this, 'get_aesop_component'));
+		add_action('wp_ajax_editus_do_shortcode', array($this, 'editus_do_shortcode'));
+		add_action('wp_ajax_editus_lock_post', array($this, 'editus_lock_post'));
+		add_action('wp_ajax_editus_hide_tour', array($this, 'editus_hide_tour'));
+		add_action('wp_ajax_editus_set_post_setting', array($this, 'editus_set_post_setting'));
 
 		// enable saving custom fields through REST API
 		self::enable_metasave('post');
@@ -92,7 +92,7 @@ 
 	public static function get_instance() {
 
 		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
+		if (null == self::$instance) {
 			self::$instance = new self;
 		}
 
@@ -109,18 +109,18 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       activated on an individual blog.
 	 */
-	public static function activate( $network_wide ) {
+	public static function activate($network_wide) {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide  ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_activate();
 				}
 
@@ -146,18 +146,18 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       deactivated on an individual blog.
 	 */
-	public static function deactivate( $network_wide ) {
+	public static function deactivate($network_wide) {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_deactivate();
 
 				}
@@ -181,13 +181,13 @@ 
 	 *
 	 * @param int     $blog_id ID of the new blog.
 	 */
-	public function activate_new_site( $blog_id ) {
+	public function activate_new_site($blog_id) {
 
-		if ( 1 !== did_action( 'wpmu_new_blog' ) ) {
+		if (1 !== did_action('wpmu_new_blog')) {
 			return;
 		}
 
-		switch_to_blog( $blog_id );
+		switch_to_blog($blog_id);
 		self::single_activate();
 		restore_current_blog();
 
@@ -212,7 +212,7 @@ 
 			WHERE archived = '0' AND spam = '0'
 			AND deleted = '0'";
 
-		return $wpdb->get_col( $sql );
+		return $wpdb->get_col($sql);
 
 	}
 
@@ -223,18 +223,18 @@ 
 	 */
 	private static function single_activate() {
 
-		$curr_version = get_option( 'lasso_version' );
+		$curr_version = get_option('lasso_version');
 
 		// update upgraded from
-		if ( $curr_version ) {
-			update_option( 'lasso_updated_from', $curr_version );
+		if ($curr_version) {
+			update_option('lasso_updated_from', $curr_version);
 		}
 
 		// update lasso version option
-		update_option( 'lasso_version', LASSO_VERSION );
+		update_option('lasso_version', LASSO_VERSION);
 
 		// set transietn for activation welcome
-		set_transient( '_lasso_welcome_redirect', true, 30 );
+		set_transient('_lasso_welcome_redirect', true, 30);
 
 
 	}
@@ -256,15 +256,15 @@ 
 	public function load_plugin_textdomain() {
 
 		$domain = $this->plugin_slug;
-		$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+		$locale = apply_filters('plugin_locale', get_locale(), $domain);
 
-		$out = load_textdomain( $domain, trailingslashit( LASSO_DIR ). 'languages/' . $domain . '-' . $locale . '.mo' );
+		$out = load_textdomain($domain, trailingslashit(LASSO_DIR).'languages/'.$domain.'-'.$locale.'.mo');
 	}
 	
     // new ajax function to lock post for editing
 	public function editus_lock_post()
 	{
-		$post_id= $_POST["postid"];
+		$post_id = $_POST["postid"];
 		$locked = wp_check_post_lock($post_id);
 		
 		if (!$locked) {
@@ -272,7 +272,7 @@ 
 			echo "true";
 		} else {
 			$user_info = get_userdata($locked);
-			echo "Post opened by ".$user_info->first_name .  " " . $user_info->last_name;
+			echo "Post opened by ".$user_info->first_name." ".$user_info->last_name;
 		}
 		exit;
 	}
@@ -282,7 +282,7 @@ 
 	{
 		$user_id = get_current_user_ID();
 				
-		update_user_meta( $user_id, 'lasso_hide_tour', true );
+		update_user_meta($user_id, 'lasso_hide_tour', true);
 		exit;
 	}
 	
@@ -293,14 +293,14 @@ 
 		$data = array();
 		parse_str($_POST['data'], $data);
 		
-		if (!wp_verify_nonce( $data[ 'nonce' ], 'lasso-update-post-settings' )) {
+		if (!wp_verify_nonce($data['nonce'], 'lasso-update-post-settings')) {
 			wp_send_json_error();
 			exit;
 		}
 		
-		$status = isset( $data['status'] ) ? $data['status'] : false;
-		$postid = isset( $data['postid'] ) ? $data['postid'] : false;
-		$slug   = isset( $data['story_slug'] ) ? $data['story_slug'] : false;
+		$status = isset($data['status']) ? $data['status'] : false;
+		$postid = isset($data['postid']) ? $data['postid'] : false;
+		$slug   = isset($data['story_slug']) ? $data['story_slug'] : false;
 	
 
 		$args = array(
@@ -311,33 +311,33 @@ 
 		
 		
 
-		wp_update_post( apply_filters( 'lasso_object_status_update_args', $args ) );
+		wp_update_post(apply_filters('lasso_object_status_update_args', $args));
 		
 		// update categories
-		$cats  = isset( $data['story_cats'] ) ? $data['story_cats'] : false;
+		$cats = isset($data['story_cats']) ? $data['story_cats'] : false;
 		
-		self::set_post_terms( $postid, $cats, 'category' );
+		self::set_post_terms($postid, $cats, 'category');
 		
 		// update tags
-		$tags = isset( $data['story_tags'] ) ? $data['story_tags'] : false;
-		self::set_post_terms( $postid, $tags, 'post_tag' );
+		$tags = isset($data['story_tags']) ? $data['story_tags'] : false;
+		self::set_post_terms($postid, $tags, 'post_tag');
 		
 		//update date
-		$date  = isset( $data['post_date'] ) ? $data['post_date'] : false;
-		self::set_date( $postid, $date );
+		$date = isset($data['post_date']) ? $data['post_date'] : false;
+		self::set_date($postid, $date);
 		
-		do_action( 'lasso_post_updated', $postid, $slug, $status, get_current_user_ID() );
+		do_action('lasso_post_updated', $postid, $slug, $status, get_current_user_ID());
 		wp_send_json_success();
 		exit;
 	}
 	
 	public static function enable_metasave($type)
 	{
-		register_rest_field( $type, 'metadata', array(
-			'get_callback' => function ( $data ) {
-				return get_post_meta( $data['id']);//, '', '' );
+		register_rest_field($type, 'metadata', array(
+			'get_callback' => function($data) {
+				return get_post_meta($data['id']); //, '', '' );
 			}, 
-			'update_callback' => function( $data, $post ) {
+			'update_callback' => function($data, $post) {
 				foreach ($data as $key => $value) {
 					update_post_meta($post->ID, $key, $value);
 				}
@@ -349,13 +349,13 @@ 
 	public function editus_do_shortcode()
 	{
 		
-		$code= $_POST["code"];
+		$code = $_POST["code"];
 		$code = str_replace('\"', '"', $code);
 		
-		$code_wrapped = lasso_wrap_shortcodes( $code);
-		$out =  do_shortcode($code);
+		$code_wrapped = lasso_wrap_shortcodes($code);
+		$out = do_shortcode($code);
 		if ($out != '') {
-			$out =  do_shortcode($code_wrapped);
+			$out = do_shortcode($code_wrapped);
 			echo $out;
 			exit;
 		}
@@ -365,7 +365,7 @@ 
 		/** @var \WP_Embed $wp_embed */
 		global $wp_embed;
 		$wp_embed->post_ID = $_POST["ID"];
-		$out =$wp_embed->run_shortcode( $code_wrapped );
+		$out = $wp_embed->run_shortcode($code_wrapped);
 		
 		echo $out;
 		exit;
@@ -375,53 +375,53 @@ 
 	{
 		
 		
-		$code= $_POST["code"];
+		$code = $_POST["code"];
 		$atts = array(
 		 );
 		foreach ($_POST as $key => $value) {
-			if ($key !="code" && $key !="action") {
+			if ($key != "code" && $key != "action") {
 			    //$shortcode = $shortcode.$key.'="'.$value.'" ';
 				$atts[$key] = $value;
 			}
 		}
 		if ($code == "aesop_video") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
 		    echo aesop_video_shortcode($atts);
 		}
 		else if ($code == "aesop_image") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
 		    echo aesop_image_shortcode($atts);
 		}
 		else if ($code == "aesop_quote") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
 		    echo aesop_quote_shortcode($atts);
 		}
 		else if ($code == "aesop_parallax") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
 		    echo aesop_parallax_shortcode($atts);
 		}
 		else if ($code == "aesop_character") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
 		    echo aesop_character_shortcode($atts);
 		}
 		else if ($code == "aesop_collection") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
 		    echo aesop_collection_shortcode($atts);
 		}
 		else if ($code == "aesop_chapter") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
 		    echo aesop_chapter_shortcode($atts);
 		}
 		else if ($code == "aesop_content") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
 		    echo aesop_content_shortcode($atts, $atts['content_data']);
 		}
 		else if ($code == "aesop_gallery") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
-		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
+		    echo do_shortcode('[aesop_gallery id="'.$atts["id"].'"]');
 		}
 		else if ($code == "aesop_audio") {
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
+		    require_once(ABSPATH.'/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
 		    echo aesop_audio_shortcode($atts);
 		}
 		else {
@@ -437,17 +437,17 @@ 
 		
 		exit; 
 	}
-	public function set_post_terms( $postid, $value, $taxonomy ) {
-		if( $value ) {
-			$value = explode( ',', $value );
-			$allow_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
+	public function set_post_terms($postid, $value, $taxonomy) {
+		if ($value) {
+			$value = explode(',', $value);
+			$allow_new_category = lasso_editor_get_option('allow_new_category', 'lasso_editor');
 			
-			if ($taxonomy =='category') {
+			if ($taxonomy == 'category') {
                 // convert from names to category ids
 				$cats = array();
 				foreach ($value as $cat) {
 					$cat_id = get_cat_ID($cat);
-					if ($cat_id !=0) {
+					if ($cat_id != 0) {
 						$cats [] = $cat_id;
 					} else if ($allow_new_category) {
 					    $cats [] = wp_create_category($cat);
@@ -456,27 +456,27 @@ 
 				$value = $cats;
 			}
 	
-			$result = wp_set_object_terms( $postid, $value, $taxonomy );
+			$result = wp_set_object_terms($postid, $value, $taxonomy);
 		}
-		else  {
+		else {
 			//remove all terms from post
-			$result = wp_set_object_terms( $postid, null, $taxonomy );
+			$result = wp_set_object_terms($postid, null, $taxonomy);
 		}
 
-		if ( ! is_wp_error( $result ) ) {
+		if (!is_wp_error($result)) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
 	
-	public function set_date( $postid, $value) {
-		if( $value ) {
+	public function set_date($postid, $value) {
+		if ($value) {
             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)),
 				)
 			);
 		}

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 = '';

Indentation +23 added lines, -23 removed lines

@@ -204,7 +204,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
@@ -484,7 +484,7 @@ 
 						</div>
 						<?php 
 						if ($allow_change_date) { 
-						    $dateformat = get_option( 'date_format' ); 
+							$dateformat = get_option( 'date_format' ); 
 						?>
 						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
 							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
@@ -598,7 +598,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 ) ) );		
 						}
@@ -626,8 +626,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();
 
@@ -870,9 +870,9 @@ 
 		$return .= '</form>';
 
 		// extra JS codes
-        if (isset($shortcode['codes'])) {
-		    $return .= $shortcode['codes'];
-        }
+		if (isset($shortcode['codes'])) {
+			$return .= $shortcode['codes'];
+		}
 		$blob[$slug] = $return;
 	}
 
@@ -921,23 +921,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;
 }

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) { 

Spacing +250 added lines, -250 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';
@@ -60,29 +60,29 @@ 
 		?>
 		<style>
 		.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 {
-			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) { ?>
@@ -112,48 +112,48 @@ 
 		<?php
 		} 
 		?>
-		<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 } ?>
 					
 
@@ -179,9 +179,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="lasso--component__settings"></div>
 		</div>
@@ -203,20 +203,20 @@ 
 	$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_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+	$toolbar_headings_h4 = lasso_editor_get_option('toolbar_headings_h4', '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');
@@ -224,113 +224,113 @@ 
 	//show alignment
 	$show_align = lasso_editor_get_option('toolbar_show_alignment', 'lasso_editor');
 	
-	$status = get_post_status( get_the_ID() );
+	$status = get_post_status(get_the_ID());
 	
-	$shortcodify_disabled = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
+	$shortcodify_disabled = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
 	
 	$sc_saving_class = 'on' == $shortcodify_disabled ? 'shortcodify-disabled' : 'shortcodify-enabled';
 
 
 	?>
-	<div class="lasso--toolbar_wrap lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$mobile_class.' '.$ase_status.' '.sanitize_html_class( $custom_classes );?>" <?php echo $mobile_style ?>>
-		<ul class="lasso--toolbar__inner lasso-editor-controls" <?php if ($is_mobile) {echo 'style="float:left;"';}?>>
-			<?php do_action( 'lasso_toolbar_components_before' );?>
-		    <li id="lasso-toolbar--bold" title="<?php esc_attr_e( 'Bold', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--underline" title="<?php esc_attr_e( 'Underline', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--italic" title="<?php esc_attr_e( 'Italicize', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--strike" title="<?php esc_attr_e( 'Strikethrough', 'lasso' );?>"></li>
-			<li id="lasso-toolbar--components" 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" 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; ?>
 					
 		    
-			<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--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--ol" title="<?php esc_attr_e('Ordered List', '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( '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>
@@ -348,20 +348,20 @@ 
  */
 function lasso_editor_settings_toolbar() {
 
-	$delete_nonce = wp_create_nonce( 'lasso-delete-nonce' );
+	$delete_nonce = wp_create_nonce('lasso-delete-nonce');
 
 	ob_start();
 
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_component_classes', '' );
+	$custom_classes = apply_filters('lasso_component_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso-component--settings__trigger" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" data-postid="<?php echo get_the_ID();?>" data-nonce="<?php echo $delete_nonce;?>" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso-component--settings__trigger" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" data-postid="<?php echo get_the_ID(); ?>" data-nonce="<?php echo $delete_nonce; ?>" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -379,13 +379,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();
@@ -409,54 +409,54 @@ 
 
 	$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');
 
 	// are we singular
-	$is_singular 		= is_singular();
+	$is_singular = is_singular();
 	$is_singular_class 	= $is_singular ? 'lasso--postsettings__2col' : 'lasso--postsettings__1col';
 	$has_thumb_class    = has_post_thumbnail() ? 'has-thumbnail' : 'no-thumbnail';
 	$theme_supports     = current_theme_supports('post-thumbnails');
-	$default_image 		= LASSO_URL.'/admin/assets/img/empty-img.png';
+	$default_image = LASSO_URL.'/admin/assets/img/empty-img.png';
 	
 	// do we support pending status
 	$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');
 
 ?>
-	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
+	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class($custom_classes); ?>">
 		<div class="lasso--modal__inner">
 
-			<?php if( $tabs ) { echo $tabs; } ?>
+			<?php if ($tabs) { echo $tabs; } ?>
 
 			<div class="lasso--modal__content modal__content--core visible" data-addon-content="core">
-				<form id="lasso--postsettings__form" enctype="multipart/form-data" class="lasso--post-form <?php echo $is_singular_class.' '.$has_thumb_class;?>" >
+				<form id="lasso--postsettings__form" enctype="multipart/form-data" class="lasso--post-form <?php echo $is_singular_class.' '.$has_thumb_class; ?>" >
 
-					<?php if ( $is_singular && $theme_supports ) : ?>
+					<?php if ($is_singular && $theme_supports) : ?>
 					<div class="lasso--postsettings__left">
-						<label><?php _e( 'Featured Image', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Change the featured image for this post.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-						<div class="lasso--post-thumb" data-default-thumb="<?php echo esc_url( $default_image );?>">
+						<label><?php _e('Featured Image', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Change the featured image for this post.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+						<div class="lasso--post-thumb" data-default-thumb="<?php echo esc_url($default_image); ?>">
 
 							<div id="lasso--post-thumb__controls" class="lasso--post-thumb__controls">
-								<i id="lasso--post-thumb__add" title="<?php _e('Change Featured Image','lasso');?>" class="dashicons dashicons-edit"></i>
-								<i id="lasso--post-thumb__delete" title="<?php _e('Delete Featured Image','lasso');?>" class="dashicons dashicons-no-alt"></i>
+								<i id="lasso--post-thumb__add" title="<?php _e('Change Featured Image', 'lasso'); ?>" class="dashicons dashicons-edit"></i>
+								<i id="lasso--post-thumb__delete" title="<?php _e('Delete Featured Image', 'lasso'); ?>" class="dashicons dashicons-no-alt"></i>
 								<i id="lasso--save-status" class="lasso-icon lasso-icon-spinner6 not-visible"></i>
 							</div>
 
-							<?php echo has_post_thumbnail() ? get_the_post_thumbnail( $post->ID, 'medium' ) : '<img src="'.$default_image.'">'; ?>
+							<?php echo has_post_thumbnail() ? get_the_post_thumbnail($post->ID, 'medium') : '<img src="'.$default_image.'">'; ?>
 
 						</div>
 						<div id="lasso--featImgSave"><a href="#" class="not-visible">Save</a></div>
@@ -466,15 +466,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>
@@ -482,10 +482,10 @@ 
 						</div>
 						<?php endif; ?>
 
-						<?php if ( 'publish' == $status ): ?>
+						<?php if ('publish' == $status): ?>
 						<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; ?>
 
@@ -494,20 +494,20 @@ 
 					<div class="lasso--postsettings__middle">
 
 						<div class="lasso--postsettings__option story-categories-option">
-							<label style="width:120px;"><?php _e( 'Categories', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Type a category name and press enter.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input id="lasso--cat-select" class="lasso--modal__trigger-footer" type="hidden" name="story_cats" value="<?php echo $categories;?>">
+							<label style="width:120px;"><?php _e('Categories', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Type a category name and press enter.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input id="lasso--cat-select" class="lasso--modal__trigger-footer" type="hidden" name="story_cats" value="<?php echo $categories; ?>">
 						</div>
 
 						<div class="lasso--postsettings__option story-tags-option">
-							<label><?php _e( 'Tags', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Type a tag name and press enter.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input id="lasso--tag-select" class="lasso--modal__trigger-footer" type="hidden" name="story_tags" value="<?php echo $tags;?>">
+							<label><?php _e('Tags', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Type a tag name and press enter.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input id="lasso--tag-select" class="lasso--modal__trigger-footer" type="hidden" name="story_tags" value="<?php echo $tags; ?>">
 						</div>
 						<?php 
 						if ($allow_change_date) { 
-						    $dateformat = get_option( 'date_format' ); 
+						    $dateformat = get_option('date_format'); 
 						?>
-						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
-							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
+						    <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); ?>"/>
 						<?php
 						}?>
 
@@ -529,23 +529,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>
 
@@ -567,41 +567,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)));
 									}
 
 								}
@@ -612,19 +612,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>
@@ -652,18 +652,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>
@@ -677,18 +677,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>
@@ -708,14 +708,14 @@ 
 
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
+	$custom_classes = apply_filters('lasso_wpimg_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso--wpimg-edit" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso--wpimg-edit" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -727,14 +727,14 @@ 
 
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
+	$custom_classes = apply_filters('lasso_wpimg_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso--wpvideo-edit" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso--wpvideo-edit" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -747,16 +747,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();
@@ -774,7 +774,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();
@@ -788,43 +788,43 @@ 
  */
 function lasso_editor_options_blob() {
 
-	$codes   = function_exists( 'aesop_shortcodes' ) ? aesop_shortcodes() : apply_filters( 'lasso_custom_options', '' );
-	$galleries  = function_exists( 'lasso_editor_galleries_exist' ) && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
+	$codes = function_exists('aesop_shortcodes') ? aesop_shortcodes() : apply_filters('lasso_custom_options', '');
+	$galleries = function_exists('lasso_editor_galleries_exist') && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
 
-	$nonce = wp_create_nonce( 'lasso_gallery' );
+	$nonce = wp_create_nonce('lasso_gallery');
 
 	$blob = array();
 
-	if ( empty( $codes ) )
+	if (empty($codes))
 		return;
 
-	foreach ( $codes as $slug => $shortcode ) {
+	foreach ($codes as $slug => $shortcode) {
 		$return = '';
 		// Shortcode has atts
 
-		if ( count( $shortcode['atts'] ) && $shortcode['atts'] ) {
+		if (count($shortcode['atts']) && $shortcode['atts']) {
 
-			foreach ( $shortcode['atts'] as $attr_name => $attr_info ) {
+			foreach ($shortcode['atts'] as $attr_name => $attr_info) {
 
 
-				$prefix = isset( $attr_info['prefix'] ) ? sprintf( '<span class="lasso-option-prefix">%s</span>', $attr_info['prefix'] ) : null;
+				$prefix = isset($attr_info['prefix']) ? sprintf('<span class="lasso-option-prefix">%s</span>', $attr_info['prefix']) : null;
 
 				$return .= '<form id="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++;
 					}
@@ -833,24 +833,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>';
@@ -861,9 +861,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();
 
@@ -874,13 +874,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>';
@@ -916,14 +916,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>
 
@@ -946,7 +946,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
@@ -955,7 +955,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
     }
 

admin/includes/load_admin.php

Indentation +15 added lines, -15 removed lines

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

Spacing +36 added lines, -36 removed lines

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

public/includes/assets.php

Indentation +12 added lines, -12 removed lines

@@ -20,10 +20,10 @@ 
 	
 		global $post;
 		if ( lasso_user_can('edit_posts') && 
-		     !( function_exists( 'is_gutenberg_page' ) && has_blocks( $post->post_content) )) {// bail if the post has Gutenberg bloc
+			 !( function_exists( 'is_gutenberg_page' ) && has_blocks( $post->post_content) )) {// bail if the post has Gutenberg bloc
 			
 			/**    Returns the time offset from UTC
-			*/
+			 */
 			function get_UTC_offset() {
 				$timezone_string = get_option( 'timezone_string' );
 				if (empty( $timezone_string ) ) {
@@ -38,7 +38,7 @@ 
 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
-            //don't load autocomplete if it's a stockholm theme
+			//don't load autocomplete if it's a stockholm theme
 			$themename  	= wp_get_theme()->get('Name');
 			if ($themename !='Stockholm' ) {
 				wp_enqueue_script('jquery-ui-autocomplete');
@@ -113,7 +113,7 @@ 
 			$tz_offset = get_UTC_offset();
 			$post_date = get_the_time('U', $postid);
 			$time = (time()+$tz_offset);
-            $delta = $time - $post_date;
+			$delta = $time - $post_date;
 
 			$strings = array(
 				'save' 				=> __('Save','lasso'),
@@ -165,11 +165,11 @@ 
 			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
 			
 			
-            if ($allow_change_date) {
-			    $permalink = get_site_url().'/?p='.$postid;
-            } else {
-                $permalink = get_permalink($postid);
-            }
+			if ($allow_change_date) {
+				$permalink = get_site_url().'/?p='.$postid;
+			} else {
+				$permalink = get_permalink($postid);
+			}
 			
 			// rest api
 			$rest_nonce = '';
@@ -262,7 +262,7 @@ 
 				'customFields'      => $custom_fields,
 				'clickToInsert'     => ($insert_comp_ui =='click'),
 				'buttonOnEmptyP'     => ($insert_comp_ui =='mediumcom'),      // auto show a button to insert components on an empty paragraph      
-                'rtl'               => is_rtl(),				
+				'rtl'               => is_rtl(),				
 				'skipToEdit'        =>( $delta < 10 && $delta >=0 ), // if it's a new post, skip to edit mode
 				'links_editable'    => $links_editable,
 				'supportPendingStatus' => !$no_pending_status
@@ -273,7 +273,7 @@ 
 			
 			
 			if (!$using_restapiv2) {
-               // enqueue REST API V1
+			   // enqueue REST API V1
 			   wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
 			   $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
 			   wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
@@ -289,7 +289,7 @@ 
 			if ($show_color) {
 				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api','iris'), LASSO_VERSION, true);
 			} else {
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
+				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
 			}
 			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
 

Spacing +92 added lines, -92 removed lines

@@ -10,24 +10,24 @@ 
 
 class assets {
 
-	public function __construct(){
+	public function __construct() {
 
-		add_action('wp_enqueue_scripts', array($this,'scripts'));
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
 	}
 
-	public function scripts(){
+	public function scripts() {
 
 	
 		global $post;
-		if ( lasso_user_can('edit_posts') && 
-		     !( function_exists( 'is_gutenberg_page' ) && has_blocks( $post->post_content) )) {// bail if the post has Gutenberg bloc
+		if (lasso_user_can('edit_posts') && 
+		     !(function_exists('is_gutenberg_page') && has_blocks($post->post_content))) {// bail if the post has Gutenberg bloc
 			
 			/**    Returns the time offset from UTC
 			*/
 			function get_UTC_offset() {
-				$timezone_string = get_option( 'timezone_string' );
-				if (empty( $timezone_string ) ) {
-					return get_option('gmt_offset')*3600;
+				$timezone_string = get_option('timezone_string');
+				if (empty($timezone_string)) {
+					return get_option('gmt_offset') * 3600;
 				}
 				
 				$origin_dtz = new \DateTimeZone($timezone_string);				
@@ -39,8 +39,8 @@ 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
             //don't load autocomplete if it's a stockholm theme
-			$themename  	= wp_get_theme()->get('Name');
-			if ($themename !='Stockholm' ) {
+			$themename = wp_get_theme()->get('Name');
+			if ($themename != 'Stockholm') {
 				wp_enqueue_script('jquery-ui-autocomplete');
 			}
 			wp_enqueue_script('jquery-ui-draggable');
@@ -53,28 +53,28 @@ 
 			// url for json api
 			$home_url = function_exists('json_get_url_prefix') ? json_get_url_prefix() : false;
 
-			$article_object 	= lasso_editor_get_option('article_class','lasso_editor');
+			$article_object 	= lasso_editor_get_option('article_class', 'lasso_editor');
 
-			$article_object 	= empty( $article_object ) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
+			$article_object 	= empty($article_object) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
 
-			$featImgClass 		= lasso_editor_get_option('featimg_class','lasso_editor');
-			if (empty( $featImgClass )) {
+			$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+			if (empty($featImgClass)) {
 				$featImgClass = lasso_get_supported_theme_featured_image_class();
 			}
-			$titleClass 		= lasso_editor_get_option('title_class','lasso_editor');
-			if (empty( $titleClass )) {
+			$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
+			if (empty($titleClass)) {
 				$titleClass = lasso_get_supported_theme_title_class();
 			}
-			$toolbar_headings  	= lasso_editor_get_option('toolbar_headings', 'lasso_editor');
-			$toolbar_headings_h4  	= lasso_editor_get_option('toolbar_headings_h4', 'lasso_editor');
+			$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+			$toolbar_headings_h4 = lasso_editor_get_option('toolbar_headings_h4', 'lasso_editor');
 			$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
-			$objectsNonEditable  	= lasso_editor_get_option('non_editable', 'lasso_editor');
+			$objectsNonEditable = lasso_editor_get_option('non_editable', 'lasso_editor');
 			$disableRESTSave = lasso_editor_get_option('save_using_rest_disabled', 'lasso_editor');
-			$save_to_post_disabled  = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
-			$edit_post_disabled  = lasso_editor_get_option( 'post_edit_disabled', 'lasso_editor' );
+			$save_to_post_disabled = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
+			$edit_post_disabled = lasso_editor_get_option('post_edit_disabled', 'lasso_editor');
 			
-			$bold_tag = lasso_editor_get_option('bold_tag', 'lasso_editor','b');
-			$i_tag = lasso_editor_get_option('i_tag', 'lasso_editor','i');
+			$bold_tag = lasso_editor_get_option('bold_tag', 'lasso_editor', 'b');
+			$i_tag = lasso_editor_get_option('i_tag', 'lasso_editor', 'i');
 
 			
 			//text alignement
@@ -91,8 +91,8 @@ 
 			
 			if ($show_color) {
 				//color picker
-				wp_enqueue_style( 'wp-color-picker' );
-				wp_enqueue_script( 'iris', admin_url( 'js/iris.min.js' ), array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), false, 1 );
+				wp_enqueue_style('wp-color-picker');
+				wp_enqueue_script('iris', admin_url('js/iris.min.js'), array('jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch'), false, 1);
 			}
 			
 			// click to insert components, not drag and drop
@@ -104,7 +104,7 @@ 
 			
 			// custom fields
 			
-			$custom_fields = apply_filters( 'editus_custom_fields', null ); //array('testFieldName' => '#field1');
+			$custom_fields = apply_filters('editus_custom_fields', null); //array('testFieldName' => '#field1');
 
 
 
@@ -112,57 +112,57 @@ 
 			$postid 			= get_the_ID();
 			$tz_offset = get_UTC_offset();
 			$post_date = get_the_time('U', $postid);
-			$time = (time()+$tz_offset);
+			$time = (time() + $tz_offset);
             $delta = $time - $post_date;
 
 			$strings = array(
-				'save' 				=> __('Save','lasso'),
-				'selectText'	  	=> __('Please Select Text First.','lasso'),
-				'cancel' 			=> __('Cancel','lasso'),
-				'exiteditor' 		=> __('Exit Editor','lasso'),
-				'saving' 			=> __('Saving...','lasso'),
-				'saved'				=> __('Saved!','lasso'),
-				'adding' 			=> __('Adding...','lasso'),
-				'added'				=> __('Added!','lasso'),
-				'loading' 			=> __('Loading...','lasso'),
-				'loadMore'			=> __('Load More','lasso'),
-				'close'			=> __('Close','lasso'),
-				'noPostsFound'		=> __('No more posts found','lasso'),
-				'fetchFail'	    	=> __('Fetching failed.','lasso'),
-				'galleryCreated' 	=> __('Gallery Created!','lasso'),
-				'galleryUpdated' 	=> __('Gallery Updated!','lasso'),
-				'justWrite'			=> __('Just write...','lasso'),
-				'chooseImage'		=> __('Choose an image','lasso'),
-				'updateImage'		=> __('Update Image','lasso'),
-				'insertImage'		=> __('Insert Image','lasso'),
-				'selectImage'		=> __('Select Image','lasso'),
-				'removeFeatImg'     => __('Remove featured image?','lasso'),
-				'updateSelectedImg' => __('Update Selected Image','lasso'),
-				'chooseImages'		=> __('Choose images','lasso'),
-				'editImage'			=> __('Edit Image','lasso'),
-				'addImages'			=> __('Add Images','lasso'),
-				'addNewGallery'		=> __('Add New Gallery','lasso'),
-				'selectGallery'		=> __('Select Editus Gallery Image','lasso'),
-				'useSelectedImages' => __('Use Selected Images','lasso'),
-				'publishPost'		=> __('Publish Post?','lasso'),
-				'publishYes'		=> __('Yes, publish it!','lasso'),
-				'deletePost'		=> __('Trash Post?','lasso'),
-				'deleteYes'			=> __('Yes, trash it!','lasso'),
-				'warning'			=> __('Oh snap!','laso'),
-				'cancelText'		=> __('O.K. got it!','lasso'),
-				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.','lasso'),
+				'save' 				=> __('Save', 'lasso'),
+				'selectText'	  	=> __('Please Select Text First.', 'lasso'),
+				'cancel' 			=> __('Cancel', 'lasso'),
+				'exiteditor' 		=> __('Exit Editor', 'lasso'),
+				'saving' 			=> __('Saving...', 'lasso'),
+				'saved'				=> __('Saved!', 'lasso'),
+				'adding' 			=> __('Adding...', 'lasso'),
+				'added'				=> __('Added!', 'lasso'),
+				'loading' 			=> __('Loading...', 'lasso'),
+				'loadMore'			=> __('Load More', 'lasso'),
+				'close'			=> __('Close', 'lasso'),
+				'noPostsFound'		=> __('No more posts found', 'lasso'),
+				'fetchFail'	    	=> __('Fetching failed.', 'lasso'),
+				'galleryCreated' 	=> __('Gallery Created!', 'lasso'),
+				'galleryUpdated' 	=> __('Gallery Updated!', 'lasso'),
+				'justWrite'			=> __('Just write...', 'lasso'),
+				'chooseImage'		=> __('Choose an image', 'lasso'),
+				'updateImage'		=> __('Update Image', 'lasso'),
+				'insertImage'		=> __('Insert Image', 'lasso'),
+				'selectImage'		=> __('Select Image', 'lasso'),
+				'removeFeatImg'     => __('Remove featured image?', 'lasso'),
+				'updateSelectedImg' => __('Update Selected Image', 'lasso'),
+				'chooseImages'		=> __('Choose images', 'lasso'),
+				'editImage'			=> __('Edit Image', 'lasso'),
+				'addImages'			=> __('Add Images', 'lasso'),
+				'addNewGallery'		=> __('Add New Gallery', 'lasso'),
+				'selectGallery'		=> __('Select Editus Gallery Image', 'lasso'),
+				'useSelectedImages' => __('Use Selected Images', 'lasso'),
+				'publishPost'		=> __('Publish Post?', 'lasso'),
+				'publishYes'		=> __('Yes, publish it!', 'lasso'),
+				'deletePost'		=> __('Trash Post?', 'lasso'),
+				'deleteYes'			=> __('Yes, trash it!', 'lasso'),
+				'warning'			=> __('Oh snap!', 'laso'),
+				'cancelText'		=> __('O.K. got it!', 'lasso'),
+				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.', 'lasso'),
 				'missingConfirm'	=> __('Update Settings', 'lasso'),
-				'helperText'		=> __('one more letter','lasso'),
+				'helperText'		=> __('one more letter', 'lasso'),
 				'editingBackup'  	=> __('You are currently editing a backup copy of this post.'),
 				
 				
 			);
 
-			$api_url = trailingslashit( home_url() ) . 'lasso-internal-api';
+			$api_url = trailingslashit(home_url()).'lasso-internal-api';
 
 			$gallery_class = new gallery();
 			$gallery_nonce_action = $gallery_class->nonce_action;
-			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
+			$gallery_nonce = wp_create_nonce($gallery_nonce_action);
 			
 			
             if ($allow_change_date) {
@@ -177,13 +177,13 @@ 
 			  
 			if (function_exists('rest_url')) {
 				//$rest_root = esc_url_raw( rest_url());
-				$rest_nonce = wp_create_nonce( 'wp_rest' );
-				$settings = array( 'root' => $rest_root, 'nonce' => $rest_nonce );
-				wp_enqueue_script( 'wp-api', '', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
-				wp_localize_script( 'wp-api', 'wpApiSettings', $settings );
-				wp_localize_script( 'wp-api', 'WP_API_Settings', $settings );
+				$rest_nonce = wp_create_nonce('wp_rest');
+				$settings = array('root' => $rest_root, 'nonce' => $rest_nonce);
+				wp_enqueue_script('wp-api', '', array('jquery', 'underscore', 'backbone'), LASSO_VERSION, true);
+				wp_localize_script('wp-api', 'wpApiSettings', $settings);
+				wp_localize_script('wp-api', 'WP_API_Settings', $settings);
 				
-				if ( class_exists( 'WP_REST_Controller' )) {
+				if (class_exists('WP_REST_Controller')) {
 					// we are using REST API V2
 					$using_restapiv2 = true;
 				}
@@ -191,8 +191,8 @@ 
 
 			// localized objects
 			$objects = array(
-				'ajaxurl' 			=> esc_url( $api_url ),
-				'ajaxurl2' 			=> esc_url( admin_url( 'admin-ajax.php' )),
+				'ajaxurl' 			=> esc_url($api_url),
+				'ajaxurl2' 			=> esc_url(admin_url('admin-ajax.php')),
 				'siteUrl'           => site_url(),
 				'rest_root'         => $rest_root,
 				'rest_nonce'        => $rest_nonce,
@@ -201,13 +201,13 @@ 
 				'featImgClass'		=> $featImgClass,
 				'titleClass'		=> $titleClass,
 				'strings'			=> $strings,
-				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url( 'settings.php?page=lasso-editor' ) : admin_url( 'admin.php?page=lasso-editor-settings' ),
-				'post_status'		=> get_post_status( $postid ),
+				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url('settings.php?page=lasso-editor') : admin_url('admin.php?page=lasso-editor-settings'),
+				'post_status'		=> get_post_status($postid),
 				'postid'			=> $postid,
 				'permalink'			=> $permalink,
 				'edit_others_pages'	=> current_user_can('edit_others_pages') ? true : false,
 				'edit_others_posts'	=> current_user_can('edit_others_posts') ? true : false,
-				'userCanEdit'		=> current_user_can('edit_post', $postid ),
+				'userCanEdit'		=> current_user_can('edit_post', $postid),
 				'can_publish'		=> is_page() ? current_user_can('publish_pages') : current_user_can('publish_posts'),
 				//'can_publish_posts'	=> current_user_can('publish_posts'),
 				//'can_publish_pages'	=> current_user_can('publish_pages'),
@@ -243,28 +243,28 @@ 
 				'postTags'    		=> lasso_get_objects('tag'),
 				'noResultsDiv'		=> lasso_editor_empty_results(),
 				'noRevisionsDiv'	=> lasso_editor_empty_results('revision'),
-				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider( $postid ) : false,
-				'mapLocations'		=> get_post_meta( $postid, 'ase_map_component_locations' ),
-				'mapStart'			=> get_post_meta( $postid, 'ase_map_component_start_point', true ),
-				'mapZoom'			=> get_post_meta( $postid, 'ase_map_component_zoom', true ),
+				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider($postid) : false,
+				'mapLocations'		=> get_post_meta($postid, 'ase_map_component_locations'),
+				'mapStart'			=> get_post_meta($postid, 'ase_map_component_start_point', true),
+				'mapZoom'			=> get_post_meta($postid, 'ase_map_component_zoom', true),
 				'revisionModal' 	=> lasso_editor_revision_modal(),
 				'isMobile'          => wp_is_mobile(),
-				'enableAutoSave'    => lasso_editor_get_option( 'enable_autosave', 'lasso_editor' ),
+				'enableAutoSave'    => lasso_editor_get_option('enable_autosave', 'lasso_editor'),
 				'showColor'         => $show_color,
 				'showAlignment'     => $show_align,
 				'showIgnoredItems'  => lasso_editor_get_option('show_ignored_items', 'lasso_editor'),
 				'restapi2'          => $using_restapiv2,
 				'saveusingrest'     => $using_restapiv2 && !$disableRESTSave,
-				'newObjectContent'  => '<p>'.apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso') ).'</p>',
+				'newObjectContent'  => '<p>'.apply_filters('lasso_new_object_content', __('Once upon a time...', 'lasso')).'</p>',
 				'disableSavePost'   => $save_to_post_disabled,
 				'disableEditPost'   => $edit_post_disabled,
 				'boldTag'           => $bold_tag,
 				'iTag'           	=> $i_tag,
 				'customFields'      => $custom_fields,
-				'clickToInsert'     => ($insert_comp_ui =='click'),
-				'buttonOnEmptyP'     => ($insert_comp_ui =='mediumcom'),      // auto show a button to insert components on an empty paragraph      
+				'clickToInsert'     => ($insert_comp_ui == 'click'),
+				'buttonOnEmptyP'     => ($insert_comp_ui == 'mediumcom'), // auto show a button to insert components on an empty paragraph      
                 'rtl'               => is_rtl(),				
-				'skipToEdit'        =>( $delta < 10 && $delta >=0 ), // if it's a new post, skip to edit mode
+				'skipToEdit'        =>($delta < 10 && $delta >= 0), // if it's a new post, skip to edit mode
 				'links_editable'    => $links_editable,
 				'supportPendingStatus' => !$no_pending_status
 			);
@@ -275,9 +275,9 @@ 
 			
 			if (!$using_restapiv2) {
                // enqueue REST API V1
-			   wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
-			   $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
-			   wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
+			   wp_enqueue_script('wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array('jquery', 'underscore', 'backbone'), LASSO_VERSION, true);
+			   $settings = array('root' => home_url($home_url), 'nonce' => wp_create_nonce('wp_json'));
+			   wp_localize_script('wp-api-js', 'WP_API_Settings', $settings);
 			}
 			
 			if ($allow_change_date) {
@@ -286,13 +286,13 @@ 
 				wp_enqueue_style('jquery-ui');
 			}
 
-			$postfix = ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ) ? '' : '.min';
+			$postfix = (defined('SCRIPT_DEBUG') && true === SCRIPT_DEBUG) ? '' : '.min';
 			if ($show_color) {
-				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api','iris'), LASSO_VERSION, true);
+				wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api', 'iris'), LASSO_VERSION, true);
 			} else {
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
+			    wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
 			}
-			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
+			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects));
 
 
 		}

includes/process/meta.php

Spacing +10 added lines, -10 removed lines

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