AesopInteractive / lasso

admin/includes/menus/license.php

Spacing +57 added lines, -57 removed lines

@@ -6,28 +6,28 @@ 
 
 	function __construct() {
 
-		define( 'LASSO_STORE_ITEM_NAME', 'lasso' );
-		define( 'LASSO_STORE_URL', 'https://edituswp.com' );
-
-		add_action( 'admin_init',  array( $this, 'plugin_updater' ), 0 );
-		add_action( 'admin_menu',  array( $this, 'license_menu' ) );
-		add_action( 'network_admin_menu',  array( $this, 'license_menu' ) ); // CHANGED Added hook.
-		add_action( 'admin_init',  array( $this, 'register_option' ) );
-		add_action( 'admin_init',  array( $this, 'activate_license' ) );
-		add_action( 'admin_init',  array( $this, 'deactivate_license' ) );
+		define('LASSO_STORE_ITEM_NAME', 'lasso');
+		define('LASSO_STORE_URL', 'https://edituswp.com');
+
+		add_action('admin_init', array($this, 'plugin_updater'), 0);
+		add_action('admin_menu', array($this, 'license_menu'));
+		add_action('network_admin_menu', array($this, 'license_menu')); // CHANGED Added hook.
+		add_action('admin_init', array($this, 'register_option'));
+		add_action('admin_init', array($this, 'activate_license'));
+		add_action('admin_init', array($this, 'deactivate_license'));
 	}
 
 	function plugin_updater() {
 
 		// retrieve our license key from the DB
-		$license_key = trim( get_option( 'lasso_license_key' ) );
+		$license_key = trim(get_option('lasso_license_key'));
 
 		// setup the updater
-		$edd_updater = new \EDD_SL_Plugin_Updater( LASSO_STORE_URL , LASSO_FILE, array(
+		$edd_updater = new \EDD_SL_Plugin_Updater(LASSO_STORE_URL, LASSO_FILE, array(
 				'version'  => LASSO_VERSION,
 				'license'  => $license_key,
 				'item_name' => LASSO_STORE_ITEM_NAME,
-				'author'  => __( 'Aesopinteractive LLC', 'lasso' )
+				'author'  => __('Aesopinteractive LLC', 'lasso')
 			)
 		);
 
@@ -35,51 +35,51 @@ 
 	function license_menu() {
 
 		// CHANGED Removed condition.
-		add_submenu_page( 'lasso-editor', __( 'License Key', 'lasso' ), __( 'License', 'lasso' ), 'manage_options', 'lasso-license', array( $this, 'license_page' ) );
+		add_submenu_page('lasso-editor', __('License Key', 'lasso'), __('License', 'lasso'), 'manage_options', 'lasso-license', array($this, 'license_page'));
 
 	}
 	function license_page() {
-		$license  = get_option( 'lasso_license_key' );
-		$status  = get_option( 'lasso_license_status' );
+		$license = get_option('lasso_license_key');
+		$status = get_option('lasso_license_status');
 
 ?>
 		<div class="wrap">
-			<h2><?php _e( 'Editus License', 'lasso' ); ?></h2>
-			<p><?php _e( 'Input the license key you recieved with your purchase to ensure your version of Editus stays updated.', 'lasso' );?></p>
+			<h2><?php _e('Editus License', 'lasso'); ?></h2>
+			<p><?php _e('Input the license key you recieved with your purchase to ensure your version of Editus stays updated.', 'lasso'); ?></p>
 			<form class="lasso--form-settings" method="post" action="options.php">
 
-				<?php settings_fields( 'lasso_license' ); ?>
+				<?php settings_fields('lasso_license'); ?>
 
 				<table class="form-table">
 					<tbody>
 						<tr valign="top">
 							<th scope="row" valign="top">
-								<?php _e( 'License Key', 'lasso' ); ?>
+								<?php _e('License Key', 'lasso'); ?>
 							</th>
 							<td>
-								<input id="lasso_license_key" name="lasso_license_key" type="text" class="regular-text" value="<?php esc_attr_e( $license ); ?>" />
+								<input id="lasso_license_key" name="lasso_license_key" type="text" class="regular-text" value="<?php esc_attr_e($license); ?>" />
 							</td>
 						</tr>
-						<?php if ( false !== $license ) { ?>
+						<?php if (false !== $license) { ?>
 							<tr valign="top">
 								<th scope="row" valign="top">
-									<?php _e( 'Activate License', 'lasso' ); ?>
+									<?php _e('Activate License', 'lasso'); ?>
 								</th>
 								<td>
-									<?php if ( $status !== false && $status == 'valid' ) { ?>
-										<span style="color:green;"><?php _e( 'active' ); ?></span>
-										<?php wp_nonce_field( 'lasso_license_nonce', 'lasso_license_nonce' ); ?>
-										<input type="submit" class="button-secondary" name="edd_license_deactivate" value="<?php esc_attr_e( 'Deactivate License', 'lasso' ); ?>"/>
+									<?php if ($status !== false && $status == 'valid') { ?>
+										<span style="color:green;"><?php _e('active'); ?></span>
+										<?php wp_nonce_field('lasso_license_nonce', 'lasso_license_nonce'); ?>
+										<input type="submit" class="button-secondary" name="edd_license_deactivate" value="<?php esc_attr_e('Deactivate License', 'lasso'); ?>"/>
 									<?php } else {
-				wp_nonce_field( 'lasso_license_nonce', 'lasso_license_nonce' ); ?>
-										<input type="submit" class="button-secondary" name="edd_license_activate" value="<?php esc_attr_e( 'Activate License', 'lasso' ); ?>"/>
+				wp_nonce_field('lasso_license_nonce', 'lasso_license_nonce'); ?>
+										<input type="submit" class="button-secondary" name="edd_license_activate" value="<?php esc_attr_e('Activate License', 'lasso'); ?>"/>
 									<?php } ?>
 								</td>
 							</tr>
 						<?php } ?>
 					</tbody>
 				</table>
-				<?php submit_button( 'Save License' ); ?>
+				<?php submit_button('Save License'); ?>
 
 			</form>
 		<?php
@@ -88,14 +88,14 @@ 
 	// register option
 	function register_option() {
 
-		register_setting( 'lasso_license', 'lasso_license_key', array( $this, 'sanitize_license' ) );
+		register_setting('lasso_license', 'lasso_license_key', array($this, 'sanitize_license'));
 	}
 
 	// santize
-	function sanitize_license( $new ) {
-		$old = get_option( 'lasso_license_key' );
-		if ( $old && $old != $new ) {
-			delete_option( 'lasso_license_status' ); // new license has been entered, so must reactivate
+	function sanitize_license($new) {
+		$old = get_option('lasso_license_key');
+		if ($old && $old != $new) {
+			delete_option('lasso_license_status'); // new license has been entered, so must reactivate
 		}
 		return $new;
 	}
@@ -104,36 +104,36 @@ 
 	function activate_license() {
 
 		// listen for our activate button to be clicked
-		if ( isset( $_POST['edd_license_activate'] ) ) {
+		if (isset($_POST['edd_license_activate'])) {
 
 			// run a quick security check
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
+			if (!check_admin_referer('lasso_license_nonce', 'lasso_license_nonce'))
 				return; // get out if we didn't click the Activate button
 
 			// retrieve the license from the database
-			$license = trim( get_option( 'lasso_license_key' ) );
+			$license = trim(get_option('lasso_license_key'));
 
 			// data to send in our API request
 			$api_params = array(
 				'edd_action'=> 'activate_license',
 				'license'  => $license,
-				'item_name' => urlencode( LASSO_STORE_ITEM_NAME ), // the name of our product in EDD
+				'item_name' => urlencode(LASSO_STORE_ITEM_NAME), // the name of our product in EDD
 				'url'       => home_url()
 			);
 
 			// Call the custom API.
-			$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
+			$response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false));
 
 			// make sure the response came back okay
-			if ( is_wp_error( $response ) )
+			if (is_wp_error($response))
 				return false;
 
 			// decode the license data
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+			$license_data = json_decode(wp_remote_retrieve_body($response));
 
 			// $license_data->license will be either "valid" or "invalid"
 
-			update_option( 'lasso_license_status', $license_data->license );
+			update_option('lasso_license_status', $license_data->license);
 
 		}
 	}
@@ -141,37 +141,37 @@ 
 	function deactivate_license() {
 
 		// listen for our activate button to be clicked
-		if ( isset( $_POST['edd_license_deactivate'] ) ) {
+		if (isset($_POST['edd_license_deactivate'])) {
 
 			// run a quick security check
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
+			if (!check_admin_referer('lasso_license_nonce', 'lasso_license_nonce'))
 				return; // get out if we didn't click the Activate button
 
 			// retrieve the license from the database
-			$license = trim( get_option( 'lasso_license_key' ) );
+			$license = trim(get_option('lasso_license_key'));
 
 
 			// data to send in our API request
 			$api_params = array(
 				'edd_action'=> 'deactivate_license',
 				'license'  => $license,
-				'item_name' => urlencode( LASSO_STORE_ITEM_NAME ), // the name of our product in EDD
+				'item_name' => urlencode(LASSO_STORE_ITEM_NAME), // the name of our product in EDD
 				'url'       => home_url()
 			);
 
 			// Call the custom API.
-			$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
+			$response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false));
 
 			// make sure the response came back okay
-			if ( is_wp_error( $response ) )
+			if (is_wp_error($response))
 				return false;
 
 			// decode the license data
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+			$license_data = json_decode(wp_remote_retrieve_body($response));
 
 			// $license_data->license will be either "deactivated" or "failed"
-			if ( $license_data->license == 'deactivated' )
-				delete_option( 'lasso_license_status' );
+			if ($license_data->license == 'deactivated')
+				delete_option('lasso_license_status');
 
 		}
 	}
@@ -181,24 +181,24 @@ 
 
 		global $wp_version;
 
-		$license = trim( get_option( 'lasso_license_key' ) );
+		$license = trim(get_option('lasso_license_key'));
 
 		$api_params = array(
 			'edd_action' => 'check_license',
 			'license' => $license,
-			'item_name' => urlencode( LASSO_STORE_ITEM_NAME ),
+			'item_name' => urlencode(LASSO_STORE_ITEM_NAME),
 			'url'       => home_url()
 		);
 
 		// Call the custom API.
-		$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
+		$response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false));
 
-		if ( is_wp_error( $response ) )
+		if (is_wp_error($response))
 			return false;
 
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
 
-		if ( $license_data->license == 'valid' ) {
+		if ($license_data->license == 'valid') {
 			echo 'valid'; exit;
 			// this license is still valid
 		} else {

includes/process/gallery.php

Spacing +56 added lines, -56 removed lines

@@ -29,15 +29,15 @@ 
 	 *
 	 * @return array Key "markup" has the HTML.
 	 */
-	public function swap( $data ) {
+	public function swap($data) {
 
 
-		$id = $data[ 'gallery_id' ];
-		if ( is_null( $id ) ) {
+		$id = $data['gallery_id'];
+		if (is_null($id)) {
 			$id = false;
 		}
 
-		$markup = sprintf( '<div contenteditable="false" class="lasso--empty-component aesop-component aesop-gallery-component" data-component-type="gallery" data-id="%s">%s</div>', $id, __( 'Save and refresh to view gallery.','lasso' ) );
+		$markup = sprintf('<div contenteditable="false" class="lasso--empty-component aesop-component aesop-gallery-component" data-component-type="gallery" data-id="%s">%s</div>', $id, __('Save and refresh to view gallery.', 'lasso'));
 
 		return array(
 			'gallery' => $markup
@@ -54,49 +54,49 @@ 
 	 *
 	 * @return array|bool On success an array containing "message" or on failure false.
 	 */
-	public function create( $data ) {
+	public function create($data) {
 
 		//@todo adapt auth callbacks to work with args.
-		if (  ! lasso_user_can( 'publish_posts' ) ) {
+		if (!lasso_user_can('publish_posts')) {
 			return false;
 
 		}
 
-		$gallery_ids = isset( $data['gallery_ids'] ) ? $data['gallery_ids'] : false;
+		$gallery_ids = isset($data['gallery_ids']) ? $data['gallery_ids'] : false;
 
 		// bail if no gallery ids
-		if ( empty( $gallery_ids ) ) {
+		if (empty($gallery_ids)) {
 			return false;
 		}
 
-		$postid   		 = isset( $data['postid'] ) ? (int) $data['postid'] : false;
-		$type   		 = isset( $data['gallery_type'] ) ? $data['gallery_type'] : false;
-		$edgallerytitle	 = isset( $data['edgallerytitle'] ) ? $data['edgallerytitle'] : $postid.'-'.rand();
+		$postid = isset($data['postid']) ? (int) $data['postid'] : false;
+		$type = isset($data['gallery_type']) ? $data['gallery_type'] : false;
+		$edgallerytitle = isset($data['edgallerytitle']) ? $data['edgallerytitle'] : $postid.'-'.rand();
 
 		// insert a new gallery
 		$args = array(
-			'post_title'    => $edgallerytitle ,
+			'post_title'    => $edgallerytitle,
 			'post_status'   => 'publish',
 			'post_type'     => 'ai_galleries'
 		);
 
-		$postid = wp_insert_post( apply_filters( 'lasso_insert_gallery_args', $args ) );
+		$postid = wp_insert_post(apply_filters('lasso_insert_gallery_args', $args));
 
 		// update gallery ids
-		if ( $gallery_ids ) {
+		if ($gallery_ids) {
 
-			update_post_meta( $postid, '_ase_gallery_images', $gallery_ids );
+			update_post_meta($postid, '_ase_gallery_images', $gallery_ids);
 
 		}
 
 		// update the gallery type
-		if ( !empty( $type ) ) {
+		if (!empty($type)) {
 
-			update_post_meta( $postid, 'aesop_gallery_type', $type );
+			update_post_meta($postid, 'aesop_gallery_type', $type);
 
 		}
 
-		do_action( 'lasso_gallery_published', $postid, $gallery_ids, get_current_user_ID() );
+		do_action('lasso_gallery_published', $postid, $gallery_ids, get_current_user_ID());
 
 		return array(
 			'message' => 'gallery-created',
@@ -114,20 +114,20 @@ 
 	 *
 	 * @return array "message" key has the message.
 	 */
-	public function update( $data ) {
-
-		$options      = isset( $data['fields'] ) ? $data['fields'] : false;
-		$postid   	  = !empty( $options ) ? (int) $options['id'] : false;
-		$gallery_ids  = isset( $data['gallery_ids'] ) ? $data['gallery_ids'] : false;
-		if ( ! empty( $data ) && $data[ 'gallery_type' ] ) {
-			$type = $data[ 'gallery_type' ];
-		}elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) {
-			$type = $options[ 'galleryType' ];
-		}else{
+	public function update($data) {
+
+		$options      = isset($data['fields']) ? $data['fields'] : false;
+		$postid = !empty($options) ? (int) $options['id'] : false;
+		$gallery_ids  = isset($data['gallery_ids']) ? $data['gallery_ids'] : false;
+		if (!empty($data) && $data['gallery_type']) {
+			$type = $data['gallery_type'];
+		}elseif (!empty($options) && $options['galleryType']) {
+			$type = $options['galleryType'];
+		} else {
 			$type = false;
 		}
 
-		save_gallery::save_gallery_options( $postid, $gallery_ids, $options, $type );
+		save_gallery::save_gallery_options($postid, $gallery_ids, $options, $type);
 
 		return array(
 			'message' => 'gallery-updated'
@@ -145,25 +145,25 @@ 
 	 *
 	 * @return bool
 	 */
-	public function get_images( $data ) {
+	public function get_images($data) {
 
 		//check caps
-		if ( !current_user_can( 'edit_posts' ) ) {
+		if (!current_user_can('edit_posts')) {
 			return false;
 		}
 
 		// bail if no id specified like on new galleries
-		if ( is_null( $data['post_id'] ) || empty( $data['post_id'] ) ) {
+		if (is_null($data['post_id']) || empty($data['post_id'])) {
 			return false;
 		}
 
-		$postid  = isset( $data['post_id'] ) ? $data['post_id'] : false;
+		$postid = isset($data['post_id']) ? $data['post_id'] : false;
 
 		// fetch image ids from cache
-		$image_ids  = get_post_meta( $postid, '_ase_gallery_images', true );
+		$image_ids = get_post_meta($postid, '_ase_gallery_images', true);
 
 		// send ids to return images
-		return self::get_the_images( $image_ids );
+		return self::get_the_images($image_ids);
 
 	}
 
@@ -173,32 +173,32 @@ 
 	 * @param $image_ids array array of image ids
 	 * @since 0.1
 	 */
-	private function get_the_images( $image_ids = '' ) {
+	private function get_the_images($image_ids = '') {
 
-		if ( empty( $image_ids ) )
+		if (empty($image_ids))
 			return;
 
-		$image_ids  = array_map( 'intval', explode( ',', $image_ids ) );
+		$image_ids = array_map('intval', explode(',', $image_ids));
 
 		$out[] = '<ul id="ase-gallery-images">';
 
-		if ( !empty( $image_ids ) ):
+		if (!empty($image_ids)):
 
-			foreach ( $image_ids as $image_id ) {
+			foreach ($image_ids as $image_id) {
 
-				$image    =  wp_get_attachment_image_src( $image_id, 'thumbnail', false );
+				$image = wp_get_attachment_image_src($image_id, 'thumbnail', false);
 
-				$out[] = sprintf( '
+				$out[] = sprintf('
 		        <li id="%1s" class="ase-gallery-image">
 		        	<i class="dashicons dashicons-no-alt" title="%2s"></i>
 		        	<i class="dashicons dashicons-edit" title="%3s"></i>
 		           	<img src="%4s">
 		        </li>
 		       ',
-					absint( $image_id ),
-					__( 'Delete From Gallery', 'lasso' ),
-					__( 'Edit Image Caption', 'lasso' ),
-					esc_url( $image[0] )
+					absint($image_id),
+					__('Delete From Gallery', 'lasso'),
+					__('Edit Image Caption', 'lasso'),
+					esc_url($image[0])
 				);
 
 			}
@@ -207,7 +207,7 @@ 
 
 		$out[] = '</ul>';
 
-		return array( 'html' => implode( '', $out ) );
+		return array('html' => implode('', $out));
 
 	}
 
@@ -219,13 +219,13 @@ 
 	 *
 	 * @return array Array of keys to pull from $data per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_gallery_swap' ] = array(
+	public static function params() {
+		$params['process_gallery_swap'] = array(
 			'gallery_id' => 'absint',
 
 		);
 
-		$params[ 'process_gallery_create' ] = array(
+		$params['process_gallery_create'] = array(
 			'postid'   => 'absint',
 			'content'   => 'wp_kses_post',
 			'edgallerytitle' =>'sanitize_text_field',
@@ -237,7 +237,7 @@ 
 
 		);
 
-		$params[ 'process_gallery_update' ] = array(
+		$params['process_gallery_update'] = array(
 			'postid'        => 'absint',
 			'gallery_ids'   => 'lasso_sanitize_data',
 			'fields'        => 'lasso_sanitize_data',
@@ -247,7 +247,7 @@ 
 			)
 		);
 
-		$params[ 'process_gallery_get_images' ] = array(
+		$params['process_gallery_get_images'] = array(
 			'post_id'       => 'absint'
 		);
 
@@ -263,19 +263,19 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_gallery_swap' ] = array(
+		$params['process_gallery_swap'] = array(
 			'lasso_user_can'
 		);
 
-		$params[ 'process_gallery_create' ] = array(
+		$params['process_gallery_create'] = array(
 			'is_user_logged_in'
 		);
 
-		$params[ 'process_gallery_update' ] = array(
+		$params['process_gallery_update'] = array(
 			'lasso_user_can'
 		);
 
-		$params[ 'process_gallery_get_images' ] = array();
+		$params['process_gallery_get_images'] = array();
 
 		return $params;
 

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/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,34 +23,34 @@ 
 	*/
 	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); ?>">
 				<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 type="submit" value="<?php _e( 'Okay, got it!', 'lasso' );?>" data-nonce="<?php echo $nonce;?>" >
+						<input type="submit" value="<?php _e('Okay, got it!', 'lasso'); ?>" data-nonce="<?php echo $nonce; ?>" >
 					</div>
 
 				</div>
@@ -74,20 +74,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
 

includes/process/update_object.php

Spacing +26 added lines, -26 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,14 +123,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)) {
@@ -143,17 +143,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;
 		}
 
@@ -168,9 +168,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/option-engine.php

Spacing +43 added lines, -43 removed lines

@@ -43,7 +43,7 @@ 
 *	Get an array of addon data for the settings modal
 *	@since 0.9.4
 */
-function lasso_get_modal_tabs(){
+function lasso_get_modal_tabs() {
 
 	$tabs = array();
 
@@ -60,36 +60,36 @@ 
 *	@uses lasso_modal_addons_content()
 *	@since 0.9.4
 */
-function lasso_modal_addons( $type = 'tab' ){
+function lasso_modal_addons($type = 'tab') {
 
 	$tabs = lasso_get_modal_tabs();
 	$out = '';
 
-	if ( $tabs ):
+	if ($tabs):
 
-		if ( 'tab' == $type ) {
+		if ('tab' == $type) {
 
 			$out = '<ul class="lasso--modal__tabs">';
 
 				$out .= '<li class="active-tab" data-addon-name="core">Editus</li>';
 
-				foreach ( $tabs as $tab ) {
+				foreach ($tabs as $tab) {
 
-					if ( isset( $tab ) ) {
+					if (isset($tab)) {
 
-						$out .= lasso_modal_addons_content( $tab, $type );
+						$out .= lasso_modal_addons_content($tab, $type);
 					}
 				}
 
 			$out .= '</ul>';
 
-		} elseif ( 'content' == $type ) {
+		} elseif ('content' == $type) {
 
 
-			foreach ( $tabs as $tab ) {
+			foreach ($tabs as $tab) {
 
-				if ( isset( $tab ) ) {
-					$out .= lasso_modal_addons_content( $tab , $type );
+				if (isset($tab)) {
+					$out .= lasso_modal_addons_content($tab, $type);
 				}
 			}
 
@@ -97,7 +97,7 @@ 
 
 	endif;
 
-	return !empty( $out ) ? $out : false;
+	return !empty($out) ? $out : false;
 }
 
 /**
@@ -117,26 +117,26 @@ 
 *	@since 0.9.5
 *	@subpackage lasso_modal_addons_content
 */
-function lasso_option_form( $name = '', $options = array() ){
+function lasso_option_form($name = '', $options = array()) {
 
 	ob_start();
 
-	if ( empty( $name ) || empty( $options ) || !is_array( $options ) )
+	if (empty($name) || empty($options) || !is_array($options))
 		return;
 
 	$nonce = wp_create_nonce('lasso-process-post-meta');
-	$key   = sprintf('_lasso_%s_settings', $name );
+	$key   = sprintf('_lasso_%s_settings', $name);
 
-	$out = sprintf('<form id="lasso--post-form" class="lasso--post-form">' );
+	$out = sprintf('<form id="lasso--post-form" class="lasso--post-form">');
 
-		$out .= lasso_option_fields( $name, $options );
-		$out .='<div class="form--bottom">';
-			$out .='<input type="submit" value="Save">';
-			$out .='<input type="hidden" name="tab_name" value="'.$key.'">';
-			$out .='<input type="hidden" name="post_id" value="'.get_the_ID().'">';
-			$out .='<input type="hidden" name="nonce" value="'.$nonce.'">';
-			$out .='<input type="hidden" name="action" value="process_meta_update">';
-		$out .='</div>';
+		$out .= lasso_option_fields($name, $options);
+		$out .= '<div class="form--bottom">';
+			$out .= '<input type="submit" value="Save">';
+			$out .= '<input type="hidden" name="tab_name" value="'.$key.'">';
+			$out .= '<input type="hidden" name="post_id" value="'.get_the_ID().'">';
+			$out .= '<input type="hidden" name="nonce" value="'.$nonce.'">';
+			$out .= '<input type="hidden" name="action" value="process_meta_update">';
+		$out .= '</div>';
 
 	$out .= '</form>';
 
@@ -154,28 +154,28 @@ 
 *	@since 0.9.5
 *	@subpackage lasso_modal_addons_content
 */
-function lasso_option_fields( $name = '', $options = array() ){
+function lasso_option_fields($name = '', $options = array()) {
 
-	$out 	= '';
+	$out = '';
 	$before = '<div class="lasso--postsettings__option">';
 	$after 	= '</div>';
 
-	if ( empty( $name ) || empty( $options ) )
+	if (empty($name) || empty($options))
 		return;
 
-	foreach ( (array) $options as $option ) {
+	foreach ((array) $options as $option) {
 
-		$type = isset( $option['type'] ) ? $option['type'] : 'text';
+		$type = isset($option['type']) ? $option['type'] : 'text';
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'text':
-				$out .= sprintf('%s%s%s', $before, lasso_option_engine_option( $name, $option,'text' ), $after );
+				$out .= sprintf('%s%s%s', $before, lasso_option_engine_option($name, $option, 'text'), $after);
 				break;
 			case 'textarea':
-				$out .= sprintf('%s%s%s', $before, lasso_option_engine_option( $name, $option,'textarea' ), $after );
+				$out .= sprintf('%s%s%s', $before, lasso_option_engine_option($name, $option, 'textarea'), $after);
 				break;
 			case 'checkbox':
-				$out .= sprintf('%s%s%s', $before, lasso_option_engine_option( $name, $option,'checkbox' ), $after );
+				$out .= sprintf('%s%s%s', $before, lasso_option_engine_option($name, $option, 'checkbox'), $after);
 				break;
 		}
 
@@ -193,27 +193,27 @@ 
 *	@param $type string text, textarea, checkbox, color
 *	@since 5.0
 */
-function lasso_option_engine_option( $name = '', $option = '', $type = '') {
+function lasso_option_engine_option($name = '', $option = '', $type = '') {
 
-	if ( empty( $type ) || empty( $option ) )
+	if (empty($type) || empty($option))
 		return;
 
-	$id = isset( $option['id'] ) ? $option['id'] : false;
-	$id = $id ? lasso_clean_string( $id ) : false;
+	$id = isset($option['id']) ? $option['id'] : false;
+	$id = $id ? lasso_clean_string($id) : false;
 
-	$desc = isset( $option['desc'] ) ? $option['desc'] : false;
+	$desc = isset($option['desc']) ? $option['desc'] : false;
 
-	$value = get_post_meta( get_the_id(), $option[ 'id' ], true );
+	$value = get_post_meta(get_the_id(), $option['id'], true);
 
-	switch ( $type ) {
+	switch ($type) {
 		case 'text':
-			$out = sprintf('<label for="lasso--post-option-%s">%s</label><input id="lasso--post-option-%s" name="%s" type="text" value="%s">',$id, esc_html( $desc ), $id, $id, $value );
+			$out = sprintf('<label for="lasso--post-option-%s">%s</label><input id="lasso--post-option-%s" name="%s" type="text" value="%s">', $id, esc_html($desc), $id, $id, $value);
 			break;
 		case 'textarea':
-			$out = sprintf('<label for="lasso--post-option-%s">%s</label><textarea id="lasso--post-option-%s" name="%s">%s</textarea>',$id, esc_html( $desc ), $id, $id, $value );
+			$out = sprintf('<label for="lasso--post-option-%s">%s</label><textarea id="lasso--post-option-%s" name="%s">%s</textarea>', $id, esc_html($desc), $id, $id, $value);
 			break;
 		case 'checkbox':
-			$out = sprintf('<label for="lasso--post-option-%s" class="checkbox-control checkbox"><input id="lasso--post-option-%s" type="checkbox" name="%s" class="checkbox"><span class="control-indicator"></span>%s',$id, $id, $id ,esc_html( $desc ) );
+			$out = sprintf('<label for="lasso--post-option-%s" class="checkbox-control checkbox"><input id="lasso--post-option-%s" type="checkbox" name="%s" class="checkbox"><span class="control-indicator"></span>%s', $id, $id, $id, esc_html($desc));
 			break;
 	}
 

public/includes/wrap-shortcodes.php

Spacing +23 added lines, -23 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,32 +60,32 @@ 
  *
  * @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_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');
 
-	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