AesopInteractive / lasso

admin/includes/class-tgm-plugin-activation.php

Doc Comments +2 added lines, -2 removed lines

@@ -1887,7 +1887,7 @@ 
 		 *
 		 * @since 2.4.0
 		 *
-		 * @return object The TGM_Plugin_Activation object.
+		 * @return TGM_Plugin_Activation The TGM_Plugin_Activation object.
 		 */
 		public static function get_instance() {
 			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof self ) ) {
@@ -2044,7 +2044,7 @@ 
 		 *
 		 * @since 2.5.0
 		 *
-		 * @return array CSS classnames.
+		 * @return string[] CSS classnames.
 		 */
 		public function get_table_classes() {
 			return array( 'widefat', 'fixed' );

Indentation +7 added lines, -7 removed lines

@@ -1322,13 +1322,13 @@
 			$key     = preg_replace( '`[^A-Za-z0-9_-]`', '', $key );
 
 			/**
-			* Filter a sanitized key string.
-			*
-			* @since 3.0.0
-			*
-			* @param string $key     Sanitized key.
-			* @param string $raw_key The key prior to sanitization.
-			*/
+			 * Filter a sanitized key string.
+			 *
+			 * @since 3.0.0
+			 *
+			 * @param string $key     Sanitized key.
+			 * @param string $raw_key The key prior to sanitization.
+			 */
 			return apply_filters( 'tgmpa_sanitize_key', $key, $raw_key );
 		}
 

Spacing +713 added lines, -713 removed lines

@@ -43,7 +43,7 @@ 
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-if ( ! class_exists( 'TGM_Plugin_Activation' ) ) {
+if (!class_exists('TGM_Plugin_Activation')) {
 
 	/**
 	 * Automatic plugin installation and activation library.
@@ -269,10 +269,10 @@ 
 			$this->wp_version = $GLOBALS['wp_version'];
 
 			// Announce that the class is ready, and pass the object (for advanced use).
-			do_action_ref_array( 'tgmpa_init', array( $this ) );
+			do_action_ref_array('tgmpa_init', array($this));
 
 			// When the rest of WP has loaded, kick-start the rest of the class.
-			add_action( 'init', array( $this, 'init' ) );
+			add_action('init', array($this, 'init'));
 		}
 
 		/**
@@ -289,7 +289,7 @@ 
 		 * @return void  Silently fail to set the property when this is tried from outside of this class context.
 		 *               (Inside this class context, the __set() method if not used as there is direct access.)
 		 */
-		public function __set( $name, $value ) {
+		public function __set($name, $value) {
 			return;
 		}
 
@@ -299,7 +299,7 @@ 
 		 * @param string $name Name of an inaccessible property.
 		 * @return mixed The property value.
 		 */
-		public function __get( $name ) {
+		public function __get($name) {
 			return $this->{$name};
 		}
 
@@ -324,16 +324,16 @@ 
 			 * @param bool $load Whether or not TGMPA should load.
 			 *                   Defaults to the return of `is_admin() && ! defined( 'DOING_AJAX' )`.
 			 */
-			if ( true !== apply_filters( 'tgmpa_load', ( is_admin() && ! defined( 'DOING_AJAX' ) ) ) ) {
+			if (true !== apply_filters('tgmpa_load', (is_admin() && !defined('DOING_AJAX')))) {
 				return;
 			}
 
 			// Load class strings.
 			$this->strings = array(
-				'page_title'                      => __( 'Install Required Plugins', 'tgmpa' ),
-				'menu_title'                      => __( 'Install Plugins', 'tgmpa' ),
-				'installing'                      => __( 'Installing Plugin: %s', 'tgmpa' ),
-				'oops'                            => __( 'Something went wrong with the plugin API.', 'tgmpa' ),
+				'page_title'                      => __('Install Required Plugins', 'tgmpa'),
+				'menu_title'                      => __('Install Plugins', 'tgmpa'),
+				'installing'                      => __('Installing Plugin: %s', 'tgmpa'),
+				'oops'                            => __('Something went wrong with the plugin API.', 'tgmpa'),
 				'notice_can_install_required'     => _n_noop(
 					'This theme requires the following plugin: %1$s.',
 					'This theme requires the following plugins: %1$s.',
@@ -394,62 +394,62 @@ 
 					'Begin activating plugins',
 					'tgmpa'
 				),
-				'return'                          => __( 'Return to Required Plugins Installer', 'tgmpa' ),
-				'dashboard'                       => __( 'Return to the dashboard', 'tgmpa' ),
-				'plugin_activated'                => __( 'Plugin activated successfully.', 'tgmpa' ),
-				'activated_successfully'          => __( 'The following plugin was activated successfully:', 'tgmpa' ),
-				'plugin_already_active'           => __( 'No action taken. Plugin %1$s was already active.', 'tgmpa' ),
-				'plugin_needs_higher_version'     => __( 'Plugin not activated. A higher version of %s is needed for this theme. Please update the plugin.', 'tgmpa' ),
-				'complete'                        => __( 'All plugins installed and activated successfully. %1$s', 'tgmpa' ),
-				'dismiss'                         => __( 'Dismiss this notice', 'tgmpa' ),
-				'contact_admin'                   => __( 'Please contact the administrator of this site for help.', 'tgmpa' ),
+				'return'                          => __('Return to Required Plugins Installer', 'tgmpa'),
+				'dashboard'                       => __('Return to the dashboard', 'tgmpa'),
+				'plugin_activated'                => __('Plugin activated successfully.', 'tgmpa'),
+				'activated_successfully'          => __('The following plugin was activated successfully:', 'tgmpa'),
+				'plugin_already_active'           => __('No action taken. Plugin %1$s was already active.', 'tgmpa'),
+				'plugin_needs_higher_version'     => __('Plugin not activated. A higher version of %s is needed for this theme. Please update the plugin.', 'tgmpa'),
+				'complete'                        => __('All plugins installed and activated successfully. %1$s', 'tgmpa'),
+				'dismiss'                         => __('Dismiss this notice', 'tgmpa'),
+				'contact_admin'                   => __('Please contact the administrator of this site for help.', 'tgmpa'),
 			);
 
-			do_action( 'tgmpa_register' );
+			do_action('tgmpa_register');
 
 			/* After this point, the plugins should be registered and the configuration set. */
 
 			// Proceed only if we have plugins to handle.
-			if ( empty( $this->plugins ) || ! is_array( $this->plugins ) ) {
+			if (empty($this->plugins) || !is_array($this->plugins)) {
 				return;
 			}
 
 			// Set up the menu and notices if we still have outstanding actions.
-			if ( true !== $this->is_tgmpa_complete() ) {
+			if (true !== $this->is_tgmpa_complete()) {
 				// Sort the plugins.
-				array_multisort( $this->sort_order, SORT_ASC, $this->plugins );
+				array_multisort($this->sort_order, SORT_ASC, $this->plugins);
 
-				add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-				add_action( 'admin_head', array( $this, 'dismiss' ) );
+				add_action('admin_menu', array($this, 'admin_menu'));
+				add_action('admin_head', array($this, 'dismiss'));
 
 				// Prevent the normal links from showing underneath a single install/update page.
-				add_filter( 'install_plugin_complete_actions', array( $this, 'actions' ) );
-				add_filter( 'update_plugin_complete_actions', array( $this, 'actions' ) );
+				add_filter('install_plugin_complete_actions', array($this, 'actions'));
+				add_filter('update_plugin_complete_actions', array($this, 'actions'));
 
-				if ( $this->has_notices ) {
-					add_action( 'admin_notices', array( $this, 'notices' ) );
-					add_action( 'admin_init', array( $this, 'admin_init' ), 1 );
-					add_action( 'admin_enqueue_scripts', array( $this, 'thickbox' ) );
+				if ($this->has_notices) {
+					add_action('admin_notices', array($this, 'notices'));
+					add_action('admin_init', array($this, 'admin_init'), 1);
+					add_action('admin_enqueue_scripts', array($this, 'thickbox'));
 				}
 
-				add_action( 'load-plugins.php', array( $this, 'add_plugin_action_link_filters' ), 1 );
+				add_action('load-plugins.php', array($this, 'add_plugin_action_link_filters'), 1);
 			}
 
 			// Make sure things get reset on switch theme.
-			add_action( 'switch_theme', array( $this, 'flush_plugins_cache' ) );
+			add_action('switch_theme', array($this, 'flush_plugins_cache'));
 
-			if ( $this->has_notices ) {
-				add_action( 'switch_theme', array( $this, 'update_dismiss' ) );
+			if ($this->has_notices) {
+				add_action('switch_theme', array($this, 'update_dismiss'));
 			}
 
 			// Setup the force activation hook.
-			if ( true === $this->has_forced_activation ) {
-				add_action( 'admin_init', array( $this, 'force_activation' ) );
+			if (true === $this->has_forced_activation) {
+				add_action('admin_init', array($this, 'force_activation'));
 			}
 
 			// Setup the force deactivation hook.
-			if ( true === $this->has_forced_deactivation ) {
-				add_action( 'switch_theme', array( $this, 'force_deactivation' ) );
+			if (true === $this->has_forced_deactivation) {
+				add_action('switch_theme', array($this, 'force_deactivation'));
 			}
 		}
 
@@ -460,17 +460,17 @@ 
 		 * @since 2.5.0
 		 */
 		public function add_plugin_action_link_filters() {
-			foreach ( $this->plugins as $slug => $plugin ) {
-				if ( false === $this->can_plugin_activate( $slug ) ) {
-					add_filter( 'plugin_action_links_' . $plugin['file_path'], array( $this, 'filter_plugin_action_links_activate' ), 20 );
+			foreach ($this->plugins as $slug => $plugin) {
+				if (false === $this->can_plugin_activate($slug)) {
+					add_filter('plugin_action_links_'.$plugin['file_path'], array($this, 'filter_plugin_action_links_activate'), 20);
 				}
 
-				if ( true === $plugin['force_activation'] ) {
-					add_filter( 'plugin_action_links_' . $plugin['file_path'], array( $this, 'filter_plugin_action_links_deactivate' ), 20 );
+				if (true === $plugin['force_activation']) {
+					add_filter('plugin_action_links_'.$plugin['file_path'], array($this, 'filter_plugin_action_links_deactivate'), 20);
 				}
 
-				if ( false !== $this->does_plugin_require_update( $slug ) ) {
-					add_filter( 'plugin_action_links_' . $plugin['file_path'], array( $this, 'filter_plugin_action_links_update' ), 20 );
+				if (false !== $this->does_plugin_require_update($slug)) {
+					add_filter('plugin_action_links_'.$plugin['file_path'], array($this, 'filter_plugin_action_links_update'), 20);
 				}
 			}
 		}
@@ -484,8 +484,8 @@ 
 		 * @param array $actions Action links.
 		 * @return array
 		 */
-		public function filter_plugin_action_links_activate( $actions ) {
-			unset( $actions['activate'] );
+		public function filter_plugin_action_links_activate($actions) {
+			unset($actions['activate']);
 
 			return $actions;
 		}
@@ -498,8 +498,8 @@ 
 		 * @param array $actions Action links.
 		 * @return array
 		 */
-		public function filter_plugin_action_links_deactivate( $actions ) {
-			unset( $actions['deactivate'] );
+		public function filter_plugin_action_links_deactivate($actions) {
+			unset($actions['deactivate']);
 
 			return $actions;
 		}
@@ -513,12 +513,12 @@ 
 		 * @param array $actions Action links.
 		 * @return array
 		 */
-		public function filter_plugin_action_links_update( $actions ) {
+		public function filter_plugin_action_links_update($actions) {
 			$actions['update'] = sprintf(
 				'<a href="%1$s" title="%2$s" class="edit">%3$s</a>',
-				esc_url( $this->get_tgmpa_status_url( 'update' ) ),
-				esc_attr__( 'This plugin needs to be updated to be compatible with your theme.', 'tgmpa' ),
-				esc_html__( 'Update Required', 'tgmpa' )
+				esc_url($this->get_tgmpa_status_url('update')),
+				esc_attr__('This plugin needs to be updated to be compatible with your theme.', 'tgmpa'),
+				esc_html__('Update Required', 'tgmpa')
 			);
 
 			return $actions;
@@ -548,15 +548,15 @@ 
 		 * @return null Returns early if not the TGMPA page.
 		 */
 		public function admin_init() {
-			if ( ! $this->is_tgmpa_page() ) {
+			if (!$this->is_tgmpa_page()) {
 				return;
 			}
 
-			if ( isset( $_REQUEST['tab'] ) && 'plugin-information' === $_REQUEST['tab'] ) {
+			if (isset($_REQUEST['tab']) && 'plugin-information' === $_REQUEST['tab']) {
 				// Needed for install_plugin_information().
-				require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+				require_once ABSPATH.'wp-admin/includes/plugin-install.php';
 
-				wp_enqueue_style( 'plugin-install' );
+				wp_enqueue_style('plugin-install');
 
 				global $tab, $body_id;
 				$body_id = 'plugin-information';
@@ -582,7 +582,7 @@ 
 		 * @since 2.1.0
 		 */
 		public function thickbox() {
-			if ( ! get_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice_' . $this->id, true ) ) {
+			if (!get_user_meta(get_current_user_id(), 'tgmpa_dismissed_notice_'.$this->id, true)) {
 				add_thickbox();
 			}
 		}
@@ -604,23 +604,23 @@ 
 		 */
 		public function admin_menu() {
 			// Make sure privileges are correct to see the page.
-			if ( ! current_user_can( 'install_plugins' ) ) {
+			if (!current_user_can('install_plugins')) {
 				return;
 			}
 
 			$args = apply_filters(
 				'tgmpa_admin_menu_args',
 				array(
-					'parent_slug' => $this->parent_slug,                     // Parent Menu slug.
-					'page_title'  => $this->strings['page_title'],           // Page title.
-					'menu_title'  => $this->strings['menu_title'],           // Menu title.
-					'capability'  => $this->capability,                      // Capability.
-					'menu_slug'   => $this->menu,                            // Menu slug.
-					'function'    => array( $this, 'install_plugins_page' ), // Callback.
+					'parent_slug' => $this->parent_slug, // Parent Menu slug.
+					'page_title'  => $this->strings['page_title'], // Page title.
+					'menu_title'  => $this->strings['menu_title'], // Menu title.
+					'capability'  => $this->capability, // Capability.
+					'menu_slug'   => $this->menu, // Menu slug.
+					'function'    => array($this, 'install_plugins_page'), // Callback.
 				)
 			);
 
-			$this->add_admin_menu( $args );
+			$this->add_admin_menu($args);
 		}
 
 		/**
@@ -630,15 +630,15 @@ 
 		 *
 		 * @param array $args Menu item configuration.
 		 */
-		protected function add_admin_menu( array $args ) {
-			if ( has_filter( 'tgmpa_admin_menu_use_add_theme_page' ) ) {
-				_deprecated_function( 'The "tgmpa_admin_menu_use_add_theme_page" filter', '2.5.0', esc_html__( 'Set the parent_slug config variable instead.', 'tgmpa' ) );
+		protected function add_admin_menu(array $args) {
+			if (has_filter('tgmpa_admin_menu_use_add_theme_page')) {
+				_deprecated_function('The "tgmpa_admin_menu_use_add_theme_page" filter', '2.5.0', esc_html__('Set the parent_slug config variable instead.', 'tgmpa'));
 			}
 
-			if ( 'themes.php' === $this->parent_slug ) {
-				$this->page_hook = call_user_func( 'add_theme_page', $args['page_title'], $args['menu_title'], $args['capability'], $args['menu_slug'], $args['function'] );
+			if ('themes.php' === $this->parent_slug) {
+				$this->page_hook = call_user_func('add_theme_page', $args['page_title'], $args['menu_title'], $args['capability'], $args['menu_slug'], $args['function']);
 			} else {
-				$this->page_hook = call_user_func( 'add_submenu_page', $args['parent_slug'], $args['page_title'], $args['menu_title'], $args['capability'], $args['menu_slug'], $args['function'] );
+				$this->page_hook = call_user_func('add_submenu_page', $args['parent_slug'], $args['page_title'], $args['menu_title'], $args['capability'], $args['menu_slug'], $args['function']);
 			}
 		}
 
@@ -658,28 +658,28 @@ 
 			$plugin_table = new TGMPA_List_Table;
 
 			// Return early if processing a plugin installation action.
-			if ( ( ( 'tgmpa-bulk-install' === $plugin_table->current_action() || 'tgmpa-bulk-update' === $plugin_table->current_action() ) && $plugin_table->process_bulk_actions() ) || $this->do_plugin_install() ) {
+			if ((('tgmpa-bulk-install' === $plugin_table->current_action() || 'tgmpa-bulk-update' === $plugin_table->current_action()) && $plugin_table->process_bulk_actions()) || $this->do_plugin_install()) {
 				return;
 			}
 
 			// Force refresh of available plugin information so we'll know about manual updates/deletes.
-			wp_clean_plugins_cache( false );
+			wp_clean_plugins_cache(false);
 
 			?>
 			<div class="tgmpa wrap">
-				<h2><?php echo esc_html( get_admin_page_title() ); ?></h2>
+				<h2><?php echo esc_html(get_admin_page_title()); ?></h2>
 				<?php $plugin_table->prepare_items(); ?>
 
 				<?php
-				if ( ! empty( $this->message ) && is_string( $this->message ) ) {
-					echo wp_kses_post( $this->message );
+				if (!empty($this->message) && is_string($this->message)) {
+					echo wp_kses_post($this->message);
 				}
 				?>
 				<?php $plugin_table->views(); ?>
 
 				<form id="tgmpa-plugins" action="" method="post">
-					<input type="hidden" name="tgmpa-page" value="<?php echo esc_attr( $this->menu ); ?>" />
-					<input type="hidden" name="plugin_status" value="<?php echo esc_attr( $plugin_table->view_context ); ?>" />
+					<input type="hidden" name="tgmpa-page" value="<?php echo esc_attr($this->menu); ?>" />
+					<input type="hidden" name="plugin_status" value="<?php echo esc_attr($plugin_table->view_context); ?>" />
 					<?php $plugin_table->display(); ?>
 				</form>
 			</div>
@@ -707,48 +707,48 @@ 
 		 * @return boolean True on success, false on failure.
 		 */
 		protected function do_plugin_install() {
-			if ( empty( $_GET['plugin'] ) ) {
+			if (empty($_GET['plugin'])) {
 				return false;
 			}
 
 			// All plugin information will be stored in an array for processing.
-			$slug = $this->sanitize_key( urldecode( $_GET['plugin'] ) );
+			$slug = $this->sanitize_key(urldecode($_GET['plugin']));
 
-			if ( ! isset( $this->plugins[ $slug ] ) ) {
+			if (!isset($this->plugins[$slug])) {
 				return false;
 			}
 
 			// Was an install or upgrade action link clicked?
-			if ( ( isset( $_GET['tgmpa-install'] ) && 'install-plugin' === $_GET['tgmpa-install'] ) || ( isset( $_GET['tgmpa-update'] ) && 'update-plugin' === $_GET['tgmpa-update'] ) ) {
+			if ((isset($_GET['tgmpa-install']) && 'install-plugin' === $_GET['tgmpa-install']) || (isset($_GET['tgmpa-update']) && 'update-plugin' === $_GET['tgmpa-update'])) {
 
 				$install_type = 'install';
-				if ( isset( $_GET['tgmpa-update'] ) && 'update-plugin' === $_GET['tgmpa-update'] ) {
+				if (isset($_GET['tgmpa-update']) && 'update-plugin' === $_GET['tgmpa-update']) {
 					$install_type = 'update';
 				}
 
-				check_admin_referer( 'tgmpa-' . $install_type, 'tgmpa-nonce' );
+				check_admin_referer('tgmpa-'.$install_type, 'tgmpa-nonce');
 
 				// Pass necessary information via URL if WP_Filesystem is needed.
 				$url = wp_nonce_url(
 					add_query_arg(
 						array(
-							'plugin'                 => urlencode( $slug ),
-							'tgmpa-' . $install_type => $install_type . '-plugin',
+							'plugin'                 => urlencode($slug),
+							'tgmpa-'.$install_type => $install_type.'-plugin',
 						),
 						$this->get_tgmpa_url()
 					),
-					'tgmpa-' . $install_type,
+					'tgmpa-'.$install_type,
 					'tgmpa-nonce'
 				);
 
 				$method = ''; // Leave blank so WP_Filesystem can populate it as necessary.
 
-				if ( false === ( $creds = request_filesystem_credentials( esc_url_raw( $url ), $method, false, false, array() ) ) ) {
+				if (false === ($creds = request_filesystem_credentials(esc_url_raw($url), $method, false, false, array()))) {
 					return true;
 				}
 
-				if ( ! WP_Filesystem( $creds ) ) {
-					request_filesystem_credentials( esc_url_raw( $url ), $method, true, false, array() ); // Setup WP_Filesystem.
+				if (!WP_Filesystem($creds)) {
+					request_filesystem_credentials(esc_url_raw($url), $method, true, false, array()); // Setup WP_Filesystem.
 					return true;
 				}
 
@@ -757,66 +757,66 @@ 
 				// Prep variables for Plugin_Installer_Skin class.
 				$extra         = array();
 				$extra['slug'] = $slug; // Needed for potentially renaming of directory name.
-				$source        = $this->get_download_url( $slug );
-				$api           = ( 'repo' === $this->plugins[ $slug ]['source_type'] ) ? $this->get_plugins_api( $slug ) : null;
-				$api           = ( false !== $api ) ? $api : null;
+				$source        = $this->get_download_url($slug);
+				$api           = ('repo' === $this->plugins[$slug]['source_type']) ? $this->get_plugins_api($slug) : null;
+				$api           = (false !== $api) ? $api : null;
 
 				$url = add_query_arg(
 					array(
-						'action' => $install_type . '-plugin',
-						'plugin' => urlencode( $slug ),
+						'action' => $install_type.'-plugin',
+						'plugin' => urlencode($slug),
 					),
 					'update.php'
 				);
 
-				if ( ! class_exists( 'Plugin_Upgrader', false ) ) {
-					require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+				if (!class_exists('Plugin_Upgrader', false)) {
+					require_once ABSPATH.'wp-admin/includes/class-wp-upgrader.php';
 				}
 
 				$skin_args = array(
-					'type'   => ( 'bundled' !== $this->plugins[ $slug ]['source_type'] ) ? 'web' : 'upload',
-					'title'  => sprintf( $this->strings['installing'], $this->plugins[ $slug ]['name'] ),
-					'url'    => esc_url_raw( $url ),
-					'nonce'  => $install_type . '-plugin_' . $slug,
+					'type'   => ('bundled' !== $this->plugins[$slug]['source_type']) ? 'web' : 'upload',
+					'title'  => sprintf($this->strings['installing'], $this->plugins[$slug]['name']),
+					'url'    => esc_url_raw($url),
+					'nonce'  => $install_type.'-plugin_'.$slug,
 					'plugin' => '',
 					'api'    => $api,
 					'extra'  => $extra,
 				);
 
-				if ( 'update' === $install_type ) {
-					$skin_args['plugin'] = $this->plugins[ $slug ]['file_path'];
-					$skin                = new Plugin_Upgrader_Skin( $skin_args );
+				if ('update' === $install_type) {
+					$skin_args['plugin'] = $this->plugins[$slug]['file_path'];
+					$skin                = new Plugin_Upgrader_Skin($skin_args);
 				} else {
-					$skin = new Plugin_Installer_Skin( $skin_args );
+					$skin = new Plugin_Installer_Skin($skin_args);
 				}
 
 				// Create a new instance of Plugin_Upgrader.
-				$upgrader = new Plugin_Upgrader( $skin );
+				$upgrader = new Plugin_Upgrader($skin);
 
 				// Perform the action and install the plugin from the $source urldecode().
-				add_filter( 'upgrader_source_selection', array( $this, 'maybe_adjust_source_dir' ), 1, 3 );
+				add_filter('upgrader_source_selection', array($this, 'maybe_adjust_source_dir'), 1, 3);
 
-				if ( 'update' === $install_type ) {
+				if ('update' === $install_type) {
 					// Inject our info into the update transient.
-					$to_inject                    = array( $slug => $this->plugins[ $slug ] );
-					$to_inject[ $slug ]['source'] = $source;
-					$this->inject_update_info( $to_inject );
+					$to_inject                    = array($slug => $this->plugins[$slug]);
+					$to_inject[$slug]['source'] = $source;
+					$this->inject_update_info($to_inject);
 
-					$upgrader->upgrade( $this->plugins[ $slug ]['file_path'] );
+					$upgrader->upgrade($this->plugins[$slug]['file_path']);
 				} else {
-					$upgrader->install( $source );
+					$upgrader->install($source);
 				}
 
-				remove_filter( 'upgrader_source_selection', array( $this, 'maybe_adjust_source_dir' ), 1, 3 );
+				remove_filter('upgrader_source_selection', array($this, 'maybe_adjust_source_dir'), 1, 3);
 
 				// Make sure we have the correct file path now the plugin is installed/updated.
-				$this->populate_file_path( $slug );
+				$this->populate_file_path($slug);
 
 				// Only activate plugins if the config option is set to true and the plugin isn't
 				// already active (upgrade).
-				if ( $this->is_automatic && ! $this->is_plugin_active( $slug ) ) {
+				if ($this->is_automatic && !$this->is_plugin_active($slug)) {
 					$plugin_activate = $upgrader->plugin_info(); // Grab the plugin info from the Plugin_Upgrader method.
-					if ( false === $this->activate_single_plugin( $plugin_activate, $slug, true ) ) {
+					if (false === $this->activate_single_plugin($plugin_activate, $slug, true)) {
 						return true; // Finish execution of the function early as we encountered an error.
 					}
 				}
@@ -824,19 +824,19 @@ 
 				$this->show_tgmpa_version();
 
 				// Display message based on if all plugins are now active or not.
-				if ( $this->is_tgmpa_complete() ) {
-					echo '<p>', sprintf( esc_html( $this->strings['complete'] ), '<a href="' . esc_url( self_admin_url() ) . '">' . esc_html__( 'Return to the Dashboard', 'tgmpa' ) . '</a>' ), '</p>';
+				if ($this->is_tgmpa_complete()) {
+					echo '<p>', sprintf(esc_html($this->strings['complete']), '<a href="'.esc_url(self_admin_url()).'">'.esc_html__('Return to the Dashboard', 'tgmpa').'</a>'), '</p>';
 					echo '<style type="text/css">#adminmenu .wp-submenu li.current { display: none !important; }</style>';
 				} else {
-					echo '<p><a href="', esc_url( $this->get_tgmpa_url() ), '" target="_parent">', esc_html( $this->strings['return'] ), '</a></p>';
+					echo '<p><a href="', esc_url($this->get_tgmpa_url()), '" target="_parent">', esc_html($this->strings['return']), '</a></p>';
 				}
 
 				return true;
-			} elseif ( isset( $this->plugins[ $slug ]['file_path'], $_GET['tgmpa-activate'] ) && 'activate-plugin' === $_GET['tgmpa-activate'] ) {
+			} elseif (isset($this->plugins[$slug]['file_path'], $_GET['tgmpa-activate']) && 'activate-plugin' === $_GET['tgmpa-activate']) {
 				// Activate action link was clicked.
-				check_admin_referer( 'tgmpa-activate', 'tgmpa-nonce' );
+				check_admin_referer('tgmpa-activate', 'tgmpa-nonce');
 
-				if ( false === $this->activate_single_plugin( $this->plugins[ $slug ]['file_path'], $slug ) ) {
+				if (false === $this->activate_single_plugin($this->plugins[$slug]['file_path'], $slug)) {
 					return true; // Finish execution of the function early as we encountered an error.
 				}
 			}
@@ -851,31 +851,31 @@ 
 		 *
 		 * @param array $plugins The plugin information for the plugins which are to be updated.
 		 */
-		public function inject_update_info( $plugins ) {
-			$repo_updates = get_site_transient( 'update_plugins' );
+		public function inject_update_info($plugins) {
+			$repo_updates = get_site_transient('update_plugins');
 
-			if ( ! is_object( $repo_updates ) ) {
+			if (!is_object($repo_updates)) {
 				$repo_updates = new stdClass;
 			}
 
-			foreach ( $plugins as $slug => $plugin ) {
+			foreach ($plugins as $slug => $plugin) {
 				$file_path = $plugin['file_path'];
 
-				if ( empty( $repo_updates->response[ $file_path ] ) ) {
-					$repo_updates->response[ $file_path ] = new stdClass;
+				if (empty($repo_updates->response[$file_path])) {
+					$repo_updates->response[$file_path] = new stdClass;
 				}
 
 				// We only really need to set package, but let's do all we can in case WP changes something.
-				$repo_updates->response[ $file_path ]->slug        = $slug;
-				$repo_updates->response[ $file_path ]->plugin      = $file_path;
-				$repo_updates->response[ $file_path ]->new_version = $plugin['version'];
-				$repo_updates->response[ $file_path ]->package     = $plugin['source'];
-				if ( empty( $repo_updates->response[ $file_path ]->url ) && ! empty( $plugin['external_url'] ) ) {
-					$repo_updates->response[ $file_path ]->url = $plugin['external_url'];
+				$repo_updates->response[$file_path]->slug        = $slug;
+				$repo_updates->response[$file_path]->plugin      = $file_path;
+				$repo_updates->response[$file_path]->new_version = $plugin['version'];
+				$repo_updates->response[$file_path]->package     = $plugin['source'];
+				if (empty($repo_updates->response[$file_path]->url) && !empty($plugin['external_url'])) {
+					$repo_updates->response[$file_path]->url = $plugin['external_url'];
 				}
 			}
 
-			set_site_transient( 'update_plugins', $repo_updates );
+			set_site_transient('update_plugins', $repo_updates);
 		}
 
 		/**
@@ -894,14 +894,14 @@ 
 		 * @param \WP_Upgrader $upgrader      Instance of the upgrader which installs the plugin.
 		 * @return string $source
 		 */
-		public function maybe_adjust_source_dir( $source, $remote_source, $upgrader ) {
-			if ( ! $this->is_tgmpa_page() || ! is_object( $GLOBALS['wp_filesystem'] ) ) {
+		public function maybe_adjust_source_dir($source, $remote_source, $upgrader) {
+			if (!$this->is_tgmpa_page() || !is_object($GLOBALS['wp_filesystem'])) {
 				return $source;
 			}
 
 			// Check for single file plugins.
-			$source_files = array_keys( $GLOBALS['wp_filesystem']->dirlist( $remote_source ) );
-			if ( 1 === count( $source_files ) && false === $GLOBALS['wp_filesystem']->is_dir( $source ) ) {
+			$source_files = array_keys($GLOBALS['wp_filesystem']->dirlist($remote_source));
+			if (1 === count($source_files) && false === $GLOBALS['wp_filesystem']->is_dir($source)) {
 				return $source;
 			}
 
@@ -909,33 +909,33 @@ 
 			$desired_slug = '';
 
 			// Figure out what the slug is supposed to be.
-			if ( false === $upgrader->bulk && ! empty( $upgrader->skin->options['extra']['slug'] ) ) {
+			if (false === $upgrader->bulk && !empty($upgrader->skin->options['extra']['slug'])) {
 				$desired_slug = $upgrader->skin->options['extra']['slug'];
 			} else {
 				// Bulk installer contains less info, so fall back on the info registered here.
-				foreach ( $this->plugins as $slug => $plugin ) {
-					if ( ! empty( $upgrader->skin->plugin_names[ $upgrader->skin->i ] ) && $plugin['name'] === $upgrader->skin->plugin_names[ $upgrader->skin->i ] ) {
+				foreach ($this->plugins as $slug => $plugin) {
+					if (!empty($upgrader->skin->plugin_names[$upgrader->skin->i]) && $plugin['name'] === $upgrader->skin->plugin_names[$upgrader->skin->i]) {
 						$desired_slug = $slug;
 						break;
 					}
 				}
-				unset( $slug, $plugin );
+				unset($slug, $plugin);
 			}
 
-			if ( ! empty( $desired_slug ) ) {
-				$subdir_name = untrailingslashit( str_replace( trailingslashit( $remote_source ), '', $source ) );
+			if (!empty($desired_slug)) {
+				$subdir_name = untrailingslashit(str_replace(trailingslashit($remote_source), '', $source));
 
-				if ( ! empty( $subdir_name ) && $subdir_name !== $desired_slug ) {
-					$from = untrailingslashit( $source );
-					$to   = trailingslashit( $remote_source ) . $desired_slug;
+				if (!empty($subdir_name) && $subdir_name !== $desired_slug) {
+					$from = untrailingslashit($source);
+					$to   = trailingslashit($remote_source).$desired_slug;
 
-					if ( true === $GLOBALS['wp_filesystem']->move( $from, $to ) ) {
-						return trailingslashit( $to );
+					if (true === $GLOBALS['wp_filesystem']->move($from, $to)) {
+						return trailingslashit($to);
 					} else {
-						return new WP_Error( 'rename_failed', esc_html__( 'The remote plugin package does not contain a folder with the desired slug and renaming did not work.', 'tgmpa' ) . ' ' . esc_html__( 'Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa' ), array( 'found' => $subdir_name, 'expected' => $desired_slug ) );
+						return new WP_Error('rename_failed', esc_html__('The remote plugin package does not contain a folder with the desired slug and renaming did not work.', 'tgmpa').' '.esc_html__('Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa'), array('found' => $subdir_name, 'expected' => $desired_slug));
 					}
-				} elseif ( empty( $subdir_name ) ) {
-					return new WP_Error( 'packaged_wrong', esc_html__( 'The remote plugin package consists of more than one file, but the files are not packaged in a folder.', 'tgmpa' ) . ' ' . esc_html__( 'Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa' ), array( 'found' => $subdir_name, 'expected' => $desired_slug ) );
+				} elseif (empty($subdir_name)) {
+					return new WP_Error('packaged_wrong', esc_html__('The remote plugin package consists of more than one file, but the files are not packaged in a folder.', 'tgmpa').' '.esc_html__('Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa'), array('found' => $subdir_name, 'expected' => $desired_slug));
 				}
 			}
 
@@ -953,51 +953,51 @@ 
 		 *                          This determines the styling of the output messages.
 		 * @return bool False if an error was encountered, true otherwise.
 		 */
-		protected function activate_single_plugin( $file_path, $slug, $automatic = false ) {
-			if ( $this->can_plugin_activate( $slug ) ) {
-				$activate = activate_plugin( $file_path );
+		protected function activate_single_plugin($file_path, $slug, $automatic = false) {
+			if ($this->can_plugin_activate($slug)) {
+				$activate = activate_plugin($file_path);
 
-				if ( is_wp_error( $activate ) ) {
-					echo '<div id="message" class="error"><p>', wp_kses_post( $activate->get_error_message() ), '</p></div>',
-						'<p><a href="', esc_url( $this->get_tgmpa_url() ), '" target="_parent">', esc_html( $this->strings['return'] ), '</a></p>';
+				if (is_wp_error($activate)) {
+					echo '<div id="message" class="error"><p>', wp_kses_post($activate->get_error_message()), '</p></div>',
+						'<p><a href="', esc_url($this->get_tgmpa_url()), '" target="_parent">', esc_html($this->strings['return']), '</a></p>';
 
 					return false; // End it here if there is an error with activation.
 				} else {
-					if ( ! $automatic ) {
+					if (!$automatic) {
 						// Make sure message doesn't display again if bulk activation is performed
 						// immediately after a single activation.
-						if ( ! isset( $_POST['action'] ) ) { // WPCS: CSRF OK.
-							echo '<div id="message" class="updated"><p>', esc_html( $this->strings['activated_successfully'] ), ' <strong>', esc_html( $this->plugins[ $slug ]['name'] ), '.</strong></p></div>';
+						if (!isset($_POST['action'])) { // WPCS: CSRF OK.
+							echo '<div id="message" class="updated"><p>', esc_html($this->strings['activated_successfully']), ' <strong>', esc_html($this->plugins[$slug]['name']), '.</strong></p></div>';
 						}
 					} else {
 						// Simpler message layout for use on the plugin install page.
-						echo '<p>', esc_html( $this->strings['plugin_activated'] ), '</p>';
+						echo '<p>', esc_html($this->strings['plugin_activated']), '</p>';
 					}
 				}
-			} elseif ( $this->is_plugin_active( $slug ) ) {
+			} elseif ($this->is_plugin_active($slug)) {
 				// No simpler message format provided as this message should never be encountered
 				// on the plugin install page.
 				echo '<div id="message" class="error"><p>',
 					sprintf(
-						esc_html( $this->strings['plugin_already_active'] ),
-						'<strong>' . esc_html( $this->plugins[ $slug ]['name'] ) . '</strong>'
+						esc_html($this->strings['plugin_already_active']),
+						'<strong>'.esc_html($this->plugins[$slug]['name']).'</strong>'
 					),
 					'</p></div>';
-			} elseif ( $this->does_plugin_require_update( $slug ) ) {
-				if ( ! $automatic ) {
+			} elseif ($this->does_plugin_require_update($slug)) {
+				if (!$automatic) {
 					// Make sure message doesn't display again if bulk activation is performed
 					// immediately after a single activation.
-					if ( ! isset( $_POST['action'] ) ) { // WPCS: CSRF OK.
+					if (!isset($_POST['action'])) { // WPCS: CSRF OK.
 						echo '<div id="message" class="error"><p>',
 							sprintf(
-								esc_html( $this->strings['plugin_needs_higher_version'] ),
-								'<strong>' . esc_html( $this->plugins[ $slug ]['name'] ) . '</strong>'
+								esc_html($this->strings['plugin_needs_higher_version']),
+								'<strong>'.esc_html($this->plugins[$slug]['name']).'</strong>'
 							),
 							'</p></div>';
 					}
 				} else {
 					// Simpler message layout for use on the plugin install page.
-					echo '<p>', sprintf( esc_html( $this->strings['plugin_needs_higher_version'] ), esc_html( $this->plugins[ $slug ]['name'] ) ), '</p>';
+					echo '<p>', sprintf(esc_html($this->strings['plugin_needs_higher_version']), esc_html($this->plugins[$slug]['name'])), '</p>';
 				}
 			}
 
@@ -1021,7 +1021,7 @@ 
 		 */
 		public function notices() {
 			// Remove nag on the install page / Return early if the nag message has been dismissed.
-			if ( $this->is_tgmpa_page() || get_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice_' . $this->id, true ) ) {
+			if ($this->is_tgmpa_page() || get_user_meta(get_current_user_id(), 'tgmpa_dismissed_notice_'.$this->id, true)) {
 				return;
 			}
 
@@ -1033,16 +1033,16 @@ 
 			$update_link_count   = 0;
 			$activate_link_count = 0;
 
-			foreach ( $this->plugins as $slug => $plugin ) {
-				if ( $this->is_plugin_active( $slug ) && false === $this->does_plugin_have_update( $slug ) ) {
+			foreach ($this->plugins as $slug => $plugin) {
+				if ($this->is_plugin_active($slug) && false === $this->does_plugin_have_update($slug)) {
 					continue;
 				}
 
-				if ( ! $this->is_plugin_installed( $slug ) ) {
-					if ( current_user_can( 'install_plugins' ) ) {
+				if (!$this->is_plugin_installed($slug)) {
+					if (current_user_can('install_plugins')) {
 						$install_link_count++;
 
-						if ( true === $plugin['required'] ) {
+						if (true === $plugin['required']) {
 							$message['notice_can_install_required'][] = $slug;
 						} else {
 							$message['notice_can_install_recommended'][] = $slug;
@@ -1052,11 +1052,11 @@ 
 						$message['notice_cannot_install'][] = $slug;
 					}
 				} else {
-					if ( ! $this->is_plugin_active( $slug ) && $this->can_plugin_activate( $slug ) ) {
-						if ( current_user_can( 'activate_plugins' ) ) {
+					if (!$this->is_plugin_active($slug) && $this->can_plugin_activate($slug)) {
+						if (current_user_can('activate_plugins')) {
 							$activate_link_count++;
 
-							if ( true === $plugin['required'] ) {
+							if (true === $plugin['required']) {
 								$message['notice_can_activate_required'][] = $slug;
 							} else {
 								$message['notice_can_activate_recommended'][] = $slug;
@@ -1067,14 +1067,14 @@ 
 						}
 					}
 
-					if ( $this->does_plugin_require_update( $slug ) || false !== $this->does_plugin_have_update( $slug ) ) {
+					if ($this->does_plugin_require_update($slug) || false !== $this->does_plugin_have_update($slug)) {
 
-						if ( current_user_can( 'install_plugins' ) ) {
+						if (current_user_can('install_plugins')) {
 							$update_link_count++;
 
-							if ( $this->does_plugin_require_update( $slug ) ) {
+							if ($this->does_plugin_require_update($slug)) {
 								$message['notice_ask_to_update'][] = $slug;
-							} elseif ( false !== $this->does_plugin_have_update( $slug ) ) {
+							} elseif (false !== $this->does_plugin_have_update($slug)) {
 								$message['notice_ask_to_update_maybe'][] = $slug;
 							}
 						} else {
@@ -1084,107 +1084,107 @@ 
 					}
 				}
 			}
-			unset( $slug, $plugin );
+			unset($slug, $plugin);
 
 			// If we have notices to display, we move forward.
-			if ( ! empty( $message ) ) {
-				krsort( $message ); // Sort messages.
+			if (!empty($message)) {
+				krsort($message); // Sort messages.
 				$rendered = '';
 
 				// As add_settings_error() wraps the final message in a <p> and as the final message can't be
 				// filtered, using <p>'s in our html would render invalid html output.
-				$line_template = '<span style="display: block; margin: 0.5em 0.5em 0 0; clear: both;">%s</span>' . "\n";
+				$line_template = '<span style="display: block; margin: 0.5em 0.5em 0 0; clear: both;">%s</span>'."\n";
 
 				// If dismissable is false and a message is set, output it now.
-				if ( ! $this->dismissable && ! empty( $this->dismiss_msg ) ) {
-					$rendered .= sprintf( $line_template, wp_kses_post( $this->dismiss_msg ) );
+				if (!$this->dismissable && !empty($this->dismiss_msg)) {
+					$rendered .= sprintf($line_template, wp_kses_post($this->dismiss_msg));
 				}
 
 				// Render the individual message lines for the notice.
-				foreach ( $message as $type => $plugin_group ) {
+				foreach ($message as $type => $plugin_group) {
 					$linked_plugins = array();
 
 					// Get the external info link for a plugin if one is available.
-					foreach ( $plugin_group as $plugin_slug ) {
-						$linked_plugins[] = $this->get_info_link( $plugin_slug );
+					foreach ($plugin_group as $plugin_slug) {
+						$linked_plugins[] = $this->get_info_link($plugin_slug);
 					}
-					unset( $plugin_slug );
+					unset($plugin_slug);
 
-					$count          = count( $plugin_group );
-					$linked_plugins = array_map( array( 'TGMPA_Utils', 'wrap_in_em' ), $linked_plugins );
-					$last_plugin    = array_pop( $linked_plugins ); // Pop off last name to prep for readability.
-					$imploded       = empty( $linked_plugins ) ? $last_plugin : ( implode( ', ', $linked_plugins ) . ' ' . esc_html_x( 'and', 'plugin A *and* plugin B', 'tgmpa' ) . ' ' . $last_plugin );
+					$count          = count($plugin_group);
+					$linked_plugins = array_map(array('TGMPA_Utils', 'wrap_in_em'), $linked_plugins);
+					$last_plugin    = array_pop($linked_plugins); // Pop off last name to prep for readability.
+					$imploded       = empty($linked_plugins) ? $last_plugin : (implode(', ', $linked_plugins).' '.esc_html_x('and', 'plugin A *and* plugin B', 'tgmpa').' '.$last_plugin);
 
 					$rendered .= sprintf(
 						$line_template,
 						sprintf(
-							translate_nooped_plural( $this->strings[ $type ], $count, 'tgmpa' ),
+							translate_nooped_plural($this->strings[$type], $count, 'tgmpa'),
 							$imploded,
 							$count
 						)
 					);
 
-					if ( 0 === strpos( $type, 'notice_cannot' ) ) {
+					if (0 === strpos($type, 'notice_cannot')) {
 						$rendered .= $this->strings['contact_admin'];
 					}
 				}
-				unset( $type, $plugin_group, $linked_plugins, $count, $last_plugin, $imploded );
+				unset($type, $plugin_group, $linked_plugins, $count, $last_plugin, $imploded);
 
 				// Setup action links.
 				$action_links = array(
 					'install'  => '',
 					'update'   => '',
 					'activate' => '',
-					'dismiss'  => $this->dismissable ? '<a href="' . esc_url( add_query_arg( 'tgmpa-dismiss', 'dismiss_admin_notices' ) ) . '" class="dismiss-notice" target="_parent">' . esc_html( $this->strings['dismiss'] ) . '</a>' : '',
+					'dismiss'  => $this->dismissable ? '<a href="'.esc_url(add_query_arg('tgmpa-dismiss', 'dismiss_admin_notices')).'" class="dismiss-notice" target="_parent">'.esc_html($this->strings['dismiss']).'</a>' : '',
 				);
 
 				$link_template = '<a href="%2$s">%1$s</a>';
 
-				if ( current_user_can( 'install_plugins' ) ) {
-					if ( $install_link_count > 0 ) {
+				if (current_user_can('install_plugins')) {
+					if ($install_link_count > 0) {
 						$action_links['install'] = sprintf(
 							$link_template,
-							translate_nooped_plural( $this->strings['install_link'], $install_link_count, 'tgmpa' ),
-							esc_url( $this->get_tgmpa_status_url( 'install' ) )
+							translate_nooped_plural($this->strings['install_link'], $install_link_count, 'tgmpa'),
+							esc_url($this->get_tgmpa_status_url('install'))
 						);
 					}
-					if ( $update_link_count > 0 ) {
+					if ($update_link_count > 0) {
 						$action_links['update'] = sprintf(
 							$link_template,
-							translate_nooped_plural( $this->strings['update_link'], $update_link_count, 'tgmpa' ),
-							esc_url( $this->get_tgmpa_status_url( 'update' ) )
+							translate_nooped_plural($this->strings['update_link'], $update_link_count, 'tgmpa'),
+							esc_url($this->get_tgmpa_status_url('update'))
 						);
 					}
 				}
 
-				if ( current_user_can( 'activate_plugins' ) && $activate_link_count > 0 ) {
+				if (current_user_can('activate_plugins') && $activate_link_count > 0) {
 					$action_links['activate'] = sprintf(
 						$link_template,
-						translate_nooped_plural( $this->strings['activate_link'], $activate_link_count, 'tgmpa' ),
-						esc_url( $this->get_tgmpa_status_url( 'activate' ) )
+						translate_nooped_plural($this->strings['activate_link'], $activate_link_count, 'tgmpa'),
+						esc_url($this->get_tgmpa_status_url('activate'))
 					);
 				}
 
-				$action_links = apply_filters( 'tgmpa_notice_action_links', $action_links );
+				$action_links = apply_filters('tgmpa_notice_action_links', $action_links);
 
-				$action_links = array_filter( (array) $action_links ); // Remove any empty array items.
+				$action_links = array_filter((array) $action_links); // Remove any empty array items.
 
-				if ( ! empty( $action_links ) && is_array( $action_links ) ) {
-					$action_links = sprintf( $line_template, implode( ' | ', $action_links ) );
-					$rendered    .= apply_filters( 'tgmpa_notice_rendered_action_links', $action_links );
+				if (!empty($action_links) && is_array($action_links)) {
+					$action_links = sprintf($line_template, implode(' | ', $action_links));
+					$rendered    .= apply_filters('tgmpa_notice_rendered_action_links', $action_links);
 				}
 
 				// Register the nag messages and prepare them to be processed.
-				if ( ! empty( $this->strings['nag_type'] ) ) {
-					add_settings_error( 'tgmpa', 'tgmpa', $rendered, sanitize_html_class( strtolower( $this->strings['nag_type'] ) ) );
+				if (!empty($this->strings['nag_type'])) {
+					add_settings_error('tgmpa', 'tgmpa', $rendered, sanitize_html_class(strtolower($this->strings['nag_type'])));
 				} else {
-					$nag_class = version_compare( $this->wp_version, '3.8', '<' ) ? 'updated' : 'update-nag';
-					add_settings_error( 'tgmpa', 'tgmpa', $rendered, $nag_class );
+					$nag_class = version_compare($this->wp_version, '3.8', '<') ? 'updated' : 'update-nag';
+					add_settings_error('tgmpa', 'tgmpa', $rendered, $nag_class);
 				}
 			}
 
 			// Admin options pages already output settings_errors, so this is to avoid duplication.
-			if ( 'options-general' !== $GLOBALS['current_screen']->parent_base ) {
+			if ('options-general' !== $GLOBALS['current_screen']->parent_base) {
 				$this->display_settings_errors();
 			}
 		}
@@ -1197,11 +1197,11 @@ 
 		protected function display_settings_errors() {
 			global $wp_settings_errors;
 
-			settings_errors( 'tgmpa' );
+			settings_errors('tgmpa');
 
-			foreach ( (array) $wp_settings_errors as $key => $details ) {
-				if ( 'tgmpa' === $details['setting'] ) {
-					unset( $wp_settings_errors[ $key ] );
+			foreach ((array) $wp_settings_errors as $key => $details) {
+				if ('tgmpa' === $details['setting']) {
+					unset($wp_settings_errors[$key]);
 					break;
 				}
 			}
@@ -1215,8 +1215,8 @@ 
 		 * @since 2.1.0
 		 */
 		public function dismiss() {
-			if ( isset( $_GET['tgmpa-dismiss'] ) ) {
-				update_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice_' . $this->id, 1 );
+			if (isset($_GET['tgmpa-dismiss'])) {
+				update_user_meta(get_current_user_id(), 'tgmpa_dismissed_notice_'.$this->id, 1);
 			}
 		}
 
@@ -1231,55 +1231,55 @@ 
 		 * @param array|null $plugin Array of plugin arguments or null if invalid argument.
 		 * @return null Return early if incorrect argument.
 		 */
-		public function register( $plugin ) {
-			if ( empty( $plugin['slug'] ) || empty( $plugin['name'] ) ) {
+		public function register($plugin) {
+			if (empty($plugin['slug']) || empty($plugin['name'])) {
 				return;
 			}
 
-			if ( empty( $plugin['slug'] ) || ! is_string( $plugin['slug'] ) || isset( $this->plugins[ $plugin['slug'] ] ) ) {
+			if (empty($plugin['slug']) || !is_string($plugin['slug']) || isset($this->plugins[$plugin['slug']])) {
 				return;
 			}
 
 			$defaults = array(
-				'name'               => '',      // String
-				'slug'               => '',      // String
-				'source'             => 'repo',  // String
-				'required'           => false,   // Boolean
-				'version'            => '',      // String
-				'force_activation'   => false,   // Boolean
-				'force_deactivation' => false,   // Boolean
-				'external_url'       => '',      // String
-				'is_callable'        => '',      // String|Array.
+				'name'               => '', // String
+				'slug'               => '', // String
+				'source'             => 'repo', // String
+				'required'           => false, // Boolean
+				'version'            => '', // String
+				'force_activation'   => false, // Boolean
+				'force_deactivation' => false, // Boolean
+				'external_url'       => '', // String
+				'is_callable'        => '', // String|Array.
 			);
 
 			// Prepare the received data.
-			$plugin = wp_parse_args( $plugin, $defaults );
+			$plugin = wp_parse_args($plugin, $defaults);
 
 			// Standardize the received slug.
-			$plugin['slug'] = $this->sanitize_key( $plugin['slug'] );
+			$plugin['slug'] = $this->sanitize_key($plugin['slug']);
 
 			// Forgive users for using string versions of booleans or floats for version number.
 			$plugin['version']            = (string) $plugin['version'];
-			$plugin['source']             = empty( $plugin['source'] ) ? 'repo' : $plugin['source'];
-			$plugin['required']           = TGMPA_Utils::validate_bool( $plugin['required'] );
-			$plugin['force_activation']   = TGMPA_Utils::validate_bool( $plugin['force_activation'] );
-			$plugin['force_deactivation'] = TGMPA_Utils::validate_bool( $plugin['force_deactivation'] );
+			$plugin['source']             = empty($plugin['source']) ? 'repo' : $plugin['source'];
+			$plugin['required']           = TGMPA_Utils::validate_bool($plugin['required']);
+			$plugin['force_activation']   = TGMPA_Utils::validate_bool($plugin['force_activation']);
+			$plugin['force_deactivation'] = TGMPA_Utils::validate_bool($plugin['force_deactivation']);
 
 			// Enrich the received data.
-			$plugin['file_path']   = $this->_get_plugin_basename_from_slug( $plugin['slug'] );
-			$plugin['source_type'] = $this->get_plugin_source_type( $plugin['source'] );
+			$plugin['file_path']   = $this->_get_plugin_basename_from_slug($plugin['slug']);
+			$plugin['source_type'] = $this->get_plugin_source_type($plugin['source']);
 
 			// Set the class properties.
-			$this->plugins[ $plugin['slug'] ]    = $plugin;
-			$this->sort_order[ $plugin['slug'] ] = $plugin['name'];
+			$this->plugins[$plugin['slug']]    = $plugin;
+			$this->sort_order[$plugin['slug']] = $plugin['name'];
 
 			// Should we add the force activation hook ?
-			if ( true === $plugin['force_activation'] ) {
+			if (true === $plugin['force_activation']) {
 				$this->has_forced_activation = true;
 			}
 
 			// Should we add the force deactivation hook ?
-			if ( true === $plugin['force_deactivation'] ) {
+			if (true === $plugin['force_deactivation']) {
 				$this->has_forced_deactivation = true;
 			}
 		}
@@ -1293,10 +1293,10 @@ 
 		 *                       (= bundled) or an external URL.
 		 * @return string 'repo', 'external', or 'bundled'
 		 */
-		protected function get_plugin_source_type( $source ) {
-			if ( 'repo' === $source || preg_match( self::WP_REPO_REGEX, $source ) ) {
+		protected function get_plugin_source_type($source) {
+			if ('repo' === $source || preg_match(self::WP_REPO_REGEX, $source)) {
 				return 'repo';
-			} elseif ( preg_match( self::IS_URL_REGEX, $source ) ) {
+			} elseif (preg_match(self::IS_URL_REGEX, $source)) {
 				return 'external';
 			} else {
 				return 'bundled';
@@ -1317,9 +1317,9 @@ 
 		 * @param string $key String key.
 		 * @return string Sanitized key
 		 */
-		public function sanitize_key( $key ) {
+		public function sanitize_key($key) {
 			$raw_key = $key;
-			$key     = preg_replace( '`[^A-Za-z0-9_-]`', '', $key );
+			$key     = preg_replace('`[^A-Za-z0-9_-]`', '', $key);
 
 			/**
 			* Filter a sanitized key string.
@@ -1329,7 +1329,7 @@ 
 			* @param string $key     Sanitized key.
 			* @param string $raw_key The key prior to sanitization.
 			*/
-			return apply_filters( 'tgmpa_sanitize_key', $key, $raw_key );
+			return apply_filters('tgmpa_sanitize_key', $key, $raw_key);
 		}
 
 		/**
@@ -1339,7 +1339,7 @@ 
 		 *
 		 * @param array $config Array of config options to pass as class properties.
 		 */
-		public function config( $config ) {
+		public function config($config) {
 			$keys = array(
 				'id',
 				'default_path',
@@ -1354,12 +1354,12 @@ 
 				'strings',
 			);
 
-			foreach ( $keys as $key ) {
-				if ( isset( $config[ $key ] ) ) {
-					if ( is_array( $config[ $key ] ) ) {
-						$this->$key = array_merge( $this->$key, $config[ $key ] );
+			foreach ($keys as $key) {
+				if (isset($config[$key])) {
+					if (is_array($config[$key])) {
+						$this->$key = array_merge($this->$key, $config[$key]);
 					} else {
-						$this->$key = $config[ $key ];
+						$this->$key = $config[$key];
 					}
 				}
 			}
@@ -1373,9 +1373,9 @@ 
 		 * @param array $install_actions Existing array of actions.
 		 * @return array Amended array of actions.
 		 */
-		public function actions( $install_actions ) {
+		public function actions($install_actions) {
 			// Remove action links on the TGMPA install page.
-			if ( $this->is_tgmpa_page() ) {
+			if ($this->is_tgmpa_page()) {
 				return false;
 			}
 
@@ -1391,8 +1391,8 @@ 
 		 * @param bool $clear_update_cache Optional. Whether to clear the Plugin updates cache.
 		 *                                 Parameter added in v2.5.0.
 		 */
-		public function flush_plugins_cache( $clear_update_cache = true ) {
-			wp_clean_plugins_cache( $clear_update_cache );
+		public function flush_plugins_cache($clear_update_cache = true) {
+			wp_clean_plugins_cache($clear_update_cache);
 		}
 
 		/**
@@ -1403,13 +1403,13 @@ 
 		 * @param string $plugin_slug Optional. If set, only (re-)populates the file path for that specific plugin.
 		 *                            Parameter added in v2.5.0.
 		 */
-		public function populate_file_path( $plugin_slug = '' ) {
-			if ( ! empty( $plugin_slug ) && is_string( $plugin_slug ) && isset( $this->plugins[ $plugin_slug ] ) ) {
-				$this->plugins[ $plugin_slug ]['file_path'] = $this->_get_plugin_basename_from_slug( $plugin_slug );
+		public function populate_file_path($plugin_slug = '') {
+			if (!empty($plugin_slug) && is_string($plugin_slug) && isset($this->plugins[$plugin_slug])) {
+				$this->plugins[$plugin_slug]['file_path'] = $this->_get_plugin_basename_from_slug($plugin_slug);
 			} else {
 				// Add file_path key for all plugins.
-				foreach ( $this->plugins as $slug => $values ) {
-					$this->plugins[ $slug ]['file_path'] = $this->_get_plugin_basename_from_slug( $slug );
+				foreach ($this->plugins as $slug => $values) {
+					$this->plugins[$slug]['file_path'] = $this->_get_plugin_basename_from_slug($slug);
 				}
 			}
 		}
@@ -1423,11 +1423,11 @@ 
 		 * @param string $slug Plugin slug (typically folder name) as provided by the developer.
 		 * @return string Either file path for plugin if installed, or just the plugin slug.
 		 */
-		protected function _get_plugin_basename_from_slug( $slug ) {
-			$keys = array_keys( $this->get_plugins() );
+		protected function _get_plugin_basename_from_slug($slug) {
+			$keys = array_keys($this->get_plugins());
 
-			foreach ( $keys as $key ) {
-				if ( preg_match( '|^' . $slug . '/|', $key ) ) {
+			foreach ($keys as $key) {
+				if (preg_match('|^'.$slug.'/|', $key)) {
 					return $key;
 				}
 			}
@@ -1447,10 +1447,10 @@ 
 		 * @param string $data Optional. Array key of plugin data to return. Default is slug.
 		 * @return string|boolean Plugin slug if found, false otherwise.
 		 */
-		public function _get_plugin_data_from_name( $name, $data = 'slug' ) {
-			foreach ( $this->plugins as $values ) {
-				if ( $name === $values['name'] && isset( $values[ $data ] ) ) {
-					return $values[ $data ];
+		public function _get_plugin_data_from_name($name, $data = 'slug') {
+			foreach ($this->plugins as $values) {
+				if ($name === $values['name'] && isset($values[$data])) {
+					return $values[$data];
 				}
 			}
 
@@ -1465,16 +1465,16 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return string Plugin download URL or path to local file or empty string if undetermined.
 		 */
-		public function get_download_url( $slug ) {
+		public function get_download_url($slug) {
 			$dl_source = '';
 
-			switch ( $this->plugins[ $slug ]['source_type'] ) {
+			switch ($this->plugins[$slug]['source_type']) {
 				case 'repo':
-					return $this->get_wp_repo_download_url( $slug );
+					return $this->get_wp_repo_download_url($slug);
 				case 'external':
-					return $this->plugins[ $slug ]['source'];
+					return $this->plugins[$slug]['source'];
 				case 'bundled':
-					return $this->default_path . $this->plugins[ $slug ]['source'];
+					return $this->default_path.$this->plugins[$slug]['source'];
 			}
 
 			return $dl_source; // Should never happen.
@@ -1488,11 +1488,11 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return string Plugin download URL.
 		 */
-		protected function get_wp_repo_download_url( $slug ) {
+		protected function get_wp_repo_download_url($slug) {
 			$source = '';
-			$api    = $this->get_plugins_api( $slug );
+			$api    = $this->get_plugins_api($slug);
 
-			if ( false !== $api && isset( $api->download_link ) ) {
+			if (false !== $api && isset($api->download_link)) {
 				$source = $api->download_link;
 			}
 
@@ -1507,26 +1507,26 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return object Plugins_api response object on success, WP_Error on failure.
 		 */
-		protected function get_plugins_api( $slug ) {
+		protected function get_plugins_api($slug) {
 			static $api = array(); // Cache received responses.
 
-			if ( ! isset( $api[ $slug ] ) ) {
-				if ( ! function_exists( 'plugins_api' ) ) {
-					require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+			if (!isset($api[$slug])) {
+				if (!function_exists('plugins_api')) {
+					require_once ABSPATH.'wp-admin/includes/plugin-install.php';
 				}
 
-				$response = plugins_api( 'plugin_information', array( 'slug' => $slug, 'fields' => array( 'sections' => false ) ) );
+				$response = plugins_api('plugin_information', array('slug' => $slug, 'fields' => array('sections' => false)));
 
-				$api[ $slug ] = false;
+				$api[$slug] = false;
 
-				if ( is_wp_error( $response ) ) {
-					wp_die( esc_html( $this->strings['oops'] ) );
+				if (is_wp_error($response)) {
+					wp_die(esc_html($this->strings['oops']));
 				} else {
-					$api[ $slug ] = $response;
+					$api[$slug] = $response;
 				}
 			}
 
-			return $api[ $slug ];
+			return $api[$slug];
 		}
 
 		/**
@@ -1538,32 +1538,32 @@ 
 		 * @return string Fully formed html link to a plugin information page if available
 		 *                or the plugin name if not.
 		 */
-		public function get_info_link( $slug ) {
-			if ( ! empty( $this->plugins[ $slug ]['external_url'] ) && preg_match( self::IS_URL_REGEX, $this->plugins[ $slug ]['external_url'] ) ) {
+		public function get_info_link($slug) {
+			if (!empty($this->plugins[$slug]['external_url']) && preg_match(self::IS_URL_REGEX, $this->plugins[$slug]['external_url'])) {
 				$link = sprintf(
 					'<a href="%1$s" target="_blank">%2$s</a>',
-					esc_url( $this->plugins[ $slug ]['external_url'] ),
-					esc_html( $this->plugins[ $slug ]['name'] )
+					esc_url($this->plugins[$slug]['external_url']),
+					esc_html($this->plugins[$slug]['name'])
 				);
-			} elseif ( 'repo' === $this->plugins[ $slug ]['source_type'] ) {
+			} elseif ('repo' === $this->plugins[$slug]['source_type']) {
 				$url = add_query_arg(
 					array(
 						'tab'       => 'plugin-information',
-						'plugin'    => urlencode( $slug ),
+						'plugin'    => urlencode($slug),
 						'TB_iframe' => 'true',
 						'width'     => '640',
 						'height'    => '500',
 					),
-					self_admin_url( 'plugin-install.php' )
+					self_admin_url('plugin-install.php')
 				);
 
 				$link = sprintf(
 					'<a href="%1$s" class="thickbox">%2$s</a>',
-					esc_url( $url ),
-					esc_html( $this->plugins[ $slug ]['name'] )
+					esc_url($url),
+					esc_html($this->plugins[$slug]['name'])
 				);
 			} else {
-				$link = esc_html( $this->plugins[ $slug ]['name'] ); // No hyperlink.
+				$link = esc_html($this->plugins[$slug]['name']); // No hyperlink.
 			}
 
 			return $link;
@@ -1577,7 +1577,7 @@ 
 		 * @return boolean True when on the TGMPA page, false otherwise.
 		 */
 		protected function is_tgmpa_page() {
-			return isset( $_GET['page'] ) && $this->menu === $_GET['page'];
+			return isset($_GET['page']) && $this->menu === $_GET['page'];
 		}
 
 		/**
@@ -1593,16 +1593,16 @@ 
 		public function get_tgmpa_url() {
 			static $url;
 
-			if ( ! isset( $url ) ) {
+			if (!isset($url)) {
 				$parent = $this->parent_slug;
-				if ( false === strpos( $parent, '.php' ) ) {
+				if (false === strpos($parent, '.php')) {
 					$parent = 'admin.php';
 				}
 				$url = add_query_arg(
 					array(
-						'page' => urlencode( $this->menu ),
+						'page' => urlencode($this->menu),
 					),
-					self_admin_url( $parent )
+					self_admin_url($parent)
 				);
 			}
 
@@ -1620,10 +1620,10 @@ 
 		 * @param string $status Plugin status - either 'install', 'update' or 'activate'.
 		 * @return string Properly encoded URL (not escaped).
 		 */
-		public function get_tgmpa_status_url( $status ) {
+		public function get_tgmpa_status_url($status) {
 			return add_query_arg(
 				array(
-					'plugin_status' => urlencode( $status ),
+					'plugin_status' => urlencode($status),
 				),
 				$this->get_tgmpa_url()
 			);
@@ -1638,8 +1638,8 @@ 
 		 */
 		public function is_tgmpa_complete() {
 			$complete = true;
-			foreach ( $this->plugins as $slug => $plugin ) {
-				if ( ! $this->is_plugin_active( $slug ) || false !== $this->does_plugin_have_update( $slug ) ) {
+			foreach ($this->plugins as $slug => $plugin) {
+				if (!$this->is_plugin_active($slug) || false !== $this->does_plugin_have_update($slug)) {
 					$complete = false;
 					break;
 				}
@@ -1656,10 +1656,10 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return bool True if installed, false otherwise.
 		 */
-		public function is_plugin_installed( $slug ) {
+		public function is_plugin_installed($slug) {
 			$installed_plugins = $this->get_plugins(); // Retrieve a list of all installed plugins (WP cached).
 
-			return ( ! empty( $installed_plugins[ $this->plugins[ $slug ]['file_path'] ] ) );
+			return (!empty($installed_plugins[$this->plugins[$slug]['file_path']]));
 		}
 
 		/**
@@ -1670,8 +1670,8 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return bool True if active, false otherwise.
 		 */
-		public function is_plugin_active( $slug ) {
-			return ( ( ! empty( $this->plugins[ $slug ]['is_callable'] ) && is_callable( $this->plugins[ $slug ]['is_callable'] ) ) || is_plugin_active( $this->plugins[ $slug ]['file_path'] ) );
+		public function is_plugin_active($slug) {
+			return ((!empty($this->plugins[$slug]['is_callable']) && is_callable($this->plugins[$slug]['is_callable'])) || is_plugin_active($this->plugins[$slug]['file_path']));
 		}
 
 		/**
@@ -1683,16 +1683,16 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return bool True if OK to update, false otherwise.
 		 */
-		public function can_plugin_update( $slug ) {
+		public function can_plugin_update($slug) {
 			// We currently can't get reliable info on non-WP-repo plugins - issue #380.
-			if ( 'repo' !== $this->plugins[ $slug ]['source_type'] ) {
+			if ('repo' !== $this->plugins[$slug]['source_type']) {
 				return true;
 			}
 
-			$api = $this->get_plugins_api( $slug );
+			$api = $this->get_plugins_api($slug);
 
-			if ( false !== $api && isset( $api->requires ) ) {
-				return version_compare( $GLOBALS['wp_version'], $api->requires, '>=' );
+			if (false !== $api && isset($api->requires)) {
+				return version_compare($GLOBALS['wp_version'], $api->requires, '>=');
 			}
 
 			// No usable info received from the plugins API, presume we can update.
@@ -1708,8 +1708,8 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return bool True if OK to activate, false otherwise.
 		 */
-		public function can_plugin_activate( $slug ) {
-			return ( ! $this->is_plugin_active( $slug ) && ! $this->does_plugin_require_update( $slug ) );
+		public function can_plugin_activate($slug) {
+			return (!$this->is_plugin_active($slug) && !$this->does_plugin_require_update($slug));
 		}
 
 		/**
@@ -1721,11 +1721,11 @@ 
 		 * @return string Version number as string or an empty string if the plugin is not installed
 		 *                or version unknown (plugins which don't comply with the plugin header standard).
 		 */
-		public function get_installed_version( $slug ) {
+		public function get_installed_version($slug) {
 			$installed_plugins = $this->get_plugins(); // Retrieve a list of all installed plugins (WP cached).
 
-			if ( ! empty( $installed_plugins[ $this->plugins[ $slug ]['file_path'] ]['Version'] ) ) {
-				return $installed_plugins[ $this->plugins[ $slug ]['file_path'] ]['Version'];
+			if (!empty($installed_plugins[$this->plugins[$slug]['file_path']]['Version'])) {
+				return $installed_plugins[$this->plugins[$slug]['file_path']]['Version'];
 			}
 
 			return '';
@@ -1739,11 +1739,11 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return bool True when a plugin needs to be updated, otherwise false.
 		 */
-		public function does_plugin_require_update( $slug ) {
-			$installed_version = $this->get_installed_version( $slug );
-			$minimum_version   = $this->plugins[ $slug ]['version'];
+		public function does_plugin_require_update($slug) {
+			$installed_version = $this->get_installed_version($slug);
+			$minimum_version   = $this->plugins[$slug]['version'];
 
-			return version_compare( $minimum_version, $installed_version, '>' );
+			return version_compare($minimum_version, $installed_version, '>');
 		}
 
 		/**
@@ -1754,20 +1754,20 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return false|string Version number string of the available update or false if no update available.
 		 */
-		public function does_plugin_have_update( $slug ) {
+		public function does_plugin_have_update($slug) {
 			// Presume bundled and external plugins will point to a package which meets the minimum required version.
-			if ( 'repo' !== $this->plugins[ $slug ]['source_type'] ) {
-				if ( $this->does_plugin_require_update( $slug ) ) {
-					return $this->plugins[ $slug ]['version'];
+			if ('repo' !== $this->plugins[$slug]['source_type']) {
+				if ($this->does_plugin_require_update($slug)) {
+					return $this->plugins[$slug]['version'];
 				}
 
 				return false;
 			}
 
-			$repo_updates = get_site_transient( 'update_plugins' );
+			$repo_updates = get_site_transient('update_plugins');
 
-			if ( isset( $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->new_version ) ) {
-				return $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->new_version;
+			if (isset($repo_updates->response[$this->plugins[$slug]['file_path']]->new_version)) {
+				return $repo_updates->response[$this->plugins[$slug]['file_path']]->new_version;
 			}
 
 			return false;
@@ -1781,16 +1781,16 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return string The upgrade notice or an empty string if no message was available or provided.
 		 */
-		public function get_upgrade_notice( $slug ) {
+		public function get_upgrade_notice($slug) {
 			// We currently can't get reliable info on non-WP-repo plugins - issue #380.
-			if ( 'repo' !== $this->plugins[ $slug ]['source_type'] ) {
+			if ('repo' !== $this->plugins[$slug]['source_type']) {
 				return '';
 			}
 
-			$repo_updates = get_site_transient( 'update_plugins' );
+			$repo_updates = get_site_transient('update_plugins');
 
-			if ( ! empty( $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->upgrade_notice ) ) {
-				return $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->upgrade_notice;
+			if (!empty($repo_updates->response[$this->plugins[$slug]['file_path']]->upgrade_notice)) {
+				return $repo_updates->response[$this->plugins[$slug]['file_path']]->upgrade_notice;
 			}
 
 			return '';
@@ -1804,12 +1804,12 @@ 
 		 * @param string $plugin_folder Optional. Relative path to single plugin folder.
 		 * @return array Array of installed plugins with plugin information.
 		 */
-		public function get_plugins( $plugin_folder = '' ) {
-			if ( ! function_exists( 'get_plugins' ) ) {
-				require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		public function get_plugins($plugin_folder = '') {
+			if (!function_exists('get_plugins')) {
+				require_once ABSPATH.'wp-admin/includes/plugin.php';
 			}
 
-			return get_plugins( $plugin_folder );
+			return get_plugins($plugin_folder);
 		}
 
 		/**
@@ -1821,7 +1821,7 @@ 
 		 * @since 2.1.1
 		 */
 		public function update_dismiss() {
-			delete_metadata( 'user', null, 'tgmpa_dismissed_notice_' . $this->id, null, true );
+			delete_metadata('user', null, 'tgmpa_dismissed_notice_'.$this->id, null, true);
 		}
 
 		/**
@@ -1839,14 +1839,14 @@ 
 		 * @since 2.2.0
 		 */
 		public function force_activation() {
-			foreach ( $this->plugins as $slug => $plugin ) {
-				if ( true === $plugin['force_activation'] ) {
-					if ( ! $this->is_plugin_installed( $slug ) ) {
+			foreach ($this->plugins as $slug => $plugin) {
+				if (true === $plugin['force_activation']) {
+					if (!$this->is_plugin_installed($slug)) {
 						// Oops, plugin isn't there so iterate to next condition.
 						continue;
-					} elseif ( $this->can_plugin_activate( $slug ) ) {
+					} elseif ($this->can_plugin_activate($slug)) {
 						// There we go, activate the plugin.
-						activate_plugin( $plugin['file_path'] );
+						activate_plugin($plugin['file_path']);
 					}
 				}
 			}
@@ -1865,10 +1865,10 @@ 
 		 * @since 2.2.0
 		 */
 		public function force_deactivation() {
-			foreach ( $this->plugins as $slug => $plugin ) {
+			foreach ($this->plugins as $slug => $plugin) {
 				// Only proceed forward if the parameter is set to true and plugin is active.
-				if ( true === $plugin['force_deactivation'] && $this->is_plugin_active( $slug ) ) {
-					deactivate_plugins( $plugin['file_path'] );
+				if (true === $plugin['force_deactivation'] && $this->is_plugin_active($slug)) {
+					deactivate_plugins($plugin['file_path']);
 				}
 			}
 		}
@@ -1878,7 +1878,7 @@ 
 		 */
 		public function show_tgmpa_version() {
 			echo '<p style="float: right; padding: 0em 1.5em 0.5em 0;"><strong><small>',
-				esc_html( sprintf( _x( 'TGMPA v%s', '%s = version number', 'tgmpa' ), self::TGMPA_VERSION ) ),
+				esc_html(sprintf(_x('TGMPA v%s', '%s = version number', 'tgmpa'), self::TGMPA_VERSION)),
 				'</small></strong></p>';
 		}
 
@@ -1890,7 +1890,7 @@ 
 		 * @return object The TGM_Plugin_Activation object.
 		 */
 		public static function get_instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof self ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof self)) {
 				self::$instance = new self();
 			}
 
@@ -1898,7 +1898,7 @@ 
 		}
 	}
 
-	if ( ! function_exists( 'load_tgm_plugin_activation' ) ) {
+	if (!function_exists('load_tgm_plugin_activation')) {
 		/**
 		 * Ensure only one instance of the class is ever invoked.
 		 */
@@ -1907,14 +1907,14 @@ 
 		}
 	}
 
-	if ( did_action( 'plugins_loaded' ) ) {
+	if (did_action('plugins_loaded')) {
 		load_tgm_plugin_activation();
 	} else {
-		add_action( 'plugins_loaded', 'load_tgm_plugin_activation' );
+		add_action('plugins_loaded', 'load_tgm_plugin_activation');
 	}
 }
 
-if ( ! function_exists( 'tgmpa' ) ) {
+if (!function_exists('tgmpa')) {
 	/**
 	 * Helper function to register a collection of required plugins.
 	 *
@@ -1924,30 +1924,30 @@ 
 	 * @param array $plugins An array of plugin arrays.
 	 * @param array $config  Optional. An array of configuration values.
 	 */
-	function tgmpa( $plugins, $config = array() ) {
-		$instance = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
+	function tgmpa($plugins, $config = array()) {
+		$instance = call_user_func(array(get_class($GLOBALS['tgmpa']), 'get_instance'));
 
-		foreach ( $plugins as $plugin ) {
-			call_user_func( array( $instance, 'register' ), $plugin );
+		foreach ($plugins as $plugin) {
+			call_user_func(array($instance, 'register'), $plugin);
 		}
 
-		if ( ! empty( $config ) && is_array( $config ) ) {
+		if (!empty($config) && is_array($config)) {
 			// Send out notices for deprecated arguments passed.
-			if ( isset( $config['notices'] ) ) {
-				_deprecated_argument( __FUNCTION__, '2.2.0', 'The `notices` config parameter was renamed to `has_notices` in TGMPA 2.2.0. Please adjust your configuration.' );
-				if ( ! isset( $config['has_notices'] ) ) {
+			if (isset($config['notices'])) {
+				_deprecated_argument(__FUNCTION__, '2.2.0', 'The `notices` config parameter was renamed to `has_notices` in TGMPA 2.2.0. Please adjust your configuration.');
+				if (!isset($config['has_notices'])) {
 					$config['has_notices'] = $config['notices'];
 				}
 			}
 
-			if ( isset( $config['parent_menu_slug'] ) ) {
-				_deprecated_argument( __FUNCTION__, '2.4.0', 'The `parent_menu_slug` config parameter was removed in TGMPA 2.4.0. In TGMPA 2.5.0 an alternative was (re-)introduced. Please adjust your configuration. For more information visit the website: http://tgmpluginactivation.com/configuration/#h-configuration-options.' );
+			if (isset($config['parent_menu_slug'])) {
+				_deprecated_argument(__FUNCTION__, '2.4.0', 'The `parent_menu_slug` config parameter was removed in TGMPA 2.4.0. In TGMPA 2.5.0 an alternative was (re-)introduced. Please adjust your configuration. For more information visit the website: http://tgmpluginactivation.com/configuration/#h-configuration-options.');
 			}
-			if ( isset( $config['parent_url_slug'] ) ) {
-				_deprecated_argument( __FUNCTION__, '2.4.0', 'The `parent_url_slug` config parameter was removed in TGMPA 2.4.0. In TGMPA 2.5.0 an alternative was (re-)introduced. Please adjust your configuration. For more information visit the website: http://tgmpluginactivation.com/configuration/#h-configuration-options.' );
+			if (isset($config['parent_url_slug'])) {
+				_deprecated_argument(__FUNCTION__, '2.4.0', 'The `parent_url_slug` config parameter was removed in TGMPA 2.4.0. In TGMPA 2.5.0 an alternative was (re-)introduced. Please adjust your configuration. For more information visit the website: http://tgmpluginactivation.com/configuration/#h-configuration-options.');
 			}
 
-			call_user_func( array( $instance, 'config' ), $config );
+			call_user_func(array($instance, 'config'), $config);
 		}
 	}
 }
@@ -1958,11 +1958,11 @@ 
  *
  * @since 2.2.0
  */
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if (!class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
-if ( ! class_exists( 'TGMPA_List_Table' ) ) {
+if (!class_exists('TGMPA_List_Table')) {
 
 	/**
 	 * List table class for handling plugins.
@@ -2020,7 +2020,7 @@ 
 		 * @since 2.2.0
 		 */
 		public function __construct() {
-			$this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
+			$this->tgmpa = call_user_func(array(get_class($GLOBALS['tgmpa']), 'get_instance'));
 
 			parent::__construct(
 				array(
@@ -2030,11 +2030,11 @@ 
 				)
 			);
 
-			if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'install', 'update', 'activate' ), true ) ) {
-				$this->view_context = sanitize_key( $_REQUEST['plugin_status'] );
+			if (isset($_REQUEST['plugin_status']) && in_array($_REQUEST['plugin_status'], array('install', 'update', 'activate'), true)) {
+				$this->view_context = sanitize_key($_REQUEST['plugin_status']);
 			}
 
-			add_filter( 'tgmpa_table_data_items', array( $this, 'sort_table_items' ) );
+			add_filter('tgmpa_table_data_items', array($this, 'sort_table_items'));
 		}
 
 		/**
@@ -2047,7 +2047,7 @@ 
 		 * @return array CSS classnames.
 		 */
 		public function get_table_classes() {
-			return array( 'widefat', 'fixed' );
+			return array('widefat', 'fixed');
 		}
 
 		/**
@@ -2066,37 +2066,37 @@ 
 			$plugins = $this->categorize_plugins_to_views();
 
 			// Set the counts for the view links.
-			$this->set_view_totals( $plugins );
+			$this->set_view_totals($plugins);
 
 			// Prep variables for use and grab list of all installed plugins.
 			$table_data = array();
 			$i          = 0;
 
 			// Redirect to the 'all' view if no plugins were found for the selected view context.
-			if ( empty( $plugins[ $this->view_context ] ) ) {
+			if (empty($plugins[$this->view_context])) {
 				$this->view_context = 'all';
 			}
 
-			foreach ( $plugins[ $this->view_context ] as $slug => $plugin ) {
-				$table_data[ $i ]['sanitized_plugin']  = $plugin['name'];
-				$table_data[ $i ]['slug']              = $slug;
-				$table_data[ $i ]['plugin']            = '<strong>' . $this->tgmpa->get_info_link( $slug ) . '</strong>';
-				$table_data[ $i ]['source']            = $this->get_plugin_source_type_text( $plugin['source_type'] );
-				$table_data[ $i ]['type']              = $this->get_plugin_advise_type_text( $plugin['required'] );
-				$table_data[ $i ]['status']            = $this->get_plugin_status_text( $slug );
-				$table_data[ $i ]['installed_version'] = $this->tgmpa->get_installed_version( $slug );
-				$table_data[ $i ]['minimum_version']   = $plugin['version'];
-				$table_data[ $i ]['available_version'] = $this->tgmpa->does_plugin_have_update( $slug );
+			foreach ($plugins[$this->view_context] as $slug => $plugin) {
+				$table_data[$i]['sanitized_plugin']  = $plugin['name'];
+				$table_data[$i]['slug']              = $slug;
+				$table_data[$i]['plugin']            = '<strong>'.$this->tgmpa->get_info_link($slug).'</strong>';
+				$table_data[$i]['source']            = $this->get_plugin_source_type_text($plugin['source_type']);
+				$table_data[$i]['type']              = $this->get_plugin_advise_type_text($plugin['required']);
+				$table_data[$i]['status']            = $this->get_plugin_status_text($slug);
+				$table_data[$i]['installed_version'] = $this->tgmpa->get_installed_version($slug);
+				$table_data[$i]['minimum_version']   = $plugin['version'];
+				$table_data[$i]['available_version'] = $this->tgmpa->does_plugin_have_update($slug);
 
 				// Prep the upgrade notice info.
-				$upgrade_notice = $this->tgmpa->get_upgrade_notice( $slug );
-				if ( ! empty( $upgrade_notice ) ) {
-					$table_data[ $i ]['upgrade_notice'] = $upgrade_notice;
+				$upgrade_notice = $this->tgmpa->get_upgrade_notice($slug);
+				if (!empty($upgrade_notice)) {
+					$table_data[$i]['upgrade_notice'] = $upgrade_notice;
 
-					add_action( "tgmpa_after_plugin_row_$slug", array( $this, 'wp_plugin_update_row' ), 10, 2 );
+					add_action("tgmpa_after_plugin_row_$slug", array($this, 'wp_plugin_update_row'), 10, 2);
 				}
 
-				$table_data[ $i ] = apply_filters( 'tgmpa_table_data_item', $table_data[ $i ], $plugin );
+				$table_data[$i] = apply_filters('tgmpa_table_data_item', $table_data[$i], $plugin);
 
 				$i++;
 			}
@@ -2117,22 +2117,22 @@ 
 				'activate' => array(),
 			);
 
-			foreach ( $this->tgmpa->plugins as $slug => $plugin ) {
-				if ( $this->tgmpa->is_plugin_active( $slug ) && false === $this->tgmpa->does_plugin_have_update( $slug ) ) {
+			foreach ($this->tgmpa->plugins as $slug => $plugin) {
+				if ($this->tgmpa->is_plugin_active($slug) && false === $this->tgmpa->does_plugin_have_update($slug)) {
 					// No need to display plugins if they are installed, up-to-date and active.
 					continue;
 				} else {
-					$plugins['all'][ $slug ] = $plugin;
+					$plugins['all'][$slug] = $plugin;
 
-					if ( ! $this->tgmpa->is_plugin_installed( $slug ) ) {
-						$plugins['install'][ $slug ] = $plugin;
+					if (!$this->tgmpa->is_plugin_installed($slug)) {
+						$plugins['install'][$slug] = $plugin;
 					} else {
-						if ( false !== $this->tgmpa->does_plugin_have_update( $slug ) ) {
-							$plugins['update'][ $slug ] = $plugin;
+						if (false !== $this->tgmpa->does_plugin_have_update($slug)) {
+							$plugins['update'][$slug] = $plugin;
 						}
 
-						if ( $this->tgmpa->can_plugin_activate( $slug ) ) {
-							$plugins['activate'][ $slug ] = $plugin;
+						if ($this->tgmpa->can_plugin_activate($slug)) {
+							$plugins['activate'][$slug] = $plugin;
 						}
 					}
 				}
@@ -2148,9 +2148,9 @@ 
 		 *
 		 * @param array $plugins Plugins order by view.
 		 */
-		protected function set_view_totals( $plugins ) {
-			foreach ( $plugins as $type => $list ) {
-				$this->view_totals[ $type ] = count( $list );
+		protected function set_view_totals($plugins) {
+			foreach ($plugins as $type => $list) {
+				$this->view_totals[$type] = count($list);
 			}
 		}
 
@@ -2162,12 +2162,12 @@ 
 		 * @param string $required Plugin required setting.
 		 * @return string
 		 */
-		protected function get_plugin_advise_type_text( $required ) {
-			if ( true === $required ) {
-				return __( 'Required', 'tgmpa' );
+		protected function get_plugin_advise_type_text($required) {
+			if (true === $required) {
+				return __('Required', 'tgmpa');
 			}
 
-			return __( 'Recommended', 'tgmpa' );
+			return __('Recommended', 'tgmpa');
 		}
 
 		/**
@@ -2178,18 +2178,18 @@ 
 		 * @param string $type Plugin type.
 		 * @return string
 		 */
-		protected function get_plugin_source_type_text( $type ) {
+		protected function get_plugin_source_type_text($type) {
 			$string = '';
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'repo':
-					$string = __( 'WordPress Repository', 'tgmpa' );
+					$string = __('WordPress Repository', 'tgmpa');
 					break;
 				case 'external':
-					$string = __( 'External Source', 'tgmpa' );
+					$string = __('External Source', 'tgmpa');
 					break;
 				case 'bundled':
-					$string = __( 'Pre-Packaged', 'tgmpa' );
+					$string = __('Pre-Packaged', 'tgmpa');
 					break;
 			}
 
@@ -2204,35 +2204,35 @@ 
 		 * @param string $slug Plugin slug.
 		 * @return string
 		 */
-		protected function get_plugin_status_text( $slug ) {
-			if ( ! $this->tgmpa->is_plugin_installed( $slug ) ) {
-				return __( 'Not Installed', 'tgmpa' );
+		protected function get_plugin_status_text($slug) {
+			if (!$this->tgmpa->is_plugin_installed($slug)) {
+				return __('Not Installed', 'tgmpa');
 			}
 
-			if ( ! $this->tgmpa->is_plugin_active( $slug ) ) {
-				$install_status = __( 'Installed But Not Activated', 'tgmpa' );
+			if (!$this->tgmpa->is_plugin_active($slug)) {
+				$install_status = __('Installed But Not Activated', 'tgmpa');
 			} else {
-				$install_status = __( 'Active', 'tgmpa' );
+				$install_status = __('Active', 'tgmpa');
 			}
 
 			$update_status = '';
 
-			if ( $this->tgmpa->does_plugin_require_update( $slug ) && false === $this->tgmpa->does_plugin_have_update( $slug ) ) {
-				$update_status = __( 'Required Update not Available', 'tgmpa' );
+			if ($this->tgmpa->does_plugin_require_update($slug) && false === $this->tgmpa->does_plugin_have_update($slug)) {
+				$update_status = __('Required Update not Available', 'tgmpa');
 
-			} elseif ( $this->tgmpa->does_plugin_require_update( $slug ) ) {
-				$update_status = __( 'Requires Update', 'tgmpa' );
+			} elseif ($this->tgmpa->does_plugin_require_update($slug)) {
+				$update_status = __('Requires Update', 'tgmpa');
 
-			} elseif ( false !== $this->tgmpa->does_plugin_have_update( $slug ) ) {
-				$update_status = __( 'Update recommended', 'tgmpa' );
+			} elseif (false !== $this->tgmpa->does_plugin_have_update($slug)) {
+				$update_status = __('Update recommended', 'tgmpa');
 			}
 
-			if ( '' === $update_status ) {
+			if ('' === $update_status) {
 				return $install_status;
 			}
 
 			return sprintf(
-				_x( '%1$s, %2$s', '%1$s = install status, %2$s = update status', 'tgmpa' ),
+				_x('%1$s, %2$s', '%1$s = install status, %2$s = update status', 'tgmpa'),
 				$install_status,
 				$update_status
 			);
@@ -2246,16 +2246,16 @@ 
 		 * @param array $items Prepared table items.
 		 * @return array Sorted table items.
 		 */
-		public function sort_table_items( $items ) {
+		public function sort_table_items($items) {
 			$type = array();
 			$name = array();
 
-			foreach ( $items as $i => $plugin ) {
-				$type[ $i ] = $plugin['type']; // Required / recommended.
-				$name[ $i ] = $plugin['sanitized_plugin'];
+			foreach ($items as $i => $plugin) {
+				$type[$i] = $plugin['type']; // Required / recommended.
+				$name[$i] = $plugin['sanitized_plugin'];
 			}
 
-			array_multisort( $type, SORT_DESC, $name, SORT_ASC, $items );
+			array_multisort($type, SORT_DESC, $name, SORT_ASC, $items);
 
 			return $items;
 		}
@@ -2270,36 +2270,36 @@ 
 		public function get_views() {
 			$status_links = array();
 
-			foreach ( $this->view_totals as $type => $count ) {
-				if ( $count < 1 ) {
+			foreach ($this->view_totals as $type => $count) {
+				if ($count < 1) {
 					continue;
 				}
 
-				switch ( $type ) {
+				switch ($type) {
 					case 'all':
-						$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins', 'tgmpa' );
+						$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins', 'tgmpa');
 						break;
 					case 'install':
-						$text = _n( 'To Install <span class="count">(%s)</span>', 'To Install <span class="count">(%s)</span>', $count, 'tgmpa' );
+						$text = _n('To Install <span class="count">(%s)</span>', 'To Install <span class="count">(%s)</span>', $count, 'tgmpa');
 						break;
 					case 'update':
-						$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count, 'tgmpa' );
+						$text = _n('Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count, 'tgmpa');
 						break;
 					case 'activate':
-						$text = _n( 'To Activate <span class="count">(%s)</span>', 'To Activate <span class="count">(%s)</span>', $count, 'tgmpa' );
+						$text = _n('To Activate <span class="count">(%s)</span>', 'To Activate <span class="count">(%s)</span>', $count, 'tgmpa');
 						break;
 					default:
 						$text = '';
 						break;
 				}
 
-				if ( ! empty( $text ) ) {
+				if (!empty($text)) {
 
-					$status_links[ $type ] = sprintf(
+					$status_links[$type] = sprintf(
 						'<a href="%s"%s>%s</a>',
-						esc_url( $this->tgmpa->get_tgmpa_status_url( $type ) ),
-						( $type === $this->view_context ) ? ' class="current"' : '',
-						sprintf( $text, number_format_i18n( $count ) )
+						esc_url($this->tgmpa->get_tgmpa_status_url($type)),
+						($type === $this->view_context) ? ' class="current"' : '',
+						sprintf($text, number_format_i18n($count))
 					);
 				}
 			}
@@ -2317,8 +2317,8 @@ 
 		 * @param string $column_name The name of the column.
 		 * @return string
 		 */
-		public function column_default( $item, $column_name ) {
-			return $item[ $column_name ];
+		public function column_default($item, $column_name) {
+			return $item[$column_name];
 		}
 
 		/**
@@ -2331,12 +2331,12 @@ 
 		 * @param array $item Array of item data.
 		 * @return string The input checkbox with all necessary info.
 		 */
-		public function column_cb( $item ) {
+		public function column_cb($item) {
 			return sprintf(
 				'<input type="checkbox" name="%1$s[]" value="%2$s" id="%3$s" />',
-				esc_attr( $this->_args['singular'] ),
-				esc_attr( $item['slug'] ),
-				esc_attr( $item['sanitized_plugin'] )
+				esc_attr($this->_args['singular']),
+				esc_attr($item['slug']),
+				esc_attr($item['sanitized_plugin'])
 			);
 		}
 
@@ -2348,11 +2348,11 @@ 
 		 * @param array $item Array of item data.
 		 * @return string The plugin name and action links.
 		 */
-		public function column_plugin( $item ) {
+		public function column_plugin($item) {
 			return sprintf(
 				'%1$s %2$s',
 				$item['plugin'],
-				$this->row_actions( $this->get_row_actions( $item ), true )
+				$this->row_actions($this->get_row_actions($item), true)
 			);
 		}
 
@@ -2364,48 +2364,48 @@ 
 		 * @param array $item Array of item data.
 		 * @return string HTML-formatted version information.
 		 */
-		public function column_version( $item ) {
+		public function column_version($item) {
 			$output = array();
 
-			if ( $this->tgmpa->is_plugin_installed( $item['slug'] ) ) {
-				$installed = ! empty( $item['installed_version'] ) ? $item['installed_version'] : _x( 'unknown', 'as in: "version nr unknown"', 'tgmpa' );
+			if ($this->tgmpa->is_plugin_installed($item['slug'])) {
+				$installed = !empty($item['installed_version']) ? $item['installed_version'] : _x('unknown', 'as in: "version nr unknown"', 'tgmpa');
 
 				$color = '';
-				if ( ! empty( $item['minimum_version'] ) && $this->tgmpa->does_plugin_require_update( $item['slug'] ) ) {
+				if (!empty($item['minimum_version']) && $this->tgmpa->does_plugin_require_update($item['slug'])) {
 					$color = ' color: #ff0000; font-weight: bold;';
 				}
 
 				$output[] = sprintf(
-					'<p><span style="min-width: 32px; text-align: right; float: right;%1$s">%2$s</span>' . __( 'Installed version:', 'tgmpa' ) . '</p>',
+					'<p><span style="min-width: 32px; text-align: right; float: right;%1$s">%2$s</span>'.__('Installed version:', 'tgmpa').'</p>',
 					$color,
 					$installed
 				);
 			}
 
-			if ( ! empty( $item['minimum_version'] ) ) {
+			if (!empty($item['minimum_version'])) {
 				$output[] = sprintf(
-					'<p><span style="min-width: 32px; text-align: right; float: right;">%1$s</span>' . __( 'Minimum required version:', 'tgmpa' ) . '</p>',
+					'<p><span style="min-width: 32px; text-align: right; float: right;">%1$s</span>'.__('Minimum required version:', 'tgmpa').'</p>',
 					$item['minimum_version']
 				);
 			}
 
-			if ( ! empty( $item['available_version'] ) ) {
+			if (!empty($item['available_version'])) {
 				$color = '';
-				if ( ! empty( $item['minimum_version'] ) && version_compare( $item['available_version'], $item['minimum_version'], '>=' ) ) {
+				if (!empty($item['minimum_version']) && version_compare($item['available_version'], $item['minimum_version'], '>=')) {
 					$color = ' color: #71C671; font-weight: bold;';
 				}
 
 				$output[] = sprintf(
-					'<p><span style="min-width: 32px; text-align: right; float: right;%1$s">%2$s</span>' . __( 'Available version:', 'tgmpa' ) . '</p>',
+					'<p><span style="min-width: 32px; text-align: right; float: right;%1$s">%2$s</span>'.__('Available version:', 'tgmpa').'</p>',
 					$color,
 					$item['available_version']
 				);
 			}
 
-			if ( empty( $output ) ) {
+			if (empty($output)) {
 				return '&nbsp;'; // Let's not break the table layout.
 			} else {
-				return implode( "\n", $output );
+				return implode("\n", $output);
 			}
 		}
 
@@ -2419,7 +2419,7 @@ 
 		 * @since 2.2.0
 		 */
 		public function no_items() {
-			printf( wp_kses_post( __( 'No plugins to install, update or activate. <a href="%1$s">Return to the Dashboard</a>', 'tgmpa' ) ), esc_url( self_admin_url() ) );
+			printf(wp_kses_post(__('No plugins to install, update or activate. <a href="%1$s">Return to the Dashboard</a>', 'tgmpa')), esc_url(self_admin_url()));
 			echo '<style type="text/css">#adminmenu .wp-submenu li.current { display: none !important; }</style>';
 		}
 
@@ -2433,17 +2433,17 @@ 
 		public function get_columns() {
 			$columns = array(
 				'cb'     => '<input type="checkbox" />',
-				'plugin' => __( 'Plugin', 'tgmpa' ),
-				'source' => __( 'Source', 'tgmpa' ),
-				'type'   => __( 'Type', 'tgmpa' ),
+				'plugin' => __('Plugin', 'tgmpa'),
+				'source' => __('Source', 'tgmpa'),
+				'type'   => __('Type', 'tgmpa'),
 			);
 
-			if ( 'all' === $this->view_context || 'update' === $this->view_context ) {
-				$columns['version'] = __( 'Version', 'tgmpa' );
-				$columns['status']  = __( 'Status', 'tgmpa' );
+			if ('all' === $this->view_context || 'update' === $this->view_context) {
+				$columns['version'] = __('Version', 'tgmpa');
+				$columns['status']  = __('Status', 'tgmpa');
 			}
 
-			return apply_filters( 'tgmpa_table_columns', $columns );
+			return apply_filters('tgmpa_table_columns', $columns);
 		}
 
 		/**
@@ -2467,7 +2467,7 @@ 
 		 * @return string The name of the primary column.
 		 */
 		protected function get_primary_column_name() {
-			if ( method_exists( 'WP_List_Table', 'get_primary_column_name' ) ) {
+			if (method_exists('WP_List_Table', 'get_primary_column_name')) {
 				return parent::get_primary_column_name();
 			} else {
 				return $this->get_default_primary_column_name();
@@ -2482,48 +2482,48 @@ 
 		 * @param array $item Array of item data.
 		 * @return array Array with relevant action links.
 		 */
-		protected function get_row_actions( $item ) {
+		protected function get_row_actions($item) {
 			$actions      = array();
 			$action_links = array();
 
 			// Display the 'Install' action link if the plugin is not yet available.
-			if ( ! $this->tgmpa->is_plugin_installed( $item['slug'] ) ) {
-				$actions['install'] = _x( 'Install %2$s', '%2$s = plugin name in screen reader markup', 'tgmpa' );
+			if (!$this->tgmpa->is_plugin_installed($item['slug'])) {
+				$actions['install'] = _x('Install %2$s', '%2$s = plugin name in screen reader markup', 'tgmpa');
 			} else {
 				// Display the 'Update' action link if an update is available and WP complies with plugin minimum.
-				if ( false !== $this->tgmpa->does_plugin_have_update( $item['slug'] ) && $this->tgmpa->can_plugin_update( $item['slug'] ) ) {
-					$actions['update'] = _x( 'Update %2$s', '%2$s = plugin name in screen reader markup', 'tgmpa' );
+				if (false !== $this->tgmpa->does_plugin_have_update($item['slug']) && $this->tgmpa->can_plugin_update($item['slug'])) {
+					$actions['update'] = _x('Update %2$s', '%2$s = plugin name in screen reader markup', 'tgmpa');
 				}
 
 				// Display the 'Activate' action link, but only if the plugin meets the minimum version.
-				if ( $this->tgmpa->can_plugin_activate( $item['slug'] ) ) {
-					$actions['activate'] = _x( 'Activate %2$s', '%2$s = plugin name in screen reader markup', 'tgmpa' );
+				if ($this->tgmpa->can_plugin_activate($item['slug'])) {
+					$actions['activate'] = _x('Activate %2$s', '%2$s = plugin name in screen reader markup', 'tgmpa');
 				}
 			}
 
 			// Create the actual links.
-			foreach ( $actions as $action => $text ) {
+			foreach ($actions as $action => $text) {
 				$nonce_url = wp_nonce_url(
 					add_query_arg(
 						array(
-							'plugin'           => urlencode( $item['slug'] ),
-							'tgmpa-' . $action => $action . '-plugin',
+							'plugin'           => urlencode($item['slug']),
+							'tgmpa-'.$action => $action.'-plugin',
 						),
 						$this->tgmpa->get_tgmpa_url()
 					),
-					'tgmpa-' . $action,
+					'tgmpa-'.$action,
 					'tgmpa-nonce'
 				);
 
-				$action_links[ $action ] = sprintf(
-					'<a href="%1$s">' . esc_html( $text ) . '</a>',
-					esc_url( $nonce_url ),
-					'<span class="screen-reader-text">' . esc_html( $item['sanitized_plugin'] ) . '</span>'
+				$action_links[$action] = sprintf(
+					'<a href="%1$s">'.esc_html($text).'</a>',
+					esc_url($nonce_url),
+					'<span class="screen-reader-text">'.esc_html($item['sanitized_plugin']).'</span>'
 				);
 			}
 
-			$prefix = ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN ) ? 'network_admin_' : '';
-			return apply_filters( "tgmpa_{$prefix}plugin_action_links", array_filter( $action_links ), $item['slug'], $item, $this->view_context );
+			$prefix = (defined('WP_NETWORK_ADMIN') && WP_NETWORK_ADMIN) ? 'network_admin_' : '';
+			return apply_filters("tgmpa_{$prefix}plugin_action_links", array_filter($action_links), $item['slug'], $item, $this->view_context);
 		}
 
 		/**
@@ -2533,8 +2533,8 @@ 
 		 *
 		 * @param object $item The current item.
 		 */
-		public function single_row( $item ) {
-			parent::single_row( $item );
+		public function single_row($item) {
+			parent::single_row($item);
 
 			/**
 			 * Fires after each specific row in the TGMPA Plugins list table.
@@ -2544,7 +2544,7 @@ 
 			 *
 			 * @since 2.5.0
 			 */
-			do_action( "tgmpa_after_plugin_row_{$item['slug']}", $item['slug'], $item, $this->view_context );
+			do_action("tgmpa_after_plugin_row_{$item['slug']}", $item['slug'], $item, $this->view_context);
 		}
 
 		/**
@@ -2558,17 +2558,17 @@ 
 		 * @param array  $item The information available in this table row.
 		 * @return null Return early if upgrade notice is empty.
 		 */
-		public function wp_plugin_update_row( $slug, $item ) {
-			if ( empty( $item['upgrade_notice'] ) ) {
+		public function wp_plugin_update_row($slug, $item) {
+			if (empty($item['upgrade_notice'])) {
 				return;
 			}
 
 			echo '
 				<tr class="plugin-update-tr">
-					<td colspan="', absint( $this->get_column_count() ), '" class="plugin-update colspanchange">
+					<td colspan="', absint($this->get_column_count()), '" class="plugin-update colspanchange">
 						<div class="update-message">',
-							esc_html__( 'Upgrade message from the plugin author:', 'tgmpa' ),
-							' <strong>', wp_kses_data( $item['upgrade_notice'] ), '</strong>
+							esc_html__('Upgrade message from the plugin author:', 'tgmpa'),
+							' <strong>', wp_kses_data($item['upgrade_notice']), '</strong>
 						</div>
 					</td>
 				</tr>';
@@ -2581,8 +2581,8 @@ 
 		 *
 		 * @param string $which 'top' or 'bottom' table navigation.
 		 */
-		public function extra_tablenav( $which ) {
-			if ( 'bottom' === $which ) {
+		public function extra_tablenav($which) {
+			if ('bottom' === $which) {
 				$this->tgmpa->show_tgmpa_version();
 			}
 		}
@@ -2598,18 +2598,18 @@ 
 
 			$actions = array();
 
-			if ( 'update' !== $this->view_context && 'activate' !== $this->view_context ) {
-				if ( current_user_can( 'install_plugins' ) ) {
-					$actions['tgmpa-bulk-install'] = __( 'Install', 'tgmpa' );
+			if ('update' !== $this->view_context && 'activate' !== $this->view_context) {
+				if (current_user_can('install_plugins')) {
+					$actions['tgmpa-bulk-install'] = __('Install', 'tgmpa');
 				}
 			}
 
-			if ( 'install' !== $this->view_context ) {
-				if ( current_user_can( 'update_plugins' ) ) {
-					$actions['tgmpa-bulk-update'] = __( 'Update', 'tgmpa' );
+			if ('install' !== $this->view_context) {
+				if (current_user_can('update_plugins')) {
+					$actions['tgmpa-bulk-update'] = __('Update', 'tgmpa');
 				}
-				if ( current_user_can( 'activate_plugins' ) ) {
-					$actions['tgmpa-bulk-activate'] = __( 'Activate', 'tgmpa' );
+				if (current_user_can('activate_plugins')) {
+					$actions['tgmpa-bulk-activate'] = __('Activate', 'tgmpa');
 				}
 			}
 
@@ -2626,64 +2626,64 @@ 
 		 */
 		public function process_bulk_actions() {
 			// Bulk installation process.
-			if ( 'tgmpa-bulk-install' === $this->current_action() || 'tgmpa-bulk-update' === $this->current_action() ) {
+			if ('tgmpa-bulk-install' === $this->current_action() || 'tgmpa-bulk-update' === $this->current_action()) {
 
-				check_admin_referer( 'bulk-' . $this->_args['plural'] );
+				check_admin_referer('bulk-'.$this->_args['plural']);
 
 				$install_type = 'install';
-				if ( 'tgmpa-bulk-update' === $this->current_action() ) {
+				if ('tgmpa-bulk-update' === $this->current_action()) {
 					$install_type = 'update';
 				}
 
 				$plugins_to_install = array();
 
 				// Did user actually select any plugins to install/update ?
-				if ( empty( $_POST['plugin'] ) ) {
-					if ( 'install' === $install_type ) {
-						$message = __( 'No plugins were selected to be installed. No action taken.', 'tgmpa' );
+				if (empty($_POST['plugin'])) {
+					if ('install' === $install_type) {
+						$message = __('No plugins were selected to be installed. No action taken.', 'tgmpa');
 					} else {
-						$message = __( 'No plugins were selected to be updated. No action taken.', 'tgmpa' );
+						$message = __('No plugins were selected to be updated. No action taken.', 'tgmpa');
 					}
 
-					echo '<div id="message" class="error"><p>', esc_html( $message ), '</p></div>';
+					echo '<div id="message" class="error"><p>', esc_html($message), '</p></div>';
 
 					return false;
 				}
 
-				if ( is_array( $_POST['plugin'] ) ) {
+				if (is_array($_POST['plugin'])) {
 					$plugins_to_install = (array) $_POST['plugin'];
-				} elseif ( is_string( $_POST['plugin'] ) ) {
+				} elseif (is_string($_POST['plugin'])) {
 					// Received via Filesystem page - un-flatten array (WP bug #19643).
-					$plugins_to_install = explode( ',', $_POST['plugin'] );
+					$plugins_to_install = explode(',', $_POST['plugin']);
 				}
 
 				// Sanitize the received input.
-				$plugins_to_install = array_map( 'urldecode', $plugins_to_install );
-				$plugins_to_install = array_map( array( $this->tgmpa, 'sanitize_key' ), $plugins_to_install );
+				$plugins_to_install = array_map('urldecode', $plugins_to_install);
+				$plugins_to_install = array_map(array($this->tgmpa, 'sanitize_key'), $plugins_to_install);
 
 				// Validate the received input.
-				foreach ( $plugins_to_install as $key => $slug ) {
+				foreach ($plugins_to_install as $key => $slug) {
 					// Check if the plugin was registered with TGMPA and remove if not.
-					if ( ! isset( $this->tgmpa->plugins[ $slug ] ) ) {
-						unset( $plugins_to_install[ $key ] );
+					if (!isset($this->tgmpa->plugins[$slug])) {
+						unset($plugins_to_install[$key]);
 						continue;
 					}
 
 					// For updates: make sure this is a plugin we *can* update (update available and WP version ok).
-					if ( 'update' === $install_type && ( $this->tgmpa->is_plugin_installed( $slug ) && ( false === $this->tgmpa->does_plugin_have_update( $slug ) || ! $this->tgmpa->can_plugin_update( $slug ) ) ) ) {
-						unset( $plugins_to_install[ $key ] );
+					if ('update' === $install_type && ($this->tgmpa->is_plugin_installed($slug) && (false === $this->tgmpa->does_plugin_have_update($slug) || !$this->tgmpa->can_plugin_update($slug)))) {
+						unset($plugins_to_install[$key]);
 					}
 				}
 
 				// No need to proceed further if we have no plugins to handle.
-				if ( empty( $plugins_to_install ) ) {
-					if ( 'install' === $install_type ) {
-						$message = __( 'No plugins are available to be installed at this time.', 'tgmpa' );
+				if (empty($plugins_to_install)) {
+					if ('install' === $install_type) {
+						$message = __('No plugins are available to be installed at this time.', 'tgmpa');
 					} else {
-						$message = __( 'No plugins are available to be updated at this time.', 'tgmpa' );
+						$message = __('No plugins are available to be updated at this time.', 'tgmpa');
 					}
 
-					echo '<div id="message" class="error"><p>', esc_html( $message ), '</p></div>';
+					echo '<div id="message" class="error"><p>', esc_html($message), '</p></div>';
 
 					return false;
 				}
@@ -2691,23 +2691,23 @@ 
 				// Pass all necessary information if WP_Filesystem is needed.
 				$url = wp_nonce_url(
 					$this->tgmpa->get_tgmpa_url(),
-					'bulk-' . $this->_args['plural']
+					'bulk-'.$this->_args['plural']
 				);
 
 				// Give validated data back to $_POST which is the only place the filesystem looks for extra fields.
-				$_POST['plugin'] = implode( ',', $plugins_to_install ); // Work around for WP bug #19643.
+				$_POST['plugin'] = implode(',', $plugins_to_install); // Work around for WP bug #19643.
 
 				$method = ''; // Leave blank so WP_Filesystem can populate it as necessary.
-				$fields = array_keys( $_POST ); // Extra fields to pass to WP_Filesystem.
+				$fields = array_keys($_POST); // Extra fields to pass to WP_Filesystem.
 
-				if ( false === ( $creds = request_filesystem_credentials( esc_url_raw( $url ), $method, false, false, $fields ) ) ) {
+				if (false === ($creds = request_filesystem_credentials(esc_url_raw($url), $method, false, false, $fields))) {
 					return true; // Stop the normal page form from displaying, credential request form will be shown.
 				}
 
 				// Now we have some credentials, setup WP_Filesystem.
-				if ( ! WP_Filesystem( $creds ) ) {
+				if (!WP_Filesystem($creds)) {
 					// Our credentials were no good, ask the user for them again.
-					request_filesystem_credentials( esc_url_raw( $url ), $method, true, false, $fields );
+					request_filesystem_credentials(esc_url_raw($url), $method, true, false, $fields);
 
 					return true;
 				}
@@ -2721,35 +2721,35 @@ 
 				$to_inject  = array(); // Information to inject into the update_plugins transient.
 
 				// Prepare the data for validated plugins for the install/upgrade.
-				foreach ( $plugins_to_install as $slug ) {
-					$name   = $this->tgmpa->plugins[ $slug ]['name'];
-					$source = $this->tgmpa->get_download_url( $slug );
+				foreach ($plugins_to_install as $slug) {
+					$name   = $this->tgmpa->plugins[$slug]['name'];
+					$source = $this->tgmpa->get_download_url($slug);
 
-					if ( ! empty( $name ) && ! empty( $source ) ) {
+					if (!empty($name) && !empty($source)) {
 						$names[] = $name;
 
-						switch ( $install_type ) {
+						switch ($install_type) {
 
 							case 'install':
 								$sources[] = $source;
 								break;
 
 							case 'update':
-								$file_paths[]                 = $this->tgmpa->plugins[ $slug ]['file_path'];
-								$to_inject[ $slug ]           = $this->tgmpa->plugins[ $slug ];
-								$to_inject[ $slug ]['source'] = $source;
+								$file_paths[]                 = $this->tgmpa->plugins[$slug]['file_path'];
+								$to_inject[$slug]           = $this->tgmpa->plugins[$slug];
+								$to_inject[$slug]['source'] = $source;
 								break;
 						}
 					}
 				}
-				unset( $slug, $name, $source );
+				unset($slug, $name, $source);
 
 				// Create a new instance of TGMPA_Bulk_Installer.
 				$installer = new TGMPA_Bulk_Installer(
 					new TGMPA_Bulk_Installer_Skin(
 						array(
-							'url'          => esc_url_raw( $this->tgmpa->get_tgmpa_url() ),
-							'nonce'        => 'bulk-' . $this->_args['plural'],
+							'url'          => esc_url_raw($this->tgmpa->get_tgmpa_url()),
+							'nonce'        => 'bulk-'.$this->_args['plural'],
 							'names'        => $names,
 							'install_type' => $install_type,
 						)
@@ -2758,21 +2758,21 @@ 
 
 				// Wrap the install process with the appropriate HTML.
 				echo '<div class="tgmpa wrap">',
-					'<h2>', esc_html( get_admin_page_title() ), '</h2>';
+					'<h2>', esc_html(get_admin_page_title()), '</h2>';
 
 				// Process the bulk installation submissions.
-				add_filter( 'upgrader_source_selection', array( $this->tgmpa, 'maybe_adjust_source_dir' ), 1, 3 );
+				add_filter('upgrader_source_selection', array($this->tgmpa, 'maybe_adjust_source_dir'), 1, 3);
 
-				if ( 'tgmpa-bulk-update' === $this->current_action() ) {
+				if ('tgmpa-bulk-update' === $this->current_action()) {
 					// Inject our info into the update transient.
-					$this->tgmpa->inject_update_info( $to_inject );
+					$this->tgmpa->inject_update_info($to_inject);
 
-					$installer->bulk_upgrade( $file_paths );
+					$installer->bulk_upgrade($file_paths);
 				} else {
-					$installer->bulk_install( $sources );
+					$installer->bulk_install($sources);
 				}
 
-				remove_filter( 'upgrader_source_selection', array( $this->tgmpa, 'maybe_adjust_source_dir' ), 1, 3 );
+				remove_filter('upgrader_source_selection', array($this->tgmpa, 'maybe_adjust_source_dir'), 1, 3);
 
 				echo '</div>';
 
@@ -2780,70 +2780,70 @@ 
 			}
 
 			// Bulk activation process.
-			if ( 'tgmpa-bulk-activate' === $this->current_action() ) {
-				check_admin_referer( 'bulk-' . $this->_args['plural'] );
+			if ('tgmpa-bulk-activate' === $this->current_action()) {
+				check_admin_referer('bulk-'.$this->_args['plural']);
 
 				// Did user actually select any plugins to activate ?
-				if ( empty( $_POST['plugin'] ) ) {
-					echo '<div id="message" class="error"><p>', esc_html__( 'No plugins were selected to be activated. No action taken.', 'tgmpa' ), '</p></div>';
+				if (empty($_POST['plugin'])) {
+					echo '<div id="message" class="error"><p>', esc_html__('No plugins were selected to be activated. No action taken.', 'tgmpa'), '</p></div>';
 
 					return false;
 				}
 
 				// Grab plugin data from $_POST.
 				$plugins = array();
-				if ( isset( $_POST['plugin'] ) ) {
-					$plugins = array_map( 'urldecode', (array) $_POST['plugin'] );
-					$plugins = array_map( array( $this->tgmpa, 'sanitize_key' ), $plugins );
+				if (isset($_POST['plugin'])) {
+					$plugins = array_map('urldecode', (array) $_POST['plugin']);
+					$plugins = array_map(array($this->tgmpa, 'sanitize_key'), $plugins);
 				}
 
 				$plugins_to_activate = array();
 				$plugin_names        = array();
 
 				// Grab the file paths for the selected & inactive plugins from the registration array.
-				foreach ( $plugins as $slug ) {
-					if ( $this->tgmpa->can_plugin_activate( $slug ) ) {
-						$plugins_to_activate[] = $this->tgmpa->plugins[ $slug ]['file_path'];
-						$plugin_names[]        = $this->tgmpa->plugins[ $slug ]['name'];
+				foreach ($plugins as $slug) {
+					if ($this->tgmpa->can_plugin_activate($slug)) {
+						$plugins_to_activate[] = $this->tgmpa->plugins[$slug]['file_path'];
+						$plugin_names[]        = $this->tgmpa->plugins[$slug]['name'];
 					}
 				}
-				unset( $slug );
+				unset($slug);
 
 				// Return early if there are no plugins to activate.
-				if ( empty( $plugins_to_activate ) ) {
-					echo '<div id="message" class="error"><p>', esc_html__( 'No plugins are available to be activated at this time.', 'tgmpa' ), '</p></div>';
+				if (empty($plugins_to_activate)) {
+					echo '<div id="message" class="error"><p>', esc_html__('No plugins are available to be activated at this time.', 'tgmpa'), '</p></div>';
 
 					return false;
 				}
 
 				// Now we are good to go - let's start activating plugins.
-				$activate = activate_plugins( $plugins_to_activate );
+				$activate = activate_plugins($plugins_to_activate);
 
-				if ( is_wp_error( $activate ) ) {
-					echo '<div id="message" class="error"><p>', wp_kses_post( $activate->get_error_message() ), '</p></div>';
+				if (is_wp_error($activate)) {
+					echo '<div id="message" class="error"><p>', wp_kses_post($activate->get_error_message()), '</p></div>';
 				} else {
-					$count        = count( $plugin_names ); // Count so we can use _n function.
-					$plugin_names = array_map( array( 'TGMPA_Utils', 'wrap_in_strong' ), $plugin_names );
-					$last_plugin  = array_pop( $plugin_names ); // Pop off last name to prep for readability.
-					$imploded     = empty( $plugin_names ) ? $last_plugin : ( implode( ', ', $plugin_names ) . ' ' . esc_html_x( 'and', 'plugin A *and* plugin B', 'tgmpa' ) . ' ' . $last_plugin );
+					$count        = count($plugin_names); // Count so we can use _n function.
+					$plugin_names = array_map(array('TGMPA_Utils', 'wrap_in_strong'), $plugin_names);
+					$last_plugin  = array_pop($plugin_names); // Pop off last name to prep for readability.
+					$imploded     = empty($plugin_names) ? $last_plugin : (implode(', ', $plugin_names).' '.esc_html_x('and', 'plugin A *and* plugin B', 'tgmpa').' '.$last_plugin);
 
 					printf( // WPCS: xss ok.
 						'<div id="message" class="updated"><p>%1$s %2$s.</p></div>',
-						esc_html( _n( 'The following plugin was activated successfully:', 'The following plugins were activated successfully:', $count, 'tgmpa' ) ),
+						esc_html(_n('The following plugin was activated successfully:', 'The following plugins were activated successfully:', $count, 'tgmpa')),
 						$imploded
 					);
 
 					// Update recently activated plugins option.
-					$recent = (array) get_option( 'recently_activated' );
-					foreach ( $plugins_to_activate as $plugin => $time ) {
-						if ( isset( $recent[ $plugin ] ) ) {
-							unset( $recent[ $plugin ] );
+					$recent = (array) get_option('recently_activated');
+					foreach ($plugins_to_activate as $plugin => $time) {
+						if (isset($recent[$plugin])) {
+							unset($recent[$plugin]);
 						}
 					}
-					update_option( 'recently_activated', $recent );
+					update_option('recently_activated', $recent);
 				}
 
-				unset( $_POST ); // Reset the $_POST variable in case user wants to perform one action after another.
+				unset($_POST); // Reset the $_POST variable in case user wants to perform one action after another.
 
 				return true;
 			}
@@ -2861,15 +2861,15 @@ 
 			$hidden                = array(); // No columns to hide, but we must set as an array.
 			$sortable              = array(); // No reason to make sortable columns.
 			$primary               = $this->get_primary_column_name(); // Column which has the row actions.
-			$this->_column_headers = array( $columns, $hidden, $sortable, $primary ); // Get all necessary column headers.
+			$this->_column_headers = array($columns, $hidden, $sortable, $primary); // Get all necessary column headers.
 
 			// Process our bulk activations here.
-			if ( 'tgmpa-bulk-activate' === $this->current_action() ) {
+			if ('tgmpa-bulk-activate' === $this->current_action()) {
 				$this->process_bulk_actions();
 			}
 
 			// Store all of our plugin data into $items array so WP_List_Table can use it.
-			$this->items = apply_filters( 'tgmpa_table_data_items', $this->_gather_plugin_data() );
+			$this->items = apply_filters('tgmpa_table_data_items', $this->_gather_plugin_data());
 		}
 
 		/* *********** DEPRECATED METHODS *********** */
@@ -2885,16 +2885,16 @@ 
 		 * @param string $data Optional. Array key of plugin data to return. Default is slug.
 		 * @return string|boolean Plugin slug if found, false otherwise.
 		 */
-		protected function _get_plugin_data_from_name( $name, $data = 'slug' ) {
-			_deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'TGM_Plugin_Activation::_get_plugin_data_from_name()' );
+		protected function _get_plugin_data_from_name($name, $data = 'slug') {
+			_deprecated_function(__FUNCTION__, 'TGMPA 2.5.0', 'TGM_Plugin_Activation::_get_plugin_data_from_name()');
 
-			return $this->tgmpa->_get_plugin_data_from_name( $name, $data );
+			return $this->tgmpa->_get_plugin_data_from_name($name, $data);
 		}
 	}
 }
 
 
-if ( ! class_exists( 'TGM_Bulk_Installer' ) ) {
+if (!class_exists('TGM_Bulk_Installer')) {
 
 	/**
 	 * Hack: Prevent TGMPA v2.4.1- bulk installer class from being loaded if 2.4.1- is loaded after 2.5+.
@@ -2902,7 +2902,7 @@ 
 	class TGM_Bulk_Installer {
 	}
 }
-if ( ! class_exists( 'TGM_Bulk_Installer_Skin' ) ) {
+if (!class_exists('TGM_Bulk_Installer_Skin')) {
 
 	/**
 	 * Hack: Prevent TGMPA v2.4.1- bulk installer skin class from being loaded if 2.4.1- is loaded after 2.5+.
@@ -2921,26 +2921,26 @@ 
  *
  * @since 2.2.0
  */
-add_action( 'admin_init', 'tgmpa_load_bulk_installer' );
-if ( ! function_exists( 'tgmpa_load_bulk_installer' ) ) {
+add_action('admin_init', 'tgmpa_load_bulk_installer');
+if (!function_exists('tgmpa_load_bulk_installer')) {
 	/**
 	 * Load bulk installer
 	 */
 	function tgmpa_load_bulk_installer() {
 		// Silently fail if 2.5+ is loaded *after* an older version.
-		if ( ! isset( $GLOBALS['tgmpa'] ) ) {
+		if (!isset($GLOBALS['tgmpa'])) {
 			return;
 		}
 
 		// Get TGMPA class instance.
-		$tgmpa_instance = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
+		$tgmpa_instance = call_user_func(array(get_class($GLOBALS['tgmpa']), 'get_instance'));
 
-		if ( isset( $_GET['page'] ) && $tgmpa_instance->menu === $_GET['page'] ) {
-			if ( ! class_exists( 'Plugin_Upgrader', false ) ) {
-				require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+		if (isset($_GET['page']) && $tgmpa_instance->menu === $_GET['page']) {
+			if (!class_exists('Plugin_Upgrader', false)) {
+				require_once ABSPATH.'wp-admin/includes/class-wp-upgrader.php';
 			}
 
-			if ( ! class_exists( 'TGMPA_Bulk_Installer' ) ) {
+			if (!class_exists('TGMPA_Bulk_Installer')) {
 
 				/**
 				 * Installer class to handle bulk plugin installations.
@@ -3002,21 +3002,21 @@ 
 					 *
 					 * @param \Bulk_Upgrader_Skin|null $skin Installer skin.
 					 */
-					public function __construct( $skin = null ) {
+					public function __construct($skin = null) {
 						// Get TGMPA class instance.
-						$this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
+						$this->tgmpa = call_user_func(array(get_class($GLOBALS['tgmpa']), 'get_instance'));
 
-						parent::__construct( $skin );
+						parent::__construct($skin);
 
-						if ( isset( $this->skin->options['install_type'] ) && 'update' === $this->skin->options['install_type'] ) {
+						if (isset($this->skin->options['install_type']) && 'update' === $this->skin->options['install_type']) {
 							$this->clear_destination = true;
 						}
 
-						if ( $this->tgmpa->is_automatic ) {
+						if ($this->tgmpa->is_automatic) {
 							$this->activate_strings();
 						}
 
-						add_action( 'upgrader_process_complete', array( $this->tgmpa, 'populate_file_path' ) );
+						add_action('upgrader_process_complete', array($this->tgmpa, 'populate_file_path'));
 					}
 
 					/**
@@ -3025,8 +3025,8 @@ 
 					 * @since 2.2.0
 					 */
 					public function activate_strings() {
-						$this->strings['activation_failed']  = __( 'Plugin activation failed.', 'tgmpa' );
-						$this->strings['activation_success'] = __( 'Plugin activated successfully.', 'tgmpa' );
+						$this->strings['activation_failed']  = __('Plugin activation failed.', 'tgmpa');
+						$this->strings['activation_success'] = __('Plugin activated successfully.', 'tgmpa');
 					}
 
 					/**
@@ -3039,12 +3039,12 @@ 
 					 * @param array $options The installation config options.
 					 * @return null|array Return early if error, array of installation data on success.
 					 */
-					public function run( $options ) {
-						$result = parent::run( $options );
+					public function run($options) {
+						$result = parent::run($options);
 
 						// Reset the strings in case we changed one during automatic activation.
-						if ( $this->tgmpa->is_automatic ) {
-							if ( 'update' === $this->skin->options['install_type'] ) {
+						if ($this->tgmpa->is_automatic) {
+							if ('update' === $this->skin->options['install_type']) {
 								$this->upgrade_strings();
 							} else {
 								$this->install_strings();
@@ -3071,14 +3071,14 @@ 
 					 * @param array $args    Arbitrary passed extra arguments.
 					 * @return string|bool Install confirmation messages on success, false on failure.
 					 */
-					public function bulk_install( $plugins, $args = array() ) {
+					public function bulk_install($plugins, $args = array()) {
 						// [TGMPA + ] Hook auto-activation in.
-						add_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+						add_filter('upgrader_post_install', array($this, 'auto_activate'), 10);
 
 						$defaults    = array(
 							'clear_update_cache' => true,
 						);
-						$parsed_args = wp_parse_args( $args, $defaults );
+						$parsed_args = wp_parse_args($args, $defaults);
 
 						$this->init();
 						$this->bulk = true;
@@ -3092,8 +3092,8 @@ 
 						$this->skin->header();
 
 						// Connect to the Filesystem first.
-						$res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
-						if ( ! $res ) {
+						$res = $this->fs_connect(array(WP_CONTENT_DIR, WP_PLUGIN_DIR));
+						if (!$res) {
 							$this->skin->footer();
 
 							return false;
@@ -3105,22 +3105,22 @@ 
 						// - running Multisite and there are one or more plugins specified, OR
 						// - a plugin with an update available is currently active.
 						// @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
-						$maintenance = ( is_multisite() && ! empty( $plugins ) );
+						$maintenance = (is_multisite() && !empty($plugins));
 
 						/*
 						[TGMPA - ]
 						foreach ( $plugins as $plugin )
 							$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
 						*/
-						if ( $maintenance ) {
-							$this->maintenance_mode( true );
+						if ($maintenance) {
+							$this->maintenance_mode(true);
 						}
 
 						$results = array();
 
-						$this->update_count   = count( $plugins );
+						$this->update_count   = count($plugins);
 						$this->update_current = 0;
-						foreach ( $plugins as $plugin ) {
+						foreach ($plugins as $plugin) {
 							$this->update_current++;
 
 							/*
@@ -3142,7 +3142,7 @@ 
 							$this->skin->plugin_active = is_plugin_active($plugin);
 							*/
 
-							$result = $this->run( array(
+							$result = $this->run(array(
 								'package'           => $plugin, // [TGMPA + ] adjusted.
 								'destination'       => WP_PLUGIN_DIR,
 								'clear_destination' => false, // [TGMPA + ] adjusted.
@@ -3151,17 +3151,17 @@ 
 								'hook_extra'        => array(
 									'plugin' => $plugin,
 								),
-							) );
+							));
 
-							$results[ $plugin ] = $this->result;
+							$results[$plugin] = $this->result;
 
 							// Prevent credentials auth screen from displaying multiple times.
-							if ( false === $result ) {
+							if (false === $result) {
 								break;
 							}
 						} //end foreach $plugins
 
-						$this->maintenance_mode( false );
+						$this->maintenance_mode(false);
 
 						/**
 						 * Fires when the bulk upgrader process is complete.
@@ -3179,12 +3179,12 @@ 
 						 *     @type array  $packages Array of plugin, theme, or core packages to update.
 						 * }
 						 */
-						do_action( 'upgrader_process_complete', $this, array(
+						do_action('upgrader_process_complete', $this, array(
 							'action'  => 'install', // [TGMPA + ] adjusted.
 							'type'    => 'plugin',
 							'bulk'    => true,
 							'plugins' => $plugins,
-						) );
+						));
 
 						$this->skin->bulk_footer();
 
@@ -3194,10 +3194,10 @@ 
 						/* [TGMPA - ] remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin')); */
 
 						// [TGMPA + ] Remove our auto-activation hook.
-						remove_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+						remove_filter('upgrader_post_install', array($this, 'auto_activate'), 10);
 
 						// Force refresh of plugin update information.
-						wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+						wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 						return $results;
 					}
@@ -3213,13 +3213,13 @@ 
 					 * @param array $args    Arbitrary passed extra arguments.
 					 * @return string|bool Install confirmation messages on success, false on failure.
 					 */
-					public function bulk_upgrade( $plugins, $args = array() ) {
+					public function bulk_upgrade($plugins, $args = array()) {
 
-						add_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+						add_filter('upgrader_post_install', array($this, 'auto_activate'), 10);
 
-						$result = parent::bulk_upgrade( $plugins, $args );
+						$result = parent::bulk_upgrade($plugins, $args);
 
-						remove_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+						remove_filter('upgrader_post_install', array($this, 'auto_activate'), 10);
 
 						return $result;
 					}
@@ -3234,9 +3234,9 @@ 
 					 * @param bool $bool The value we need to give back (true).
 					 * @return bool
 					 */
-					public function auto_activate( $bool ) {
+					public function auto_activate($bool) {
 						// Only process the activation of installed plugins if the automatic flag is set to true.
-						if ( $this->tgmpa->is_automatic ) {
+						if ($this->tgmpa->is_automatic) {
 							// Flush plugins cache so the headers of the newly installed plugins will be read correctly.
 							wp_clean_plugins_cache();
 
@@ -3244,14 +3244,14 @@ 
 							$plugin_info = $this->plugin_info();
 
 							// Don't try to activate on upgrade of active plugin as WP will do this already.
-							if ( ! is_plugin_active( $plugin_info ) ) {
-								$activate = activate_plugin( $plugin_info );
+							if (!is_plugin_active($plugin_info)) {
+								$activate = activate_plugin($plugin_info);
 
 								// Adjust the success string based on the activation result.
-								$this->strings['process_success'] = $this->strings['process_success'] . "<br />\n";
+								$this->strings['process_success'] = $this->strings['process_success']."<br />\n";
 
-								if ( is_wp_error( $activate ) ) {
-									$this->skin->error( $activate );
+								if (is_wp_error($activate)) {
+									$this->skin->error($activate);
 									$this->strings['process_success'] .= $this->strings['activation_failed'];
 								} else {
 									$this->strings['process_success'] .= $this->strings['activation_success'];
@@ -3264,7 +3264,7 @@ 
 				}
 			}
 
-			if ( ! class_exists( 'TGMPA_Bulk_Installer_Skin' ) ) {
+			if (!class_exists('TGMPA_Bulk_Installer_Skin')) {
 
 				/**
 				 * Installer skin to set strings for the bulk plugin installations..
@@ -3328,9 +3328,9 @@ 
 					 *
 					 * @param array $args Arguments to pass for use within the class.
 					 */
-					public function __construct( $args = array() ) {
+					public function __construct($args = array()) {
 						// Get TGMPA class instance.
-						$this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
+						$this->tgmpa = call_user_func(array(get_class($GLOBALS['tgmpa']), 'get_instance'));
 
 						// Parse default and new args.
 						$defaults = array(
@@ -3339,13 +3339,13 @@ 
 							'names'        => array(),
 							'install_type' => 'install',
 						);
-						$args     = wp_parse_args( $args, $defaults );
+						$args = wp_parse_args($args, $defaults);
 
 						// Set plugin names to $this->plugin_names property.
 						$this->plugin_names = $args['names'];
 
 						// Extract the new args.
-						parent::__construct( $args );
+						parent::__construct($args);
 					}
 
 					/**
@@ -3357,25 +3357,25 @@ 
 					 * @since 2.2.0
 					 */
 					public function add_strings() {
-						if ( 'update' === $this->options['install_type'] ) {
+						if ('update' === $this->options['install_type']) {
 							parent::add_strings();
-							$this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
+							$this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)', 'tgmpa');
 						} else {
-							$this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while installing %1$s: <strong>%2$s</strong>.', 'tgmpa' );
-							$this->upgrader->strings['skin_update_failed']       = __( 'The installation of %1$s failed.', 'tgmpa' );
+							$this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while installing %1$s: <strong>%2$s</strong>.', 'tgmpa');
+							$this->upgrader->strings['skin_update_failed']       = __('The installation of %1$s failed.', 'tgmpa');
 
-							if ( $this->tgmpa->is_automatic ) {
+							if ($this->tgmpa->is_automatic) {
 								// Automatic activation strings.
-								$this->upgrader->strings['skin_upgrade_start']        = __( 'The installation and activation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' );
-								$this->upgrader->strings['skin_update_successful']    = __( '%1$s installed and activated successfully.', 'tgmpa' ) . ' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>' . esc_html__( 'Show Details', 'tgmpa' ) . '</span><span class="hidden">' . esc_html__( 'Hide Details', 'tgmpa' ) . '</span>.</a>';
-								$this->upgrader->strings['skin_upgrade_end']          = __( 'All installations and activations have been completed.', 'tgmpa' );
-								$this->upgrader->strings['skin_before_update_header'] = __( 'Installing and Activating Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
+								$this->upgrader->strings['skin_upgrade_start']        = __('The installation and activation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa');
+								$this->upgrader->strings['skin_update_successful']    = __('%1$s installed and activated successfully.', 'tgmpa').' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>'.esc_html__('Show Details', 'tgmpa').'</span><span class="hidden">'.esc_html__('Hide Details', 'tgmpa').'</span>.</a>';
+								$this->upgrader->strings['skin_upgrade_end']          = __('All installations and activations have been completed.', 'tgmpa');
+								$this->upgrader->strings['skin_before_update_header'] = __('Installing and Activating Plugin %1$s (%2$d/%3$d)', 'tgmpa');
 							} else {
 								// Default installation strings.
-								$this->upgrader->strings['skin_upgrade_start']        = __( 'The installation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' );
-								$this->upgrader->strings['skin_update_successful']    = esc_html__( '%1$s installed successfully.', 'tgmpa' ) . ' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>' . esc_html__( 'Show Details', 'tgmpa' ) . '</span><span class="hidden">' . esc_html__( 'Hide Details', 'tgmpa' ) . '</span>.</a>';
-								$this->upgrader->strings['skin_upgrade_end']          = __( 'All installations have been completed.', 'tgmpa' );
-								$this->upgrader->strings['skin_before_update_header'] = __( 'Installing Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
+								$this->upgrader->strings['skin_upgrade_start']        = __('The installation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa');
+								$this->upgrader->strings['skin_update_successful']    = esc_html__('%1$s installed successfully.', 'tgmpa').' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>'.esc_html__('Show Details', 'tgmpa').'</span><span class="hidden">'.esc_html__('Hide Details', 'tgmpa').'</span>.</a>';
+								$this->upgrader->strings['skin_upgrade_end']          = __('All installations have been completed.', 'tgmpa');
+								$this->upgrader->strings['skin_before_update_header'] = __('Installing Plugin %1$s (%2$d/%3$d)', 'tgmpa');
 							}
 						}
 					}
@@ -3387,11 +3387,11 @@ 
 					 *
 					 * @param string $title Unused in this implementation.
 					 */
-					public function before( $title = '' ) {
-						if ( empty( $title ) ) {
-							$title = esc_html( $this->plugin_names[ $this->i ] );
+					public function before($title = '') {
+						if (empty($title)) {
+							$title = esc_html($this->plugin_names[$this->i]);
 						}
-						parent::before( $title );
+						parent::before($title);
 					}
 
 					/**
@@ -3404,11 +3404,11 @@ 
 					 *
 					 * @param string $title Unused in this implementation.
 					 */
-					public function after( $title = '' ) {
-						if ( empty( $title ) ) {
-							$title = esc_html( $this->plugin_names[ $this->i ] );
+					public function after($title = '') {
+						if (empty($title)) {
+							$title = esc_html($this->plugin_names[$this->i]);
 						}
-						parent::after( $title );
+						parent::after($title);
 
 						$this->i++;
 					}
@@ -3430,15 +3430,15 @@ 
 						// Display message based on if all plugins are now active or not.
 						$update_actions = array();
 
-						if ( $this->tgmpa->is_tgmpa_complete() ) {
+						if ($this->tgmpa->is_tgmpa_complete()) {
 							// All plugins are active, so we display the complete string and hide the menu to protect users.
 							echo '<style type="text/css">#adminmenu .wp-submenu li.current { display: none !important; }</style>';
 							$update_actions['dashboard'] = sprintf(
-								esc_html( $this->tgmpa->strings['complete'] ),
-								'<a href="' . esc_url( self_admin_url() ) . '">' . esc_html__( 'Return to the Dashboard', 'tgmpa' ) . '</a>'
+								esc_html($this->tgmpa->strings['complete']),
+								'<a href="'.esc_url(self_admin_url()).'">'.esc_html__('Return to the Dashboard', 'tgmpa').'</a>'
 							);
 						} else {
-							$update_actions['tgmpa_page'] = '<a href="' . esc_url( $this->tgmpa->get_tgmpa_url() ) . '" target="_parent">' . esc_html( $this->tgmpa->strings['return'] ) . '</a>';
+							$update_actions['tgmpa_page'] = '<a href="'.esc_url($this->tgmpa->get_tgmpa_url()).'" target="_parent">'.esc_html($this->tgmpa->strings['return']).'</a>';
 						}
 
 						/**
@@ -3449,10 +3449,10 @@ 
 						 * @param array $update_actions Array of plugin action links.
 						 * @param array $plugin_info    Array of information for the last-handled plugin.
 						 */
-						$update_actions = apply_filters( 'tgmpa_update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
+						$update_actions = apply_filters('tgmpa_update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
 
-						if ( ! empty( $update_actions ) ) {
-							$this->feedback( implode( ' | ', (array) $update_actions ) );
+						if (!empty($update_actions)) {
+							$this->feedback(implode(' | ', (array) $update_actions));
 						}
 					}
 
@@ -3466,7 +3466,7 @@ 
 					 * @see        Bulk_Upgrader_Skin::flush_output()
 					 */
 					public function before_flush_output() {
-						_deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' );
+						_deprecated_function(__FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()');
 						$this->flush_output();
 					}
 
@@ -3479,7 +3479,7 @@ 
 					 * @see        Bulk_Upgrader_Skin::flush_output()
 					 */
 					public function after_flush_output() {
-						_deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' );
+						_deprecated_function(__FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()');
 						$this->flush_output();
 						$this->i++;
 					}
@@ -3489,7 +3489,7 @@ 
 	}
 }
 
-if ( ! class_exists( 'TGMPA_Utils' ) ) {
+if (!class_exists('TGMPA_Utils')) {
 
 	/**
 	 * Generic utilities for TGMPA.
@@ -3527,8 +3527,8 @@ 
 		 * @param string $string Text to be wrapped.
 		 * @return string
 		 */
-		public static function wrap_in_em( $string ) {
-			return '<em>' . wp_kses_post( $string ) . '</em>';
+		public static function wrap_in_em($string) {
+			return '<em>'.wp_kses_post($string).'</em>';
 		}
 
 		/**
@@ -3541,8 +3541,8 @@ 
 		 * @param string $string Text to be wrapped.
 		 * @return string
 		 */
-		public static function wrap_in_strong( $string ) {
-			return '<strong>' . wp_kses_post( $string ) . '</strong>';
+		public static function wrap_in_strong($string) {
+			return '<strong>'.wp_kses_post($string).'</strong>';
 		}
 
 		/**
@@ -3555,15 +3555,15 @@ 
 		 * @param mixed $value Arbitrary value.
 		 * @return bool
 		 */
-		public static function validate_bool( $value ) {
-			if ( ! isset( self::$has_filters ) ) {
-				self::$has_filters = extension_loaded( 'filter' );
+		public static function validate_bool($value) {
+			if (!isset(self::$has_filters)) {
+				self::$has_filters = extension_loaded('filter');
 			}
 
-			if ( self::$has_filters ) {
-				return filter_var( $value, FILTER_VALIDATE_BOOLEAN );
+			if (self::$has_filters) {
+				return filter_var($value, FILTER_VALIDATE_BOOLEAN);
 			} else {
-				return self::emulate_filter_bool( $value );
+				return self::emulate_filter_bool($value);
 			}
 		}
 
@@ -3577,9 +3577,9 @@ 
 		 * @param mixed $value Value to cast.
 		 * @return bool
 		 */
-		protected static function emulate_filter_bool( $value ) {
+		protected static function emulate_filter_bool($value) {
 			// @codingStandardsIgnoreStart
-			static $true  = array(
+			static $true = array(
 				'1',
 				'true', 'True', 'TRUE',
 				'y', 'Y',
@@ -3595,17 +3595,17 @@ 
 			);
 			// @codingStandardsIgnoreEnd
 
-			if ( is_bool( $value ) ) {
+			if (is_bool($value)) {
 				return $value;
-			} else if ( is_int( $value ) && ( 0 === $value || 1 === $value ) ) {
+			} else if (is_int($value) && (0 === $value || 1 === $value)) {
 				return (bool) $value;
-			} else if ( ( is_float( $value ) && ! is_nan( $value ) ) && ( (float) 0 === $value || (float) 1 === $value ) ) {
+			} else if ((is_float($value) && !is_nan($value)) && ((float) 0 === $value || (float) 1 === $value)) {
 				return (bool) $value;
-			} else if ( is_string( $value ) ) {
-				$value = trim( $value );
-				if ( in_array( $value, $true, true ) ) {
+			} else if (is_string($value)) {
+				$value = trim($value);
+				if (in_array($value, $true, true)) {
 					return true;
-				} else if ( in_array( $value, $false, true ) ) {
+				} else if (in_array($value, $false, true)) {
 					return false;
 				} else {
 					return false;

public/includes/editor-modules--gallery.php

Spacing +34 added lines, -34 removed lines

@@ -11,12 +11,12 @@ 
 
 	ob_start();
 
-	if ( $galleries ) { ?>
+	if ($galleries) { ?>
 	
-		<?php if ( lasso_user_can( 'publish_posts' ) ): ?>
+		<?php if (lasso_user_can('publish_posts')): ?>
 			<div class="ase-gallery-opts ase-gallery-opts--create-gallery" style="display:inline !important; postion:relative !important;left:12px !important">
 				<div class="ase-gallery-opts--single lasso-option">
-				<a href="#" class="editor-btn-secondary" id="lasso--gallery__create"><?php _e( 'Create gallery', 'lasso' );?></a>
+				<a href="#" class="editor-btn-secondary" id="lasso--gallery__create"><?php _e('Create gallery', 'lasso'); ?></a>
 				</div>
 			</div>
 		<?php endif; ?>
@@ -24,11 +24,11 @@ 
 		<div class="ase-gallery-opts ase-gallery-opts--edit-gallery" >
 			<div class="ase-gallery-opts--single lasso-option">
 
-				<label><?php _e( 'Manage Images', 'lasso' );?>
-					<a href="#" id="ase-gallery-add-image" class="lasso-editor-tiny-btn" title="<?php esc_attr_e( 'Add Images', 'lasso' );?>"><i class="lasso-icon-pencil"></i></a>
+				<label><?php _e('Manage Images', 'lasso'); ?>
+					<a href="#" id="ase-gallery-add-image" class="lasso-editor-tiny-btn" title="<?php esc_attr_e('Add Images', 'lasso'); ?>"><i class="lasso-icon-pencil"></i></a>
 
 				</label>
-				<small class="lasso-option-desc"><?php _e( 'Rearrange or edit the images in this gallery.', 'lasso' );?></small>
+				<small class="lasso-option-desc"><?php _e('Rearrange or edit the images in this gallery.', 'lasso'); ?></small>
 
 				<div id="lasso--gallery__images"><span class="lasso-icon-spinner6"></span></div>
 
@@ -38,22 +38,22 @@ 
 
 	<?php }
 
-	if ( lasso_user_can( 'publish_posts' ) ): ?>
+	if (lasso_user_can('publish_posts')): ?>
 
 		<div class="ase-gallery-opts ase-gallery-opts--create-gallery" >
 
 			<div class="ase-gallery-opts--single lasso-option">
 
-				<label><?php _e( 'Create a Gallery', 'lasso' );?></label>
+				<label><?php _e('Create a Gallery', 'lasso'); ?></label>
 				<small class="lasso-option-desc">Gallery Name:</small>
                 <input type="text" id="lasso--gallery__galleryname" value="New Gallery"><br>
 				
-				<small class="lasso-option-desc"><?php _e( 'Select images to create a gallery.', 'lasso' );?></small>
-				<a href="#" class="editor-btn-secondary" id="lasso--gallery__selectImages"><?php _e( 'Select Images', 'lasso' );?></a>
+				<small class="lasso-option-desc"><?php _e('Select images to create a gallery.', 'lasso'); ?></small>
+				<a href="#" class="editor-btn-secondary" id="lasso--gallery__selectImages"><?php _e('Select Images', 'lasso'); ?></a>
 
 				<div id="ase-gallery-images"></div>
 
-				<a style="display:none;" class="editor-btn-secondary" data-post-title="<?php echo esc_attr( strtolower( the_title_attribute() ) );?>" id="lasso--gallery__save" href="#"><?php _e( 'Create Gallery', 'lasso' );?></a>
+				<a style="display:none;" class="editor-btn-secondary" data-post-title="<?php echo esc_attr(strtolower(the_title_attribute())); ?>" id="lasso--gallery__save" href="#"><?php _e('Create Gallery', 'lasso'); ?></a>
 
 			</div>
 
@@ -64,14 +64,14 @@ 
 	<!-- Gallery Layout/Type Chooser -->
 	<div class="ase-gallery-opts ase-gallery-opts--type" >
 		<div data-option="gallery-type" class="ase-gallery-opts--single lasso-option">
-			<label><?php _e( 'Gallery Type', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Select the type of gallery.', 'lasso' );?></small>
+			<label><?php _e('Gallery Type', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Select the type of gallery.', 'lasso'); ?></small>
 			<fieldset>
-	      		<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="grid"><?php _e( 'Grid', 'lasso' );?></label>
-	        	<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="thumbnail"><?php _e( 'Thumbnail', 'lasso' );?></label>
+	      		<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="grid"><?php _e('Grid', 'lasso'); ?></label>
+	        	<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="thumbnail"><?php _e('Thumbnail', 'lasso'); ?></label>
 				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="sequence">Sequence</label>
-				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="photoset"><?php _e( 'Photoset', 'lasso' );?></label>
-				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="stacked"><?php _e( 'Parallax', 'lasso' );?></label>
+				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="photoset"><?php _e('Photoset', 'lasso'); ?></label>
+				<label for="lasso_gallery_type" class="ase-gallery-layout-label"><input class="lasso-generator-attr ase-gallery-type-radio" type="radio" name="lasso_gallery_type" value="stacked"><?php _e('Parallax', 'lasso'); ?></label>
 			</fieldset>
 		</div>
 	</div>
@@ -80,8 +80,8 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--grid" style="display:none;">
 
 		<div data-option="itemwidth" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_grid_gallery_width"><?php _e( 'Grid Item Width', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Adjust the width of the individual grid items, only if using Grid gallery style. Default is 400.', 'lasso' );?></small>
+			<label for="lasso_grid_gallery_width"><?php _e('Grid Item Width', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Adjust the width of the individual grid items, only if using Grid gallery style. Default is 400.', 'lasso'); ?></small>
 			<input type="text_small" class="lasso-generator-attr" name="lasso_grid_gallery_width" value="">
 		</div>
 
@@ -91,24 +91,24 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--thumb" style="display:none;">
 
 		<div data-option="transition" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_thumb_gallery_transition"><?php _e( 'Gallery Transition', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Adjust the transition effect for the Thumbnail gallery. Default is slide.', 'lasso' );?></small>
+			<label for="lasso_thumb_gallery_transition"><?php _e('Gallery Transition', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Adjust the transition effect for the Thumbnail gallery. Default is slide.', 'lasso'); ?></small>
 		   	<select name="lasso_thumb_gallery_transition" class="lasso-generator-attr">
-		      <option value="crossfade"><?php _e( 'Fade', 'lasso' );?></option>
-		      <option value="slide"><?php _e( 'Slide', 'lasso' );?></option>
-		      <option value="dissolve"><?php _e( 'Dissolve', 'lasso' );?></option>
+		      <option value="crossfade"><?php _e('Fade', 'lasso'); ?></option>
+		      <option value="slide"><?php _e('Slide', 'lasso'); ?></option>
+		      <option value="dissolve"><?php _e('Dissolve', 'lasso'); ?></option>
 		    </select>
 		</div>
 
 		<div data-option="speed" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_thumb_gallery_transition_speed"><?php _e( 'Gallery Transition Speed', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Activate slideshow by setting a speed for the transition.5000 = 5 seconds.', 'lasso' );?></small>
+			<label for="lasso_thumb_gallery_transition_speed"><?php _e('Gallery Transition Speed', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Activate slideshow by setting a speed for the transition.5000 = 5 seconds.', 'lasso'); ?></small>
 			<input type="text" class="lasso-generator-attr" name="lasso_thumb_gallery_transition_speed" value="">
 		</div>
 
 		<div data-option="hide-thumbs" class="ase-gallery-opts--single lasso-option">
 			<input class="lasso-generator-attr" type="checkbox" name="lasso_thumb_gallery_hide_thumbs">
-			<label for="lasso_thumb_gallery_hide_thumbs"><?php _e( 'Hide Gallery Thumbnails', 'lasso' );?></label>
+			<label for="lasso_thumb_gallery_hide_thumbs"><?php _e('Hide Gallery Thumbnails', 'lasso'); ?></label>
 		</div>
 
 	</div>
@@ -117,14 +117,14 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--photoset" style="display:none;">
 
 		<div data-option="pslayout" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso-photoset-gallery-layout"><?php _e( 'Gallery Layout', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Let\'s say you have 4 images in this gallery. If you enter 121 you will have one image on the top row, two images on the second row, and one image on the third row.', 'lasso' );?></small>
+			<label for="lasso-photoset-gallery-layout"><?php _e('Gallery Layout', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Let\'s say you have 4 images in this gallery. If you enter 121 you will have one image on the top row, two images on the second row, and one image on the third row.', 'lasso'); ?></small>
 			<input type="text" class="lasso-generator-attr" name="lasso_photoset_gallery_layout" value="">
 		</div>
 
 		<div data-option="pslightbox" class="ase-gallery-opts--single lasso-option">
 			<input type="checkbox" class="lasso-generator-attr" name="lasso_photoset_gallery_lightbox">
-			<label for="lasso_photoset_gallery_lightbox"><?php _e( 'Enable Lightbox', 'lasso' );?></label>
+			<label for="lasso_photoset_gallery_lightbox"><?php _e('Enable Lightbox', 'lasso'); ?></label>
 		</div>
 
 	</div>
@@ -133,13 +133,13 @@ 
 	<div class="ase-gallery-opts ase-gallery-opts--global">
 
 		<div data-option="width" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_gallery_width"><?php _e( 'Main Gallery Width', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Adjust the overall width of the grid/thumbnail gallery. Acceptable values include 500px or 50%.', 'lasso' );?></small>
+			<label for="lasso_gallery_width"><?php _e('Main Gallery Width', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Adjust the overall width of the grid/thumbnail gallery. Acceptable values include 500px or 50%.', 'lasso'); ?></small>
 			<input type="text_small" class="lasso-generator-attr" name="lasso_gallery_width" value="">
 		</div>
 		<div data-option="caption" class="ase-gallery-opts--single lasso-option">
-			<label for="lasso_gallery_caption"><?php _e( 'Gallery Caption', 'lasso' );?></label>
-			<small class="lasso-option-desc"><?php _e( 'Add an optional caption for the gallery.', 'lasso' );?></small>
+			<label for="lasso_gallery_caption"><?php _e('Gallery Caption', 'lasso'); ?></label>
+			<small class="lasso-option-desc"><?php _e('Add an optional caption for the gallery.', 'lasso'); ?></small>
 			<textarea name="lasso_gallery_caption" class="lasso-generator-attr"></textarea>
 		</div>
 

includes/process/save.php

Spacing +22 added lines, -22 removed lines

@@ -19,26 +19,26 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function content( $data ) {
+	public function content($data) {
 
 		$save_to_post_disabled = $this->save_to_post_disables();
 
-		$postid = (int) $data[ 'post_id' ];
-		$content = $this->replace_rendered_shortcodes( $data[ 'content' ] );
+		$postid = (int) $data['post_id'];
+		$content = $this->replace_rendered_shortcodes($data['content']);
 
-		if ( 'off' == $save_to_post_disabled || empty( $save_to_post_disabled ) ) {
+		if ('off' == $save_to_post_disabled || empty($save_to_post_disabled)) {
 
 			$args = array(
 				'ID'           => (int) $postid,
 				'post_content' => $content
 			);
 
-			wp_update_post( apply_filters( 'lasso_object_save_args', $args ) );
+			wp_update_post(apply_filters('lasso_object_save_args', $args));
 
 		}
 
 		// run save action
-		do_action( 'lasso_post_saved', $postid, $content, get_current_user_ID() );
+		do_action('lasso_post_saved', $postid, $content, get_current_user_ID());
 
 		return true;
 
@@ -53,24 +53,24 @@ 
 	 *
 	 * @return bool Always returns true.
 	 */
-	public function publish_content( $data ) {
+	public function publish_content($data) {
 		$save_to_post_disabled = $this->save_to_post_disables();
 
-		$postid = (int) $data[ 'post_id' ];
-		$content = $this->replace_rendered_shortcodes( $data[ 'content' ] );
+		$postid = (int) $data['post_id'];
+		$content = $this->replace_rendered_shortcodes($data['content']);
 
-		if ( 'off' == $save_to_post_disabled || empty( $save_to_post_disabled ) ) {
+		if ('off' == $save_to_post_disabled || empty($save_to_post_disabled)) {
 
-			$args = array (
+			$args = array(
 				'ID'           	=> $postid,
 				'post_content' 	=> $content,
 				'post_status' 	=> 'publish'
 			);
-			wp_update_post( apply_filters( 'lasso_object_publish_args', $args ) );
+			wp_update_post(apply_filters('lasso_object_publish_args', $args));
 
 		}
 
-		do_action( 'lasso_post_published', $postid, $content, get_current_user_ID() );
+		do_action('lasso_post_published', $postid, $content, get_current_user_ID());
 
 		return true;
 
@@ -83,13 +83,13 @@ 
 	 *
 	 * @return array Array of keys to pull from $_POST per action and their sanitization callback
 	 */
-	public static function params(){
-		$params[ 'process_save_content' ] = array(
+	public static function params() {
+		$params['process_save_content'] = array(
 			'post_id' => 'absint',
 			'content' => 'wp_kses_post'
 		);
 
-		$params[ 'process_save_publish_content' ] = array(
+		$params['process_save_publish_content'] = array(
 			'post_id' => 'absint',
 			'content' => 'wp_kses_post'
 		);
@@ -105,11 +105,11 @@ 
 	 * @return array Array of additional functions to use to authorize action.
 	 */
 	public static function auth_callbacks() {
-		$params[ 'process_save_content' ] = array(
+		$params['process_save_content'] = array(
 			'lasso_user_can'
 		);
 
-		$params[ 'process_save_publish_content' ] = array();
+		$params['process_save_publish_content'] = array();
 
 		return $params;
 
@@ -125,7 +125,7 @@ 
 	 * @return bool
 	 */
 	protected function save_to_post_disables() {
-		$save_to_post_disabled = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
+		$save_to_post_disabled = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
 
 		return $save_to_post_disabled;
 
@@ -142,11 +142,11 @@ 
 	 *
 	 * @return string
 	 */
-	protected function replace_rendered_shortcodes( $content ) {
-		if ( false === strpos( $content, '--EDITUS_OTHER_SHORTCODE_START|' ) ) {
+	protected function replace_rendered_shortcodes($content) {
+		if (false === strpos($content, '--EDITUS_OTHER_SHORTCODE_START|')) {
 			return $content;
 		}
-		$content = htmlspecialchars_decode ($content);
+		$content = htmlspecialchars_decode($content);
 
 		$content = preg_replace(
 			'/<!--EDITUS_OTHER_SHORTCODE_START\|\[(.*?)\]-->(.*?)<!--EDITUS_OTHER_SHORTCODE_END-->/s',

public/includes/wrap-shortcodes.php

Indentation +6 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
 	if ( strpos( $m[2],'aesop_'  ) === 0 ) {
 		// check against the exceptions
 		if (strpos_arr($m[2],array('aesop_gallery_pop','aesop_character_carousel'))===false) {
-		    return $m[0];
+			return $m[0];
 		}
 	}
 
@@ -76,9 +76,9 @@ 
 
 /* a helper function */
 function strpos_arr($haystack, $needle) {
-    if(!is_array($needle)) $needle = array($needle);
-    foreach($needle as $what) {
-        if(($pos = strpos($haystack, $what))!==false) return $pos;
-    }
-    return false;
+	if(!is_array($needle)) $needle = array($needle);
+	foreach($needle as $what) {
+		if(($pos = strpos($haystack, $what))!==false) return $pos;
+	}
+	return false;
 }
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -3,8 +3,8 @@ 
  * Wraps shortcodes of other Plugins in prep for later replacement on save to preserve the shortcodes
  */
 
-if ( lasso_user_can( 'edit_posts' ) && ! is_admin() ) {
-	add_filter( 'the_content', 'lasso_wrap_shortcodes', 9 );
+if (lasso_user_can('edit_posts') && !is_admin()) {
+	add_filter('the_content', 'lasso_wrap_shortcodes', 9);
 }
 
 /**
@@ -17,33 +17,33 @@ 
  *
  * @return string
  */
-function lasso_wrap_shortcodes( $content ) {
+function lasso_wrap_shortcodes($content) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if (false === strpos($content, '[')) {
 		return $content;
 	}
 
-	if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
+	if (empty($shortcode_tags) || !is_array($shortcode_tags)) {
 		return $content;
 	}
 
-	$tagnames  = array_keys( $shortcode_tags );
-	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
+	$tagnames  = array_keys($shortcode_tags);
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 	$pattern   = "/\\[($tagregexp)/s";
 
-	if ( 1 !== preg_match( $pattern, $content ) ) {
+	if (1 !== preg_match($pattern, $content)) {
 		// Avoids parsing HTML when there are no shortcodes or embeds anyway.
 		return $content;
 	}
 
-	$content = do_shortcodes_in_html_tags( $content, true ,$tagnames);
+	$content = do_shortcodes_in_html_tags($content, true, $tagnames);
 
 	$pattern = get_shortcode_regex();
-	$content = preg_replace_callback( "/$pattern/s", 'lasso_wrap_shortcode_tag', $content );
+	$content = preg_replace_callback("/$pattern/s", 'lasso_wrap_shortcode_tag', $content);
 
 	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
+	$content = unescape_invalid_shortcodes($content);
 
 	return $content;
 }
@@ -57,28 +57,28 @@ 
  *
  * @return string
  */
-function lasso_wrap_shortcode_tag( $m ) {
+function lasso_wrap_shortcode_tag($m) {
 	// allow [[foo]] syntax for escaping a tag
-	if ( $m[1] == '[' && $m[6] == ']' ) {
-		return substr( $m[0], 1, - 1 );
+	if ($m[1] == '[' && $m[6] == ']') {
+		return substr($m[0], 1, - 1);
 	}
 	//array('aesop_quote','aesop_gallery','aesop_chapter','aesop_timeline_stop','aesop_video','aesop_collection','aesop_character','aesop_document','aesop_audio','aesop_content','aesop_map')
 
-	if ( strpos( $m[2],'aesop_'  ) === 0 ) {
+	if (strpos($m[2], 'aesop_') === 0) {
 		// check against the exceptions
-		if (strpos_arr($m[2],array('aesop_gallery_pop','aesop_character_carousel'))===false) {
+		if (strpos_arr($m[2], array('aesop_gallery_pop', 'aesop_character_carousel')) === false) {
 		    return $m[0];
 		}
 	}
 
-	return '<!--EDITUS_OTHER_SHORTCODE_START|[' . $m[0] . ']-->' . $m[0] . '<!--EDITUS_OTHER_SHORTCODE_END-->';
+	return '<!--EDITUS_OTHER_SHORTCODE_START|['.$m[0].']-->'.$m[0].'<!--EDITUS_OTHER_SHORTCODE_END-->';
 }
 
 /* a helper function */
 function strpos_arr($haystack, $needle) {
-    if(!is_array($needle)) $needle = array($needle);
-    foreach($needle as $what) {
-        if(($pos = strpos($haystack, $what))!==false) return $pos;
+    if (!is_array($needle)) $needle = array($needle);
+    foreach ($needle as $what) {
+        if (($pos = strpos($haystack, $what)) !== false) return $pos;
     }
     return false;
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -76,9 +76,13 @@
 
 /* a helper function */
 function strpos_arr($haystack, $needle) {
-    if(!is_array($needle)) $needle = array($needle);
+    if(!is_array($needle)) {
+    	$needle = array($needle);
+    }
     foreach($needle as $what) {
-        if(($pos = strpos($haystack, $what))!==false) return $pos;
+        if(($pos = strpos($haystack, $what))!==false) {
+        	return $pos;
+        }
     }
     return false;
 }
\ No newline at end of file

public/includes/editor-modules.php

Braces +32 added lines, -20 removed lines

@@ -107,8 +107,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
-		return;
+	if ( !lasso_user_can() ) {
+			return;
+	}
 
 	// let users add custom css classes
 	$custom_classes = apply_filters( 'lasso_sidebar_classes', '' );
@@ -131,8 +132,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
-		return;
+	if ( !lasso_user_can() ) {
+			return;
+	}
 
 	// check for lasso story engine and add a class doniting this
 	$ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
@@ -205,8 +207,11 @@ 
 						<?php if ( class_exists ('Aesop_GalleryPop') ) { ?>
 						     <li data-type="gallery" title="<?php esc_attr_e( 'Gallery Pop', 'lasso' );?>"  class="lasso-toolbar--component__gallerypop"></li>
 						<?php }?>
-					<?php else: ?>
-						<li data-type="wpimg" title="<?php esc_attr_e( 'WordPress Image', 'lasso' );?>" class="image lasso-toolbar--component__image"></li>
+					<?php else {
+	: ?>
+						<li data-type="wpimg" title="<?php esc_attr_e( 'WordPress Image', 'lasso' );
+}
+?>" class="image lasso-toolbar--component__image"></li>
 						<li data-type="wpquote" title="<?php esc_attr_e( 'WordPress Quote', 'lasso' );?>" class="quote lasso-toolbar--component__quote"></li>
 						<!--li data-type="wpvideo" title="<?php esc_attr_e( 'WordPress Video', 'lasso' );?>" class="video lasso-toolbar--component__video"></li-->
 					<?php endif; ?>
@@ -230,8 +235,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
-		return;
+	if ( !lasso_user_can() ) {
+			return;
+	}
 
 	// let users add custom css classes
 	$custom_classes = apply_filters( 'lasso_component_classes', '' );
@@ -257,8 +263,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
-		return;
+	if ( !lasso_user_can() ) {
+			return;
+	}
 
 	// has post thumbnail
 	$has_thumbnail = has_post_thumbnail( get_the_ID() ) ? 'class="lasso--featImg--has-thumb"' : false;
@@ -286,8 +293,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
-		return;
+	if ( !lasso_user_can() ) {
+			return;
+	}
 
 	global $post;
 
@@ -417,8 +425,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can('edit_posts') )
-		return;
+	if ( !lasso_user_can('edit_posts') ) {
+			return;
+	}
 
 	$status = get_post_status( get_the_ID() );
 
@@ -541,8 +550,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
-		return;
+	if ( !lasso_user_can() ) {
+			return;
+	}
 
 	// let users add custom css classes
 	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
@@ -562,8 +572,9 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
-		return;
+	if ( !lasso_user_can() ) {
+			return;
+	}
 
 	// let users add custom css classes
 	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
@@ -634,8 +645,9 @@ 
 
 	$blob = array();
 
-	if ( empty( $codes ) )
-		return;
+	if ( empty( $codes ) ) {
+			return;
+	}
 
 	foreach ( $codes as $slug => $shortcode ) {
 		$return = '';

Indentation +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 	$toolbar_headings      = lasso_editor_get_option( 'toolbar_headings', 'lasso_editor' );
 
 	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
-    $mobile_class = $is_mobile ? 'lasso-mobile' : false;
+	$mobile_class = $is_mobile ? 'lasso-mobile' : false;
 	
 	$mobile_style =$is_mobile ? 'style="top:40px;"' : null;
 

Spacing +207 added lines, -207 removed lines

@@ -12,32 +12,32 @@ 
  *
  * @since 1.0
  */
-add_action( 'wp_footer', 'lasso_editor_controls' );
+add_action('wp_footer', 'lasso_editor_controls');
 function lasso_editor_controls() {
 
 	global $post;
 
-	if ( lasso_user_can('edit_posts') ) {
+	if (lasso_user_can('edit_posts')) {
 
-		$status = get_post_status( get_the_ID() );
+		$status = get_post_status(get_the_ID());
 
 		// let users add custom css classes
-		$custom_classes = apply_filters( 'lasso_control_classes', '' );
+		$custom_classes = apply_filters('lasso_control_classes', '');
 
 		$post_access_class   = '';
-		$post_new_disabled   = lasso_editor_get_option( 'post_adding_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');
+		$post_settings_disabled = lasso_editor_get_option('post_settings_disabled', 'lasso_editor');
+		$shortcodify_disabled = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
 
 
 		// CSS class if adding new post objects is disabled
-		if ( 'on' == $post_new_disabled ) { $post_access_class = 'lasso--post-new-disabled'; }
+		if ('on' == $post_new_disabled) { $post_access_class = 'lasso--post-new-disabled'; }
 
 		// CSS class if adjust settings is disabled
-		if ( 'on' == $post_settings_disabled ) { $post_access_class = 'lasso--post-settings-disabled'; }
+		if ('on' == $post_settings_disabled) { $post_access_class = 'lasso--post-settings-disabled'; }
 
 		// CSS class if adding new post objects AND settings are disabled
-		if ( 'on' == $post_new_disabled && 'on' == $post_settings_disabled ) { $post_access_class = 'lasso--post-all-disabled'; }
+		if ('on' == $post_new_disabled && 'on' == $post_settings_disabled) { $post_access_class = 'lasso--post-all-disabled'; }
 
 		// CSS class if shortcodify or (Aesop Shortcode Conversion) is disabled
 		$sc_saving_class = 'on' == $shortcodify_disabled ? 'shortcodify-disabled' : 'shortcodify-enabled';
@@ -47,44 +47,44 @@ 
 		
 		$mobile_style = wp_is_mobile() ? 'style="top:40px;"' : null;
 
-		?><div id="lasso--controls" class="lasso-post-status--<?php echo sanitize_html_class( $status );?> <?php echo sanitize_html_class( $custom_classes );?>" data-post-id="<?php echo get_the_ID();?>" >
+		?><div id="lasso--controls" class="lasso-post-status--<?php echo sanitize_html_class($status); ?> <?php echo sanitize_html_class($custom_classes); ?>" data-post-id="<?php echo get_the_ID(); ?>" >
 
-			<ul class="lasso--controls__center lasso-editor-controls lasso-editor-controls--wrap <?php echo $post_access_class;?> "  <?php echo $mobile_style ?> >
+			<ul class="lasso--controls__center lasso-editor-controls lasso-editor-controls--wrap <?php echo $post_access_class; ?> "  <?php echo $mobile_style ?> >
 
-				<?php do_action( 'lasso_editor_controls_before' );
+				<?php do_action('lasso_editor_controls_before');
 
-				if ( $is_capable ) { ?>
+				if ($is_capable) { ?>
 
-					<li id="lasso--edit" title="<?php esc_attr_e( 'Edit Post', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+					<li id="lasso--edit" title="<?php esc_attr_e('Edit Post', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 
-					<?php if ( 'off' == $post_settings_disabled || empty( $post_settings_disabled ) ) { ?>
-						<li id="lasso--post-settings" title="<?php esc_attr_e( 'Post Settings', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+					<?php if ('off' == $post_settings_disabled || empty($post_settings_disabled)) { ?>
+						<li id="lasso--post-settings" title="<?php esc_attr_e('Post Settings', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 					<?php }
 
 				} ?>
 
-				<li id="lasso--post-all" title="<?php esc_attr_e( 'All Posts', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+				<li id="lasso--post-all" title="<?php esc_attr_e('All Posts', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 
-				<?php if ( $is_capable && wp_revisions_enabled( $post ) ) { ?>
-					<li id="lasso--post-revisions" title="<?php esc_attr_e( 'Revisions', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+				<?php if ($is_capable && wp_revisions_enabled($post)) { ?>
+					<li id="lasso--post-revisions" title="<?php esc_attr_e('Revisions', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 				<?php } ?>
 
-				<?php if ( ( 'off' == $post_new_disabled || empty( $post_new_disabled ) && lasso_user_can('publish_posts') ) ) { ?>
-					<li id="lasso--post-new" title="<?php esc_attr_e( 'Add Post', 'lasso' );?>"><a href="#" class="lasso--button__primary"></a></li>
+				<?php if (('off' == $post_new_disabled || empty($post_new_disabled) && lasso_user_can('publish_posts'))) { ?>
+					<li id="lasso--post-new" title="<?php esc_attr_e('Add Post', 'lasso'); ?>"><a href="#" class="lasso--button__primary"></a></li>
 				<?php } ?>
 
-				<?php do_action( 'lasso_editor_controls_after' );?>
+				<?php do_action('lasso_editor_controls_after'); ?>
 
 			</ul>
 
-			<?php if ( is_singular() ) { ?>
+			<?php if (is_singular()) { ?>
 
 				<div class="lasso--controls__right">
 
-					<a href="#" title="<?php esc_attr_e( 'Save Post', 'lasso' );?>" id="lasso--save" class="lasso-save-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<a href="#" title="<?php esc_attr_e('Save Post', 'lasso'); ?>" id="lasso--save" class="lasso-save-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 
-					<?php if ( 'draft' == $status && ( lasso_user_can('publish_posts') || lasso_user_can('publish_pages') )  ) { ?>
-						<a href="#" title="<?php esc_attr_e( 'Publish Post', 'lasso' );?>" id="lasso--publish" class="lasso-publish-post lasso--button <?php echo $sc_saving_class;?>"></a>
+					<?php if ('draft' == $status && (lasso_user_can('publish_posts') || lasso_user_can('publish_pages'))) { ?>
+						<a href="#" title="<?php esc_attr_e('Publish Post', 'lasso'); ?>" id="lasso--publish" class="lasso-publish-post lasso--button <?php echo $sc_saving_class; ?>"></a>
 					<?php } ?>
 
 				</div>
@@ -107,13 +107,13 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
+	if (!lasso_user_can())
 		return;
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_sidebar_classes', '' );
+	$custom_classes = apply_filters('lasso_sidebar_classes', '');
 	?>
-	<div id="lasso--sidebar" class="<?php echo sanitize_html_class( $custom_classes );?>" >
+	<div id="lasso--sidebar" class="<?php echo sanitize_html_class($custom_classes); ?>" >
 		<div class="lasso--sidebar__inner">
 			<div id="lasso--component__settings"></div>
 		</div>
@@ -131,25 +131,25 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
+	if (!lasso_user_can())
 		return;
 	
 	$is_mobile = wp_is_mobile();
 
 	// check for lasso story engine and add a class doniting this
-	$ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
+	$ase_status = class_exists('Aesop_Core') || defined('LASSO_CUSTOM') ? 'ase-active' : 'ase-not-active';
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_toolbar_classes', '' );
+	$custom_classes = apply_filters('lasso_toolbar_classes', '');
 
 	// are toolbar headings enabled
-	$toolbar_headings      = lasso_editor_get_option( 'toolbar_headings', 'lasso_editor' );
+	$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
 
-	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
+	$toolbar_class = $toolbar_headings ? 'toolbar-extended' : false;
 	
 	// mobile styles
     $mobile_class = $is_mobile ? 'lasso-mobile' : false;
-	$mobile_style =$is_mobile ? 'style="top:40px;"' : null;
+	$mobile_style = $is_mobile ? 'style="top:40px;"' : null;
 	
 	//show color
 	$show_color = true;
@@ -159,81 +159,81 @@ 
 
 
 	?>
-	<div class="lasso--toolbar_wrap lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$mobile_class.' '.$ase_status.' '.sanitize_html_class( $custom_classes );?>" <?php echo $mobile_style ?>>
+	<div class="lasso--toolbar_wrap lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$mobile_class.' '.$ase_status.' '.sanitize_html_class($custom_classes); ?>" <?php echo $mobile_style ?>>
 		<ul class="lasso--toolbar__inner lasso-editor-controls">
-			<?php do_action( 'lasso_toolbar_components_before' );?>
-		    <li id="lasso-toolbar--bold" title="<?php esc_attr_e( 'Bold', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--underline" title="<?php esc_attr_e( 'Underline', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--italic" title="<?php esc_attr_e( 'Italicize', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--strike" title="<?php esc_attr_e( 'Strikethrough', 'lasso' );?>"></li>
-		    <?php if ( $toolbar_headings ): ?>
-		    <li id="lasso-toolbar--h2" title="<?php esc_attr_e( 'H2 Heading', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--h3" title="<?php esc_attr_e( 'H3 Heading', 'lasso' );?>"></li>
+			<?php do_action('lasso_toolbar_components_before'); ?>
+		    <li id="lasso-toolbar--bold" title="<?php esc_attr_e('Bold', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--underline" title="<?php esc_attr_e('Underline', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--italic" title="<?php esc_attr_e('Italicize', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--strike" title="<?php esc_attr_e('Strikethrough', 'lasso'); ?>"></li>
+		    <?php if ($toolbar_headings): ?>
+		    <li id="lasso-toolbar--h2" title="<?php esc_attr_e('H2 Heading', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--h3" title="<?php esc_attr_e('H3 Heading', 'lasso'); ?>"></li>
 			<?php endif; ?>
 			
-			<?php if ( $show_color ): ?>
-		    <li id="lasso-toolbar--color-set" title="<?php esc_attr_e( 'Set Text Color', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--color-pick" title="<?php esc_attr_e( 'Choose Color', 'lasso' );?>"></li>
+			<?php if ($show_color): ?>
+		    <li id="lasso-toolbar--color-set" title="<?php esc_attr_e('Set Text Color', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--color-pick" title="<?php esc_attr_e('Choose Color', 'lasso'); ?>"></li>
 			<?php endif; ?>
 			
-		    <li id="lasso-toolbar--link" title="<?php esc_attr_e( 'Anchor Link', 'lasso' );?>">
+		    <li id="lasso-toolbar--link" title="<?php esc_attr_e('Anchor Link', 'lasso'); ?>">
 		    	<div id="lasso-toolbar--link__wrap" <?php echo $mobile_style ?> >
-		    		<div id="lasso-toolbar--link__inner" contenteditable="true" placeholder="<?php esc_attr_e( 'http://url.com', 'lasso' );?>"></div>
-		    		<a href="#" title="<?php esc_attr_e( 'Create Link', 'lasso' );?>" class="lasso-toolbar--link__control" id="lasso-toolbar--link__create" ></a>
+		    		<div id="lasso-toolbar--link__inner" contenteditable="true" placeholder="<?php esc_attr_e('http://url.com', 'lasso'); ?>"></div>
+		    		<a href="#" title="<?php esc_attr_e('Create Link', 'lasso'); ?>" class="lasso-toolbar--link__control" id="lasso-toolbar--link__create" ></a>
 					<!--input class="styled-checkbox" type="checkbox" /-->
                     <!--label>Styled Check Box</label-->
 		    	</div>
 		    </li>
-		    <?php do_action( 'lasso_toolbar_components_after' );?>
-		    <li id="lasso-toolbar--html" title="<?php esc_attr_e( 'Insert HTML', 'lasso' );?>">
+		    <?php do_action('lasso_toolbar_components_after'); ?>
+		    <li id="lasso-toolbar--html" title="<?php esc_attr_e('Insert HTML', 'lasso'); ?>">
 		    	<div id="lasso-toolbar--html__wrap" <?php echo $mobile_style ?>>
-		    		<div id="lasso-toolbar--html__inner" contenteditable="true" placeholder="<?php esc_attr_e( 'Enter HTML to insert', 'lasso' );?>"></div>
+		    		<div id="lasso-toolbar--html__inner" contenteditable="true" placeholder="<?php esc_attr_e('Enter HTML to insert', 'lasso'); ?>"></div>
 		    		<div id="lasso-toolbar--html__footer">
 		    			<ul class="lasso-toolbar--html-snips">
-		    				<?php if ( !$toolbar_headings ): ?>
-		    				<li id="lasso-html--h2" title="<?php esc_attr_e( 'H2 Heading', 'lasso' );?>">
-		    				<li id="lasso-html--h3" title="<?php esc_attr_e( 'H3 Heading', 'lasso' );?>">
+		    				<?php if (!$toolbar_headings): ?>
+		    				<li id="lasso-html--h2" title="<?php esc_attr_e('H2 Heading', 'lasso'); ?>">
+		    				<li id="lasso-html--h3" title="<?php esc_attr_e('H3 Heading', 'lasso'); ?>">
 		    				<?php endif; ?>
-		    				<li id="lasso-html--ul" title="<?php esc_attr_e( 'Unordered List', 'lasso' );?>">
-		    				<li id="lasso-html--ol" title="<?php esc_attr_e( 'Ordered List', 'lasso' );?>">
+		    				<li id="lasso-html--ul" title="<?php esc_attr_e('Unordered List', 'lasso'); ?>">
+		    				<li id="lasso-html--ol" title="<?php esc_attr_e('Ordered List', 'lasso'); ?>">
 		    			</ul>
-		    			<a class="lasso-toolbar--html__control lasso-toolbar--html__cancel" href="#"><?php _e( 'Cancel', 'lasso' );?></a>
-		    			<a href="#" title="<?php esc_attr_e( 'Insert HTML', 'lasso' );?>" class="lasso-toolbar--html__control" id="lasso-toolbar--html__insert" ><?php _e( 'Insert', 'lasso' );?></a>
+		    			<a class="lasso-toolbar--html__control lasso-toolbar--html__cancel" href="#"><?php _e('Cancel', 'lasso'); ?></a>
+		    			<a href="#" title="<?php esc_attr_e('Insert HTML', 'lasso'); ?>" class="lasso-toolbar--html__control" id="lasso-toolbar--html__insert" ><?php _e('Insert', 'lasso'); ?></a>
 		    		</div>
 		    	</div>
 		    </li>
 			
-			<?php if ( $show_align ): ?>
-		    <li id="lasso-toolbar--left-align" title="<?php esc_attr_e( 'Text Left Align', 'lasso' );?>"></li>
-		    <li id="lasso-toolbar--center-align" title="<?php esc_attr_e( 'Text Center Align', 'lasso' );?>"></li>
-			<li id="lasso-toolbar--right-align" title="<?php esc_attr_e( 'Text Right Align', 'lasso' );?>"></li>
+			<?php if ($show_align): ?>
+		    <li id="lasso-toolbar--left-align" title="<?php esc_attr_e('Text Left Align', 'lasso'); ?>"></li>
+		    <li id="lasso-toolbar--center-align" title="<?php esc_attr_e('Text Center Align', 'lasso'); ?>"></li>
+			<li id="lasso-toolbar--right-align" title="<?php esc_attr_e('Text Right Align', 'lasso'); ?>"></li>
 			<?php endif; ?>
 			
-		    <li id="lasso-toolbar--components" title="<?php esc_attr_e( 'Insert Component', 'lasso' );?>">
+		    <li id="lasso-toolbar--components" title="<?php esc_attr_e('Insert Component', 'lasso'); ?>">
 			    <ul id="lasso-toolbar--components__list" style="display:none;">
-			    	<?php if ( 'ase-active' == $ase_status ): ?>
-						<li data-type="image" title="<?php esc_attr_e( 'Image', 'lasso' );?>" class="lasso-toolbar--component__image"></li>
-						<li data-type="character" title="<?php esc_attr_e( 'Character', 'lasso' );?>" class="lasso-toolbar--component__character"></li>
-						<li data-type="quote" title="<?php esc_attr_e( 'Quote', 'lasso' );?>"  class="lasso-toolbar--component__quote"></li>
-						<li data-type="content" title="<?php esc_attr_e( 'Content', 'lasso' );?>"  class="lasso-toolbar--component__content"></li>
-						<li data-type="chapter" title="<?php esc_attr_e( 'Chapter', 'lasso' );?>"  class="lasso-toolbar--component__chapter"></li>
-						<li data-type="parallax" title="<?php esc_attr_e( 'Parallax', 'lasso' );?>"  class="lasso-toolbar--component__parallax"></li>
-						<li data-type="audio" title="<?php esc_attr_e( 'Audio', 'lasso' );?>"  class="lasso-toolbar--component__audio"></li>
-						<li data-type="video" title="<?php esc_attr_e( 'Video', 'lasso' );?>"  class="lasso-toolbar--component__video"></li>
-						<li data-type="map" title="<?php esc_attr_e( 'Map', 'lasso' );?>"  class="lasso-toolbar--component__map"></li>
-						<li data-type="timeline_stop" title="<?php esc_attr_e( 'Timeline', 'lasso' );?>"  class="lasso-toolbar--component__timeline"></li>
-						<li data-type="document" title="<?php esc_attr_e( 'Document', 'lasso' );?>"  class="lasso-toolbar--component__document"></li>
-						<li data-type="collection" title="<?php esc_attr_e( 'Collection', 'lasso' );?>"  class="lasso-toolbar--component__collection"></li>
-						<li data-type="gallery" title="<?php esc_attr_e( 'Gallery', 'lasso' );?>"  class="lasso-toolbar--component__gallery"></li>
-						<?php if ( class_exists ('Aesop_GalleryPop') ) { ?>
-						     <li data-type="gallery" title="<?php esc_attr_e( 'Gallery Pop', 'lasso' );?>"  class="lasso-toolbar--component__gallerypop"></li>
+			    	<?php if ('ase-active' == $ase_status): ?>
+						<li data-type="image" title="<?php esc_attr_e('Image', 'lasso'); ?>" class="lasso-toolbar--component__image"></li>
+						<li data-type="character" title="<?php esc_attr_e('Character', 'lasso'); ?>" class="lasso-toolbar--component__character"></li>
+						<li data-type="quote" title="<?php esc_attr_e('Quote', 'lasso'); ?>"  class="lasso-toolbar--component__quote"></li>
+						<li data-type="content" title="<?php esc_attr_e('Content', 'lasso'); ?>"  class="lasso-toolbar--component__content"></li>
+						<li data-type="chapter" title="<?php esc_attr_e('Chapter', 'lasso'); ?>"  class="lasso-toolbar--component__chapter"></li>
+						<li data-type="parallax" title="<?php esc_attr_e('Parallax', 'lasso'); ?>"  class="lasso-toolbar--component__parallax"></li>
+						<li data-type="audio" title="<?php esc_attr_e('Audio', 'lasso'); ?>"  class="lasso-toolbar--component__audio"></li>
+						<li data-type="video" title="<?php esc_attr_e('Video', 'lasso'); ?>"  class="lasso-toolbar--component__video"></li>
+						<li data-type="map" title="<?php esc_attr_e('Map', 'lasso'); ?>"  class="lasso-toolbar--component__map"></li>
+						<li data-type="timeline_stop" title="<?php esc_attr_e('Timeline', 'lasso'); ?>"  class="lasso-toolbar--component__timeline"></li>
+						<li data-type="document" title="<?php esc_attr_e('Document', 'lasso'); ?>"  class="lasso-toolbar--component__document"></li>
+						<li data-type="collection" title="<?php esc_attr_e('Collection', 'lasso'); ?>"  class="lasso-toolbar--component__collection"></li>
+						<li data-type="gallery" title="<?php esc_attr_e('Gallery', 'lasso'); ?>"  class="lasso-toolbar--component__gallery"></li>
+						<?php if (class_exists('Aesop_GalleryPop')) { ?>
+						     <li data-type="gallery" title="<?php esc_attr_e('Gallery Pop', 'lasso'); ?>"  class="lasso-toolbar--component__gallerypop"></li>
 						<?php }?>
 					<?php else: ?>
-						<li data-type="wpimg" title="<?php esc_attr_e( 'WordPress Image', 'lasso' );?>" class="image lasso-toolbar--component__image"></li>
-						<li data-type="wpquote" title="<?php esc_attr_e( 'WordPress Quote', 'lasso' );?>" class="quote lasso-toolbar--component__quote"></li>
-						<!--li data-type="wpvideo" title="<?php esc_attr_e( 'WordPress Video', 'lasso' );?>" class="video lasso-toolbar--component__video"></li-->
+						<li data-type="wpimg" title="<?php esc_attr_e('WordPress Image', 'lasso'); ?>" class="image lasso-toolbar--component__image"></li>
+						<li data-type="wpquote" title="<?php esc_attr_e('WordPress Quote', 'lasso'); ?>" class="quote lasso-toolbar--component__quote"></li>
+						<!--li data-type="wpvideo" title="<?php esc_attr_e('WordPress Video', 'lasso'); ?>" class="video lasso-toolbar--component__video"></li-->
 					<?php endif; ?>
-					<?php do_action( 'lasso_toolbar_components' );?>
+					<?php do_action('lasso_toolbar_components'); ?>
 			    </ul>
 			</li>
 		</ul>
@@ -249,22 +249,22 @@ 
  */
 function lasso_editor_settings_toolbar() {
 
-	$delete_nonce = wp_create_nonce( 'lasso-delete-nonce' );
+	$delete_nonce = wp_create_nonce('lasso-delete-nonce');
 
 	ob_start();
 
-	if ( !lasso_user_can() )
+	if (!lasso_user_can())
 		return;
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_component_classes', '' );
+	$custom_classes = apply_filters('lasso_component_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso-component--settings__trigger" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" data-postid="<?php echo get_the_ID();?>" data-nonce="<?php echo $delete_nonce;?>" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso-component--settings__trigger" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" data-postid="<?php echo get_the_ID(); ?>" data-nonce="<?php echo $delete_nonce; ?>" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -280,17 +280,17 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
+	if (!lasso_user_can())
 		return;
 
 	// has post thumbnail
-	$has_thumbnail = has_post_thumbnail( get_the_ID() ) ? 'class="lasso--featImg--has-thumb"' : false;
+	$has_thumbnail = has_post_thumbnail(get_the_ID()) ? 'class="lasso--featImg--has-thumb"' : false;
 
 	?>
-	<ul id="lasso--featImgControls" <?php echo $has_thumbnail;?>>
-		<li id="lasso--featImgUpload"><a title="<?php esc_attr_e( 'Replace Image', 'lasso' );?>" href="#"><i class="lasso-icon-image"></i></a></li>
-		<li id="lasso--featImgDelete"><a title="<?php esc_attr_e( 'Delete Image', 'lasso' );?>" href="#"><i class="lasso-icon-bin2"></i></a></li>
-		<li id="lasso--featImgSave"><a href="#"><?php esc_attr_e( 'save', 'lasso' );?></a></li>
+	<ul id="lasso--featImgControls" <?php echo $has_thumbnail; ?>>
+		<li id="lasso--featImgUpload"><a title="<?php esc_attr_e('Replace Image', 'lasso'); ?>" href="#"><i class="lasso-icon-image"></i></a></li>
+		<li id="lasso--featImgDelete"><a title="<?php esc_attr_e('Delete Image', 'lasso'); ?>" href="#"><i class="lasso-icon-bin2"></i></a></li>
+		<li id="lasso--featImgSave"><a href="#"><?php esc_attr_e('save', 'lasso'); ?></a></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -309,55 +309,55 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
+	if (!lasso_user_can())
 		return;
 
 	global $post;
 
 	$postid = get_the_ID();
 
-	$status = get_post_status( $postid );
-	$nonce = wp_create_nonce( 'lasso-update-post-settings' );
+	$status = get_post_status($postid);
+	$nonce = wp_create_nonce('lasso-update-post-settings');
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_modal_settings_classes', '' );
+	$custom_classes = apply_filters('lasso_modal_settings_classes', '');
 
 	// objects categories
-	$categories 		= lasso_get_post_objects( $postid, 'category' );
-	$tags 				= lasso_get_post_objects( $postid, 'tag' );
+	$categories = lasso_get_post_objects($postid, 'category');
+	$tags = lasso_get_post_objects($postid, 'tag');
 
 	// modal tabs
-	$tabs  				= lasso_modal_addons('tab');
-	$content 			= lasso_modal_addons('content');
+	$tabs = lasso_modal_addons('tab');
+	$content = lasso_modal_addons('content');
 
 	// are we singular
-	$is_singular 		= is_singular();
+	$is_singular = is_singular();
 	$is_singular_class 	= $is_singular ? 'lasso--postsettings__2col' : 'lasso--postsettings__1col';
 	$has_thumb_class    = has_post_thumbnail() ? 'has-thumbnail' : 'no-thumbnail';
 	$theme_supports     = current_theme_supports('post-thumbnails');
-	$default_image 		= LASSO_URL.'/admin/assets/img/empty-img.png';
+	$default_image = LASSO_URL.'/admin/assets/img/empty-img.png';
 
 ?>
-	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
+	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class($custom_classes); ?>">
 		<div class="lasso--modal__inner">
 
-			<?php if( $tabs ) { echo $tabs; } ?>
+			<?php if ($tabs) { echo $tabs; } ?>
 
 			<div class="lasso--modal__content modal__content--core visible" data-addon-content="core">
-				<form id="lasso--postsettings__form" enctype="multipart/form-data" class="lasso--post-form <?php echo $is_singular_class.' '.$has_thumb_class;?>" >
+				<form id="lasso--postsettings__form" enctype="multipart/form-data" class="lasso--post-form <?php echo $is_singular_class.' '.$has_thumb_class; ?>" >
 
-					<?php if ( $is_singular && $theme_supports ) : ?>
+					<?php if ($is_singular && $theme_supports) : ?>
 					<div class="lasso--postsettings__left">
-						<label><?php _e( 'Featured Image', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Change the featured image for this post.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-						<div class="lasso--post-thumb" data-default-thumb="<?php echo esc_url( $default_image );?>">
+						<label><?php _e('Featured Image', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Change the featured image for this post.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+						<div class="lasso--post-thumb" data-default-thumb="<?php echo esc_url($default_image); ?>">
 
 							<div id="lasso--post-thumb__controls" class="lasso--post-thumb__controls">
-								<i id="lasso--post-thumb__add" title="<?php _e('Change Featured Image','lasso');?>" class="dashicons dashicons-edit"></i>
-								<i id="lasso--post-thumb__delete" title="<?php _e('Delete Featured Image','lasso');?>" class="dashicons dashicons-no-alt"></i>
+								<i id="lasso--post-thumb__add" title="<?php _e('Change Featured Image', 'lasso'); ?>" class="dashicons dashicons-edit"></i>
+								<i id="lasso--post-thumb__delete" title="<?php _e('Delete Featured Image', 'lasso'); ?>" class="dashicons dashicons-no-alt"></i>
 								<i id="lasso--save-status" class="lasso-icon lasso-icon-spinner6 not-visible"></i>
 							</div>
 
-							<?php echo has_post_thumbnail() ? get_the_post_thumbnail( $post->ID, 'medium' ) : '<img src="'.$default_image.'">'; ?>
+							<?php echo has_post_thumbnail() ? get_the_post_thumbnail($post->ID, 'medium') : '<img src="'.$default_image.'">'; ?>
 
 						</div>
 						<div id="lasso--featImgSave"><a href="#" class="not-visible">Save</a></div>
@@ -367,12 +367,12 @@ 
 
 					<div class="lasso--postsettings__right">
 
-						<?php if( lasso_user_can('publish_posts') || lasso_user_can('publish_pages') ): ?>
+						<?php if (lasso_user_can('publish_posts') || lasso_user_can('publish_pages')): ?>
 						<div class="lasso--postsettings__option story-status-option">
-							<label><?php _e( 'Status', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Change the status of the post to draft or publish.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<ul class="story-status story-status-<?php echo sanitize_html_class( $status );?>">
-								<li id="lasso--status-draft"><?php _e( 'Draft', 'lasso' );?></li>
-								<li id="lasso--status-publish"><?php _e( 'Publish', 'lasso' );?></li>
+							<label><?php _e('Status', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Change the status of the post to draft or publish.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<ul class="story-status story-status-<?php echo sanitize_html_class($status); ?>">
+								<li id="lasso--status-draft"><?php _e('Draft', 'lasso'); ?></li>
+								<li id="lasso--status-publish"><?php _e('Publish', 'lasso'); ?></li>
 							</ul>
 							<div class="lasso--slider_wrap">
 								<div id="lasso--slider"></div>
@@ -380,10 +380,10 @@ 
 						</div>
 						<?php endif; ?>
 
-						<?php if ( 'publish' == $status ): ?>
+						<?php if ('publish' == $status): ?>
 						<div class="lasso--postsettings__option story-slug-option">
-							<label><?php _e( 'Post URL', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Change the URL (slug) of this post.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input class="lasso--modal__trigger-footer" type="text" name="story_slug" value="<?php echo isset( $post ) ? esc_attr( $post->post_name ) : false;?>">
+							<label><?php _e('Post URL', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Change the URL (slug) of this post.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input class="lasso--modal__trigger-footer" type="text" name="story_slug" value="<?php echo isset($post) ? esc_attr($post->post_name) : false; ?>">
 						</div>
 						<?php endif; ?>
 
@@ -392,34 +392,34 @@ 
 					<div class="lasso--postsettings__middle">
 
 						<div class="lasso--postsettings__option story-categories-option">
-							<label><?php _e( 'Categories', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Type a category name and press enter.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input id="lasso--cat-select" class="lasso--modal__trigger-footer" type="hidden" name="story_cats" value="<?php echo $categories;?>">
+							<label><?php _e('Categories', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Type a category name and press enter.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input id="lasso--cat-select" class="lasso--modal__trigger-footer" type="hidden" name="story_cats" value="<?php echo $categories; ?>">
 						</div>
 
 						<div class="lasso--postsettings__option story-tags-option">
-							<label><?php _e( 'Tags', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Type a tag name and press enter.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-							<input id="lasso--tag-select" class="lasso--modal__trigger-footer" type="hidden" name="story_tags" value="<?php echo $tags;?>">
+							<label><?php _e('Tags', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Type a tag name and press enter.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+							<input id="lasso--tag-select" class="lasso--modal__trigger-footer" type="hidden" name="story_tags" value="<?php echo $tags; ?>">
 						</div>
 
 					</div>
 
-					<?php do_action( 'lasso_modal_post_form' ); // action ?>
+					<?php do_action('lasso_modal_post_form'); // action ?>
 
 					<div class="lasso--postsettings__footer" style="display:none;">
-						<a href="#" class="lasso--postsettings-cancel"><?php _e( 'Cancel', 'lasso' );?></a>
+						<a href="#" class="lasso--postsettings-cancel"><?php _e('Cancel', 'lasso'); ?></a>
 						<input type="hidden" name="status" value="">
 						<input type="hidden" name="categories" value="">
-						<input type="hidden" name="postid" value="<?php echo get_the_ID();?>">
+						<input type="hidden" name="postid" value="<?php echo get_the_ID(); ?>">
 						<input type="hidden" name="action" value="process_update-object_post">
-						<input type="hidden" name="nonce" value="<?php echo $nonce;?>">
-						<?php do_action( 'lasso_modal_post_form_footer' ); // action ?>
-						<input type="submit" value="<?php esc_attr_e( 'Save', 'lasso' );?>">
+						<input type="hidden" name="nonce" value="<?php echo $nonce; ?>">
+						<?php do_action('lasso_modal_post_form_footer'); // action ?>
+						<input type="submit" value="<?php esc_attr_e('Save', 'lasso'); ?>">
 					</div>
 
 				</form>
 			</div>
 
-			<?php if( $tabs ) { echo $content; } ?>
+			<?php if ($tabs) { echo $content; } ?>
 
 		</div>
 
@@ -440,41 +440,41 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can('edit_posts') )
+	if (!lasso_user_can('edit_posts'))
 		return;
 
-	$status = get_post_status( get_the_ID() );
+	$status = get_post_status(get_the_ID());
 
-	$nonce = wp_create_nonce( 'lasso-editor-new-post' );
+	$nonce = wp_create_nonce('lasso-editor-new-post');
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_modal_post_classes', '' );
+	$custom_classes = apply_filters('lasso_modal_post_classes', '');
 
 	// return the post type
-	$type = get_post_type( get_the_ID() );
+	$type = get_post_type(get_the_ID());
 
 	?>
-	<div id="lasso--post-new__modal" class="lasso--modal lasso--modal__med lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
+	<div id="lasso--post-new__modal" class="lasso--modal lasso--modal__med lassoShowAnimate <?php echo sanitize_html_class($custom_classes); ?>">
 		<div class="lasso--modal__inner">
 
 			<form id="lasso--postnew__form" enctype="multipart/form-data" class="lasso--post-form">
 
 				<div class="lasso--postsettings__option story-slug-option lasso--last-option">
-					<label><?php esc_attr_e( 'New <span>post</span> title', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Specify title for new post, then save to edit.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
-					<input class="lasso--modal__trigger-footer" type="text" required name="story_title" value="" placeholder="<?php esc_attr_e( 'Grump Wizards Make Toxic Brew', 'lasso' );?>">
+					<label><?php esc_attr_e('New <span>post</span> title', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Specify title for new post, then save to edit.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
+					<input class="lasso--modal__trigger-footer" type="text" required name="story_title" value="" placeholder="<?php esc_attr_e('Grump Wizards Make Toxic Brew', 'lasso'); ?>">
 						<div class="lasso--select-wrap" style="width:90px">
 						<select id="lasso--select-type" name="story_type">
 
 							<?php
 								$types = lasso_post_types();
 
-								if ( !empty( $types ) ) {
+								if (!empty($types)) {
 
-									foreach( $types as $type ) {
+									foreach ($types as $type) {
 
-										$type = preg_replace( '/s\b/','', $type );
+										$type = preg_replace('/s\b/', '', $type);
 
-										printf( '<option value="%s">%s</option>', lcfirst( esc_attr( $type ) ) , ucfirst( esc_attr( $type ) ) );
+										printf('<option value="%s">%s</option>', lcfirst(esc_attr($type)), ucfirst(esc_attr($type)));
 									}
 
 								}
@@ -485,11 +485,11 @@ 
 				</div>
 
 				<div class="lasso--postsettings__footer" style="display:none;">
-					<a href="#" class="lasso--postsettings-cancel"><?php _e( 'Cancel', 'lasso' );?></a>
+					<a href="#" class="lasso--postsettings-cancel"><?php _e('Cancel', 'lasso'); ?></a>
 					<input type="hidden" name="action" value="process_new-object_post">
 					<input type="hidden" name="object" value="post">
-					<input type="hidden" name="nonce" value="<?php echo $nonce;?>">
-					<input type="submit" value="<?php esc_attr_e( 'Create', 'lasso' );?>">
+					<input type="hidden" name="nonce" value="<?php echo $nonce; ?>">
+					<input type="submit" value="<?php esc_attr_e('Create', 'lasso'); ?>">
 				</div>
 
 			</form>
@@ -513,18 +513,18 @@ 
 	ob_start();
 
 	// post status
-	$status = get_post_status( get_the_ID() );
+	$status = get_post_status(get_the_ID());
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_modal_all_post_classes', '' );
+	$custom_classes = apply_filters('lasso_modal_all_post_classes', '');
 
 	?>
-	<div id="lasso--all-posts__modal" class="lasso--modal lasso--modal__full lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
+	<div id="lasso--all-posts__modal" class="lasso--modal lasso--modal__full lassoShowAnimate <?php echo sanitize_html_class($custom_classes); ?>">
 		<div class="lasso--modal__inner">
 
 			<div class="lasso--post-filtering not-visible">
 				<div class="lasso--search__results">
-					<span id="lasso--results-found"></span><?php _e('results found','lasso');?>
+					<span id="lasso--results-found"></span><?php _e('results found', 'lasso'); ?>
 				</div>
 				<div class="lasso--search">
 					<i id="lasso--search__toggle" class="dashicons dashicons-search"></i>
@@ -537,16 +537,16 @@ 
 
 				$post_types = lasso_post_types_names();
 
-				if ( ! empty( $post_types ) ) {
+				if (!empty($post_types)) {
 					$first = 'active';
-					foreach( $post_types as $name => $label ) {
-						printf( '<li class="%1s lasso--show-objects" data-post-type="%2s">%3s</li>', esc_attr( $first), esc_attr( $name ), esc_attr( $label ) );
+					foreach ($post_types as $name => $label) {
+						printf('<li class="%1s lasso--show-objects" data-post-type="%2s">%3s</li>', esc_attr($first), esc_attr($name), esc_attr($label));
 						$first = '';
 					}
 
 				}
 
-				do_action('lasso_modal_post_objects');?>
+				do_action('lasso_modal_post_objects'); ?>
 
 			</ul>
 			<div id="lasso--loading" class="lasso--loading"><div class="lasso--loader"></div></div>
@@ -564,18 +564,18 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
+	if (!lasso_user_can())
 		return;
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
+	$custom_classes = apply_filters('lasso_wpimg_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso--wpimg-edit" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso--wpimg-edit" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -585,18 +585,18 @@ 
 
 	ob_start();
 
-	if ( !lasso_user_can() )
+	if (!lasso_user_can())
 		return;
 
 	// let users add custom css classes
-	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
+	$custom_classes = apply_filters('lasso_wpimg_classes', '');
 
 	?>
-	<ul class="lasso-component--controls <?php echo sanitize_html_class( $custom_classes );?>" contenteditable="false">
-		<li class="lasso-drag" title="<?php esc_attr_e( 'Move', 'lasso' );?>"></li>
-		<li id="lasso--wpvideo-edit" class="lasso-settings" title="<?php esc_attr_e( 'Settings', 'lasso' );?>"></li>
-		<li class="lasso-clone" title="<?php esc_attr_e( 'Clone', 'lasso' );?>"></li>
-		<li class="lasso-delete" title="<?php esc_attr_e( 'Delete', 'lasso' );?>"></li>
+	<ul class="lasso-component--controls <?php echo sanitize_html_class($custom_classes); ?>" contenteditable="false">
+		<li class="lasso-drag" title="<?php esc_attr_e('Move', 'lasso'); ?>"></li>
+		<li id="lasso--wpvideo-edit" class="lasso-settings" title="<?php esc_attr_e('Settings', 'lasso'); ?>"></li>
+		<li class="lasso-clone" title="<?php esc_attr_e('Clone', 'lasso'); ?>"></li>
+		<li class="lasso-delete" title="<?php esc_attr_e('Delete', 'lasso'); ?>"></li>
 	</ul>
 
 	<?php return ob_get_clean();
@@ -609,16 +609,16 @@ 
  */
 function lasso_map_form_footer() {
 
-	$nonce = wp_create_nonce( 'lasso-process-map' );
+	$nonce = wp_create_nonce('lasso-process-map');
 
 	ob_start();
 
 	?>
 	<div class="lasso--map-form__footer">
-		<input type="hidden" name="postid" value="<?php echo get_the_ID();?>">
-		<input type="hidden" name="nonce" value="<?php echo $nonce;?>">
+		<input type="hidden" name="postid" value="<?php echo get_the_ID(); ?>">
+		<input type="hidden" name="nonce" value="<?php echo $nonce; ?>">
 		<input type="hidden" name="action" value="process_map_save">
-		<input type="submit" class="lasso--map-form__submit" value="<?php esc_attr_e( 'Save Locations', 'lasso' );?>">
+		<input type="submit" class="lasso--map-form__submit" value="<?php esc_attr_e('Save Locations', 'lasso'); ?>">
 	</div>
 
 	<?php return ob_get_clean();
@@ -636,7 +636,7 @@ 
 
 	?>
 	<div id="lasso--pagerefresh" class="visible">
-		<?php _e( 'Save this post and refesh the page to see these changes.', 'lasso' );?>
+		<?php _e('Save this post and refesh the page to see these changes.', 'lasso'); ?>
 	</div>
 
 	<?php return ob_get_clean();
@@ -650,43 +650,43 @@ 
  */
 function lasso_editor_options_blob() {
 
-	$codes   = function_exists( 'aesop_shortcodes' ) ? aesop_shortcodes() : apply_filters( 'lasso_custom_options', '' );
-	$galleries  = function_exists( 'lasso_editor_galleries_exist' ) && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
+	$codes = function_exists('aesop_shortcodes') ? aesop_shortcodes() : apply_filters('lasso_custom_options', '');
+	$galleries = function_exists('lasso_editor_galleries_exist') && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
 
-	$nonce = wp_create_nonce( 'lasso_gallery' );
+	$nonce = wp_create_nonce('lasso_gallery');
 
 	$blob = array();
 
-	if ( empty( $codes ) )
+	if (empty($codes))
 		return;
 
-	foreach ( $codes as $slug => $shortcode ) {
+	foreach ($codes as $slug => $shortcode) {
 		$return = '';
 		// Shortcode has atts
 
-		if ( count( $shortcode['atts'] ) && $shortcode['atts'] ) {
+		if (count($shortcode['atts']) && $shortcode['atts']) {
 
-			foreach ( $shortcode['atts'] as $attr_name => $attr_info ) {
+			foreach ($shortcode['atts'] as $attr_name => $attr_info) {
 
 
-				$prefix = isset( $attr_info['prefix'] ) ? sprintf( '<span class="lasso-option-prefix">%s</span>', $attr_info['prefix'] ) : null;
+				$prefix = isset($attr_info['prefix']) ? sprintf('<span class="lasso-option-prefix">%s</span>', $attr_info['prefix']) : null;
 
 				$return .= '<form id="lasso--component-settings-form" class="'.$galleries.'" method="post">';
 				$return .= '<p data-option="'.$attr_name.'" class="lasso-option lasso-'.$slug.'-'.$attr_name.'">';
-				$return .= '<label for="lasso-generator-attr-' . $attr_name . '">' . $attr_info['desc'] . '</label>';
+				$return .= '<label for="lasso-generator-attr-'.$attr_name.'">'.$attr_info['desc'].'</label>';
 				$return .= '<small class="lasso-option-desc">'.$attr_info['tip'].'</small>';
 				// Select
 
-				if ( isset( $attr_info['values'] ) ) {
+				if (isset($attr_info['values'])) {
 
-					$return .= '<select name="' . $attr_name . '" id="lasso-generator-attr-' . $attr_name . '" class="lasso-generator-attr">';
+					$return .= '<select name="'.$attr_name.'" id="lasso-generator-attr-'.$attr_name.'" class="lasso-generator-attr">';
 
-					$i=0;
+					$i = 0;
 
-					foreach ( $attr_info['values'] as $attr_value ) {
+					foreach ($attr_info['values'] as $attr_value) {
 						$attr_value_selected = $attr_info['default'] == $attr_value ? ' selected="selected"' : '';
 
-						$return .= '<option value="'.$attr_info['values'][$i]['value'].'" ' . $attr_value_selected . '>'.$attr_info['values'][$i]['name'].'</option>';
+						$return .= '<option value="'.$attr_info['values'][$i]['value'].'" '.$attr_value_selected.'>'.$attr_info['values'][$i]['name'].'</option>';
 
 						$i++;
 					}
@@ -695,24 +695,24 @@ 
 
 				} else {
 
-					$attr_field_type = isset( $attr_info['type'] ) ? $attr_info['type'] : 'text';
+					$attr_field_type = isset($attr_info['type']) ? $attr_info['type'] : 'text';
 
 					// image upload
-					if ( 'media_upload' == $attr_info['type'] ) {
+					if ('media_upload' == $attr_info['type']) {
 
-						$return .= '<input type="' . $attr_field_type . '" name="' . $attr_name . '" value="'.$attr_info['default'].'" id="lasso-generator-attr-' . $attr_name . '" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" />';
+						$return .= '<input type="'.$attr_field_type.'" name="'.$attr_name.'" value="'.$attr_info['default'].'" id="lasso-generator-attr-'.$attr_name.'" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" />';
 						$return .= '<a href="#" id="lasso-upload-img" class="lasso-option-button" /></a>';
 
-					} elseif ( 'color' == $attr_info['type'] ) {
+					} elseif ('color' == $attr_info['type']) {
 
-						$return .= '<input type="color" name="' . $attr_name . '" value="'.$attr_info['default'].'" id="lasso-generator-attr-' . $attr_name . '" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" />';
+						$return .= '<input type="color" name="'.$attr_name.'" value="'.$attr_info['default'].'" id="lasso-generator-attr-'.$attr_name.'" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" />';
 
-					} elseif ( 'text_area' == $attr_info['type'] ) {
+					} elseif ('text_area' == $attr_info['type']) {
 
-						$return .= '<textarea name="' . $attr_name . '" id="lasso-generator-attr-' . $attr_name . '" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" placeholder="'.$attr_info['default'].'" /></textarea>'.$prefix.'';
+						$return .= '<textarea name="'.$attr_name.'" id="lasso-generator-attr-'.$attr_name.'" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" placeholder="'.$attr_info['default'].'" /></textarea>'.$prefix.'';
 
 					} else {
-						$return .= '<input type="' . $attr_field_type . '" name="' . $attr_name . '" value="'.$attr_info['default'].'" id="lasso-generator-attr-' . $attr_name . '" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" />'.$prefix.'';
+						$return .= '<input type="'.$attr_field_type.'" name="'.$attr_name.'" value="'.$attr_info['default'].'" id="lasso-generator-attr-'.$attr_name.'" class="lasso-generator-attr lasso-generator-attr-'.$attr_field_type.'" />'.$prefix.'';
 					}
 				}
 				$return .= '</p>';
@@ -723,9 +723,9 @@ 
 		///////////////////////////
 		// START GALLERY AND MAP FRONT END STUFFS
 		///////////////////////////
-		if ( isset( $shortcode['front'] ) && true == $shortcode['front'] ) {
+		if (isset($shortcode['front']) && true == $shortcode['front']) {
 
-			if ( 'gallery' == $shortcode['front_type'] ) {
+			if ('gallery' == $shortcode['front_type']) {
 
 				$return .= lasso_gallery_editor_module();
 
@@ -736,13 +736,13 @@ 
 		///////////////////////////
 
 		// Single shortcode (not closed)
-		if ( 'single' == $shortcode['type'] ) {
+		if ('single' == $shortcode['type']) {
 
 			$return .= '<input type="hidden" name="lasso-generator-content" id="lasso-generator-content" value="false" />';
 
 		} else {
 
-			$return .= '<p data-option="content" class="lasso-option lasso-c-comp-text"><label>' . __( 'Content', 'lasso' ) . '</label><textarea type="text" name="lasso-generator-content" id="lasso-generator-content" value="' . $shortcode['content'] . '" /></textarea></p>';
+			$return .= '<p data-option="content" class="lasso-option lasso-c-comp-text"><label>'.__('Content', 'lasso').'</label><textarea type="text" name="lasso-generator-content" id="lasso-generator-content" value="'.$shortcode['content'].'" /></textarea></p>';
 		}
 
 		$return .= '<p class="lasso-buttoninsert-wrap"><a href="#" class="lasso-generator-cancel" id="lasso--sidebar__close">Cancel
@@ -775,7 +775,7 @@ 
 				<div id="lasso--loading" class="lasso--loading"><div class="lasso--loader"></div></div>
 				<div id="lasso--hide" style="display:none;" class="lasso--post-form">
 					<i class="lasso-icon lasso-icon-move"></i>
-					<label><?php _e( 'Revisions', 'lasso' );?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e( 'Use the slider to view the revision live on the page.', 'lasso' );?>"><i class="lasso-icon-help"></i></span></label>
+					<label><?php _e('Revisions', 'lasso'); ?><span class="lasso-util--help lasso-util--help-top" data-tooltip="<?php esc_attr_e('Use the slider to view the revision live on the page.', 'lasso'); ?>"><i class="lasso-icon-help"></i></span></label>
 					<div class="lasso--slider_wrap">
 						<div id="lasso--slider"></div>
 					</div>

lasso.php

Spacing +8 added lines, -8 removed lines

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

public/includes/components.php

Spacing +52 added lines, -52 removed lines

@@ -16,76 +16,76 @@ 
 
 	$array = array(
 		'quote' => array(
-			'name'    => __('Quote','lasso'),
+			'name'    => __('Quote', 'lasso'),
 			'content' => lasso_quote_component(),
 		),
 		'image' => array(
-			'name'    => __('Image','lasso'),
+			'name'    => __('Image', 'lasso'),
 			'content' => lasso_image_component(),
 		),
 		'parallax' => array(
-			'name'    => __('Parallax','lasso'),
+			'name'    => __('Parallax', 'lasso'),
 			'content' => lasso_parallax_component(),
 		),
 		'audio' => array(
-			'name'    => __('Audio','lasso'),
+			'name'    => __('Audio', 'lasso'),
 			'content' => lasso_audio_component(),
 		),
 		'content' => array(
-			'name'    => __('Content','lasso'),
+			'name'    => __('Content', 'lasso'),
 			'content' => lasso_content_component(),
 		),
 		'character' => array(
-			'name'    => __('Character','lasso'),
+			'name'    => __('Character', 'lasso'),
 			'content' => lasso_character_component(),
 		),
 		'collection' => array(
-			'name'    => __('Collection','lasso'),
+			'name'    => __('Collection', 'lasso'),
 			'content' => lasso_collections_component(),
 		),
 		'document' => array(
-			'name'    => __('Document','lasso'),
+			'name'    => __('Document', 'lasso'),
 			'content' => lasso_document_component(),
 		),
 		'gallery' => array(
-			'name'    => __('Gallery','lasso'),
+			'name'    => __('Gallery', 'lasso'),
 			'content' => lasso_gallery_component(),
 		),
 		'chapter' => array(
-			'name'    => __('Chapter','lasso'),
+			'name'    => __('Chapter', 'lasso'),
 			'content' => lasso_heading_component(),
 		),
 		'map' => array(
-			'name'    => __('Map','lasso'),
+			'name'    => __('Map', 'lasso'),
 			'content' => lasso_map_component(),
 		),
 		'timeline_stop' => array(
-			'name'    => __('Timeline','lasso'),
+			'name'    => __('Timeline', 'lasso'),
 			'content' => lasso_timeline_component(),
 		),
 		'video' => array(
-			'name'    => __('Video','lasso'),
+			'name'    => __('Video', 'lasso'),
 			'content' => lasso_video_component(),
 		),
 		'wpimg' => array(
-			'name'    => __('WordPress Image','lasso'),
+			'name'    => __('WordPress Image', 'lasso'),
 			'content' => lasso_wp_image(),
 		),
 		'wpquote' => array(
-			'name'    => __('WordPress Quote','lasso'),
+			'name'    => __('WordPress Quote', 'lasso'),
 			'content' => lasso_wp_quote(),
 		),
 		'gallery_pop' => array(
-			'name'    => __('Gallery Pop','lasso'),
+			'name'    => __('Gallery Pop', 'lasso'),
 			'content' => lasso_gallery_pop_component(),
 		),
 		'wpvideo' => array(
-			'name'    => __('WordPress Image','lasso'),
+			'name'    => __('WordPress Image', 'lasso'),
 			'content' => lasso_wp_video(),
 		),
 	);
 
-	return apply_filters( 'lasso_components', $array );
+	return apply_filters('lasso_components', $array);
 }
 
 /**
@@ -111,132 +111,132 @@ 
  */
 
 // 1
-if ( !function_exists( 'lasso_quote_component' ) ):
+if (!function_exists('lasso_quote_component')):
 	function lasso_quote_component() {
 
-		return do_shortcode( '[aesop_quote quote="The Universe is made of stories, not of atoms."]' );
+		return do_shortcode('[aesop_quote quote="The Universe is made of stories, not of atoms."]');
 	}
 endif;
 
 // 2
-if ( !function_exists( 'lasso_image_component' ) ):
+if (!function_exists('lasso_image_component')):
 	function lasso_image_component() {
 
-		return do_shortcode( '[aesop_image img="'.LASSO_URL.'/public/assets/img/empty-img.png" align="center" imgwidth="800px"]' );
+		return do_shortcode('[aesop_image img="'.LASSO_URL.'/public/assets/img/empty-img.png" align="center" imgwidth="800px"]');
 	}
 endif;
 
 // 3
-if ( !function_exists( 'lasso_parallax_component' ) ):
+if (!function_exists('lasso_parallax_component')):
 	function lasso_parallax_component() {
 
-		return do_shortcode( '[aesop_parallax img="'.LASSO_URL.'/public/assets/img/empty-img.png"]' );
+		return do_shortcode('[aesop_parallax img="'.LASSO_URL.'/public/assets/img/empty-img.png"]');
 	}
 endif;
 
 // 4
-if ( !function_exists( 'lasso_audio_component' ) ):
+if (!function_exists('lasso_audio_component')):
 	function lasso_audio_component() {
 
-		return do_shortcode( '[aesop_audio src="http://users.skynet.be/fa046054/home/P22/track06.mp3"]' );
+		return do_shortcode('[aesop_audio src="http://users.skynet.be/fa046054/home/P22/track06.mp3"]');
 
 	}
 endif;
 
 // 5
-if ( !function_exists( 'lasso_content_component' ) ):
+if (!function_exists('lasso_content_component')):
 	function lasso_content_component() {
 
-		return do_shortcode( '[aesop_content]Start typing here...[/aesop_content]' );
+		return do_shortcode('[aesop_content]Start typing here...[/aesop_content]');
 	}
 endif;
 
 // 6
-if ( !function_exists( 'lasso_character_component' ) ):
+if (!function_exists('lasso_character_component')):
 	function lasso_character_component() {
 
-		return do_shortcode( '[aesop_character img="'.LASSO_URL.'/public/assets/img/empty-img.png" name="Joes Apartment" width="150px"]' );
+		return do_shortcode('[aesop_character img="'.LASSO_URL.'/public/assets/img/empty-img.png" name="Joes Apartment" width="150px"]');
 
 	}
 endif;
 
 // 7
-if ( !function_exists( 'lasso_collections_component' ) ):
+if (!function_exists('lasso_collections_component')):
 	function lasso_collections_component() {
 
-		return do_shortcode( '[aesop_collection]' );
+		return do_shortcode('[aesop_collection]');
 	}
 endif;
 
 // 8
-if ( !function_exists( 'lasso_document_component' ) ):
+if (!function_exists('lasso_document_component')):
 	function lasso_document_component() {
 
-		return do_shortcode( '[aesop_document src="'.LASSO_URL.'/public/assets/img/empty-img.png" ]' );
+		return do_shortcode('[aesop_document src="'.LASSO_URL.'/public/assets/img/empty-img.png" ]');
 
 	}
 endif;
 
 // 9
-if ( !function_exists( 'lasso_gallery_component' ) ):
+if (!function_exists('lasso_gallery_component')):
 	function lasso_gallery_component() {
 
-		return do_shortcode( '[aesop_gallery]' );
+		return do_shortcode('[aesop_gallery]');
 
 	}
 endif;
 
 // 10
-if ( !function_exists( 'lasso_heading_component' ) ):
+if (!function_exists('lasso_heading_component')):
 	function lasso_heading_component() {
 
-		return do_shortcode( '[aesop_chapter title="Chapter One" img="'.LASSO_URL.'/public/assets/img/empty-img.png" full="on"]' );
+		return do_shortcode('[aesop_chapter title="Chapter One" img="'.LASSO_URL.'/public/assets/img/empty-img.png" full="on"]');
 	}
 endif;
 
 // 11
-if ( !function_exists( 'lasso_map_component' ) ):
+if (!function_exists('lasso_map_component')):
 	function lasso_map_component() {
 
 		return '<form id="lasso--map-form" class="aesop-component aesop-map-component lasso--map-drag-holder" enctype="multipart/form-data">
 				'.lasso_map_form_footer().'
-				'.do_shortcode( '[aesop_map sticky="off"]' ).'
+				'.do_shortcode('[aesop_map sticky="off"]').'
 			</form>';
 
 	}
 endif;
 
 // 12
-if ( !function_exists( 'lasso_timeline_component' ) ):
+if (!function_exists('lasso_timeline_component')):
 	function lasso_timeline_component() {
 
-		return do_shortcode( '[aesop_timeline_stop num="Title" title="2014"]' );
+		return do_shortcode('[aesop_timeline_stop num="Title" title="2014"]');
 
 	}
 endif;
 
 // 13
-if ( !function_exists( 'lasso_video_component' ) ):
+if (!function_exists('lasso_video_component')):
 	function lasso_video_component() {
 
-		return do_shortcode( '[aesop_video src="vimeo" id="59940289" width="100%" align="center"]' );
+		return do_shortcode('[aesop_video src="vimeo" id="59940289" width="100%" align="center"]');
 
 	}
 endif;
 
 // 14 - since 0.9.1
-if ( !function_exists('lasso_wp_image') ):
+if (!function_exists('lasso_wp_image')):
 
-	function lasso_wp_image(){
+	function lasso_wp_image() {
 		return '<div data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img class="wp-image-0" src="'.LASSO_URL.'/public/assets/img/empty-img.png"></div>';
 	}
 
 endif;
 
 // 15 - since 0.9.2
-if ( !function_exists('lasso_wp_quote') ):
+if (!function_exists('lasso_wp_quote')):
 
-	function lasso_wp_quote(){
+	function lasso_wp_quote() {
 		return '<blockquote data-component-type="wpquote" class="lasso--wpquote lasso-component"><p>The universe is made of stories.</p></blockquote>';
 	}
 
@@ -244,16 +244,16 @@ 
 
 // 16 gallery pop added but not fully supported as of 0.9.9.11 
 
-if ( !function_exists( 'lasso_gallery_pop_component' ) ):
+if (!function_exists('lasso_gallery_pop_component')):
 	function lasso_gallery_pop_component() {
-		return do_shortcode( '[aesop_gallery_pop]' );
+		return do_shortcode('[aesop_gallery_pop]');
 	}
 endif;
 
 // 17 - work in progress
-if ( !function_exists('lasso_wp_video') ):
+if (!function_exists('lasso_wp_video')):
 
-	function lasso_wp_video(){
+	function lasso_wp_video() {
 		return '<div data-component-type="wpvideo" class="lasso--wpvideo__wrap lasso-component"><video class="wp-video-0"></video>';
 	}
 

public/includes/assets.php

Indentation +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 	public function scripts(){
 
 	
-        // for now editus is disabled for mobile. it will be reenabled when mobile platforms are better supported
+		// for now editus is disabled for mobile. it will be reenabled when mobile platforms are better supported
 		if ( lasso_user_can('edit_posts')) {
 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
@@ -181,15 +181,15 @@ 
 			if ($show_color) {
 				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'iris'), LASSO_VERSION, true);
 			} else {
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
+				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
 			}
 			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
 			
 			//enqueue js if tour is not hidden 
-            		$tour_hidden = get_user_meta( get_current_user_ID(), 'lasso_hide_tour', true );
-    			if ( lasso_user_can() && !$tour_hidden ){
-                		wp_enqueue_script('lasso-tour', LASSO_URL. "/public/assets/js/tour.js", array('jquery', 'lasso'), LASSO_VERSION, true);
-    			}
+					$tour_hidden = get_user_meta( get_current_user_ID(), 'lasso_hide_tour', true );
+				if ( lasso_user_can() && !$tour_hidden ){
+						wp_enqueue_script('lasso-tour', LASSO_URL. "/public/assets/js/tour.js", array('jquery', 'lasso'), LASSO_VERSION, true);
+				}
 
 		}
 

Spacing +70 added lines, -70 removed lines

@@ -10,16 +10,16 @@ 
 
 class assets {
 
-	public function __construct(){
+	public function __construct() {
 
-		add_action('wp_enqueue_scripts', array($this,'scripts'));
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
 	}
 
-	public function scripts(){
+	public function scripts() {
 
 	
         // for now editus is disabled for mobile. it will be reenabled when mobile platforms are better supported
-		if ( lasso_user_can('edit_posts')) {
+		if (lasso_user_can('edit_posts')) {
 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
@@ -34,21 +34,21 @@ 
 			// url for json api
 			$home_url = function_exists('json_get_url_prefix') ? json_get_url_prefix() : false;
 
-			$article_object 	= lasso_editor_get_option('article_class','lasso_editor');
+			$article_object 	= lasso_editor_get_option('article_class', 'lasso_editor');
 
-			$article_object 	= empty( $article_object ) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
+			$article_object 	= empty($article_object) && lasso_get_supported_theme_class() ? lasso_get_supported_theme_class() : $article_object;
 
-			$featImgClass 		= lasso_editor_get_option('featimg_class','lasso_editor');
-			if (empty( $featImgClass )) {
+			$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
+			if (empty($featImgClass)) {
 				$featImgClass = lasso_get_supported_theme_featured_image_class();
 			}
-			$titleClass 		= lasso_editor_get_option('title_class','lasso_editor');
-			if (empty( $titleClass )) {
+			$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
+			if (empty($titleClass)) {
 				$titleClass = lasso_get_supported_theme_title_class();
 			}
-			$toolbar_headings  	= lasso_editor_get_option('toolbar_headings', 'lasso_editor');
-			$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
-			$objectsNonEditable  	= lasso_editor_get_option('non_editable', 'lasso_editor');
+			$toolbar_headings = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
+			$objectsNoSave = lasso_editor_get_option('dont_save', 'lasso_editor');
+			$objectsNonEditable = lasso_editor_get_option('non_editable', 'lasso_editor');
 
 			
 			//text alignement
@@ -59,74 +59,74 @@ 
 			
 			if ($show_color) {
 				//color picker
-				wp_enqueue_style( 'wp-color-picker' );
-				wp_enqueue_script( 'iris', admin_url( 'js/iris.min.js' ), array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), false, 1 );
+				wp_enqueue_style('wp-color-picker');
+				wp_enqueue_script('iris', admin_url('js/iris.min.js'), array('jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch'), false, 1);
 			}
 
 
 
 			// post id reference
-			$postid 			= get_the_ID();
+			$postid = get_the_ID();
 
 			$strings = array(
-				'save' 				=> __('Save','lasso'),
-				'saving' 			=> __('Saving...','lasso'),
-				'saved'				=> __('Saved!','lasso'),
-				'adding' 			=> __('Adding...','lasso'),
-				'added'				=> __('Added!','lasso'),
-				'loading' 			=> __('Loading...','lasso'),
-				'loadMore'			=> __('Load More','lasso'),
-				'noPostsFound'		=> __('No more posts found','lasso'),
-				'fetchFail'	    	=> __('Fetching failed. REST API plugin may not have been installed or configured correctly.','lasso'),
-				'galleryCreated' 	=> __('Gallery Created!','lasso'),
-				'galleryUpdated' 	=> __('Gallery Updated!','lasso'),
-				'justWrite'			=> __('Just write...','lasso'),
-				'chooseImage'		=> __('Choose an image','lasso'),
-				'updateImage'		=> __('Update Image','lasso'),
-				'insertImage'		=> __('Insert Image','lasso'),
-				'selectImage'		=> __('Select Image','lasso'),
-				'removeFeatImg'     => __('Remove featured image?','lasso'),
-				'updateSelectedImg' => __('Update Selected Image','lasso'),
-				'chooseImages'		=> __('Choose images','lasso'),
-				'editImage'			=> __('Edit Image','lasso'),
-				'addImages'			=> __('Add Images','lasso'),
-				'addNewGallery'		=> __('Add New Gallery','lasso'),
-				'selectGallery'		=> __('Select Lasso Gallery Image','lasso'),
-				'useSelectedImages' => __('Use Selected Images','lasso'),
-				'publishPost'		=> __('Publish Post?','lasso'),
-				'publishYes'		=> __('Yes, publish it!','lasso'),
-				'deletePost'		=> __('Trash Post?','lasso'),
-				'deleteYes'			=> __('Yes, trash it!','lasso'),
-				'warning'			=> __('Oh snap!','laso'),
-				'cancelText'		=> __('O.K. got it!','lasso'),
-				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.','lasso'),
+				'save' 				=> __('Save', 'lasso'),
+				'saving' 			=> __('Saving...', 'lasso'),
+				'saved'				=> __('Saved!', 'lasso'),
+				'adding' 			=> __('Adding...', 'lasso'),
+				'added'				=> __('Added!', 'lasso'),
+				'loading' 			=> __('Loading...', 'lasso'),
+				'loadMore'			=> __('Load More', 'lasso'),
+				'noPostsFound'		=> __('No more posts found', 'lasso'),
+				'fetchFail'	    	=> __('Fetching failed. REST API plugin may not have been installed or configured correctly.', 'lasso'),
+				'galleryCreated' 	=> __('Gallery Created!', 'lasso'),
+				'galleryUpdated' 	=> __('Gallery Updated!', 'lasso'),
+				'justWrite'			=> __('Just write...', 'lasso'),
+				'chooseImage'		=> __('Choose an image', 'lasso'),
+				'updateImage'		=> __('Update Image', 'lasso'),
+				'insertImage'		=> __('Insert Image', 'lasso'),
+				'selectImage'		=> __('Select Image', 'lasso'),
+				'removeFeatImg'     => __('Remove featured image?', 'lasso'),
+				'updateSelectedImg' => __('Update Selected Image', 'lasso'),
+				'chooseImages'		=> __('Choose images', 'lasso'),
+				'editImage'			=> __('Edit Image', 'lasso'),
+				'addImages'			=> __('Add Images', 'lasso'),
+				'addNewGallery'		=> __('Add New Gallery', 'lasso'),
+				'selectGallery'		=> __('Select Lasso Gallery Image', 'lasso'),
+				'useSelectedImages' => __('Use Selected Images', 'lasso'),
+				'publishPost'		=> __('Publish Post?', 'lasso'),
+				'publishYes'		=> __('Yes, publish it!', 'lasso'),
+				'deletePost'		=> __('Trash Post?', 'lasso'),
+				'deleteYes'			=> __('Yes, trash it!', 'lasso'),
+				'warning'			=> __('Oh snap!', 'laso'),
+				'cancelText'		=> __('O.K. got it!', 'lasso'),
+				'missingClass'		=> __('It looks like we are either missing the Article CSS class, or it is configured incorrectly. Editus will not function correctly without this CSS class.', 'lasso'),
 				'missingConfirm'	=> __('Update Settings', 'lasso'),
-				'helperText'		=> __('one more letter','lasso'),
+				'helperText'		=> __('one more letter', 'lasso'),
 				'editingBackup'  	=> __('You are currently editing a backup copy of this post.')
 			);
 
-			$api_url = trailingslashit( home_url() ) . 'lasso-internal-api';
+			$api_url = trailingslashit(home_url()).'lasso-internal-api';
 
 			$gallery_class = new gallery();
 			$gallery_nonce_action = $gallery_class->nonce_action;
-			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
+			$gallery_nonce = wp_create_nonce($gallery_nonce_action);
 
 			// localized objects
 			$objects = array(
-				'ajaxurl' 			=> esc_url( $api_url ),
-				'ajaxurl2' 			=> esc_url( admin_url( 'admin-ajax.php' )),
+				'ajaxurl' 			=> esc_url($api_url),
+				'ajaxurl2' 			=> esc_url(admin_url('admin-ajax.php')),
 				'editor' 			=> 'lasso--content', // ID of editable content (without #) DONT CHANGE
 				'article_object'	=> $article_object,
 				'featImgClass'		=> $featImgClass,
 				'titleClass'		=> $titleClass,
 				'strings'			=> $strings,
-				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url( 'settings.php?page=lasso-editor' ) : admin_url( 'admin.php?page=lasso-editor-settings' ),
-				'post_status'		=> get_post_status( $postid ),
+				'settingsLink'		=> function_exists('is_multisite') && is_multisite() ? network_admin_url('settings.php?page=lasso-editor') : admin_url('admin.php?page=lasso-editor-settings'),
+				'post_status'		=> get_post_status($postid),
 				'postid'			=> $postid,
 				'permalink'			=> get_permalink(),
 				'edit_others_pages'	=> current_user_can('edit_others_pages') ? true : false,
 				'edit_others_posts'	=> current_user_can('edit_others_posts') ? true : false,
-				'userCanEdit'		=> current_user_can('edit_post', $postid ),
+				'userCanEdit'		=> current_user_can('edit_post', $postid),
 				'can_publish_posts'	=> current_user_can('publish_posts'),
 				'can_publish_pages'	=> current_user_can('publish_pages'),
 				'author'			=> is_user_logged_in() ? get_current_user_ID() : false,
@@ -160,35 +160,35 @@ 
 				'postTags'    		=> lasso_get_objects('tag'),
 				'noResultsDiv'		=> lasso_editor_empty_results(),
 				'noRevisionsDiv'	=> lasso_editor_empty_results('revision'),
-				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider( $postid ) : false,
-				'mapLocations'		=> get_post_meta( $postid, 'ase_map_component_locations' ),
-				'mapStart'			=> get_post_meta( $postid, 'ase_map_component_start_point', true ),
-				'mapZoom'			=> get_post_meta( $postid, 'ase_map_component_zoom', true ),
+				'mapTileProvider'   => function_exists('aesop_map_tile_provider') ? aesop_map_tile_provider($postid) : false,
+				'mapLocations'		=> get_post_meta($postid, 'ase_map_component_locations'),
+				'mapStart'			=> get_post_meta($postid, 'ase_map_component_start_point', true),
+				'mapZoom'			=> get_post_meta($postid, 'ase_map_component_zoom', true),
 				'revisionModal' 	=> lasso_editor_revision_modal(),
 				'isMobile'          => wp_is_mobile(),
-				'enableAutoSave'    => lasso_editor_get_option( 'enable_autosave', 'lasso_editor' ),
+				'enableAutoSave'    => lasso_editor_get_option('enable_autosave', 'lasso_editor'),
 				'showColor'         => $show_color,
 				'showAlignment'  => $show_align
 			);
 
 
 			// wp api client
-			wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
-			$settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
-			wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
+			wp_enqueue_script('wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array('jquery', 'underscore', 'backbone'), LASSO_VERSION, true);
+			$settings = array('root' => home_url($home_url), 'nonce' => wp_create_nonce('wp_json'));
+			wp_localize_script('wp-api-js', 'WP_API_Settings', $settings);
 
-			$postfix = ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ) ? '' : '.min';
+			$postfix = (defined('SCRIPT_DEBUG') && true === SCRIPT_DEBUG) ? '' : '.min';
 			if ($show_color) {
-				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'iris'), LASSO_VERSION, true);
+				wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery', 'iris'), LASSO_VERSION, true);
 			} else {
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
+			    wp_enqueue_script('lasso', LASSO_URL."/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true);
 			}
-			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
+			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects));
 			
 			//enqueue js if tour is not hidden 
-            		$tour_hidden = get_user_meta( get_current_user_ID(), 'lasso_hide_tour', true );
-    			if ( lasso_user_can() && !$tour_hidden ){
-                		wp_enqueue_script('lasso-tour', LASSO_URL. "/public/assets/js/tour.js", array('jquery', 'lasso'), LASSO_VERSION, true);
+            		$tour_hidden = get_user_meta(get_current_user_ID(), 'lasso_hide_tour', true);
+    			if (lasso_user_can() && !$tour_hidden) {
+                		wp_enqueue_script('lasso-tour', LASSO_URL."/public/assets/js/tour.js", array('jquery', 'lasso'), LASSO_VERSION, true);
     			}
 
 		}