AesopInteractive / lasso

includes/process/tour.php

Spacing +6 added lines, -6 removed lines

@@ -26,13 +26,13 @@ 
 	 *
 	 * @returns bool Always returns true
 	 */
-	public function hide( $data ) {
+	public function hide($data) {
 
 		$user_id = get_current_user_ID();
 
-		update_user_meta( $user_id, 'lasso_hide_tour', true );
+		update_user_meta($user_id, 'lasso_hide_tour', true);
 
-		do_action( 'lasso_tour_hidden', $user_id );
+		do_action('lasso_tour_hidden', $user_id);
 
 		return true;
 
@@ -45,8 +45,8 @@ 
 	 *
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_tour_hide' ] = array(
+	public static function params() {
+		$params['process_tour_hide'] = array(
 			'action'
 		);
 
@@ -61,7 +61,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_tour_hide' ] = array(
+		$params['process_tour_hide'] = array(
 			'lasso_user_can'
 		);
 

includes/process/update_object.php

Indentation +1 added lines, -1 removed lines

@@ -118,7 +118,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.

Spacing +25 added lines, -25 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,20 +43,20 @@ 
 			'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');
 
 
-		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;
 
@@ -70,8 +70,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(
@@ -101,7 +101,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'
 		);
 
@@ -123,25 +123,25 @@ 
 	 *
 	 *  @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);
 			}
 
 
-			$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;
 		}
 
@@ -156,9 +156,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 +2 added lines, -3 removed lines

@@ -132,8 +132,7 @@ 
 
 
 			$result = wp_set_object_terms( $postid, $value, $taxonomy );
-		}
-		else  {
+		} else  {
 			//remove all terms from post
 			$result = wp_set_object_terms( $postid, null, $taxonomy );
 
@@ -141,7 +140,7 @@ 
 
 		if ( ! is_wp_error( $result ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 

includes/process/upload_image.php

Spacing +12 added lines, -12 removed lines

@@ -28,14 +28,14 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function upload( $data ) {
+	public function upload($data) {
 
-		$postid  	= isset( $data['postid'] ) ? $data['postid'] : false;
-		$image_id  	= isset( $data['image_id'] ) ? absint( $data['image_id'] ) : false;
+		$postid = isset($data['postid']) ? $data['postid'] : false;
+		$image_id = isset($data['image_id']) ? absint($data['image_id']) : false;
 
-		set_post_thumbnail( $postid, $image_id );
+		set_post_thumbnail($postid, $image_id);
 
-		do_action( 'lasso_featured_image_set', $postid, $image_id, get_current_user_ID() );
+		do_action('lasso_featured_image_set', $postid, $image_id, get_current_user_ID());
 
 		return true;
 
@@ -50,13 +50,13 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function delete( $data ) {
+	public function delete($data) {
 
-		$postid  = isset( $data['postid'] ) ? $data['postid'] : false;
+		$postid = isset($data['postid']) ? $data['postid'] : false;
 
-		delete_post_thumbnail( $postid );
+		delete_post_thumbnail($postid);
 
-		do_action( 'lasso_featured_image_deleted', $postid, get_current_user_ID() );
+		do_action('lasso_featured_image_deleted', $postid, get_current_user_ID());
 
 		return true;
 
@@ -69,13 +69,13 @@ 
 	 *
 	 * @return array Array of keys to pull from $data per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_upload_image_upload' ] = array(
+	public static function params() {
+		$params['process_upload_image_upload'] = array(
 			'postid' => 'absint',
 			'image_id' => 'absint'
 		);
 
-		$params[ 'process_upload_image_delete' ] = array(
+		$params['process_upload_image_delete'] = array(
 			'postid' => 'absint',
 		);
 

includes/sanatize.php

Spacing +41 added lines, -41 removed lines

@@ -28,11 +28,11 @@ 
 	 * @since 1.1.10
 	 *
 	 */
-	public static function do_sanitize( $input, $params = array() ) {
+	public static function do_sanitize($input, $params = array()) {
 
-		$input = stripslashes_deep( $input );
+		$input = stripslashes_deep($input);
 
-		if ( '' === $input || is_int( $input ) || is_float( $input ) || empty( $input ) ) {
+		if ('' === $input || is_int($input) || is_float($input) || empty($input)) {
 			return $input;
 		}
 
@@ -43,45 +43,45 @@ 
 			'type' => null // %s %d %f etc
 		);
 
-		if ( !is_array( $params ) ) {
-			$defaults[ 'type' ] = $params;
+		if (!is_array($params)) {
+			$defaults['type'] = $params;
 
 			$params = $defaults;
 		}
 		else {
-			$params = array_merge( $defaults, (array) $params );
+			$params = array_merge($defaults, (array) $params);
 		}
 
-		if ( is_object( $input ) ) {
-			$input = get_object_vars( $input );
+		if (is_object($input)) {
+			$input = get_object_vars($input);
 
 			$n_params = $params;
-			$n_params[ 'nested' ] = true;
+			$n_params['nested'] = true;
 
-			foreach ( $input as $key => $val ) {
-				$output[ self::do_sanitize( $key ) ] = self::do_sanitize( $val, $n_params );
+			foreach ($input as $key => $val) {
+				$output[self::do_sanitize($key)] = self::do_sanitize($val, $n_params);
 			}
 
 			$output = (object) $output;
 		}
-		elseif ( is_array( $input ) ) {
+		elseif (is_array($input)) {
 			$n_params = $params;
-			$n_params[ 'nested' ] = true;
+			$n_params['nested'] = true;
 
-			foreach ( $input as $key => $val ) {
-				$output[ self::do_sanitize( $key ) ] = self::do_sanitize( $val, $n_params );
+			foreach ($input as $key => $val) {
+				$output[self::do_sanitize($key)] = self::do_sanitize($val, $n_params);
 			}
 		}
-		elseif ( !empty( $params[ 'type' ] ) && false !== strpos( $params[ 'type' ], '%' ) ) {
+		elseif (!empty($params['type']) && false !== strpos($params['type'], '%')) {
 			/**
 			 * @var $wpdb wpdb
 			 */
 			global $wpdb;
 
-			$output = $wpdb->prepare( $params[ 'type' ], $output );
+			$output = $wpdb->prepare($params['type'], $output);
 		}
 		else {
-			$output = wp_slash( $input );
+			$output = wp_slash($input);
 		}
 
 		return $output;
@@ -99,38 +99,38 @@ 
 	 *
 	 * @see like_escape
 	 */
-	public static function sanitize_like( $input ) {
+	public static function sanitize_like($input) {
 
-		if ( '' === $input || is_int( $input ) || is_float( $input ) || empty( $input ) ) {
+		if ('' === $input || is_int($input) || is_float($input) || empty($input)) {
 			return $input;
 		}
 
 		$output = array();
 
-		if ( is_object( $input ) ) {
-			$input = get_object_vars( $input );
+		if (is_object($input)) {
+			$input = get_object_vars($input);
 
-			foreach ( $input as $key => $val ) {
-				$output[ $key ] = self::sanitize_like( $val );
+			foreach ($input as $key => $val) {
+				$output[$key] = self::sanitize_like($val);
 			}
 
 			$output = (object) $output;
 		}
-		elseif ( is_array( $input ) ) {
-			foreach ( $input as $key => $val ) {
-				$output[ $key ] = self::sanitize_like( $val );
+		elseif (is_array($input)) {
+			foreach ($input as $key => $val) {
+				$output[$key] = self::sanitize_like($val);
 			}
 		}
 		else {
 			global $wpdb;
 
 			//backwords-compat check for pre WP4.0
-			if ( method_exists( 'wpdb', 'esc_like' ) ) {
-				$output = $wpdb->esc_like( self::do_sanitize( $input ) );
+			if (method_exists('wpdb', 'esc_like')) {
+				$output = $wpdb->esc_like(self::do_sanitize($input));
 			}
 			else {
 				// like_escape is deprecated in WordPress 4.0
-				$output = like_escape( self::do_sanitize( $input ) );
+				$output = like_escape(self::do_sanitize($input));
 			}
 		}
 
@@ -150,33 +150,33 @@ 
 	 *
 	 * @see wp_unslash
 	 */
-	public static function unslash( $input ) {
+	public static function unslash($input) {
 
-		if ( '' === $input || is_int( $input ) || is_float( $input ) || empty( $input ) ) {
+		if ('' === $input || is_int($input) || is_float($input) || empty($input)) {
 			return $input;
 		}
 
 		$output = array();
 
-		if ( empty( $input ) ) {
+		if (empty($input)) {
 			$output = $input;
 		}
-		elseif ( is_object( $input ) ) {
-			$input = get_object_vars( $input );
+		elseif (is_object($input)) {
+			$input = get_object_vars($input);
 
-			foreach ( $input as $key => $val ) {
-				$output[ $key ] = self::unslash( $val );
+			foreach ($input as $key => $val) {
+				$output[$key] = self::unslash($val);
 			}
 
 			$output = (object) $output;
 		}
-		elseif ( is_array( $input ) ) {
-			foreach ( $input as $key => $val ) {
-				$output[ $key ] = self::unslash( $val );
+		elseif (is_array($input)) {
+			foreach ($input as $key => $val) {
+				$output[$key] = self::unslash($val);
 			}
 		}
 		else {
-			$output = wp_unslash( $input );
+			$output = wp_unslash($input);
 
 		}
 

Braces +10 added lines, -20 removed lines

@@ -47,8 +47,7 @@ 
 			$defaults[ 'type' ] = $params;
 
 			$params = $defaults;
-		}
-		else {
+		} else {
 			$params = array_merge( $defaults, (array) $params );
 		}
 
@@ -63,24 +62,21 @@ 
 			}
 
 			$output = (object) $output;
-		}
-		elseif ( is_array( $input ) ) {
+		} elseif ( is_array( $input ) ) {
 			$n_params = $params;
 			$n_params[ 'nested' ] = true;
 
 			foreach ( $input as $key => $val ) {
 				$output[ self::do_sanitize( $key ) ] = self::do_sanitize( $val, $n_params );
 			}
-		}
-		elseif ( !empty( $params[ 'type' ] ) && false !== strpos( $params[ 'type' ], '%' ) ) {
+		} elseif ( !empty( $params[ 'type' ] ) && false !== strpos( $params[ 'type' ], '%' ) ) {
 			/**
 			 * @var $wpdb wpdb
 			 */
 			global $wpdb;
 
 			$output = $wpdb->prepare( $params[ 'type' ], $output );
-		}
-		else {
+		} else {
 			$output = wp_slash( $input );
 		}
 
@@ -115,20 +111,17 @@ 
 			}
 
 			$output = (object) $output;
-		}
-		elseif ( is_array( $input ) ) {
+		} elseif ( is_array( $input ) ) {
 			foreach ( $input as $key => $val ) {
 				$output[ $key ] = self::sanitize_like( $val );
 			}
-		}
-		else {
+		} else {
 			global $wpdb;
 
 			//backwords-compat check for pre WP4.0
 			if ( method_exists( 'wpdb', 'esc_like' ) ) {
 				$output = $wpdb->esc_like( self::do_sanitize( $input ) );
-			}
-			else {
+			} else {
 				// like_escape is deprecated in WordPress 4.0
 				$output = like_escape( self::do_sanitize( $input ) );
 			}
@@ -160,8 +153,7 @@ 
 
 		if ( empty( $input ) ) {
 			$output = $input;
-		}
-		elseif ( is_object( $input ) ) {
+		} elseif ( is_object( $input ) ) {
 			$input = get_object_vars( $input );
 
 			foreach ( $input as $key => $val ) {
@@ -169,13 +161,11 @@ 
 			}
 
 			$output = (object) $output;
-		}
-		elseif ( is_array( $input ) ) {
+		} elseif ( is_array( $input ) ) {
 			foreach ( $input as $key => $val ) {
 				$output[ $key ] = self::unslash( $val );
 			}
-		}
-		else {
+		} else {
 			$output = wp_unslash( $input );
 
 		}

includes/save_gallery.php

Spacing +20 added lines, -20 removed lines

@@ -12,56 +12,56 @@
 	/**
 	 * 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
-		$psLayout = isset( $options['pslayout'] ) ? $options['pslayout'] : false;
+		$psLayout = isset($options['pslayout']) ? $options['pslayout'] : false;
 
 		// photoset layout
-		$psLightbox = isset( $options['pslightbox'] ) ? $options['pslightbox'] : false;
+		$psLightbox = isset($options['pslightbox']) ? $options['pslightbox'] : 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)));
 
 	}
 

internal-api/end_points.php

Spacing +4 added lines, -4 removed lines

@@ -18,8 +18,8 @@ 
 	 * Adds our API endpoint and hooks it in at template_redirect
 	 */
 	public function __construct() {
-		add_action( 'init', array( $this, 'add_endpoints' ) );
-		add_action( 'template_redirect', array( route::init(), 'do_api' ) );
+		add_action('init', array($this, 'add_endpoints'));
+		add_action('template_redirect', array(route::init(), 'do_api'));
 	}
 
 	/**
@@ -29,10 +29,10 @@ 
 	 */
 	public function add_endpoints() {
 		//add "action" as a rewrite tag
-		add_rewrite_tag( '%action%', '^[a-z0-9_\-]+$' );
+		add_rewrite_tag('%action%', '^[a-z0-9_\-]+$');
 
 		//add the endpoint
-		add_rewrite_rule( 'lasso-internal-api/^[a-z0-9_\-]+$/?', 'index.php?action=$matches[1]', 'top' );
+		add_rewrite_rule('lasso-internal-api/^[a-z0-9_\-]+$/?', 'index.php?action=$matches[1]', 'top');
 
 	}
 }

internal-api/find_data.php

Spacing +19 added lines, -19 removed lines

@@ -29,9 +29,9 @@ 
 	 * @param object $callback_instance Callback class.
 	 * @param string $action The name of the action we are processing for.
 	 */
-	public function __construct( $callback_instance, $action ) {
-		if ( is_object( $callback_instance ) ) {
-			$this->get_data( $callback_instance, $action );
+	public function __construct($callback_instance, $action) {
+		if (is_object($callback_instance)) {
+			$this->get_data($callback_instance, $action);
 		}
 
 	}
@@ -49,9 +49,9 @@ 
 	 * @param object $callback_instance Callback class.
 	 * @param string $action The name of the action we are processing for.
 	 */
-	protected function get_data( $callback_instance, $action ) {
+	protected function get_data($callback_instance, $action) {
 		$data = array();
-		if ( is_array( $_POST ) ) {
+		if (is_array($_POST)) {
 			$params = $callback_instance::params();
 
 			/**
@@ -61,20 +61,20 @@ 
 			 *
 			 * @param array $params Array of params in form of $params[ 'action_name' ][ 'POST_field' ] = 'callback_function_for_sanatizing' ]
 			 */
-			$params = apply_filters( 'lasso_api_params', $params );
-			if ( is_array( $params ) && isset( $params[ $action ] ) && is_array( $params[ $action ] ) ) {
-				$params = $params[ $action ];
-				foreach( $params as $key => $callback ) {
+			$params = apply_filters('lasso_api_params', $params);
+			if (is_array($params) && isset($params[$action]) && is_array($params[$action])) {
+				$params = $params[$action];
+				foreach ($params as $key => $callback) {
 					$_data = null;
-					if ( is_array( $callback ) ) {
-						foreach( $callback as $cb ) {
-							$_data = $this->sanitize( $key, $cb );
+					if (is_array($callback)) {
+						foreach ($callback as $cb) {
+							$_data = $this->sanitize($key, $cb);
 						}
-					}else{
-						$_data = $this->sanitize( $key, $callback );
+					} else {
+						$_data = $this->sanitize($key, $callback);
 					}
 
-					$data[ $key ] = $_data;
+					$data[$key] = $_data;
 
 				}
 
@@ -98,11 +98,11 @@ 
 	 *
 	 * @return string|null Sanitized data or null.
 	 */
-	protected function sanitize( $key, $cb ) {
+	protected function sanitize($key, $cb) {
 		$_data = null;
-		if ( isset( $_POST[ $key ] ) ) {
-			if ( function_exists( $cb ) ) {
-				$_data = call_user_func( $cb, $_POST[ $key ] );
+		if (isset($_POST[$key])) {
+			if (function_exists($cb)) {
+				$_data = call_user_func($cb, $_POST[$key]);
 
 				return $_data;
 

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 						foreach( $callback as $cb ) {
 							$_data = $this->sanitize( $key, $cb );
 						}
-					}else{
+					} else{
 						$_data = $this->sanitize( $key, $callback );
 					}
 

lasso.php

Spacing +8 added lines, -8 removed lines

@@ -18,27 +18,27 @@
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
 // Set some constants
-define( 'LASSO_VERSION', '0.9.8.2' );
-define( 'LASSO_DIR', plugin_dir_path( __FILE__ ) );
-define( 'LASSO_URL', plugins_url( '', __FILE__ ) );
-define( 'LASSO_FILE', __FILE__ );
+define('LASSO_VERSION', '0.9.8.2');
+define('LASSO_DIR', plugin_dir_path(__FILE__));
+define('LASSO_URL', plugins_url('', __FILE__));
+define('LASSO_FILE', __FILE__);
 
 /**
  * Load plugin if PHP version is 5.4 or later.
  */
-if ( version_compare( PHP_VERSION, '5.4.0', '>=' ) ) {
+if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
 
-	include_once( LASSO_DIR . '/bootstrap.php' );
+	include_once(LASSO_DIR.'/bootstrap.php');
 
 } else {
 
 	add_action('admin_head', 'lasso_fail_notice');
-	function lasso_fail_notice(){
+	function lasso_fail_notice() {
 
 		printf('<div class="error"><p>Lasso requires PHP 5.4 or higher.</p></div>');
 

public/includes/assets.php

Spacing +58 added lines, -58 removed lines

@@ -10,14 +10,14 @@ 
 
 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() {
 
-		if ( lasso_user_can('edit_posts') ) {
+		if (lasso_user_can('edit_posts')) {
 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
@@ -32,75 +32,75 @@ 
 			// 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');
-			$titleClass 		= lasso_editor_get_option('title_class','lasso_editor');
-			$toolbar_headings  	= lasso_editor_get_option('toolbar_headings', 'lasso_editor');
-			$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
+			$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+			$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
+			$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+			$objectsNoSave = lasso_editor_get_option('dont_save', 'lasso_editor');
 
 			// post id reference
-			$postid 			= get_the_ID();
+			$postid = get_the_ID();
 
 			$strings = array(
-				'save' 				=> __('Save','lasso'),
-				'saving' 			=> __('Saving...','lasso'),
-				'saved'				=> __('Saved!','lasso'),
-				'adding' 			=> __('Adding...','lasso'),
-				'added'				=> __('Added!','lasso'),
-				'loading' 			=> __('Loading...','lasso'),
-				'loadMore'			=> __('Load More','lasso'),
-				'noPostsFound'		=> __('No more posts found','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 Lasso 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 missing the Article CSS class. Lasso will not function correctly without this CSS class.','lasso'),
+				'save' 				=> __('Save', 'lasso'),
+				'saving' 			=> __('Saving...', 'lasso'),
+				'saved'				=> __('Saved!', 'lasso'),
+				'adding' 			=> __('Adding...', 'lasso'),
+				'added'				=> __('Added!', 'lasso'),
+				'loading' 			=> __('Loading...', 'lasso'),
+				'loadMore'			=> __('Load More', 'lasso'),
+				'noPostsFound'		=> __('No more posts found', '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 Lasso 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 missing the Article CSS class. Lasso 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);
 
 			// localized objects
 			$objects = array(
-				'ajaxurl' 			=> esc_url( $api_url ),
+				'ajaxurl' 			=> esc_url($api_url),
 				'editor' 			=> 'lasso--content', // ID of editable content (without #) DONT CHANGE
 				'article_object'	=> $article_object,
 				'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'			=> get_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_posts'	=> current_user_can('publish_posts'),
 				'can_publish_pages'	=> current_user_can('publish_pages'),
 				'author'			=> is_user_logged_in() ? get_current_user_ID() : false,
@@ -132,22 +132,22 @@ 
 				'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()
 			);
 
 
 			// wp api client
-			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);
 
-				$postfix = ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ) ? '' : '.min';
-				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
-				wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
+				$postfix = (defined('SCRIPT_DEBUG') && true === SCRIPT_DEBUG) ? '' : '.min';
+				wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
+				wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects));
 
 
 		}