AesopInteractive / lasso

admin/includes/EDD_SL_Plugin_Updater.php

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

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

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/lasso_autoloader.php

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

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

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

includes/process/meta.php

Spacing +10 added lines, -10 removed lines

@@ -28,9 +28,9 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function update( $data ) {
+	public function update($data) {
 
-		$post_id = isset( $data['post_id'] ) ? $data['post_id'] : false;
+		$post_id = isset($data['post_id']) ? $data['post_id'] : false;
 
 			
 		/**
@@ -40,11 +40,11 @@ 
 		 *
 		 * @param array $allowed_fields The fields
 		 */
-		$allowed_fields = apply_filters( 'lasso_meta_fields', array() );
-		if ( ! empty( $allowed_fields ) ) {
-			foreach( $allowed_fields as $field ) {
-				if ( isset( $data[ $field ] ) ) {
-					update_post_meta( $post_id, lasso_unclean_string( $field ), $data[ $field ]  );
+		$allowed_fields = apply_filters('lasso_meta_fields', array());
+		if (!empty($allowed_fields)) {
+			foreach ($allowed_fields as $field) {
+				if (isset($data[$field])) {
+					update_post_meta($post_id, lasso_unclean_string($field), $data[$field]);
 				}
 			}
 		}
@@ -62,8 +62,8 @@ 
 	 *
 	 * @return array Array of keys to pull from $data per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_meta_update' ] = array(
+	public static function params() {
+		$params['process_meta_update'] = array(
 			'post_id' 	=> 'absint',
 			'tab_name'	=> 'trim'
 		);
@@ -80,7 +80,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_meta_update' ] = array(
+		$params['process_meta_update'] = array(
 			'lasso_user_can'
 		);
 

includes/process/new_object.php

Spacing +10 added lines, -10 removed lines

@@ -28,26 +28,26 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function post( $data ) {
+	public function post($data) {
 
-		$title  = $data[ 'story_title' ];
+		$title  = $data['story_title'];
 
-		$object = is_null( $data[ 'object'] ) ? false : $data[ 'object' ];
+		$object = is_null($data['object']) ? false : $data['object'];
 
 		// insert a new post
 		$args = array(
 			'post_title'    => $title,
 			'post_status'   => 'draft',
 			'post_type'    	=> $object,
-			'post_content'  => apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso') )
+			'post_content'  => apply_filters('lasso_new_object_content', __('Once upon a time...', 'lasso'))
 		);
 
-		$postid = wp_insert_post( apply_filters( 'lasso_insert_object_args', $args ) );
+		$postid = wp_insert_post(apply_filters('lasso_insert_object_args', $args));
 
-		do_action( 'lasso_new_object', $postid, $object, $title, get_current_user_ID() );
+		do_action('lasso_new_object', $postid, $object, $title, get_current_user_ID());
 
 		return array(
-			'postlink' => get_permalink( $postid )
+			'postlink' => get_permalink($postid)
 		);
 
 	}
@@ -60,8 +60,8 @@ 
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
 	public static function params() {
-		$params[ 'process_new_object_post' ] = array(
-			'story_title' => array( 'wp_strip_all_tags', 'trim' ),
+		$params['process_new_object_post'] = array(
+			'story_title' => array('wp_strip_all_tags', 'trim'),
 			'object' => 'trim'
 		);
 
@@ -77,7 +77,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_new_object_post' ] = array();
+		$params['process_new_object_post'] = array();
 
 		return $params;
 

includes/process/revision.php

Spacing +13 added lines, -13 removed lines

@@ -27,17 +27,17 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get( $data ) {
+	public static function get($data) {
 		$args = array();
-		if ( isset( $data[ 'limit' ] ) ) {
-			$args[ 'posts_per_page' ] = $data[ 'limit' ];
-		}else{
-			$args[ 'posts_per_page' ] = 6; // we start at revision 0
+		if (isset($data['limit'])) {
+			$args['posts_per_page'] = $data['limit'];
+		} else {
+			$args['posts_per_page'] = 6; // we start at revision 0
 		}
 
-		$revisions = wp_get_post_revisions( $data[ 'postid' ], $args  );
-		if ( is_array( $revisions )  && ! empty( $revisions )  ) {
-			self::set_revisions( $data[ 'postid' ], $revisions );
+		$revisions = wp_get_post_revisions($data['postid'], $args);
+		if (is_array($revisions) && !empty($revisions)) {
+			self::set_revisions($data['postid'], $revisions);
 		}
 
 		return self::$revisions;
@@ -53,9 +53,9 @@ 
 	 * @param int $id The post ID to get the revisions for
 	 * @param obj $revisions The revisions for this post
 	 */
-	protected static function set_revisions( $id, $revisions ) {
+	protected static function set_revisions($id, $revisions) {
 
-		array_walk( $revisions, function ( $post, $i ) {
+		array_walk($revisions, function($post, $i) {
 			self::$revisions[] = array(
 				'post_content' => $post->post_content,
 				'post_title' => $post->post_title,
@@ -73,8 +73,8 @@ 
 	 *
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_revision_get' ] = array(
+	public static function params() {
+		$params['process_revision_get'] = array(
 			'postid'    => 'absint',
 			'limit'     => 'absint'
 		);
@@ -90,7 +90,7 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_revision_get' ] = array(
+		$params['process_revision_get'] = array(
 			'lasso_user_can'
 		);