AesopInteractive / lasso

admin/includes/EDD_SL_Plugin_Updater.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 * @uses api_request()
 	 *
 	 * @param array   $_transient_data Update array build by WordPress.
-	 * @return array Modified update array with custom plugin data.
+	 * @return stdClass Modified update array with custom plugin data.
 	 */
 	function check_update( $_transient_data ) {
 

Spacing +77 added lines, -77 removed lines

@@ -26,16 +26,16 @@ 
 	 * @param array   $_api_data    Optional data to send with API calls.
 	 * @return void
 	 */
-	function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
-		$this->api_url  = trailingslashit( $_api_url );
+	function __construct($_api_url, $_plugin_file, $_api_data = null) {
+		$this->api_url  = trailingslashit($_api_url);
 		$this->api_data = $_api_data;
-		$this->name     = plugin_basename( $_plugin_file );
-		$this->slug     = basename( $_plugin_file, '.php' );
+		$this->name     = plugin_basename($_plugin_file);
+		$this->slug     = basename($_plugin_file, '.php');
 		$this->version  = $_api_data['version'];
 
 		// Set up hooks.
 		$this->init();
-		add_action( 'admin_init', array( $this, 'show_changelog' ) );
+		add_action('admin_init', array($this, 'show_changelog'));
 	}
 
 	/**
@@ -47,10 +47,10 @@ 
 	 */
 	public function init() {
 
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
+		add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
 
-		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+		add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
 	}
 
 	/**
@@ -66,34 +66,34 @@ 
 	 * @param array   $_transient_data Update array build by WordPress.
 	 * @return array Modified update array with custom plugin data.
 	 */
-	function check_update( $_transient_data ) {
+	function check_update($_transient_data) {
 
 		global $pagenow;
 
-		if ( ! is_object( $_transient_data ) ) {
+		if (!is_object($_transient_data)) {
 			$_transient_data = new stdClass;
 		}
 
-		if ( 'plugins.php' == $pagenow && is_multisite() ) {
+		if ('plugins.php' == $pagenow && is_multisite()) {
 			return $_transient_data;
 		}
 
-		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
 
-			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
 
 				$this->did_check = true;
 
-				if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if (version_compare($this->version, $version_info->new_version, '<')) {
 
-					$_transient_data->response[ $this->name ] = $version_info;
+					$_transient_data->response[$this->name] = $version_info;
 
 				}
 
 				$_transient_data->last_checked = time();
-				$_transient_data->checked[ $this->name ] = $this->version;
+				$_transient_data->checked[$this->name] = $this->version;
 
 			}
 
@@ -108,84 +108,84 @@ 
 	 * @param string  $file
 	 * @param array   $plugin
 	 */
-	public function show_update_notification( $file, $plugin ) {
+	public function show_update_notification($file, $plugin) {
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
+		if (!current_user_can('update_plugins')) {
 			return;
 		}
 
-		if ( ! is_multisite() ) {
+		if (!is_multisite()) {
 			return;
 		}
 
-		if ( $this->name != $file ) {
+		if ($this->name != $file) {
 			return;
 		}
 
 		// Remove our filter on the site transient
-		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+		remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
 
-		$update_cache = get_site_transient( 'update_plugins' );
+		$update_cache = get_site_transient('update_plugins');
 
-		if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if (!is_object($update_cache) || empty($update_cache->response) || empty($update_cache->response[$this->name])) {
 
-			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-			$version_info = get_transient( $cache_key );
+			$cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
+			$version_info = get_transient($cache_key);
 
-			if ( false === $version_info ) {
+			if (false === $version_info) {
 
-				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+				$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-				set_transient( $cache_key, $version_info, 3600 );
+				set_transient($cache_key, $version_info, 3600);
 			}
 
 
-			if ( ! is_object( $version_info ) ) {
+			if (!is_object($version_info)) {
 				return;
 			}
 
-			if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+			if (version_compare($this->version, $version_info->new_version, '<')) {
 
-				$update_cache->response[ $this->name ] = $version_info;
+				$update_cache->response[$this->name] = $version_info;
 
 			}
 
 			$update_cache->last_checked = time();
-			$update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->checked[$this->name] = $this->version;
 
-			set_site_transient( 'update_plugins', $update_cache );
+			set_site_transient('update_plugins', $update_cache);
 
 		} else {
 
-			$version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[$this->name];
 
 		}
 
 		// Restore our filter
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
 
-		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if (!empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
 
 			// build a plugin list row, with update notification
-			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			$wp_list_table = _get_list_table('WP_Plugins_List_Table');
+			echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
 
-			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
 
-			if ( empty( $version_info->download_link ) ) {
+			if (empty($version_info->download_link)) {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'lasso' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'lasso'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version)
 				);
 			} else {
 				printf(
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'lasso' ),
-					esc_html( $version_info->name ),
-					esc_url( $changelog_link ),
-					esc_html( $version_info->new_version ),
-					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'lasso'),
+					esc_html($version_info->name),
+					esc_url($changelog_link),
+					esc_html($version_info->new_version),
+					esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
 				);
 			}
 
@@ -204,16 +204,16 @@ 
 	 * @param object  $_args
 	 * @return object $_data
 	 */
-	function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+	function plugins_api_filter($_data, $_action = '', $_args = null) {
 
 
-		if ( $_action != 'plugin_information' ) {
+		if ($_action != 'plugin_information') {
 
 			return $_data;
 
 		}
 
-		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+		if (!isset($_args->slug) || ($_args->slug != $this->slug)) {
 
 			return $_data;
 
@@ -228,9 +228,9 @@ 
 			)
 		);
 
-		$api_response = $this->api_request( 'plugin_information', $to_send );
+		$api_response = $this->api_request('plugin_information', $to_send);
 
-		if ( false !== $api_response ) {
+		if (false !== $api_response) {
 			$_data = $api_response;
 		}
 
@@ -245,9 +245,9 @@ 
 	 * @param string  $url
 	 * @return object $array
 	 */
-	function http_request_args( $args, $url ) {
+	function http_request_args($args, $url) {
 		// If it is an https request and we are performing a package download, disable ssl verification
-		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+		if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
 			$args['sslverify'] = false;
 		}
 		return $args;
@@ -264,40 +264,40 @@ 
 	 * @param array   $_data   Parameters for the API action.
 	 * @return false||object
 	 */
-	private function api_request( $_action, $_data ) {
+	private function api_request($_action, $_data) {
 
 		global $wp_version;
 
-		$data = array_merge( $this->api_data, $_data );
+		$data = array_merge($this->api_data, $_data);
 
-		if ( $data['slug'] != $this->slug )
+		if ($data['slug'] != $this->slug)
 			return;
 
-		if ( empty( $data['license'] ) )
+		if (empty($data['license']))
 			return;
 
-		if ( $this->api_url == home_url() ) {
+		if ($this->api_url == home_url()) {
 			return false; // Don't allow a plugin to ping itself
 		}
 
 		$api_params = array(
 			'edd_action' => 'get_version',
 			'license'    => $data['license'],
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+			'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
 			'slug'       => $data['slug'],
 			'author'     => $data['author'],
 			'url'        => home_url()
 		);
 
-		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
 
-		if ( ! is_wp_error( $request ) ) {
-			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		if (!is_wp_error($request)) {
+			$request = json_decode(wp_remote_retrieve_body($request));
 		}
 
-		if ( $request && isset( $request->sections ) ) {
-			$request->sections = maybe_unserialize( $request->sections );
+		if ($request && isset($request->sections)) {
+			$request->sections = maybe_unserialize($request->sections);
 		} else {
 			$request = false;
 		}
@@ -308,26 +308,26 @@ 
 	public function show_changelog() {
 
 
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+		if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['plugin'] ) ) {
+		if (empty($_REQUEST['plugin'])) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['slug'] ) ) {
+		if (empty($_REQUEST['slug'])) {
 			return;
 		}
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
-			wp_die( __( 'You do not have permission to install plugin updates', 'lasso' ), __( 'Error', 'lasso' ), array( 'response' => 403 ) );
+		if (!current_user_can('update_plugins')) {
+			wp_die(__('You do not have permission to install plugin updates', 'lasso'), __('Error', 'lasso'), array('response' => 403));
 		}
 
-		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+		$response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
 
-		if ( $response && isset( $response->sections['changelog'] ) ) {
-			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+		if ($response && isset($response->sections['changelog'])) {
+			echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
 		}
 
 

Braces +6 added lines, -4 removed lines

@@ -270,11 +270,13 @@
 
 		$data = array_merge( $this->api_data, $_data );
 
-		if ( $data['slug'] != $this->slug )
-			return;
+		if ( $data['slug'] != $this->slug ) {
+					return;
+		}
 
-		if ( empty( $data['license'] ) )
-			return;
+		if ( empty( $data['license'] ) ) {
+					return;
+		}
 
 		if ( $this->api_url == home_url() ) {
 			return false; // Don't allow a plugin to ping itself

includes/lasso_autoloader.php

Doc Comments +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	 * Loads the class file for a given class name.
 	 *
 	 * @param string $class The fully-qualified class name.
-	 * @return mixed The mapped file name on success, or boolean false on
+	 * @return string|false The mapped file name on success, or boolean false on
 	 * failure.
 	 */
 	public function loadClass($class) {
@@ -99,7 +99,7 @@ 
 	 *
 	 * @param string $prefix The namespace prefix.
 	 * @param string $relative_class The relative class name.
-	 * @return mixed Boolean false if no mapped file can be loaded, or the
+	 * @return false|string Boolean false if no mapped file can be loaded, or the
 	 * name of the mapped file that was loaded.
 	 */
 	protected function loadMappedFile($prefix, $relative_class) {

Indentation +2 added lines, -2 removed lines

@@ -115,8 +115,8 @@
 			// replace namespace separators with directory separators
 			// in the relative class name, append with .php
 			$file = $base_dir
-			        . str_replace('\\', '/', $relative_class)
-			        . '.php';
+					. str_replace('\\', '/', $relative_class)
+					. '.php';
 
 			// if the mapped file exists, require it
 			if ($this->requireFile($file)) {

Spacing +2 added lines, -2 removed lines

@@ -40,10 +40,10 @@
 	 */
 	public function addNamespace($prefix, $base_dir, $prepend = false) {
 		// normalize namespace prefix
-		$prefix = trim($prefix, '\\') . '\\';
+		$prefix = trim($prefix, '\\').'\\';
 
 		// normalize the base directory with a trailing separator
-		$base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/';
+		$base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR).'/';
 
 		// initialize the namespace prefix array
 		if (isset($this->prefixes[$prefix]) === false) {

internal-api/auth.php

Doc Comments +1 added lines, -2 removed lines

@@ -49,7 +49,6 @@ 
 	 *
 	 * @param string $action The AJAX action we are processing.
 	 * @param string|object $callback_class The class to use for the callback. Either the name of the class or an instance of that class.
-	 * @param string $method The name of the callback method.
 
 	 */
 	public function __construct( $action, $callback_class) {
@@ -123,7 +122,7 @@ 
 	 *
 	 * @access protected
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	protected function if_implements() {
 

Indentation -1 removed lines

@@ -50,7 +50,6 @@
 	 * @param string $action The AJAX action we are processing.
 	 * @param string|object $callback_class The class to use for the callback. Either the name of the class or an instance of that class.
 	 * @param string $method The name of the callback method.
-
 	 */
 	public function __construct( $action, $callback_class) {
 		if ( ! is_object( $callback_class ) ) {

Braces +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	public function __construct( $action, $callback_class) {
 		if ( ! is_object( $callback_class ) ) {
 			$this->callback_instance = new $callback_class;
-		}else{
+		} else{
 			$this->callback_instance = $callback_class;
 		}
 
@@ -149,7 +149,7 @@ 
 	protected function check_nonce() {
 		if ( isset( $this->callback_instance->nonce_action ) ) {
 			$nonce = $this->callback_instance->nonce_action;
-		}else{
+		} else{
 			$nonce = 'lasso_editor';
 		}
 

Spacing +23 added lines, -23 removed lines

@@ -52,28 +52,28 @@ 
 	 * @param string $method The name of the callback method.
 
 	 */
-	public function __construct( $action, $callback_class) {
-		if ( ! is_object( $callback_class ) ) {
+	public function __construct($action, $callback_class) {
+		if (!is_object($callback_class)) {
 			$this->callback_instance = new $callback_class;
-		}else{
+		} else {
 			$this->callback_instance = $callback_class;
 		}
 
-		if ( $this->check_nonce() ) {
-			if ( is_object( $this->callback_instance ) && $this->if_implements() ) {
-				if ( $this->other_auth_checks( $action ) ) {
+		if ($this->check_nonce()) {
+			if (is_object($this->callback_instance) && $this->if_implements()) {
+				if ($this->other_auth_checks($action)) {
 					$this->status_code = 200;
 				} else {
-					$this->error_message = __( 'Unauthorized action', 'lasso' );
+					$this->error_message = __('Unauthorized action', 'lasso');
 					$this->status_code   = 401;
 				}
 			} else {
-				$this->error_message = __( 'All callback classes used for processing the Editus Internal API must implement the lasso\internal_api\api_action interface.', 'lasso' );
+				$this->error_message = __('All callback classes used for processing the Editus Internal API must implement the lasso\internal_api\api_action interface.', 'lasso');
 				$this->status_code   = 401;
 			}
 		} else {
 			$this->status_code   = 401;
-			$this->error_message = __( 'Nonce invalid', 'lasso' );
+			$this->error_message = __('Nonce invalid', 'lasso');
 		}
 
 	}
@@ -89,20 +89,20 @@ 
 	 *
 	 * @return bool True if auth checks were all postive.
 	 */
-	protected function other_auth_checks( $action ) {
+	protected function other_auth_checks($action) {
 		$auth_callbacks = $this->callback_instance->auth_callbacks();
 
-		if ( is_array( $auth_callbacks ) && isset( $auth_callbacks[ $action ] ) && is_array( $auth_callbacks[ $action ] ) ) {
-			$checks = $auth_callbacks[ $action ];
-			if ( is_array( $checks ) ) {
-				foreach ( $checks as $check ) {
-					if ( is_array( $check ) ) {
-						$check = call_user_func( array( $check[0], $check[1] ) );
+		if (is_array($auth_callbacks) && isset($auth_callbacks[$action]) && is_array($auth_callbacks[$action])) {
+			$checks = $auth_callbacks[$action];
+			if (is_array($checks)) {
+				foreach ($checks as $check) {
+					if (is_array($check)) {
+						$check = call_user_func(array($check[0], $check[1]));
 					} else {
-						$check = call_user_func( $check );
+						$check = call_user_func($check);
 					}
 
-					if ( false === $check ) {
+					if (false === $check) {
 						return false;
 
 					}
@@ -127,8 +127,8 @@ 
 	 */
 	protected function if_implements() {
 
-		$implements = class_implements( $this->callback_instance );
-		if ( is_array( $implements ) && in_array( 'lasso\internal_api\api_action', $implements ) ) {
+		$implements = class_implements($this->callback_instance);
+		if (is_array($implements) && in_array('lasso\internal_api\api_action', $implements)) {
 			return true;
 
 		}
@@ -147,13 +147,13 @@ 
 	 * @return bool
 	 */
 	protected function check_nonce() {
-		if ( isset( $this->callback_instance->nonce_action ) ) {
+		if (isset($this->callback_instance->nonce_action)) {
 			$nonce = $this->callback_instance->nonce_action;
-		}else{
+		} else {
 			$nonce = 'lasso_editor';
 		}
 
-		return wp_verify_nonce( $_POST[ 'nonce' ], $nonce );
+		return wp_verify_nonce($_POST['nonce'], $nonce);
 
 	}
 

internal-api/route.php

Doc Comments +1 added lines

@@ -97,6 +97,7 @@
 	 *
 	 * @access protected
 	 *
+	 * @param string $action
 	 * @return array
 	 */
 	protected static function find_callback( $action ) {

Indentation -1 removed lines

@@ -81,7 +81,6 @@
 	 *
 	 * @param string $action The AJAX action we are processing.
 	 * @param string|object $callback The class to use for the callback. Either the name of the class or an instance of that class.
-
 	 *
 	 * @return \lasso\internal_api\auth
 	 */

Braces +6 added lines, -6 removed lines

@@ -36,9 +36,9 @@ 
 				$callback = self::find_callback( strip_tags( $action ) );
 				if ( is_int( $callback )  ) {
 					$code = $callback;
-				}elseif( ! class_exists( $callback['class'] ) ) {
+				} elseif( ! class_exists( $callback['class'] ) ) {
 					$code = 415;
-				}else {
+				} else {
 					$action = str_replace( '-', '_', $action );
 					$callback_instance = new $callback['class'];
 					$auth              = self::auth( $action, $callback_instance, $callback['method'] );
@@ -61,7 +61,7 @@ 
 
 				}
 
-			}else{
+			} else{
 				$code = 401;
 				$response = __( 'Nonce not set.', 'lasso' );
 			}
@@ -167,9 +167,9 @@ 
 
 		if ( is_string( $response ) ) {
 			$data[] = $response;
-		}elseif( is_array( $response ) ) {
+		} elseif( is_array( $response ) ) {
 			$data = $response;
-		}else{
+		} else{
 			$data[] = $code;
 		}
 
@@ -177,7 +177,7 @@ 
 		nocache_headers();
 		if ( 200 == $code ) {
 			wp_send_json_success( $data );
-		}else{
+		} else{
 			wp_send_json_error( $data );
 		}
 

Spacing +41 added lines, -41 removed lines

@@ -24,35 +24,35 @@ 
 		global $wp_query;
 
 		//get action, and if set, possibly act
-		$action = $wp_query->get( 'action' );
-		if ( $action && strpos( $_SERVER['REQUEST_URI'], 'lasso-internal-api' ) ) {
+		$action = $wp_query->get('action');
+		if ($action && strpos($_SERVER['REQUEST_URI'], 'lasso-internal-api')) {
 
-			$response = __( 'Editus API Error.', 'lasso' );
+			$response = __('Editus API Error.', 'lasso');
 			$code = 400;
 
 			//see if have a nonce. Will verify it in auth class.
-			if ( isset( $_POST[ 'nonce' ] ) ) {
+			if (isset($_POST['nonce'])) {
 
-				$callback = self::find_callback( strip_tags( $action ) );
-				if ( is_int( $callback )  ) {
+				$callback = self::find_callback(strip_tags($action));
+				if (is_int($callback)) {
 					$code = $callback;
-				}elseif( ! class_exists( $callback['class'] ) ) {
+				}elseif (!class_exists($callback['class'])) {
 					$code = 415;
-				}else {
-					$action = str_replace( '-', '_', $action );
+				} else {
+					$action = str_replace('-', '_', $action);
 					$callback_instance = new $callback['class'];
-					$auth              = self::auth( $action, $callback_instance, $callback['method'] );
-					if ( 200 == $auth->status_code && is_array( $callback ) ) {
+					$auth              = self::auth($action, $callback_instance, $callback['method']);
+					if (200 == $auth->status_code && is_array($callback)) {
 						$code = 200;
-						$data = new find_data( $callback_instance, $action );
-						if ( is_array( $data->data ) && ! empty( $data->data ) ) {
-							$response = self::route( $action, $callback_instance, $callback['method'], $data->data );
+						$data = new find_data($callback_instance, $action);
+						if (is_array($data->data) && !empty($data->data)) {
+							$response = self::route($action, $callback_instance, $callback['method'], $data->data);
 						} else {
 							$code = 500;
 						}
 
 					} else {
-						if ( isset( $auth->error_message ) && is_string( $auth->error_message ) ) {
+						if (isset($auth->error_message) && is_string($auth->error_message)) {
 							$response = $auth->error_message;
 						}
 
@@ -61,12 +61,12 @@ 
 
 				}
 
-			}else{
+			} else {
 				$code = 401;
-				$response = __( 'Nonce not set.', 'lasso' );
+				$response = __('Nonce not set.', 'lasso');
 			}
 
-			self::respond( $response, $code );
+			self::respond($response, $code);
 
 		}
 
@@ -85,8 +85,8 @@ 
 	 *
 	 * @return \lasso\internal_api\auth
 	 */
-	protected static function auth( $action, $callback ) {
-		return new auth( $action, $callback );
+	protected static function auth($action, $callback) {
+		return new auth($action, $callback);
 
 	}
 
@@ -99,15 +99,15 @@ 
 	 *
 	 * @return array
 	 */
-	protected static function find_callback( $action ) {
-		if ( $action ) {
-			$parts = explode( '_', $action );
+	protected static function find_callback($action) {
+		if ($action) {
+			$parts = explode('_', $action);
 
-			if ( isset( $parts[0] ) && isset( $parts[1] ) && isset( $parts[2] ) ) {
-				$class     = str_replace( '-', '_', $parts[1] );
+			if (isset($parts[0]) && isset($parts[1]) && isset($parts[2])) {
+				$class     = str_replace('-', '_', $parts[1]);
 
 				$class = "\\lasso\\{$parts[0]}\\{$class}";
-				$callback  = str_replace( '-', '_', $parts[2] );
+				$callback  = str_replace('-', '_', $parts[2]);
 
 				return array(
 					'class'  => $class,
@@ -136,9 +136,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected static function route( $action, $callback, $method, $data ) {
-		if (  method_exists( $callback, $method ) ) {
-			$response = call_user_func( array( $callback, $method ), $data  );
+	protected static function route($action, $callback, $method, $data) {
+		if (method_exists($callback, $method)) {
+			$response = call_user_func(array($callback, $method), $data);
 
 			return $response;
 
@@ -156,29 +156,29 @@ 
 	 * @param array|string $response The response message to send.
 	 * @param bool|int $code Response code or bool. If is bool, response code will be 200 or 401
 	 */
-	protected static function respond( $response, $code ) {
-		if ( true === $code ) {
+	protected static function respond($response, $code) {
+		if (true === $code) {
 			$code = 200;
 		}
 
-		if ( false == $code ) {
+		if (false == $code) {
 			$code = 401;
 		}
 
-		if ( is_string( $response ) ) {
+		if (is_string($response)) {
 			$data[] = $response;
-		}elseif( is_array( $response ) ) {
+		}elseif (is_array($response)) {
 			$data = $response;
-		}else{
+		} else {
 			$data[] = $code;
 		}
 
-		status_header( $code );
+		status_header($code);
 		nocache_headers();
-		if ( 200 == $code ) {
-			wp_send_json_success( $data );
-		}else{
-			wp_send_json_error( $data );
+		if (200 == $code) {
+			wp_send_json_success($data);
+		} else {
+			wp_send_json_error($data);
 		}
 
 	}
@@ -200,7 +200,7 @@ 
 	 */
 	public static function init() {
 
-		if ( ! self::$instance ) {
+		if (!self::$instance) {
 			self::$instance = new self;
 		}
 

admin/includes/menus/license.php

Braces +20 added lines, -12 removed lines

@@ -106,8 +106,10 @@ 
 		if ( isset( $_POST['edd_license_activate'] ) ) {
 
 			// run a quick security check
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
-				return; // get out if we didn't click the Activate button
+			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' ) );
@@ -124,8 +126,9 @@ 
 			$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 ) )
-				return false;
+			if ( is_wp_error( $response ) ) {
+							return false;
+			}
 
 			// decode the license data
 			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
@@ -143,8 +146,10 @@ 
 		if ( isset( $_POST['edd_license_deactivate'] ) ) {
 
 			// run a quick security check
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
-				return; // get out if we didn't click the Activate button
+			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' ) );
@@ -162,15 +167,17 @@ 
 			$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 ) )
-				return false;
+			if ( is_wp_error( $response ) ) {
+							return false;
+			}
 
 			// decode the license data
 			$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' );
+			}
 
 		}
 	}
@@ -192,8 +199,9 @@ 
 		// Call the custom API.
 		$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
 
-		if ( is_wp_error( $response ) )
-			return false;
+		if ( is_wp_error( $response ) ) {
+					return false;
+		}
 
 		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
 

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 {

bootstrap.php

Spacing +12 added lines, -12 removed lines

@@ -9,7 +9,7 @@ 
 /*----------------------------------------------------------------------------*
  * Register Autoloader
  *----------------------------------------------------------------------------*/
-include_once( LASSO_DIR . '/includes/lasso_autoloader.php' );
+include_once(LASSO_DIR.'/includes/lasso_autoloader.php');
 $loader = new lasso_autoloader();
 
 $loader->register();
@@ -19,19 +19,19 @@ 
  *----------------------------------------------------------------------------*/
 //require_once plugin_dir_path( __FILE__ ) . 'public/class-lasso.php';
 
-$loader->addNamespace('lasso', LASSO_DIR . 'includes' );
-$loader->addNamespace('lasso_public_facing', LASSO_DIR . 'public/includes' );
-$loader->addNamespace('lasso\internal_api', LASSO_DIR . 'internal-api' );
+$loader->addNamespace('lasso', LASSO_DIR.'includes');
+$loader->addNamespace('lasso_public_facing', LASSO_DIR.'public/includes');
+$loader->addNamespace('lasso\internal_api', LASSO_DIR.'internal-api');
 new lasso\internal_api\end_points();
 
-register_activation_hook( __FILE__, array( 'lasso_public_facing\lasso', 'activate' ) );
-register_deactivation_hook( __FILE__, array( 'lasso_public_facing\lasso', 'deactivate' ) );
+register_activation_hook(__FILE__, array('lasso_public_facing\lasso', 'activate'));
+register_deactivation_hook(__FILE__, array('lasso_public_facing\lasso', 'deactivate'));
 
-add_action( 'plugins_loaded', array( 'lasso_public_facing\lasso', 'get_instance' ) );
+add_action('plugins_loaded', array('lasso_public_facing\lasso', 'get_instance'));
 
 //load tour
-add_action(  'init', function() {
-	if (! is_admin() && is_user_logged_in() ) {
+add_action('init', function() {
+	if (!is_admin() && is_user_logged_in()) {
 		new \lasso_public_facing\tour();
 	}
 });
@@ -41,8 +41,8 @@ 
  * Dashboard and Administrative Functionality
  *----------------------------------------------------------------------------*/
 
-if ( is_admin() ) {
-	$loader->addNamespace('lasso_admin', LASSO_DIR . 'admin/includes' );
-	add_action( 'plugins_loaded', array( 'lasso_admin\load_admin', 'get_instance' ) );
+if (is_admin()) {
+	$loader->addNamespace('lasso_admin', LASSO_DIR.'admin/includes');
+	add_action('plugins_loaded', array('lasso_admin\load_admin', 'get_instance'));
 
 }

includes/process/delete.php

Spacing +8 added lines, -8 removed lines

@@ -25,12 +25,12 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function post( $data ) {
+	public function post($data) {
 
-		$postid = isset( $data['postid'] ) ? $data['postid'] : false;
+		$postid = isset($data['postid']) ? $data['postid'] : false;
 
 		// bail out if teh current user can't publish posts
-		if ( !lasso_user_can( 'delete_post', $postid ) )
+		if (!lasso_user_can('delete_post', $postid))
 			return;
 
 		$args = array(
@@ -38,9 +38,9 @@ 
 			'post_status' 	=> 'trash'
 		);
 
-		wp_update_post( apply_filters( 'lasso_object_deleted_args', $args ) );
+		wp_update_post(apply_filters('lasso_object_deleted_args', $args));
 
-		do_action( 'lasso_object_deleted', $postid, get_current_user_ID() );
+		do_action('lasso_object_deleted', $postid, get_current_user_ID());
 
 		return true;
 	}
@@ -52,8 +52,8 @@ 
 	 *
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_delete_post' ] = array(
+	public static function params() {
+		$params['process_delete_post'] = array(
 			'postid' => 'absint',
 		);
 
@@ -68,7 +68,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_delete_post' ] = array(
+		$params['process_delete_post'] = array(
 			'lasso_user_can'
 		);
 

Braces +3 added lines, -2 removed lines

@@ -30,8 +30,9 @@
 		$postid = isset( $data['postid'] ) ? $data['postid'] : false;
 
 		// bail out if teh current user can't publish posts
-		if ( !lasso_user_can( 'delete_post', $postid ) )
-			return;
+		if ( !lasso_user_can( 'delete_post', $postid ) ) {
+					return;
+		}
 
 		$args = array(
 			'ID'   			=> (int) $postid,

includes/process/gallery.php

Braces +5 added lines, -4 removed lines

@@ -119,9 +119,9 @@ 
 		$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' ] ) {
+		} elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) {
 			$type = $options[ 'galleryType' ];
-		}else{
+		} else{
 			$type = false;
 		}
 
@@ -173,8 +173,9 @@ 
 	 */
 	private function get_the_images( $image_ids = '' ) {
 
-		if ( empty( $image_ids ) )
-			return;
+		if ( empty( $image_ids ) ) {
+					return;
+		}
 
 		$image_ids  = array_map( 'intval', explode( ',', $image_ids ) );
 

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/process/map.php

Spacing +15 added lines, -15 removed lines

@@ -28,27 +28,27 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function save( $data ) {
+	public function save($data) {
 
-		$postid     	= isset( $data['postid'] ) ? $data['postid'] : false;
-		$locations    	= isset( $data['ase-map-component-locations'] ) ? $data['ase-map-component-locations'] : false;
-		$start_point    = isset( $data['ase-map-component-start-point'] ) ? $data['ase-map-component-start-point']: false;
-		$zoom       	= isset( $data['ase-map-component-zoom'] ) ? $data['ase-map-component-zoom' ] : false;
+		$postid     	= isset($data['postid']) ? $data['postid'] : false;
+		$locations = isset($data['ase-map-component-locations']) ? $data['ase-map-component-locations'] : false;
+		$start_point = isset($data['ase-map-component-start-point']) ? $data['ase-map-component-start-point'] : false;
+		$zoom       	= isset($data['ase-map-component-zoom']) ? $data['ase-map-component-zoom'] : false;
 
-		if ( is_array( $locations ) ) {
-			delete_post_meta( $postid, 'ase_map_component_locations' );
+		if (is_array($locations)) {
+			delete_post_meta($postid, 'ase_map_component_locations');
 
 			// update locations if set
-			foreach ( $locations as $location ) {
-				$point = json_decode( urldecode( $location ), true );
-				add_post_meta( $postid, 'ase_map_component_locations', $point );
+			foreach ($locations as $location) {
+				$point = json_decode(urldecode($location), true);
+				add_post_meta($postid, 'ase_map_component_locations', $point);
 			}
 
 			// udpate start point
-			update_post_meta( $postid, 'ase_map_component_start_point', $start_point );
+			update_post_meta($postid, 'ase_map_component_start_point', $start_point);
 
 			// update zoom
-			update_post_meta( $postid, 'ase_map_component_zoom', $zoom );
+			update_post_meta($postid, 'ase_map_component_zoom', $zoom);
 		}
 
 		return true;
@@ -62,8 +62,8 @@ 
 	 *
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_map_save' ] = array(
+	public static function params() {
+		$params['process_map_save'] = array(
 			'postid' => 'absint',
 			'ase-map-component-locations' => 'lasso_sanitize_data',
 			'ase-map-component-start-point' => array(
@@ -87,7 +87,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_map_save' ] = array(
+		$params['process_map_save'] = array(
 			'lasso_user_can'
 		);