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

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 Lasso Internal API must implement the lasso\internal_api\api_action interface.', 'lasso' );
+				$this->error_message = __('All callback classes used for processing the Lasso 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);
 
 	}
 

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

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
 	 */

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

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 = __( 'Lasso API Error.', 'lasso' );
+			$response = __('Lasso 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;
 		}
 

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

Indentation +6 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Route the requests
- *
- * @package   lasso
- * @author    Josh Pollock <Josh@JoshPress.net>
- * @license   GPL-2.0+
- */
+	 * Route the requests
+	 *
+	 * @package   lasso
+	 * @author    Josh Pollock <Josh@JoshPress.net>
+	 * @license   GPL-2.0+
+	 */
 
 namespace lasso\internal_api;
 
@@ -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
 	 */

public/includes/helpers.php

Doc Comments +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@ 
  * If we're on multsite we'll grab the site option which is stored in the main blogs site option tables, otherwise
  * we'll grab the option which is stored on the single blogs option tables
  *
- * @param unknown $option  string name of the option
- * @param unknown $section string name of the section
+ * @param string $option  string name of the option
+ * @param string $section string name of the section
  * @param unknown $default string/int default option value
  * @return the option value
  * @since 1.0
@@ -52,7 +52,7 @@ 
  * Return a CSS class of an automatically supported theme
  *
  * @since 0.8.6
- * @return a css class if the theme is supported, false if nothing
+ * @return string|false css class if the theme is supported, false if nothing
  */
 function lasso_get_supported_theme_class() {
 
@@ -228,7 +228,7 @@ 
 *	Used internally as a callback to build a tab or content area for modal addons
 *
 *	@param $tab object
-*	@param $type string tab or content
+*	@param string $type string tab or content
 *	@uses lasso_modal_addons()
 *	@since 0.9.4
 */

Indentation +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 		'public' => true,
 	), 'objects' );
 	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
-    unset( $post_types[ 'attachment' ] );
+	unset( $post_types[ 'attachment' ] );
 
 	/**
 	 * Set which post types are allowed

Braces +27 added lines, -19 removed lines

@@ -14,8 +14,9 @@ 
  */
 function lasso_editor_get_option( $option, $section, $default = '' ) {
 
-	if ( empty( $option ) )
-		return;
+	if ( empty( $option ) ) {
+			return;
+	}
 
 	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 
@@ -42,11 +43,12 @@ 
 
 	$q = new wp_query( array( 'post_type' => 'ai_galleries', 'post_status' => 'publish' ) );
 
-	if ( $q->have_posts() )
-		return true;
-	else
-		return false;
-}
+	if ( $q->have_posts() ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Return a CSS class of an automatically supported theme
@@ -149,13 +151,15 @@ 
 */
 function lasso_get_post_objects( $postid = '', $taxonomy = 'category') {
 
-	if ( empty( $postid ) )
-		$postid = get_the_ID();
+	if ( empty( $postid ) ) {
+			$postid = get_the_ID();
+	}
 
 	$objects = 'category' == $taxonomy ? get_the_category( $postid ) : get_the_tags( $postid );
 
-	if ( empty( $objects) )
-		return;
+	if ( empty( $objects) ) {
+			return;
+	}
 
 	$out = '';
 	foreach( $objects as $object ) {
@@ -176,8 +180,9 @@ 
 
 	$objects = 'category' == $taxonomy ? get_categories(array('hide_empty' => 0)) : get_tags(array('hide_empty' => 0));
 
-	if ( empty( $objects) )
-		return;
+	if ( empty( $objects) ) {
+			return;
+	}
 
 	$out = array();
 	foreach( $objects as $object ) {
@@ -264,8 +269,9 @@ 
 */
 function lasso_clean_string( $string = '' ) {
 
-	if ( empty( $string ) )
-		return;
+	if ( empty( $string ) ) {
+			return;
+	}
 
 	return sanitize_text_field( strtolower( preg_replace('/[\s_]/', '-', $string ) ) );
 }
@@ -304,11 +310,13 @@ 
 if ( !function_exists( 'lasso_user_can' ) ):
 	function lasso_user_can( $action = '', $postid = 0 ) {
 
-		if ( empty( $action ) )
-			$action = 'edit_posts';
+		if ( empty( $action ) ) {
+					$action = 'edit_posts';
+		}
 
-		if ( empty( $postid ) )
-			$postid = get_the_ID();
+		if ( empty( $postid ) ) {
+					$postid = get_the_ID();
+		}
 
 		if ( is_user_logged_in() && current_user_can( $action, $postid ) ) {
 

Spacing +61 added lines, -61 removed lines

@@ -12,21 +12,21 @@ 
  * @return the option value
  * @since 1.0
  */
-function lasso_editor_get_option( $option, $section, $default = '' ) {
+function lasso_editor_get_option($option, $section, $default = '') {
 
-	if ( empty( $option ) )
+	if (empty($option))
 		return;
 
-	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+	if (function_exists('is_multisite') && is_multisite()) {
 
-		$options = get_site_option( $section );
+		$options = get_site_option($section);
 
 	} else {
 
-		$options = get_option( $section );
+		$options = get_option($section);
 	}
 
-	if ( isset( $options[$option] ) ) {
+	if (isset($options[$option])) {
 		return $options[$option];
 	}
 
@@ -40,9 +40,9 @@ 
  */
 function lasso_editor_galleries_exist() {
 
-	$q = new wp_query( array( 'post_type' => 'ai_galleries', 'post_status' => 'publish' ) );
+	$q = new wp_query(array('post_type' => 'ai_galleries', 'post_status' => 'publish'));
 
-	if ( $q->have_posts() )
+	if ($q->have_posts())
 		return true;
 	else
 		return false;
@@ -57,9 +57,9 @@ 
 function lasso_get_supported_theme_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	switch ( $slug ) {
+	switch ($slug) {
 		case 'aesop-story-theme': // aesop
 			$out = '.aesop-entry-content';
 			break;
@@ -108,15 +108,15 @@ 
 
 	}
 
-	return !empty( $out ) ? $out : false;
+	return !empty($out) ? $out : false;
 }
 
 function lasso_get_supported_theme_title_class() {
 
 	$name  	= wp_get_theme()->get('Name');
-	$slug  	= lasso_clean_string( $name );
+	$slug  	= lasso_clean_string($name);
 
-	switch ( $slug ) {
+	switch ($slug) {
 
 		case 'aesop-story-theme': // aesop
 			$out = '.aesop-entry-title';
@@ -144,7 +144,7 @@ 
 			break;
 	}
 
-	return !empty( $out ) ? $out : false;
+	return !empty($out) ? $out : false;
 }
 
 /**
@@ -154,7 +154,7 @@ 
 *	@since 0.8.7
 *	@return string of comma separated classes
 */
-function lasso_supported_no_save(){
+function lasso_supported_no_save() {
 
 	return apply_filters('lasso_dont_save', '.lasso--ignore, .sharedaddy, .us_wrapper, .twitter-tweet');
 }
@@ -168,8 +168,8 @@ 
  *
  * @return array|mixed|object|string|void
  */
-function lasso_sanitize_data( $data ) {
-	return \lasso\sanatize::do_sanitize( $data );
+function lasso_sanitize_data($data) {
+	return \lasso\sanatize::do_sanitize($data);
 
 }
 
@@ -179,18 +179,18 @@ 
  *	@since 0.9.3
  *	@return string of comma delimited category slugs
 */
-function lasso_get_post_objects( $postid = '', $taxonomy = 'category') {
+function lasso_get_post_objects($postid = '', $taxonomy = 'category') {
 
-	if ( empty( $postid ) )
+	if (empty($postid))
 		$postid = get_the_ID();
 
-	$objects = 'category' == $taxonomy ? get_the_category( $postid ) : get_the_tags( $postid );
+	$objects = 'category' == $taxonomy ? get_the_category($postid) : get_the_tags($postid);
 
-	if ( empty( $objects) )
+	if (empty($objects))
 		return;
 
 	$out = '';
-	foreach( $objects as $object ) {
+	foreach ($objects as $object) {
 		$out .= $object->slug.', ';
 	}
 
@@ -204,15 +204,15 @@ 
  *	@since 0.9.3
  *	@return array all categoiries
 */
-function lasso_get_objects( $taxonomy = 'category' ) {
+function lasso_get_objects($taxonomy = 'category') {
 
 	$objects = 'category' == $taxonomy ? get_categories(array('hide_empty' => 0)) : get_tags(array('hide_empty' => 0));
 
-	if ( empty( $objects) )
+	if (empty($objects))
 		return;
 
 	$out = array();
-	foreach( $objects as $object ) {
+	foreach ($objects as $object) {
 		$out[] = $object->slug;
 	}
 
@@ -228,11 +228,11 @@ 
  */
 function lasso_post_types() {
 
-	$post_types = get_post_types( array(
+	$post_types = get_post_types(array(
 		'public' => true,
-	), 'objects' );
-	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
-    unset( $post_types[ 'attachment' ] );
+	), 'objects');
+	$post_types = array_combine(array_keys($post_types), wp_list_pluck($post_types, 'label'));
+    unset($post_types['attachment']);
 
 	/**
 	 * Set which post types are allowed
@@ -241,10 +241,10 @@ 
 	 *
 	 * @param array $allowed_post_types Array of names (not labels) of allowed post types. Must be registered.
 	 */
-	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', array( 'post', 'page' ) );
-	foreach( $post_types as $name => $label ) {
-		if ( ! in_array( $name, $allowed_post_types ) ) {
-			unset( $post_types[ $name ] );
+	$allowed_post_types = apply_filters('lasso_allowed_post_types', array('post', 'page'));
+	foreach ($post_types as $name => $label) {
+		if (!in_array($name, $allowed_post_types)) {
+			unset($post_types[$name]);
 		}
 
 	}
@@ -264,22 +264,22 @@ 
 *	@uses lasso_modal_addons()
 *	@since 0.9.4
 */
-function lasso_modal_addons_content( $tab = '', $type ){
+function lasso_modal_addons_content($tab = '', $type) {
 
-	$name = lasso_clean_string( $tab['name'] );
+	$name = lasso_clean_string($tab['name']);
 
-	if ( 'tab' == $type ) {
+	if ('tab' == $type) {
 
-		$out = sprintf( '<li data-addon-name="%s">%s</li>', $name, $tab['name'] );
+		$out = sprintf('<li data-addon-name="%s">%s</li>', $name, $tab['name']);
 
-	} else if ( 'content' == $type ){
+	} else if ('content' == $type) {
 
-		$content = isset( $tab['content'] ) && is_callable( $tab['content'] ) ? call_user_func( $tab['content'] ) : false;
-		$options = isset( $tab['options'] ) && is_callable( $tab['options'] ) ? call_user_func( $tab['options'] ) : false;
+		$content = isset($tab['content']) && is_callable($tab['content']) ? call_user_func($tab['content']) : false;
+		$options = isset($tab['options']) && is_callable($tab['options']) ? call_user_func($tab['options']) : false;
 
-		$out = sprintf( '<div class="lasso--modal__content not-visible" data-addon-content="%s">
+		$out = sprintf('<div class="lasso--modal__content not-visible" data-addon-content="%s">
 			%s%s
-			</div>', $name, $content, lasso_option_form( $name, $options ) );
+			</div>', $name, $content, lasso_option_form($name, $options));
 
 	}
 
@@ -294,12 +294,12 @@ 
 *
 * @return void|string
 */
-function lasso_clean_string( $string = '' ) {
+function lasso_clean_string($string = '') {
 
-	if ( empty( $string ) )
+	if (empty($string))
 		return;
 
-	return sanitize_text_field( strtolower( preg_replace('/[\s_]/', '-', $string ) ) );
+	return sanitize_text_field(strtolower(preg_replace('/[\s_]/', '-', $string)));
 }
 
 /**
@@ -312,13 +312,13 @@ 
  *
  * @return void|string
  */
-function lasso_unclean_string( $string = '' ) {
+function lasso_unclean_string($string = '') {
 
-	if ( empty( $string ) ) {
+	if (empty($string)) {
 		return;
 	}
 
-	return sanitize_text_field( strtolower( str_replace( '-', '_', $string ) ) );
+	return sanitize_text_field(strtolower(str_replace('-', '_', $string)));
 }
 
 
@@ -333,16 +333,16 @@ 
  * @param unknown $postid int the id of the post object to check against
  * @since 1.0
  */
-if ( !function_exists( 'lasso_user_can' ) ):
-	function lasso_user_can( $action = '', $postid = 0 ) {
+if (!function_exists('lasso_user_can')):
+	function lasso_user_can($action = '', $postid = 0) {
 
-		if ( empty( $action ) )
+		if (empty($action))
 			$action = 'edit_posts';
 
-		if ( empty( $postid ) )
+		if (empty($postid))
 			$postid = get_the_ID();
 
-		if ( is_user_logged_in() && current_user_can( $action, $postid ) ) {
+		if (is_user_logged_in() && current_user_can($action, $postid)) {
 
 			return true;
 
@@ -360,25 +360,25 @@ 
 *
 *	@since 0.9.5
 */
-if ( !function_exists('lasso_editor_empty_results') ):
+if (!function_exists('lasso_editor_empty_results')):
 
-	function lasso_editor_empty_results( $type = 'posts' ){
+	function lasso_editor_empty_results($type = 'posts') {
 
-		if ( 'posts' == $type ) {
+		if ('posts' == $type) {
 
-			$string = apply_filters('lasso_empty_state_message', __('No posts to show', 'lasso') );
+			$string = apply_filters('lasso_empty_state_message', __('No posts to show', 'lasso'));
 			$icon = 'lasso-icon-file-text2';
 			$button = false;
 
-		} elseif ( 'revision' == $type ) {
+		} elseif ('revision' == $type) {
 
-			$string = apply_filters('lasso_empty_state_message', __('No revisions found', 'lasso') );
+			$string = apply_filters('lasso_empty_state_message', __('No revisions found', 'lasso'));
 			$icon = 'lasso-icon-history';
-			$button = sprintf('<a href="#" class="lasso--btn-secondary" id="lasso--close-modal">%s</a>', __('Close','lasso') );
+			$button = sprintf('<a href="#" class="lasso--btn-secondary" id="lasso--close-modal">%s</a>', __('Close', 'lasso'));
 
 		}
 
-		return sprintf('<div id="lasso--empty-state" class="lasso--empty-state"><i class="lasso--empty-state-icon lasso-icon %s"></i><p>%s</p>%s</div>', $icon, $string, $button );
+		return sprintf('<div id="lasso--empty-state" class="lasso--empty-state"><i class="lasso--empty-state-icon lasso-icon %s"></i><p>%s</p>%s</div>', $icon, $string, $button);
 	}
 
 endif;

public/includes/lasso.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	 *
 	 * @since    0.0.1
 	 *
-	 * @return    Plugin slug variable.
+	 * @return    string slug variable.
 	 */
 	public function get_plugin_slug() {
 		return $this->plugin_slug;

Spacing +24 added lines, -24 removed lines

@@ -51,10 +51,10 @@ 
 		require_once LASSO_DIR.'/public/includes/option-engine.php';
 
 		// Activate plugin when new blog is added
-		add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) );
+		add_action('wpmu_new_blog', array($this, 'activate_new_site'));
 
 		// Load plugin text domain
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
+		add_action('init', array($this, 'load_plugin_textdomain'));
 
 		//enqueue assets
 		new assets();
@@ -82,7 +82,7 @@ 
 	public static function get_instance() {
 
 		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
+		if (null == self::$instance) {
 			self::$instance = new self;
 		}
 
@@ -99,18 +99,18 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       activated on an individual blog.
 	 */
-	public static function activate( $network_wide ) {
+	public static function activate($network_wide) {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide  ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_activate();
 				}
 
@@ -136,18 +136,18 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       deactivated on an individual blog.
 	 */
-	public static function deactivate( $network_wide ) {
+	public static function deactivate($network_wide) {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_deactivate();
 
 				}
@@ -171,13 +171,13 @@ 
 	 *
 	 * @param int     $blog_id ID of the new blog.
 	 */
-	public function activate_new_site( $blog_id ) {
+	public function activate_new_site($blog_id) {
 
-		if ( 1 !== did_action( 'wpmu_new_blog' ) ) {
+		if (1 !== did_action('wpmu_new_blog')) {
 			return;
 		}
 
-		switch_to_blog( $blog_id );
+		switch_to_blog($blog_id);
 		self::single_activate();
 		restore_current_blog();
 
@@ -202,7 +202,7 @@ 
 			WHERE archived = '0' AND spam = '0'
 			AND deleted = '0'";
 
-		return $wpdb->get_col( $sql );
+		return $wpdb->get_col($sql);
 
 	}
 
@@ -213,18 +213,18 @@ 
 	 */
 	private static function single_activate() {
 
-		$curr_version = get_option( 'lasso_version' );
+		$curr_version = get_option('lasso_version');
 
 		// update upgraded from
-		if ( $curr_version ) {
-			update_option( 'lasso_updated_from', $curr_version );
+		if ($curr_version) {
+			update_option('lasso_updated_from', $curr_version);
 		}
 
 		// update lasso version option
-		update_option( 'lasso_version', LASSO_VERSION );
+		update_option('lasso_version', LASSO_VERSION);
 
 		// set transietn for activation welcome
-		set_transient( '_lasso_welcome_redirect', true, 30 );
+		set_transient('_lasso_welcome_redirect', true, 30);
 
 
 	}
@@ -246,8 +246,8 @@ 
 	public function load_plugin_textdomain() {
 
 		$domain = $this->plugin_slug;
-		$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+		$locale = apply_filters('plugin_locale', get_locale(), $domain);
 
-		$out = load_textdomain( $domain, trailingslashit( LASSO_DIR ). 'languages/' . $domain . '-' . $locale . '.mo' );
+		$out = load_textdomain($domain, trailingslashit(LASSO_DIR).'languages/'.$domain.'-'.$locale.'.mo');
 	}
 }

Indentation +13 added lines, -13 removed lines

@@ -1,20 +1,20 @@
 <?php
 /**
- * AH Editor
- *
- * @package   Lasso
- * @author    Nick Haskins <nick@aesopinteractive.com>
- * @license   GPL-2.0+
- * @link      http://aesopinteractive.com
- * @copyright 2015 Aesopinteractive LLC
- */
+	 * AH Editor
+	 *
+	 * @package   Lasso
+	 * @author    Nick Haskins <nick@aesopinteractive.com>
+	 * @license   GPL-2.0+
+	 * @link      http://aesopinteractive.com
+	 * @copyright 2015 Aesopinteractive LLC
+	 */
 namespace lasso_public_facing;
 /**
- *
- *
- * @package Lasso
- * @author  Nick Haskins <nick@aesopinteractive.com>
- */
+	 *
+	 *
+	 * @package Lasso
+	 * @author  Nick Haskins <nick@aesopinteractive.com>
+	 */
 class lasso {
 
 	/**

admin/includes/load_admin.php

Spacing +34 added lines, -34 removed lines

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

Indentation +21 added lines, -21 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * AH Stripe
- *
- * @package   Editus_Admin
- * @author    Nick Haskins <nick@aesopinteractive.com>
- * @license   GPL-2.0+
- * @link      http://aesopinteractive.com
- * @copyright 2015 Aesopinteractive LLC
- */
+	 * AH Stripe
+	 *
+	 * @package   Editus_Admin
+	 * @author    Nick Haskins <nick@aesopinteractive.com>
+	 * @license   GPL-2.0+
+	 * @link      http://aesopinteractive.com
+	 * @copyright 2015 Aesopinteractive LLC
+	 */
 namespace lasso_admin;
 
 use lasso_public_facing\lasso;
@@ -127,11 +127,11 @@ 
 	}
 
 	/**
-	*	Adds an admin notice reminding the user if their license key has not been saved
-	*
-	*	@since 0.9.7
-	*	@todo make dismissible
-	*/
+	 *	Adds an admin notice reminding the user if their license key has not been saved
+	 *
+	 *	@since 0.9.7
+	 *	@todo make dismissible
+	 */
 	public function license_nag(){
 
 		$screen 	= get_current_screen();
@@ -152,26 +152,26 @@ 
 
 			if ( empty( $license ) ) {
 
-        		printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
+				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
 
-        	} else if ( 'invalid' == $status ){ // license key entered wrong or something
+			} else if ( 'invalid' == $status ){ // license key entered wrong or something
 
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link , $dismiss_link );
 
-        	} else if ( empty( $status ) ){ // license key saved but not activated
+			} else if ( empty( $status ) ){ // license key saved but not activated
 
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link );
 
-        	}
+			}
 		}
 
 	}
 
 	/**
-	*  Process hiding the dimiss
-	*
-	* @since 0.9.7
-	*/
+	 *  Process hiding the dimiss
+	 *
+	 * @since 0.9.7
+	 */
 	public function dismiss_nag() {
 
 		if ( isset( $_GET['lasso-notice'] ) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options') ) {

admin/includes/menus/license.php

Spacing +57 added lines, -57 removed lines

@@ -6,79 +6,79 @@ 
 
 	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( '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('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')
 			)
 		);
 
 	}
 	function license_menu() {
 
-		if ( function_exists( 'is_multisite' ) && !is_multisite() ) {
-			add_submenu_page( 'lasso-editor', __( 'License Key', 'lasso' ), __( 'License', 'lasso' ), 'manage_options', 'lasso-license', array( $this, 'license_page' ) );
+		if (function_exists('is_multisite') && !is_multisite()) {
+			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
@@ -87,14 +87,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;
 	}
@@ -103,36 +103,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);
 
 		}
 	}
@@ -140,37 +140,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');
 
 		}
 	}
@@ -180,24 +180,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 {

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

admin/includes/menus/settings.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * Class responsible for adding a settings submenu
- *
- */
+	 * Class responsible for adding a settings submenu
+	 *
+	 */
 namespace lasso_admin\menus;
 
 class settings {

Spacing +55 added lines, -55 removed lines

@@ -9,9 +9,9 @@ 
 
 	function __construct() {
 
-		add_action( 'admin_menu',     array( $this, 'menu' ) );
-		add_action( 'network_admin_menu',   array( $this, 'menu' ) );
-		add_action( 'wp_ajax_lasso-editor-settings', array( $this, 'process_settings' ) );
+		add_action('admin_menu', array($this, 'menu'));
+		add_action('network_admin_menu', array($this, 'menu'));
+		add_action('wp_ajax_lasso-editor-settings', array($this, 'process_settings'));
 
 	}
 
@@ -22,13 +22,13 @@ 
 	 */
 	function menu() {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			add_submenu_page( 'settings.php', __( 'Editus', 'lasso' ), __( 'Editus', 'lasso' ), 'manage_network', 'lasso-editor', array( $this, 'settings' ) );
+			add_submenu_page('settings.php', __('Editus', 'lasso'), __('Editus', 'lasso'), 'manage_network', 'lasso-editor', array($this, 'settings'));
 
 		} else {
 
-			add_submenu_page( 'lasso-editor', __( 'Settings', 'lasso' ), __( 'Settings', 'lasso' ), 'manage_options', 'lasso-editor-settings', array( $this, 'settings' ) );
+			add_submenu_page('lasso-editor', __('Settings', 'lasso'), __('Settings', 'lasso'), 'manage_options', 'lasso-editor-settings', array($this, 'settings'));
 
 		}
 	}
@@ -51,22 +51,22 @@ 
 	function process_settings() {
 
 		// bail out if current user isn't and administrator and they are not logged in
-		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() )
+		if (!current_user_can('manage_options') || !is_user_logged_in())
 			return;
 
-		if ( isset( $_POST['action'] ) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer( 'nonce', 'lasso_editor_settings' ) ) {
+		if (isset($_POST['action']) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer('nonce', 'lasso_editor_settings')) {
 
-			$options = isset( $_POST['lasso_editor'] ) ? $_POST['lasso_editor'] : false;
+			$options = isset($_POST['lasso_editor']) ? $_POST['lasso_editor'] : false;
 
-			$options = array_map( 'sanitize_text_field', $options );
+			$options = array_map('sanitize_text_field', $options);
 
-			if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+			if (function_exists('is_multisite') && is_multisite()) {
 
-				update_site_option( 'lasso_editor', $options );
+				update_site_option('lasso_editor', $options);
 
 			} else {
 
-				update_option( 'lasso_editor', $options );
+				update_option('lasso_editor', $options);
 			}
 
 			wp_send_json_success();
@@ -88,111 +88,111 @@ 
 	 */
 	function lasso_editor_settings_form() {
 
-		if ( !is_user_logged_in() )
+		if (!is_user_logged_in())
 			return;
 
-		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
-		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );
-		$titleClass    = lasso_editor_get_option( 'title_class', 'lasso_editor' );
+		$article_object = lasso_editor_get_option('article_class', 'lasso_editor');
+		$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+		$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
 
-		$post_new_disabled   = lasso_editor_get_option( 'post_adding_disabled', 'lasso_editor' );
-		$save_to_post_disabled  = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
-		$post_settings_disabled = lasso_editor_get_option( 'post_settings_disabled', 'lasso_editor' );
-		$shortcodify_disabled  = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
+		$post_new_disabled = lasso_editor_get_option('post_adding_disabled', 'lasso_editor');
+		$save_to_post_disabled  = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
+		$post_settings_disabled = lasso_editor_get_option('post_settings_disabled', 'lasso_editor');
+		$shortcodify_disabled  = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
 
-		$toolbar_headings      = lasso_editor_get_option( 'toolbar_headings', 'lasso_editor' );
-		$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
+		$toolbar_headings      = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+		$objectsNoSave = lasso_editor_get_option('dont_save', 'lasso_editor');
 
 ?>
 		<div class="wrap">
 
-	    	<h2><?php _e( 'Editus Settings', 'lasso' );?></h2>
+	    	<h2><?php _e('Editus Settings', 'lasso'); ?></h2>
 
 			<form id="lasso-editor-settings-form" class="lasso--form-settings" method="post" enctype="multipart/form-data">
 
-				<?php do_action('lasso_settings_before');?>
+				<?php do_action('lasso_settings_before'); ?>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Article Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso' );?></span>
-						<input required type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr( $article_object );?>" placeholder=".entry-content">
+						<label><?php _e('Article Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso'); ?></span>
+						<input required type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr($article_object); ?>" placeholder=".entry-content">
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Featured Image Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr( $featImgClass );?>" placeholder=".entry-content">
+						<label><?php _e('Featured Image Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr($featImgClass); ?>" placeholder=".entry-content">
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Article Title Class', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso' );?></span>
-						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr( $titleClass );?>" placeholder=".entry-content">
+						<label><?php _e('Article Title Class', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso'); ?></span>
+						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr($titleClass); ?>" placeholder=".entry-content">
 					</div>
 				</div>
 
 				<!-- Advanced -->
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<label><?php _e( 'Ignored Items to Save', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso' );?></span>
-						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr( $objectsNoSave );?></textarea>
+						<label><?php _e('Ignored Items to Save', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso'); ?></span>
+						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr($objectsNoSave); ?></textarea>
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked( $toolbar_headings, 'on' );?> >
-						<label for="lasso_editor[toolbar_headings]"><?php _e( 'Enable Toolbar Headings', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'By default the H2 and H3 options for headings are in the insert HTML area. You may prefer those headings to act just like the underline, and strikethrough, so toggling this will add them to the toolbar.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked($toolbar_headings, 'on'); ?> >
+						<label for="lasso_editor[toolbar_headings]"><?php _e('Enable Toolbar Headings', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('By default the H2 and H3 options for headings are in the insert HTML area. You may prefer those headings to act just like the underline, and strikethrough, so toggling this will add them to the toolbar.', 'lasso'); ?></span>
 
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked( $save_to_post_disabled, 'on' );?> >
-						<label for="lasso_editor[post_save_disabled]"><?php _e( 'Disable Post Saving', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked($save_to_post_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_save_disabled]"><?php _e('Disable Post Saving', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso'); ?></span>
 
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked( $post_settings_disabled, 'on' );?> >
-						<label for="lasso_editor[post_settings_disabled]"> <?php _e( 'Disable Post Settings', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this to disable users from being able to edit post settings from the front-end.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked($post_settings_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_settings_disabled]"> <?php _e('Disable Post Settings', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this to disable users from being able to edit post settings from the front-end.', 'lasso'); ?></span>
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked( $post_new_disabled, 'on' );?> >
-						<label for="lasso_editor[post_adding_disabled]"><?php _e( 'Disable Post Adding', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable users from being able to add new posts from the front-end.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked($post_new_disabled, 'on'); ?> >
+						<label for="lasso_editor[post_adding_disabled]"><?php _e('Disable Post Adding', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to disable users from being able to add new posts from the front-end.', 'lasso'); ?></span>
 					</div>
 				</div>
 
 				<div class="lasso-editor-settings--option-wrap last">
 					<div class="lasso-editor-settings--option-inner">
-						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked( $shortcodify_disabled, 'on' );?> >
-						<label for="lasso_editor[shortcodify_disabled]"><?php _e( 'Disable Aesop Component Conversion', 'lasso' );?></label>
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso' );?></span>
+						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked($shortcodify_disabled, 'on'); ?> >
+						<label for="lasso_editor[shortcodify_disabled]"><?php _e('Disable Aesop Component Conversion', 'lasso'); ?></label>
+						<span class="lasso--setting-description"><?php _e('Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso'); ?></span>
 					</div>
 				</div>
 
-				<?php do_action('lasso_settings_after');?>
+				<?php do_action('lasso_settings_after'); ?>
 
 				<div class="lasso-editor-settings--submit">
 				    <input type="hidden" name="action" value="lasso-editor-settings" />
-				    <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Save Settings', 'lasso' );?>" />
-					<?php wp_nonce_field( 'nonce', 'lasso_editor_settings' ); ?>
+				    <input type="submit" class="button-primary" value="<?php esc_attr_e('Save Settings', 'lasso'); ?>" />
+					<?php wp_nonce_field('nonce', 'lasso_editor_settings'); ?>
 				</div>
 			</form>
 

Braces +6 added lines, -4 removed lines

@@ -51,8 +51,9 @@ 
 	function process_settings() {
 
 		// bail out if current user isn't and administrator and they are not logged in
-		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() )
-			return;
+		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() ) {
+					return;
+		}
 
 		if ( isset( $_POST['action'] ) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer( 'nonce', 'lasso_editor_settings' ) ) {
 
@@ -88,8 +89,9 @@ 
 	 */
 	function lasso_editor_settings_form() {
 
-		if ( !is_user_logged_in() )
-			return;
+		if ( !is_user_logged_in() ) {
+					return;
+		}
 
 		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
 		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );