AesopInteractive / lasso

includes/save_gallery.php

Spacing +23 added lines, -23 removed lines

@@ -12,65 +12,65 @@
 	/**
 	 * Update an existing galleries options
 	 */
-	public static function save_gallery_options( $postid, $gallery_ids, $options, $type = false ) {
+	public static function save_gallery_options($postid, $gallery_ids, $options, $type = false) {
 
 		// gallery width
-		$gallery_width = isset( $options['width'] ) ? $options['width'] : false;
+		$gallery_width = isset($options['width']) ? $options['width'] : false;
 
 		// gallery grid item width
-		$item_width = isset( $options['itemwidth'] ) ? $options['itemwidth'] : false;
+		$item_width = isset($options['itemwidth']) ? $options['itemwidth'] : false;
 
 		// caption
-		$caption = isset( $options['caption'] ) ? $options['caption'] : false;
+		$caption = isset($options['caption']) ? $options['caption'] : false;
 
 		// gallery transition
-		$transition = isset( $options['transition'] ) ? $options['transition'] : false;
+		$transition = isset($options['transition']) ? $options['transition'] : false;
 
 		// gallery transition speed
-		$transitionSpeed = isset( $options['speed'] ) ? $options['speed'] : false;
+		$transitionSpeed = isset($options['speed']) ? $options['speed'] : false;
 
 		// gallery hide thumbs
-		$hideThumbs = isset( $options['hideThumbs'] ) ? $options['hideThumbs'] : false;
+		$hideThumbs = isset($options['hideThumbs']) ? $options['hideThumbs'] : false;
 
 		// photoset layout hardwired to on for now
-		$psLayout = isset( $options['pslayout'] ) ? $options['pslayout'] : false;
+		$psLayout = isset($options['pslayout']) ? $options['pslayout'] : false;
 
 		// photoset layout
-		$psLightbox = 'on';//isset( $options['pslightbox'] ) ? $options['pslightbox'] : false;
+		$psLightbox = 'on'; //isset( $options['pslightbox'] ) ? $options['pslightbox'] : false;
 		
 		// hero gallery height
-		$gallery_height = isset( $options['height'] ) ? $options['height'] : false;
+		$gallery_height = isset($options['height']) ? $options['height'] : false;
 
 		// update gallery ids
-		if ( !empty( $gallery_ids ) ) {
+		if (!empty($gallery_ids)) {
 
-			update_post_meta( $postid, '_ase_gallery_images', $gallery_ids );
+			update_post_meta($postid, '_ase_gallery_images', $gallery_ids);
 
 		}
 
-		update_post_meta( $postid, 'aesop_gallery_type', sanitize_text_field( trim( $type ) ) );
+		update_post_meta($postid, 'aesop_gallery_type', sanitize_text_field(trim($type)));
 
-		update_post_meta( $postid, 'aesop_gallery_width', sanitize_text_field( trim( $gallery_width ) ) );
+		update_post_meta($postid, 'aesop_gallery_width', sanitize_text_field(trim($gallery_width)));
 
-		update_post_meta( $postid, 'aesop_grid_gallery_width', sanitize_text_field( trim( $item_width ) ) );
+		update_post_meta($postid, 'aesop_grid_gallery_width', sanitize_text_field(trim($item_width)));
 
-		update_post_meta( $postid, 'aesop_gallery_caption', sanitize_text_field( trim( $caption ) ) );
+		update_post_meta($postid, 'aesop_gallery_caption', sanitize_text_field(trim($caption)));
 
-		update_post_meta( $postid, 'aesop_thumb_gallery_transition', sanitize_text_field( trim( $transition ) ) );
+		update_post_meta($postid, 'aesop_thumb_gallery_transition', sanitize_text_field(trim($transition)));
 
-		update_post_meta( $postid, 'aesop_thumb_gallery_transition_speed', absint( trim( $transitionSpeed ) ) );
+		update_post_meta($postid, 'aesop_thumb_gallery_transition_speed', absint(trim($transitionSpeed)));
 
-		update_post_meta( $postid, 'aesop_thumb_gallery_hide_thumbs', sanitize_text_field( trim( $hideThumbs ) ) );
+		update_post_meta($postid, 'aesop_thumb_gallery_hide_thumbs', sanitize_text_field(trim($hideThumbs)));
 
-		update_post_meta( $postid, 'aesop_photoset_gallery_layout', sanitize_text_field( trim( $psLayout ) ) );
+		update_post_meta($postid, 'aesop_photoset_gallery_layout', sanitize_text_field(trim($psLayout)));
 
-		update_post_meta( $postid, 'aesop_photoset_gallery_lightbox', sanitize_text_field( trim( $psLightbox ) ) );
+		update_post_meta($postid, 'aesop_photoset_gallery_lightbox', sanitize_text_field(trim($psLightbox)));
 		
-		update_post_meta( $postid, 'aesop_hero_gallery_height', sanitize_text_field( trim( $gallery_height ) ) );
+		update_post_meta($postid, 'aesop_hero_gallery_height', sanitize_text_field(trim($gallery_height)));
 		
 		//hardwired for now
 		
-		update_post_meta( $postid, 'aesop_hero_gallery_transition_speed', 300 );
+		update_post_meta($postid, 'aesop_hero_gallery_transition_speed', 300);
 
 	}
 

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

Spacing +35 added lines, -35 removed lines

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

includes/process/save.php

Spacing +24 added lines, -24 removed lines

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

public/includes/underscore-templates.php

Spacing +12 added lines, -12 removed lines

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

public/includes/components.php

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

public/includes/wrap-shortcodes.php

Spacing +24 added lines, -24 removed lines

@@ -6,8 +6,8 @@ 
 
 
  
-if ( lasso_user_can( 'edit_posts' ) && ! is_admin() ) {
-	add_filter( 'the_content', 'lasso_wrap_shortcodes', 9 );
+if (lasso_user_can('edit_posts') && !is_admin()) {
+	add_filter('the_content', 'lasso_wrap_shortcodes', 9);
 }
 
 /**
@@ -20,33 +20,33 @@ 
  *
  * @return string
  */
-function lasso_wrap_shortcodes( $content ) {
+function lasso_wrap_shortcodes($content) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if (false === strpos($content, '[')) {
 		return $content;
 	}
 
-	if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
+	if (empty($shortcode_tags) || !is_array($shortcode_tags)) {
 		return $content;
 	}
 
-	$tagnames  = array_keys( $shortcode_tags );
-	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
+	$tagnames  = array_keys($shortcode_tags);
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 	$pattern   = "/\\[($tagregexp)/s";
 
-	if ( 0 === preg_match( $pattern, $content ) ) {
+	if (0 === preg_match($pattern, $content)) {
 		// Avoids parsing HTML when there are no shortcodes or embeds anyway.
 		return $content;
 	}
 
-	$content = do_shortcodes_in_html_tags( $content, true ,$tagnames);
+	$content = do_shortcodes_in_html_tags($content, true, $tagnames);
 
 	$pattern = get_shortcode_regex();
-	$content = preg_replace_callback( "/$pattern/s", 'lasso_wrap_shortcode_tag', $content );
+	$content = preg_replace_callback("/$pattern/s", 'lasso_wrap_shortcode_tag', $content);
 
 	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
+	$content = unescape_invalid_shortcodes($content);
 
 	return $content;
 }
@@ -60,33 +60,33 @@ 
  *
  * @return string
  */
-function lasso_wrap_shortcode_tag( $m ) {
+function lasso_wrap_shortcode_tag($m) {
 	// allow [[foo]] syntax for escaping a tag
-	if ( $m[1] == '[' && $m[6] == ']' ) {
-		return substr( $m[0], 1, - 1 );
+	if ($m[1] == '[' && $m[6] == ']') {
+		return substr($m[0], 1, - 1);
 	}
-	$exception_arr1 = array('aesop_gallery_pop','aesop_character_carousel');
-	$exception_arr2 = array('su_box', 'su_note', 'su_document', 'su_spoiler','av_textblock','av_toggle_container','av_toggle');
-	$exception_arr2 = apply_filters('lasso_wrap_shortcode_exceptions',$exception_arr2);
+	$exception_arr1 = array('aesop_gallery_pop', 'aesop_character_carousel');
+	$exception_arr2 = array('su_box', 'su_note', 'su_document', 'su_spoiler', 'av_textblock', 'av_toggle_container', 'av_toggle');
+	$exception_arr2 = apply_filters('lasso_wrap_shortcode_exceptions', $exception_arr2);
 
-	if ( strpos( $m[2],'aesop_'  ) === 0 ) {
+	if (strpos($m[2], 'aesop_') === 0) {
 		// check against the exceptions
-		if (strpos_arr($m[2],$exception_arr1)===false) {
+		if (strpos_arr($m[2], $exception_arr1) === false) {
 		    return $m[0];
 		}
 	}
-	if (strpos_arr($m[2],$exception_arr2)!==false) {
+	if (strpos_arr($m[2], $exception_arr2) !== false) {
 		return $m[0];
 	}
 
-	return '<!--EDITUS_OTHER_SHORTCODE_START|[' . $m[0] . ']-->' . $m[0] . '<!--EDITUS_OTHER_SHORTCODE_END-->';
+	return '<!--EDITUS_OTHER_SHORTCODE_START|['.$m[0].']-->'.$m[0].'<!--EDITUS_OTHER_SHORTCODE_END-->';
 }
 
 /* a helper function */
 function strpos_arr($haystack, $needle) {
-    if(!is_array($needle)) $needle = array($needle);
-    foreach($needle as $what) {
-        if(($pos = strpos($haystack, $what))!==false) return $pos;
+    if (!is_array($needle)) $needle = array($needle);
+    foreach ($needle as $what) {
+        if (($pos = strpos($haystack, $what)) !== false) return $pos;
     }
     return false;
 }
\ No newline at end of file

includes/process/update_object.php

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, ',');
 
 	}
 

public/includes/tour.php

Spacing +19 added lines, -19 removed lines

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

public/includes/lasso.php

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