WordPoints / wordpoints

src/classes/entity.php

Doc Comments +1 added lines, -1 removed lines

@@ -430,7 +430,7 @@
 	 *
 	 * @since 2.1.0
 	 *
-	 * @return mixed The ID of the entity.
+	 * @return integer The ID of the entity.
 	 */
 	public function get_the_id() {
 		return $this->get_the_value();

src/includes/class-shortcode.php

Doc Comments +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
 	 *
 	 * @since 1.8.0
 	 *
-	 * @return string|WP_Error|null An error message or object on failure.
+	 * @return string|null An error message or object on failure.
 	 */
 	protected function verify_atts() {
 

src/includes/class-un-installer.php

Spacing +33 added lines, -33 removed lines

@@ -23,12 +23,12 @@ 
 	 * @since 1.8.0
 	 */
 	protected $updates = array(
-		'1.3.0'  => array( 'single' => true, /*     -     */ /*      -      */ ),
+		'1.3.0'  => array('single' => true, /*     -     */ /*      -      */),
 		'1.5.0'  => array( /*      -      */ 'site' => true, /*      -      */ ),
 		'1.8.0'  => array( /*      -      */ 'site' => true, /*      -      */ ),
-		'1.10.3' => array( 'single' => true, /*     -     */ 'network' => true ),
-		'2.1.0-alpha-3'  => array( 'single' => true, /*     -     */ 'network' => true ),
-		'2.3.0-alpha-2'  => array( 'single' => true, /*     -     */ 'network' => true ),
+		'1.10.3' => array('single' => true, /*     -     */ 'network' => true),
+		'2.1.0-alpha-3'  => array('single' => true, /*     -     */ 'network' => true),
+		'2.3.0-alpha-2'  => array('single' => true, /*     -     */ 'network' => true),
 	);
 
 	/**
@@ -112,24 +112,24 @@ 
 	/**
 	 * @since 1.8.0
 	 */
-	public function install( $network ) {
+	public function install($network) {
 
-		$filter_func = ( $network ) ? '__return_true' : '__return_false';
-		add_filter( 'is_wordpoints_network_active', $filter_func );
+		$filter_func = ($network) ? '__return_true' : '__return_false';
+		add_filter('is_wordpoints_network_active', $filter_func);
 
 		// Check if the plugin has been activated/installed before.
-		$installed = (bool) wordpoints_get_maybe_network_option( 'wordpoints_data' );
+		$installed = (bool) wordpoints_get_maybe_network_option('wordpoints_data');
 
-		parent::install( $network );
+		parent::install($network);
 
 		// Activate the Points component, if this is the first activation.
-		if ( false === $installed ) {
+		if (false === $installed) {
 			$wordpoints_components = WordPoints_Components::instance();
 			$wordpoints_components->load();
-			$wordpoints_components->activate( 'points' );
+			$wordpoints_components->activate('points');
 		}
 
-		remove_filter( 'is_wordpoints_network_active', $filter_func );
+		remove_filter('is_wordpoints_network_active', $filter_func);
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 
 		parent::before_update();
 
-		if ( $this->network_wide ) {
-			unset( $this->updates['1_8_0'] );
+		if ($this->network_wide) {
+			unset($this->updates['1_8_0']);
 		}
 	}
 
@@ -149,10 +149,10 @@ 
 	 */
 	protected function install_network() {
 
-		$data = wordpoints_get_maybe_network_option( 'wordpoints_data' );
+		$data = wordpoints_get_maybe_network_option('wordpoints_data');
 
 		// Add plugin data.
-		if ( ! is_array( $data ) ) {
+		if ( ! is_array($data)) {
 
 			wordpoints_update_maybe_network_option(
 				'wordpoints_data',
@@ -170,7 +170,7 @@ 
 			// corrupted somehow.
 			$data['version'] = WORDPOINTS_VERSION;
 
-			wordpoints_update_maybe_network_option( 'wordpoints_data', $data );
+			wordpoints_update_maybe_network_option('wordpoints_data', $data);
 		}
 
 		$this->install_db_schema();
@@ -220,11 +220,11 @@ 
 	protected function uninstall_modules() {
 
 		wordpoints_deactivate_modules(
-			wordpoints_get_array_option( 'wordpoints_active_modules', 'site' )
+			wordpoints_get_array_option('wordpoints_active_modules', 'site')
 		);
 
-		foreach ( array_keys( wordpoints_get_modules() ) as $module ) {
-			wordpoints_uninstall_module( $module );
+		foreach (array_keys(wordpoints_get_modules()) as $module) {
+			wordpoints_uninstall_module($module);
 		}
 
 		$this->delete_modules_dir();
@@ -239,8 +239,8 @@ 
 
 		global $wp_filesystem;
 
-		if ( $wp_filesystem instanceof WP_Filesystem_Base ) {
-			$wp_filesystem->delete( wordpoints_modules_dir(), true );
+		if ($wp_filesystem instanceof WP_Filesystem_Base) {
+			$wp_filesystem->delete(wordpoints_modules_dir(), true);
 		}
 	}
 
@@ -252,13 +252,13 @@ 
 	protected function uninstall_components() {
 
 		/** This filter is documented in includes/class-wordpoints-components.php */
-		do_action( 'wordpoints_components_register' );
+		do_action('wordpoints_components_register');
 
 		$components = WordPoints_Components::instance();
 
 		// Uninstall the components.
-		foreach ( $components->get() as $component => $data ) {
-			WordPoints_Installables::uninstall( 'component', $component );
+		foreach ($components->get() as $component => $data) {
+			WordPoints_Installables::uninstall('component', $component);
 		}
 	}
 
@@ -268,7 +268,7 @@ 
 	 * @since 1.8.0
 	 */
 	protected function update_single_to_1_3_0() {
-		wordpoints_add_custom_caps( $this->custom_caps );
+		wordpoints_add_custom_caps($this->custom_caps);
 	}
 
 	/**
@@ -277,7 +277,7 @@ 
 	 * @since 1.8.0
 	 */
 	protected function update_site_to_1_5_0() {
-		wordpoints_add_custom_caps( $this->custom_caps );
+		wordpoints_add_custom_caps($this->custom_caps);
 	}
 
 	/**
@@ -309,14 +309,14 @@ 
 
 		$modules_dir = wordpoints_modules_dir();
 
-		if ( ! WP_Filesystem( false, $modules_dir ) ) {
+		if ( ! WP_Filesystem(false, $modules_dir)) {
 			return;
 		}
 
 		$index_file = $modules_dir . '/index.php';
 
-		if ( ! $wp_filesystem->exists( $index_file ) ) {
-			$wp_filesystem->put_contents( $index_file, '<?php // Gold is silent.' );
+		if ( ! $wp_filesystem->exists($index_file)) {
+			$wp_filesystem->put_contents($index_file, '<?php // Gold is silent.');
 		}
 	}
 
@@ -326,7 +326,7 @@ 
 	 * @since 2.1.0
 	 */
 	protected function update_network_to_2_1_0_alpha_3() {
-		$this->map_shortcuts( 'schema' );
+		$this->map_shortcuts('schema');
 		$this->install_db_schema();
 	}
 
@@ -336,7 +336,7 @@ 
 	 * @since 2.1.0
 	 */
 	protected function update_single_to_2_1_0_alpha_3() {
-		$this->map_shortcuts( 'schema' );
+		$this->map_shortcuts('schema');
 		$this->install_db_schema();
 	}
 
@@ -349,7 +349,7 @@ 
 
 		// We don't need to update the table if the new schema has just been used to
 		// install it.
-		if ( version_compare( $this->get_db_version(), '2.1.0-alpha-3', '<' ) ) {
+		if (version_compare($this->get_db_version(), '2.1.0-alpha-3', '<')) {
 			return;
 		}
 

src/includes/modules.php

Spacing +240 added lines, -240 removed lines

@@ -18,11 +18,11 @@ 
  *
  * @return bool Whether the module is active.
  */
-function is_wordpoints_module_active( $module ) {
+function is_wordpoints_module_active($module) {
 
 	return (
-		in_array( $module, wordpoints_get_array_option( 'wordpoints_active_modules' ) )
-		|| is_wordpoints_module_active_for_network( $module )
+		in_array($module, wordpoints_get_array_option('wordpoints_active_modules'))
+		|| is_wordpoints_module_active_for_network($module)
 	);
 }
 
@@ -35,15 +35,15 @@ 
  *
  * @return bool Whether the module is network active.
  */
-function is_wordpoints_module_active_for_network( $module ) {
+function is_wordpoints_module_active_for_network($module) {
 
-	if ( ! is_wordpoints_network_active() ) {
+	if ( ! is_wordpoints_network_active()) {
 		return false;
 	}
 
-	$modules = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
+	$modules = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
 
-	if ( isset( $modules[ $module ] ) ) {
+	if (isset($modules[$module])) {
 		return true;
 	}
 
@@ -65,9 +65,9 @@ 
  *
  * @return bool True if the module is network only, false otherwise.
  */
-function is_network_only_wordpoints_module( $module ) {
+function is_network_only_wordpoints_module($module) {
 
-	$module_data = wordpoints_get_module_data( wordpoints_modules_dir() . '/' . $module );
+	$module_data = wordpoints_get_module_data(wordpoints_modules_dir() . '/' . $module);
 
 	return $module_data['network'];
 }
@@ -81,9 +81,9 @@ 
  *
  * @return bool True if the module has an uninstall script, false otherwise.
  */
-function is_uninstallable_wordpoints_module( $module ) {
+function is_uninstallable_wordpoints_module($module) {
 
-	return ( file_exists( wordpoints_modules_dir() . '/' . dirname( wordpoints_module_basename( $module ) ) . '/uninstall.php' ) );
+	return (file_exists(wordpoints_modules_dir() . '/' . dirname(wordpoints_module_basename($module)) . '/uninstall.php'));
 }
 
 /**
@@ -143,30 +143,30 @@ 
 	 *
 	 * @return bool Whether the path was able to be registered.
 	 */
-	public static function register( $file ) {
+	public static function register($file) {
 
-		$file = wp_normalize_path( $file );
+		$file = wp_normalize_path($file);
 
 		// We store this so that we don't have to keep normalizing a constant value.
-		if ( ! isset( self::$modules_dir ) ) {
-			self::$modules_dir = wp_normalize_path( wordpoints_modules_dir() );
+		if ( ! isset(self::$modules_dir)) {
+			self::$modules_dir = wp_normalize_path(wordpoints_modules_dir());
 		}
 
-		$module_path = wp_normalize_path( dirname( $file ) );
+		$module_path = wp_normalize_path(dirname($file));
 
 		// It was a single-file module.
-		if ( $module_path . '/' === self::$modules_dir ) {
+		if ($module_path . '/' === self::$modules_dir) {
 			return false;
 		}
 
-		$module_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
+		$module_realpath = wp_normalize_path(dirname(realpath($file)));
 
-		if ( $module_path !== $module_realpath ) {
+		if ($module_path !== $module_realpath) {
 
-			$realpath_length = strlen( $module_realpath );
+			$realpath_length = strlen($module_realpath);
 
 			// Use unique keys, but still easy to sort by realpath length.
-			self::$paths[ $realpath_length . '-' . $module_path ] = array(
+			self::$paths[$realpath_length . '-' . $module_path] = array(
 				'module_path'     => $module_path,
 				'module_realpath' => $module_realpath,
 				'realpath_length' => $realpath_length,
@@ -187,19 +187,19 @@ 
 	 *
 	 * @return string The path to the symlink in the modules directory.
 	 */
-	public static function resolve( $file ) {
+	public static function resolve($file) {
 
-		$file = wp_normalize_path( $file );
+		$file = wp_normalize_path($file);
 
 		// Sort the paths by the realpath length, see https://core.trac.wordpress.org/ticket/28441.
-		if ( ! self::$paths_sorted ) {
-			krsort( self::$paths );
+		if ( ! self::$paths_sorted) {
+			krsort(self::$paths);
 			self::$paths_sorted = true;
 		}
 
-		foreach ( self::$paths as $path ) {
-			if ( 0 === strpos( $file, $path['module_realpath'] ) ) {
-				$file = $path['module_path'] . substr( $file, $path['realpath_length'] );
+		foreach (self::$paths as $path) {
+			if (0 === strpos($file, $path['module_realpath'])) {
+				$file = $path['module_path'] . substr($file, $path['realpath_length']);
 			}
 		}
 
@@ -228,11 +228,11 @@ 
 
 	static $modules_dir;
 
-	if ( ! $modules_dir ) {
+	if ( ! $modules_dir) {
 
-		if ( defined( 'WORDPOINTS_MODULES_DIR' ) ) {
+		if (defined('WORDPOINTS_MODULES_DIR')) {
 
-			$modules_dir = trailingslashit( WORDPOINTS_MODULES_DIR );
+			$modules_dir = trailingslashit(WORDPOINTS_MODULES_DIR);
 
 		} else {
 
@@ -248,7 +248,7 @@ 
 	 *
 	 * @param string $module_dir The full path to the modules folder.
 	 */
-	return apply_filters( 'wordpoints_modules_dir', $modules_dir );
+	return apply_filters('wordpoints_modules_dir', $modules_dir);
 }
 
 /**
@@ -261,30 +261,30 @@ 
  *
  * @return string The URL for the path passed.
  */
-function wordpoints_modules_url( $path = '', $module = '' ) {
+function wordpoints_modules_url($path = '', $module = '') {
 
-	$path   = wp_normalize_path( $path );
-	$module = wp_normalize_path( $module );
+	$path   = wp_normalize_path($path);
+	$module = wp_normalize_path($module);
 
-	if ( defined( 'WORDPOINTS_MODULES_URL' ) ) {
+	if (defined('WORDPOINTS_MODULES_URL')) {
 		$url = WORDPOINTS_MODULES_URL;
 	} else {
 		$url = WP_CONTENT_URL . '/wordpoints-modules';
 	}
 
-	$url = set_url_scheme( $url );
+	$url = set_url_scheme($url);
 
-	if ( ! empty( $module ) && is_string( $module ) ) {
+	if ( ! empty($module) && is_string($module)) {
 
-		$folder = dirname( wordpoints_module_basename( $module ) );
+		$folder = dirname(wordpoints_module_basename($module));
 
-		if ( '.' !== $folder ) {
-			$url .= '/' . ltrim( $folder, '/' );
+		if ('.' !== $folder) {
+			$url .= '/' . ltrim($folder, '/');
 		}
 	}
 
-	if ( $path && is_string( $path ) ) {
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path)) {
+		$url .= '/' . ltrim($path, '/');
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 * @param string $path   A relative path to a file or folder.
 	 * @param string $module A module file that the $path should be relative to.
 	 */
-	return apply_filters( 'wordpoints_modules_url', $url, $path, $module );
+	return apply_filters('wordpoints_modules_url', $url, $path, $module);
 }
 
 /**
@@ -308,17 +308,17 @@ 
  *
  * @return string The name of the module file.
  */
-function wordpoints_module_basename( $file ) {
+function wordpoints_module_basename($file) {
 
 	// Sanitize, and resolve possible symlink path from what is likely a real path.
-	$file = WordPoints_Module_Paths::resolve( $file );
+	$file = WordPoints_Module_Paths::resolve($file);
 
 	// Sanitize for Win32 installs and remove any duplicate slashes.
-	$modules_dir = wp_normalize_path( wordpoints_modules_dir() );
+	$modules_dir = wp_normalize_path(wordpoints_modules_dir());
 
 	// Get the relative path from the modules directory, and trim off the slashes.
-	$file = preg_replace( '#^' . preg_quote( $modules_dir, '#' ) . '#', '', $file );
-	$file = trim( $file, '/' );
+	$file = preg_replace('#^' . preg_quote($modules_dir, '#') . '#', '', $file);
+	$file = trim($file, '/');
 
 	return $file;
 }
@@ -358,7 +358,7 @@ 
  *         @type string $namespace   The namespace for this module. Should be Title_Case, and omit "WordPoints" prefix.
  * }
  */
-function wordpoints_get_module_data( $module_file, $markup = true, $translate = true ) {
+function wordpoints_get_module_data($module_file, $markup = true, $translate = true) {
 
 	$default_headers = array(
 		'name'        => 'Module Name',
@@ -376,94 +376,94 @@ 
 		'namespace'   => 'Namespace',
 	);
 
-	$module_data = WordPoints_Modules::get_data( $module_file );
+	$module_data = WordPoints_Modules::get_data($module_file);
 
-	if ( $module_data && wp_normalize_path( $module_file ) === $module_data['raw_file'] ) {
-		unset( $module_data['raw'], $module_data['raw_file'] );
+	if ($module_data && wp_normalize_path($module_file) === $module_data['raw_file']) {
+		unset($module_data['raw'], $module_data['raw_file']);
 	} else {
-		$module_data = get_file_data( $module_file, $default_headers, 'wordpoints_module' );
+		$module_data = get_file_data($module_file, $default_headers, 'wordpoints_module');
 	}
 
-	if ( ! empty( $module_data['update_api'] ) ) {
-		_deprecated_argument( __FUNCTION__, '1.10.0', 'The "Update API" module header has been deprecated in favor of "Channel".' );
+	if ( ! empty($module_data['update_api'])) {
+		_deprecated_argument(__FUNCTION__, '1.10.0', 'The "Update API" module header has been deprecated in favor of "Channel".');
 	}
 
-	$module_data['network'] = ( 'true' === strtolower( $module_data['network'] ) );
+	$module_data['network'] = ('true' === strtolower($module_data['network']));
 
-	if ( $markup || $translate ) {
+	if ($markup || $translate) {
 
 		// Sanitize the plugin filename to a WP_module_DIR relative path
-		$module_file = wordpoints_module_basename( $module_file );
+		$module_file = wordpoints_module_basename($module_file);
 
 		// Translate fields
-		if ( $translate ) {
+		if ($translate) {
 
 			$textdomain = $module_data['text_domain'];
 
-			if ( $textdomain ) {
+			if ($textdomain) {
 
-				if ( ! is_textdomain_loaded( $textdomain ) ) {
+				if ( ! is_textdomain_loaded($textdomain)) {
 
-					$domain_path = dirname( $module_file );
+					$domain_path = dirname($module_file);
 
-					if ( $module_data['domain_path'] ) {
+					if ($module_data['domain_path']) {
 						$domain_path .= $module_data['domain_path'];
 					}
 
-					wordpoints_load_module_textdomain( $textdomain, $domain_path );
+					wordpoints_load_module_textdomain($textdomain, $domain_path);
 				}
 
-				foreach ( array( 'name', 'module_uri', 'description', 'author', 'author_uri', 'version' ) as $field ) {
+				foreach (array('name', 'module_uri', 'description', 'author', 'author_uri', 'version') as $field) {
 
-					$module_data[ $field ] = translate( $module_data[ $field ], $textdomain ); // @codingStandardsIgnoreLine
+					$module_data[$field] = translate($module_data[$field], $textdomain); // @codingStandardsIgnoreLine
 				}
 			}
 		}
 
 		// Sanitize fields.
 		$allowed_tags_in_links = array(
-			'abbr'    => array( 'title' => true ),
-			'acronym' => array( 'title' => true ),
+			'abbr'    => array('title' => true),
+			'acronym' => array('title' => true),
 			'code'    => true,
 			'em'      => true,
 			'strong'  => true,
 		);
 
 		$allowed_tags = $allowed_tags_in_links;
-		$allowed_tags['a'] = array( 'href' => true, 'title' => true );
+		$allowed_tags['a'] = array('href' => true, 'title' => true);
 
 		// Name and author ar marked up inside <a> tags. Don't allow these.
-		$module_data['name']   = wp_kses( $module_data['name'],   $allowed_tags_in_links );
-		$module_data['author'] = wp_kses( $module_data['author'], $allowed_tags_in_links );
+		$module_data['name']   = wp_kses($module_data['name'], $allowed_tags_in_links);
+		$module_data['author'] = wp_kses($module_data['author'], $allowed_tags_in_links);
 
-		$module_data['description'] = wp_kses( $module_data['description'], $allowed_tags );
-		$module_data['version']     = wp_kses( $module_data['version'],     $allowed_tags );
+		$module_data['description'] = wp_kses($module_data['description'], $allowed_tags);
+		$module_data['version']     = wp_kses($module_data['version'], $allowed_tags);
 
-		$module_data['module_uri'] = esc_url( $module_data['module_uri'] );
-		$module_data['author_uri'] = esc_url( $module_data['author_uri'] );
+		$module_data['module_uri'] = esc_url($module_data['module_uri']);
+		$module_data['author_uri'] = esc_url($module_data['author_uri']);
 
 		$module_data['title']       = $module_data['name'];
 		$module_data['author_name'] = $module_data['author'];
 
 		// Apply markup.
-		if ( $markup ) {
+		if ($markup) {
 
-			if ( $module_data['module_uri'] && $module_data['name'] ) {
+			if ($module_data['module_uri'] && $module_data['name']) {
 				$module_data['title'] = '<a href="' . $module_data['module_uri']
 					. '">' . $module_data['name'] . '</a>';
 			}
 
-			if ( $module_data['author_uri'] && $module_data['author'] ) {
+			if ($module_data['author_uri'] && $module_data['author']) {
 				$module_data['author'] = '<a href="' . $module_data['author_uri']
 					. '">' . $module_data['author'] . '</a>';
 			}
 
-			$module_data['description'] = wptexturize( $module_data['description'] );
+			$module_data['description'] = wptexturize($module_data['description']);
 
-			if ( $module_data['author'] ) {
+			if ($module_data['author']) {
 				$module_data['description'] .= ' <cite>'
 					// translators: Author name.
-					. sprintf( __( 'By %s.', 'wordpoints' ), $module_data['author'] )
+					. sprintf(__('By %s.', 'wordpoints'), $module_data['author'])
 					. '</cite>';
 			}
 		}
@@ -489,7 +489,7 @@ 
  *
  * @return bool Whether the textdoamin was loaded successfully.
  */
-function wordpoints_load_module_textdomain( $domain, $module_rel_path = false ) {
+function wordpoints_load_module_textdomain($domain, $module_rel_path = false) {
 
 	$locale = get_locale();
 
@@ -501,11 +501,11 @@ 
 	 * @param string $locale The module's current locale.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$locale = apply_filters( 'wordpoints_module_locale', $locale, $domain );
+	$locale = apply_filters('wordpoints_module_locale', $locale, $domain);
 
-	if ( false !== $module_rel_path	) {
+	if (false !== $module_rel_path) {
 
-		$path = wordpoints_modules_dir() . '/' . trim( $module_rel_path, '/' );
+		$path = wordpoints_modules_dir() . '/' . trim($module_rel_path, '/');
 
 	} else {
 
@@ -515,14 +515,14 @@ 
 	// Load the textdomain according to the module first.
 	$mofile = $domain . '-' . $locale . '.mo';
 
-	if ( load_textdomain( $domain, $path . '/' . $mofile ) ) {
+	if (load_textdomain($domain, $path . '/' . $mofile)) {
 		return true;
 	}
 
 	// Otherwise, load from the languages directory.
 	$mofile = WP_LANG_DIR . '/wordpoints-modules/' . $mofile;
 
-	return load_textdomain( $domain, $mofile );
+	return load_textdomain($domain, $mofile);
 }
 
 /**
@@ -542,76 +542,76 @@ 
  *
  * @return array A list of the module files found (files with module headers).
  */
-function wordpoints_get_modules( $module_folder = '', $markup = false, $translate = false ) {
+function wordpoints_get_modules($module_folder = '', $markup = false, $translate = false) {
 
-	$cache_modules = wp_cache_get( 'wordpoints_modules', 'wordpoints_modules' );
+	$cache_modules = wp_cache_get('wordpoints_modules', 'wordpoints_modules');
 
-	if ( ! $cache_modules ) {
+	if ( ! $cache_modules) {
 		$cache_modules = array();
 	}
 
-	if ( isset( $cache_modules[ $module_folder ] ) ) {
-		return $cache_modules[ $module_folder ];
+	if (isset($cache_modules[$module_folder])) {
+		return $cache_modules[$module_folder];
 	}
 
 	$modules     = array();
 	$module_root = wordpoints_modules_dir();
 
-	if ( ! empty( $module_folder ) ) {
+	if ( ! empty($module_folder)) {
 		$module_root .= $module_folder;
 	}
 
 	// Escape pattern-matching characters in the path.
-	$module_escape_root = str_replace( array( '*', '?', '[' ), array( '[*]', '[?]', '[[]' ), $module_root );
+	$module_escape_root = str_replace(array('*', '?', '['), array('[*]', '[?]', '[[]'), $module_root);
 
 	// Get the top level files.
-	$module_files = glob( "{$module_escape_root}/*.php" );
+	$module_files = glob("{$module_escape_root}/*.php");
 
-	if ( false === $module_files ) {
+	if (false === $module_files) {
 		return $modules;
 	}
 
 	// Get the files of subfolders, if not already searching in a subfolder.
-	if ( empty( $module_folder ) ) {
+	if (empty($module_folder)) {
 
-		$subfolder_files = glob( "{$module_escape_root}/*/*.php" );
+		$subfolder_files = glob("{$module_escape_root}/*/*.php");
 
-		if ( false === $subfolder_files ) {
+		if (false === $subfolder_files) {
 			return $modules;
 		}
 
-		$module_files = array_merge( $module_files, $subfolder_files );
+		$module_files = array_merge($module_files, $subfolder_files);
 	}
 
-	if ( empty( $module_files ) ) {
+	if (empty($module_files)) {
 		return $modules;
 	}
 
-	foreach ( $module_files as $module_file ) {
+	foreach ($module_files as $module_file) {
 
-		if ( ! is_readable( $module_file ) ) {
+		if ( ! is_readable($module_file)) {
 			continue;
 		}
 
-		$module_data = wordpoints_get_module_data( $module_file, $markup, $translate );
+		$module_data = wordpoints_get_module_data($module_file, $markup, $translate);
 
-		if ( empty( $module_data['name'] ) ) {
+		if (empty($module_data['name'])) {
 			continue;
 		}
 
-		$module_file = wordpoints_module_basename( $module_file );
+		$module_file = wordpoints_module_basename($module_file);
 
-		if ( $module_folder ) {
-			$module_file = basename( $module_file );
+		if ($module_folder) {
+			$module_file = basename($module_file);
 		}
 
-		$modules[ $module_file ] = $module_data;
+		$modules[$module_file] = $module_data;
 	}
 
-	uasort( $modules, '_wordpoints_sort_uname_callback' );
+	uasort($modules, '_wordpoints_sort_uname_callback');
 
-	$cache_modules[ $module_folder ] = $modules;
-	wp_cache_set( 'wordpoints_modules', $cache_modules, 'wordpoints_modules' );
+	$cache_modules[$module_folder] = $modules;
+	wp_cache_set('wordpoints_modules', $cache_modules, 'wordpoints_modules');
 
 	return $modules;
 }
@@ -625,20 +625,20 @@ 
  *
  * @return true|WP_Error True on success, a WP_Error on failure.
  */
-function wordpoints_validate_module( $module ) {
+function wordpoints_validate_module($module) {
 
-	if ( validate_file( $module ) ) {
-		return new WP_Error( 'module_invalid', __( 'Invalid module path.', 'wordpoints' ) );
+	if (validate_file($module)) {
+		return new WP_Error('module_invalid', __('Invalid module path.', 'wordpoints'));
 	}
 
-	if ( ! file_exists( wordpoints_modules_dir() . '/' . $module ) ) {
-		return new WP_Error( 'module_not_found', __( 'Module file does not exist.', 'wordpoints' ) );
+	if ( ! file_exists(wordpoints_modules_dir() . '/' . $module)) {
+		return new WP_Error('module_not_found', __('Module file does not exist.', 'wordpoints'));
 	}
 
 	$installed_modules = wordpoints_get_modules();
 
-	if ( ! isset( $installed_modules[ $module ] ) ) {
-		return new WP_Error( 'no_module_header', __( 'The module does not have a valid header.', 'wordpoints' ) );
+	if ( ! isset($installed_modules[$module])) {
+		return new WP_Error('no_module_header', __('The module does not have a valid header.', 'wordpoints'));
 	}
 
 	return true;
@@ -655,27 +655,27 @@ 
  */
 function wordpoints_validate_active_modules() {
 
-	$modules = wordpoints_get_array_option( 'wordpoints_active_modules' );
+	$modules = wordpoints_get_array_option('wordpoints_active_modules');
 
-	if ( is_multisite() && current_user_can( 'manage_network_wordpoints_modules' ) ) {
+	if (is_multisite() && current_user_can('manage_network_wordpoints_modules')) {
 
-		$network_modules = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
-		$modules = array_merge( $modules, array_keys( $network_modules ) );
+		$network_modules = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
+		$modules = array_merge($modules, array_keys($network_modules));
 	}
 
-	if ( empty( $modules ) ) {
+	if (empty($modules)) {
 		return null;
 	}
 
 	$invalid = array();
 
-	foreach ( $modules as $module ) {
+	foreach ($modules as $module) {
 
-		$result = wordpoints_validate_module( $module );
+		$result = wordpoints_validate_module($module);
 
-		if ( is_wp_error( $result ) ) {
-			$invalid[ $module ] = $result;
-			wordpoints_deactivate_modules( $module, true );
+		if (is_wp_error($result)) {
+			$invalid[$module] = $result;
+			wordpoints_deactivate_modules($module, true);
 		}
 	}
 
@@ -692,9 +692,9 @@ 
  *
  * @return int {@see strnatcasecmp()}.
  */
-function _wordpoints_sort_uname_callback( $a, $b ) {
+function _wordpoints_sort_uname_callback($a, $b) {
 
-	return strnatcasecmp( $a['name'], $b['name'] );
+	return strnatcasecmp($a['name'], $b['name']);
 }
 
 /**
@@ -725,33 +725,33 @@ 
  *
  * @return WP_Error|null An error object on failure, or null on success.
  */
-function wordpoints_activate_module( $module, $redirect = '', $network_wide = false, $silent = false ) {
+function wordpoints_activate_module($module, $redirect = '', $network_wide = false, $silent = false) {
 
-	$module = wordpoints_module_basename( $module );
+	$module = wordpoints_module_basename($module);
 
-	$valid = wordpoints_validate_module( $module );
+	$valid = wordpoints_validate_module($module);
 
-	if ( is_wp_error( $valid ) ) {
+	if (is_wp_error($valid)) {
 		return $valid;
 	}
 
-	if ( is_multisite() && ( $network_wide || is_network_only_wordpoints_module( $module ) ) ) {
+	if (is_multisite() && ($network_wide || is_network_only_wordpoints_module($module))) {
 
 		$network_wide = true;
-		$network_current = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
-		$current = array_keys( $network_current );
+		$network_current = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
+		$current = array_keys($network_current);
 
 	} else {
 
-		$current = wordpoints_get_array_option( 'wordpoints_active_modules' );
+		$current = wordpoints_get_array_option('wordpoints_active_modules');
 	}
 
 	// If the module is already active, return.
-	if ( in_array( $module, $current ) ) {
+	if (in_array($module, $current)) {
 		return null;
 	}
 
-	if ( ! empty( $redirect ) ) {
+	if ( ! empty($redirect)) {
 
 		/*
 		 * Redirect. We'll override this later if the module can be included
@@ -760,7 +760,7 @@ 
 		wp_safe_redirect(
 			add_query_arg(
 				'_error_nonce'
-				, wp_create_nonce( 'module-activation-error_' . $module )
+				, wp_create_nonce('module-activation-error_' . $module)
 				, $redirect
 			)
 		);
@@ -769,11 +769,11 @@ 
 	ob_start();
 
 	$module_file = wordpoints_modules_dir() . '/' . $module;
-	WordPoints_Module_Paths::register( $module_file );
+	WordPoints_Module_Paths::register($module_file);
 
 	include_once $module_file;
 
-	if ( ! $silent ) {
+	if ( ! $silent) {
 
 		/**
 		 * Fires before a module is activated.
@@ -785,7 +785,7 @@ 
 		 *                             all sites in the network or just the
 		 *                             current site.
 		 */
-		do_action( 'wordpoints_module_activate', $module, $network_wide );
+		do_action('wordpoints_module_activate', $module, $network_wide);
 
 		/**
 		 * Fires before a module is activated.
@@ -796,28 +796,28 @@ 
 		 *                           all sites in the network or just the current
 		 *                           site.
 		 */
-		do_action( "wordpoints_module_activate-{$module}", $network_wide );
+		do_action("wordpoints_module_activate-{$module}", $network_wide);
 
 		WordPoints_Installables::install(
 			'module'
-			, WordPoints_Modules::get_slug( $module )
+			, WordPoints_Modules::get_slug($module)
 			, $network_wide
 		);
 	}
 
-	if ( $network_wide ) {
+	if ($network_wide) {
 
-		$network_current[ $module ] = time();
-		update_site_option( 'wordpoints_sitewide_active_modules', $network_current );
+		$network_current[$module] = time();
+		update_site_option('wordpoints_sitewide_active_modules', $network_current);
 
 	} else {
 
 		$current[] = $module;
-		sort( $current );
-		update_option( 'wordpoints_active_modules', $current );
+		sort($current);
+		update_option('wordpoints_active_modules', $current);
 	}
 
-	if ( ! $silent ) {
+	if ( ! $silent) {
 		/**
 		 * Fires after a module has been activated in activate_plugin() when the $silent parameter is false.
 		 *
@@ -828,14 +828,14 @@ 
 		 *                             all sites in the network or just the
 		 *                             current site.
 		 */
-		do_action( 'wordpoints_activated_module', $module, $network_wide );
+		do_action('wordpoints_activated_module', $module, $network_wide);
 	}
 
-	if ( ob_get_length() > 0 ) {
+	if (ob_get_length() > 0) {
 
 		return new WP_Error(
 			'unexpected_output'
-			, __( 'The module generated unexpected output.', 'wordpoints' )
+			, __('The module generated unexpected output.', 'wordpoints')
 			, ob_get_contents()
 		);
 	}
@@ -855,29 +855,29 @@ 
  *                                   Default is false.
  * @param bool         $network_wide Whether to apply the change network wide.
  */
-function wordpoints_deactivate_modules( $modules, $silent = false, $network_wide = null ) {
+function wordpoints_deactivate_modules($modules, $silent = false, $network_wide = null) {
 
 	$network_current = array();
-	if ( is_wordpoints_network_active() ) {
-		$network_current = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
+	if (is_wordpoints_network_active()) {
+		$network_current = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
 	}
 
-	$current = wordpoints_get_array_option( 'wordpoints_active_modules' );
+	$current = wordpoints_get_array_option('wordpoints_active_modules');
 
 	$do_network = false;
 	$do_blog = false;
 
-	foreach ( (array) $modules as $module ) {
+	foreach ((array) $modules as $module) {
 
-		$module = wordpoints_module_basename( $module );
+		$module = wordpoints_module_basename($module);
 
-		if ( ! is_wordpoints_module_active( $module ) ) {
+		if ( ! is_wordpoints_module_active($module)) {
 			continue;
 		}
 
-		$network_deactivating = ( false !== $network_wide && is_wordpoints_module_active_for_network( $module ) );
+		$network_deactivating = (false !== $network_wide && is_wordpoints_module_active_for_network($module));
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires for each module being deactivated in wordpoints_deactivate_modules(), before deactivation
 			 * and when the $silent parameter is false.
@@ -888,34 +888,34 @@ 
 			 * @param bool   $network_deactivating Whether the module is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'wordpoints_deactivate_module', $module, $network_deactivating );
+			do_action('wordpoints_deactivate_module', $module, $network_deactivating);
 		}
 
-		if ( false !== $network_wide ) {
+		if (false !== $network_wide) {
 
-			if ( is_wordpoints_module_active_for_network( $module ) ) {
+			if (is_wordpoints_module_active_for_network($module)) {
 
 				$do_network = true;
-				unset( $network_current[ $module ] );
+				unset($network_current[$module]);
 
-			} elseif ( $network_wide ) {
+			} elseif ($network_wide) {
 
 				continue;
 			}
 		}
 
-		if ( true !== $network_wide ) {
+		if (true !== $network_wide) {
 
-			$key = array_search( $module, $current );
+			$key = array_search($module, $current);
 
-			if ( false !== $key ) {
+			if (false !== $key) {
 
 				$do_blog = true;
-				unset( $current[ $key ] );
+				unset($current[$key]);
 			}
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires for each module being deactivated in wordpoints_deactivate_module(), after deactivation
 			 * and when the $silent parameter is false.
@@ -928,7 +928,7 @@ 
 			 * @param bool $network_deactivating Whether the module is deactivated for all sites in the network
 			 *                                   or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'wordpoints_deactivate_module-' . $module, $network_deactivating );
+			do_action('wordpoints_deactivate_module-' . $module, $network_deactivating);
 
 			/**
 			 * Fires for each module being deactivated in deactivate_plugins(), after deactivation
@@ -940,17 +940,17 @@ 
 			 * @param bool   $network_deactivating Whether the module is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'wordpoints_deactivated_module', $module, $network_deactivating );
+			do_action('wordpoints_deactivated_module', $module, $network_deactivating);
 		}
 
 	} // End foreach ( $modules ).
 
-	if ( $do_blog ) {
-		update_option( 'wordpoints_active_modules', $current );
+	if ($do_blog) {
+		update_option('wordpoints_active_modules', $current);
 	}
 
-	if ( $do_network ) {
-		update_site_option( 'wordpoints_sitewide_active_modules', $network_current );
+	if ($do_network) {
+		update_site_option('wordpoints_sitewide_active_modules', $network_current);
 	}
 }
 
@@ -967,31 +967,31 @@ 
  * @return bool|WP_Error True if all modules deleted successfully, false or WP_Error
  *                       on failure.
  */
-function wordpoints_delete_modules( $modules ) {
+function wordpoints_delete_modules($modules) {
 
 	global $wp_filesystem;
 
-	if ( empty( $modules ) ) {
+	if (empty($modules)) {
 		return false;
 	}
 
 	$checked = array();
 
-	foreach ( $modules as $module ) {
+	foreach ($modules as $module) {
 		$checked[] = 'checked[]=' . $module;
 	}
 
 	ob_start();
 
-	$url = wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&verify-delete=1&' . implode( '&', $checked ) ), 'bulk-modules' );
+	$url = wp_nonce_url(self_admin_url('admin.php?page=wordpoints_modules&action=delete-selected&verify-delete=1&' . implode('&', $checked)), 'bulk-modules');
 
-	$credentials = request_filesystem_credentials( $url );
+	$credentials = request_filesystem_credentials($url);
 
-	if ( false === $credentials ) {
+	if (false === $credentials) {
 
 		$data = ob_get_clean();
 
-		if ( ! empty( $data ) ) {
+		if ( ! empty($data)) {
 
 			include_once ABSPATH . 'wp-admin/admin-header.php';
 			echo $data; // XSS OK here, WPCS.
@@ -1002,14 +1002,14 @@ 
 		return false;
 	}
 
-	if ( ! WP_Filesystem( $credentials ) ) {
+	if ( ! WP_Filesystem($credentials)) {
 
 		// Failed to connect, Error and request again
-		request_filesystem_credentials( $url, '', true );
+		request_filesystem_credentials($url, '', true);
 
 		$data = ob_get_clean();
 
-		if ( ! empty( $data ) ) {
+		if ( ! empty($data)) {
 
 			include_once ABSPATH . 'wp-admin/admin-header.php';
 			echo $data; // XSS OK here too, WPCS.
@@ -1020,41 +1020,41 @@ 
 		return false;
 	}
 
-	if ( ! is_object( $wp_filesystem ) ) {
-		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.', 'wordpoints' ) );
+	if ( ! is_object($wp_filesystem)) {
+		return new WP_Error('fs_unavailable', __('Could not access filesystem.', 'wordpoints'));
 	}
 
-	if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-		return new WP_Error( 'fs_error', __( 'Filesystem error.', 'wordpoints' ), $wp_filesystem->errors );
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
+		return new WP_Error('fs_error', __('Filesystem error.', 'wordpoints'), $wp_filesystem->errors);
 	}
 
 	// Get the base module folder.
-	$modules_dir = $wp_filesystem->find_folder( wordpoints_modules_dir() );
+	$modules_dir = $wp_filesystem->find_folder(wordpoints_modules_dir());
 
-	if ( empty( $modules_dir ) ) {
-		return new WP_Error( 'fs_no_modules_dir', __( 'Unable to locate WordPoints Module directory.', 'wordpoints' ) );
+	if (empty($modules_dir)) {
+		return new WP_Error('fs_no_modules_dir', __('Unable to locate WordPoints Module directory.', 'wordpoints'));
 	}
 
-	$modules_dir = trailingslashit( $modules_dir );
+	$modules_dir = trailingslashit($modules_dir);
 	$errors = array();
 
-	foreach ( $modules as $module_file ) {
+	foreach ($modules as $module_file) {
 
 		// Run uninstall hook.
-		if ( is_uninstallable_wordpoints_module( $module_file ) ) {
-			wordpoints_uninstall_module( $module_file );
+		if (is_uninstallable_wordpoints_module($module_file)) {
+			wordpoints_uninstall_module($module_file);
 		}
 
-		$this_module_dir = trailingslashit( dirname( $modules_dir . $module_file ) );
+		$this_module_dir = trailingslashit(dirname($modules_dir . $module_file));
 
 		// If module is in its own directory, recursively delete the directory.
-		if ( strpos( $module_file, '/' ) && $this_module_dir !== $modules_dir ) {
-			$deleted = $wp_filesystem->delete( $this_module_dir, true );
+		if (strpos($module_file, '/') && $this_module_dir !== $modules_dir) {
+			$deleted = $wp_filesystem->delete($this_module_dir, true);
 		} else {
-			$deleted = $wp_filesystem->delete( $modules_dir . $module_file );
+			$deleted = $wp_filesystem->delete($modules_dir . $module_file);
 		}
 
-		if ( ! $deleted ) {
+		if ( ! $deleted) {
 			$errors[] = $module_file;
 		}
 	}
@@ -1071,9 +1071,9 @@ 
 	 * @param array $modules The modules that were to be deleted.
 	 * @param array $errors  The modules that failed to delete.
 	 */
-	do_action( 'wordpoints_deleted_modules', $modules, $errors );
+	do_action('wordpoints_deleted_modules', $modules, $errors);
 
-	if ( ! empty( $errors ) ) {
+	if ( ! empty($errors)) {
 		return new WP_Error(
 			'could_not_remove_module'
 			, sprintf(
@@ -1081,10 +1081,10 @@ 
 				_n(
 					'Could not fully remove the module %s.'
 					, 'Could not fully remove the modules %s.'
-					, count( $errors )
+					, count($errors)
 					, 'wordpoints'
 				)
-				, implode( ', ', $errors )
+				, implode(', ', $errors)
 			)
 		);
 	}
@@ -1103,16 +1103,16 @@ 
  *
  * @return bool Whether the module had an uninstall process.
  */
-function wordpoints_uninstall_module( $module ) {
+function wordpoints_uninstall_module($module) {
 
-	$file              = wordpoints_module_basename( $module );
-	$module_dir        = wordpoints_modules_dir() . '/' . dirname( $file );
+	$file              = wordpoints_module_basename($module);
+	$module_dir        = wordpoints_modules_dir() . '/' . dirname($file);
 	$uninstall_file    = $module_dir . '/uninstall.php';
 	$un_installer_file = $module_dir . '/includes/class-un-installer.php';
 
-	if ( file_exists( $uninstall_file ) ) {
+	if (file_exists($uninstall_file)) {
 
-		if ( ! defined( 'WORDPOINTS_UNINSTALL_MODULE' ) ) {
+		if ( ! defined('WORDPOINTS_UNINSTALL_MODULE')) {
 			/**
 			 * Uninstalling a module.
 			 *
@@ -1126,17 +1126,17 @@ 
 			 *
 			 * @const WORDPOINTS_UNINSTALL_MODULE
 			 */
-			define( 'WORDPOINTS_UNINSTALL_MODULE', true );
+			define('WORDPOINTS_UNINSTALL_MODULE', true);
 		}
 
-		WordPoints_Module_Paths::register( $uninstall_file );
+		WordPoints_Module_Paths::register($uninstall_file);
 		include $uninstall_file;
 
 		return true;
 
-	} elseif ( file_exists( $un_installer_file ) ) {
+	} elseif (file_exists($un_installer_file)) {
 
-		$slug = WordPoints_Modules::get_slug( $module );
+		$slug = WordPoints_Modules::get_slug($module);
 
 		WordPoints_Installables::register(
 			'module'
@@ -1148,7 +1148,7 @@ 
 			)
 		);
 
-		return WordPoints_Installables::uninstall( 'module', $slug );
+		return WordPoints_Installables::uninstall('module', $slug);
 
 	} else {
 
@@ -1174,34 +1174,34 @@ 
  */
 function wordpoints_load_modules() {
 
-	$active_modules = wordpoints_get_array_option( 'wordpoints_active_modules' );
+	$active_modules = wordpoints_get_array_option('wordpoints_active_modules');
 
-	if ( is_wordpoints_network_active() ) {
+	if (is_wordpoints_network_active()) {
 
 		$network_active_modules = array_keys(
-			wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' )
+			wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site')
 		);
 
 		// On the network admin screens we only load the network active modules.
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			$active_modules = $network_active_modules;
 		} else {
-			$active_modules = array_merge( $active_modules, $network_active_modules );
+			$active_modules = array_merge($active_modules, $network_active_modules);
 		}
 	}
 
-	if ( ! empty( $active_modules ) ) {
+	if ( ! empty($active_modules)) {
 
 		$modules_dir = wordpoints_modules_dir();
 
-		foreach ( $active_modules as $module ) {
+		foreach ($active_modules as $module) {
 
 			if (
-				0 === validate_file( $module )
-				&& '.php' === substr( $module, -4 )
-				&& file_exists( $modules_dir . '/' . $module )
+				0 === validate_file($module)
+				&& '.php' === substr($module, -4)
+				&& file_exists($modules_dir . '/' . $module)
 			) {
-				WordPoints_Module_Paths::register( $modules_dir . '/' . $module );
+				WordPoints_Module_Paths::register($modules_dir . '/' . $module);
 				include $modules_dir . '/' . $module;
 			}
 		}
@@ -1214,7 +1214,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	do_action( 'wordpoints_modules_loaded' );
+	do_action('wordpoints_modules_loaded');
 }
 
 /**
@@ -1225,11 +1225,11 @@ 
  * @param string $file     The main file of the module the hook is for.
  * @param string $function The callback function.
  */
-function wordpoints_register_module_activation_hook( $file, $function ) {
+function wordpoints_register_module_activation_hook($file, $function) {
 
-	$module_file = wordpoints_module_basename( $file );
+	$module_file = wordpoints_module_basename($file);
 
-	add_action( "wordpoints_module_activate-{$module_file}", $function );
+	add_action("wordpoints_module_activate-{$module_file}", $function);
 }
 
 /**
@@ -1240,11 +1240,11 @@ 
  * @param string $file     The main file of the module the hook is for.
  * @param string $function The callback function.
  */
-function wordpoints_register_module_deactivation_hook( $file, $function ) {
+function wordpoints_register_module_deactivation_hook($file, $function) {
 
-	$module_file = wordpoints_module_basename( $file );
+	$module_file = wordpoints_module_basename($file);
 
-	add_action( "wordpoints_deactivate_module-{$module_file}", $function );
+	add_action("wordpoints_deactivate_module-{$module_file}", $function);
 }
 
 // EOF

src/includes/class-un-installer-base.php

Spacing +268 added lines, -268 removed lines

@@ -285,21 +285,21 @@ 
 	 * @param string $slug    The slug of the entity.
 	 * @param string $version The current code version of the entity.
 	 */
-	public function __construct( $slug = null, $version = null ) {
+	public function __construct($slug = null, $version = null) {
 
-		if ( ! isset( $slug ) ) {
-			_doing_it_wrong( __METHOD__, 'The $slug parameter is required.', '2.0.0' );
+		if ( ! isset($slug)) {
+			_doing_it_wrong(__METHOD__, 'The $slug parameter is required.', '2.0.0');
 		}
 
-		if ( ! isset( $version ) ) {
-			_doing_it_wrong( __METHOD__, 'The $version parameter is required.', '2.0.0' );
+		if ( ! isset($version)) {
+			_doing_it_wrong(__METHOD__, 'The $version parameter is required.', '2.0.0');
 		}
 
 		$this->slug = $slug;
 		$this->version = $version;
 
-		if ( isset( $this->option_prefix ) ) {
-			_deprecated_argument( __METHOD__, '2.0.0', 'The $option_prefix property is deprecated.' );
+		if (isset($this->option_prefix)) {
+			_deprecated_argument(__METHOD__, '2.0.0', 'The $option_prefix property is deprecated.');
 		}
 	}
 
@@ -310,7 +310,7 @@ 
 	 *
 	 * @param bool $network Whether the install should be network-wide on multisite.
 	 */
-	public function install( $network ) {
+	public function install($network) {
 
 		$this->action = 'install';
 
@@ -320,7 +320,7 @@ 
 
 		$hooks = wordpoints_hooks();
 		$hooks_mode = $hooks->get_current_mode();
-		$hooks->set_current_mode( 'standard' );
+		$hooks->set_current_mode('standard');
 
 		$this->before_install();
 
@@ -329,38 +329,38 @@ 
 		 *
 		 * @since 1.8.0
 		 */
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 
 			$this->context = 'network';
-			$hooks->set_current_mode( 'network' );
+			$hooks->set_current_mode('network');
 
 			$this->install_network();
 
 			$this->context = 'site';
-			$hooks->set_current_mode( 'standard' );
+			$hooks->set_current_mode('standard');
 
-			if ( $network ) {
+			if ($network) {
 
 				$this->set_network_installed();
 
 				$skip_per_site_install = $this->skip_per_site_install();
 
-				if ( ! ( $skip_per_site_install & self::SKIP_INSTALL ) ) {
+				if ( ! ($skip_per_site_install & self::SKIP_INSTALL)) {
 
 					$ms_switched_state = new WordPoints_Multisite_Switched_State();
 					$ms_switched_state->backup();
 
-					foreach ( $this->get_all_site_ids() as $blog_id ) {
-						switch_to_blog( $blog_id );
+					foreach ($this->get_all_site_ids() as $blog_id) {
+						switch_to_blog($blog_id);
 						$this->install_site();
 					}
 
 					$ms_switched_state->restore();
 				}
 
-				if ( $skip_per_site_install & self::REQUIRES_MANUAL_INSTALL ) {
+				if ($skip_per_site_install & self::REQUIRES_MANUAL_INSTALL) {
 
 					// We'll check this later and let the user know that per-site
 					// install was skipped.
@@ -380,7 +380,7 @@ 
 
 		} // End if ( is_multisite() ) else.
 
-		$hooks->set_current_mode( $hooks_mode );
+		$hooks->set_current_mode($hooks_mode);
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 	 *
 	 * @param int $site_id The ID of the site to install on.
 	 */
-	public function install_on_site( $site_id ) {
+	public function install_on_site($site_id) {
 
 		$this->action = 'install';
 		$this->network_wide = true;
@@ -399,7 +399,7 @@ 
 
 		$hooks = wordpoints_hooks();
 		$hooks_mode = $hooks->get_current_mode();
-		$hooks->set_current_mode( 'standard' );
+		$hooks->set_current_mode('standard');
 
 		$this->before_install();
 
@@ -408,15 +408,15 @@ 
 		 *
 		 * @since 1.8.0
 		 */
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		$this->context = 'site';
 
-		switch_to_blog( $site_id );
+		switch_to_blog($site_id);
 		$this->install_site();
 		restore_current_blog();
 
-		$hooks->set_current_mode( $hooks_mode );
+		$hooks->set_current_mode($hooks_mode);
 	}
 
 	/**
@@ -435,13 +435,13 @@ 
 
 		$hooks = wordpoints_hooks();
 		$hooks_mode = $hooks->get_current_mode();
-		$hooks->set_current_mode( 'standard' );
+		$hooks->set_current_mode('standard');
 
 		$this->before_uninstall();
 
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 
-			if ( $this->do_per_site_uninstall() ) {
+			if ($this->do_per_site_uninstall()) {
 
 				$this->context = 'site';
 
@@ -450,22 +450,22 @@ 
 
 				$site_ids = $this->get_installed_site_ids();
 
-				if ( ! $this->is_network_installed() ) {
-					$site_ids = $this->validate_site_ids( $site_ids );
+				if ( ! $this->is_network_installed()) {
+					$site_ids = $this->validate_site_ids($site_ids);
 				}
 
-				foreach ( $site_ids as $blog_id ) {
-					switch_to_blog( $blog_id );
+				foreach ($site_ids as $blog_id) {
+					switch_to_blog($blog_id);
 					$this->uninstall_site();
 				}
 
 				$ms_switched_state->restore();
 
-				unset( $ms_switched_state, $site_ids );
+				unset($ms_switched_state, $site_ids);
 			}
 
 			$this->context = 'network';
-			$hooks->set_current_mode( 'network' );
+			$hooks->set_current_mode('network');
 
 			$this->uninstall_network();
 
@@ -473,7 +473,7 @@ 
 
 			// If WordPoints is being uninstalled, the options will already have been
 			// deleted, and calling these methods will actually create them again.
-			if ( 'wordpoints' !== $this->slug ) {
+			if ('wordpoints' !== $this->slug) {
 				$this->unset_network_installed();
 				$this->unset_network_install_skipped();
 				$this->unset_network_update_skipped();
@@ -486,7 +486,7 @@ 
 
 		} // End if ( is_multisite() ) else.
 
-		$hooks->set_current_mode( $hooks_mode );
+		$hooks->set_current_mode($hooks_mode);
 	}
 
 	/**
@@ -499,24 +499,24 @@ 
 	 * @param bool   $network Whether the entity is network active. Defaults to the
 	 *                        state of WordPoints itself.
 	 */
-	protected function prepare_to_update( $from, $to, $network ) {
+	protected function prepare_to_update($from, $to, $network) {
 
 		$this->action = 'update';
 
-		if ( null === $network ) {
+		if (null === $network) {
 			$network = is_wordpoints_network_active();
 		}
 
 		$this->network_wide = $network;
-		$this->updating_from = ( null === $from ) ? $this->get_db_version() : $from;
-		$this->updating_to   = ( null === $to ) ? $this->version : $to;
+		$this->updating_from = (null === $from) ? $this->get_db_version() : $from;
+		$this->updating_to   = (null === $to) ? $this->version : $to;
 
 		$updates = array();
 
-		foreach ( $this->updates as $version => $types ) {
+		foreach ($this->updates as $version => $types) {
 
-			if ( version_compare( $from, $version, '<' ) ) {
-				$updates[ str_replace( array( '.', '-' ), '_', $version ) ] = $types;
+			if (version_compare($from, $version, '<')) {
+				$updates[str_replace(array('.', '-'), '_', $version)] = $types;
 			}
 		}
 
@@ -533,11 +533,11 @@ 
 	 * @param bool   $network Whether the entity is network active. Defaults to the
 	 *                        state of WordPoints itself.
 	 */
-	public function update( $from = null, $to = null, $network = null ) {
+	public function update($from = null, $to = null, $network = null) {
 
-		$this->prepare_to_update( $from, $to, $network );
+		$this->prepare_to_update($from, $to, $network);
 
-		if ( empty( $this->updates ) ) {
+		if (empty($this->updates)) {
 			return;
 		}
 
@@ -545,7 +545,7 @@ 
 
 		$hooks = wordpoints_hooks();
 		$hooks_mode = $hooks->get_current_mode();
-		$hooks->set_current_mode( 'standard' );
+		$hooks->set_current_mode('standard');
 
 		$this->before_update();
 
@@ -554,32 +554,32 @@ 
 		 *
 		 * @since 1.8.0
 		 */
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 
 			$this->context = 'network';
-			$hooks->set_current_mode( 'network' );
+			$hooks->set_current_mode('network');
 
-			$this->update_( 'network', $this->get_updates_for( 'network' ) );
+			$this->update_('network', $this->get_updates_for('network'));
 
 			$this->context = 'site';
-			$hooks->set_current_mode( 'standard' );
+			$hooks->set_current_mode('standard');
 
-			if ( $this->network_wide ) {
+			if ($this->network_wide) {
 
-				$updates = $this->get_updates_for( 'site' );
+				$updates = $this->get_updates_for('site');
 
-				if ( $updates ) {
+				if ($updates) {
 
-					if ( $this->do_per_site_update() ) {
+					if ($this->do_per_site_update()) {
 
 						$ms_switched_state = new WordPoints_Multisite_Switched_State();
 						$ms_switched_state->backup();
 
-						foreach ( $this->get_installed_site_ids() as $blog_id ) {
-							switch_to_blog( $blog_id );
-							$this->update_( 'site', $updates );
+						foreach ($this->get_installed_site_ids() as $blog_id) {
+							switch_to_blog($blog_id);
+							$this->update_('site', $updates);
 						}
 
 						$ms_switched_state->restore();
@@ -594,19 +594,19 @@ 
 
 			} else {
 
-				$this->update_( 'site', $this->get_updates_for( 'site' ) );
+				$this->update_('site', $this->get_updates_for('site'));
 			}
 
 		} else {
 
 			$this->context = 'single';
-			$this->update_( 'single', $this->get_updates_for( 'single' ) );
+			$this->update_('single', $this->get_updates_for('single'));
 
 		} // End if ( is_multisite() ) else.
 
 		$this->after_update();
 
-		$hooks->set_current_mode( $hooks_mode );
+		$hooks->set_current_mode($hooks_mode);
 	}
 
 	//
@@ -620,10 +620,10 @@ 
 	 */
 	protected function no_interruptions() {
 
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! wordpoints_is_function_disabled( 'set_time_limit' ) ) {
-			set_time_limit( 0 );
+		if ( ! wordpoints_is_function_disabled('set_time_limit')) {
+			set_time_limit(0);
 		}
 	}
 
@@ -638,7 +638,7 @@ 
 	 */
 	protected function skip_per_site_install() {
 
-		return ( wp_is_large_network() )
+		return (wp_is_large_network())
 			? self::SKIP_INSTALL | self::REQUIRES_MANUAL_INSTALL
 			: self::DO_INSTALL;
 	}
@@ -673,9 +673,9 @@ 
 	 */
 	protected function get_all_site_ids() {
 
-		$site_ids = get_site_transient( 'wordpoints_all_site_ids' );
+		$site_ids = get_site_transient('wordpoints_all_site_ids');
 
-		if ( ! $site_ids ) {
+		if ( ! $site_ids) {
 
 			$site_ids = get_sites(
 				array(
@@ -685,7 +685,7 @@ 
 				)
 			);
 
-			set_site_transient( 'wordpoints_all_site_ids', $site_ids, 2 * MINUTE_IN_SECONDS );
+			set_site_transient('wordpoints_all_site_ids', $site_ids, 2 * MINUTE_IN_SECONDS);
 		}
 
 		return $site_ids;
@@ -699,11 +699,11 @@ 
 	 * @param string $option The name of the option to set.
 	 * @param mixed  $value  The value of the option.
 	 */
-	private function _set_option( $option, $value = true ) {
+	private function _set_option($option, $value = true) {
 
-		if ( isset( $this->option_prefix ) ) {
+		if (isset($this->option_prefix)) {
 
-			update_site_option( "{$this->option_prefix}{$option}", $value );
+			update_site_option("{$this->option_prefix}{$option}", $value);
 
 		} else {
 
@@ -712,9 +712,9 @@ 
 				, 'site'
 			);
 
-			$data[ $this->type ][ $this->slug ] = $value;
+			$data[$this->type][$this->slug] = $value;
 
-			update_site_option( "wordpoints_{$option}", $data );
+			update_site_option("wordpoints_{$option}", $data);
 		}
 	}
 
@@ -725,11 +725,11 @@ 
 	 *
 	 * @param string $option The name of the option to delete.
 	 */
-	private function _unset_option( $option ) {
+	private function _unset_option($option) {
 
-		if ( isset( $this->option_prefix ) ) {
+		if (isset($this->option_prefix)) {
 
-			delete_site_option( "{$this->option_prefix}{$option}" );
+			delete_site_option("{$this->option_prefix}{$option}");
 
 		} else {
 
@@ -738,9 +738,9 @@ 
 				, 'site'
 			);
 
-			unset( $data[ $this->type ][ $this->slug ] );
+			unset($data[$this->type][$this->slug]);
 
-			update_site_option( "wordpoints_{$option}", $data );
+			update_site_option("wordpoints_{$option}", $data);
 		}
 	}
 
@@ -753,9 +753,9 @@ 
 	 */
 	protected function is_network_installed() {
 
-		if ( isset( $this->option_prefix ) ) {
+		if (isset($this->option_prefix)) {
 
-			return (bool) get_site_option( "{$this->option_prefix}network_installed" );
+			return (bool) get_site_option("{$this->option_prefix}network_installed");
 
 		} else {
 
@@ -764,7 +764,7 @@ 
 				, 'site'
 			);
 
-			return isset( $network_installed[ $this->type ][ $this->slug ] );
+			return isset($network_installed[$this->type][$this->slug]);
 		}
 	}
 
@@ -774,7 +774,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected function set_network_installed() {
-		$this->_set_option( 'network_installed' );
+		$this->_set_option('network_installed');
 	}
 
 	/**
@@ -783,7 +783,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected function unset_network_installed() {
-		$this->_unset_option( 'network_installed' );
+		$this->_unset_option('network_installed');
 	}
 
 	/**
@@ -792,7 +792,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected function set_network_install_skipped() {
-		$this->_set_option( 'network_install_skipped' );
+		$this->_set_option('network_install_skipped');
 	}
 
 	/**
@@ -801,7 +801,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected function unset_network_install_skipped() {
-		$this->_unset_option( 'network_install_skipped' );
+		$this->_unset_option('network_install_skipped');
 	}
 
 	/**
@@ -810,7 +810,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected function set_network_update_skipped() {
-		$this->_set_option( 'network_update_skipped', $this->updating_from );
+		$this->_set_option('network_update_skipped', $this->updating_from);
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected function unset_network_update_skipped() {
-		$this->_unset_option( 'network_update_skipped' );
+		$this->_unset_option('network_update_skipped');
 	}
 
 	/**
@@ -833,11 +833,11 @@ 
 	 */
 	protected function do_per_site_uninstall() {
 
-		if ( wp_is_large_network() ) {
+		if (wp_is_large_network()) {
 
-			if ( $this->is_network_installed() ) {
+			if ($this->is_network_installed()) {
 				return false;
-			} elseif ( count( $this->get_installed_site_ids() ) > 10000 ) {
+			} elseif (count($this->get_installed_site_ids()) > 10000) {
 				return false;
 			}
 		}
@@ -856,7 +856,7 @@ 
 	 */
 	protected function do_per_site_update() {
 
-		if ( $this->is_network_installed() && wp_is_large_network() ) {
+		if ($this->is_network_installed() && wp_is_large_network()) {
 			return false;
 		}
 
@@ -872,11 +872,11 @@ 
 	 */
 	private function _get_installed_site_ids_option_name() {
 
-		if ( isset( $this->option_prefix ) ) {
+		if (isset($this->option_prefix)) {
 			$option_prefix = $this->option_prefix;
-		} elseif ( 'wordpoints' === $this->slug ) {
+		} elseif ('wordpoints' === $this->slug) {
 			$option_prefix = 'wordpoints_';
-		} elseif ( 'component' === $this->type ) {
+		} elseif ('component' === $this->type) {
 			$option_prefix = "wordpoints_{$this->slug}_";
 		} else {
 			$option_prefix = "wordpoints_{$this->type}_{$this->slug}_";
@@ -894,7 +894,7 @@ 
 	 */
 	protected function get_installed_site_ids() {
 
-		if ( $this->is_network_installed() ) {
+		if ($this->is_network_installed()) {
 			$sites = $this->get_all_site_ids();
 		} else {
 			$sites = wordpoints_get_array_option(
@@ -913,18 +913,18 @@ 
 	 *
 	 * @param int $id The ID of the site to add. Defaults to the current site's ID.
 	 */
-	protected function add_installed_site_id( $id = null ) {
+	protected function add_installed_site_id($id = null) {
 
-		if ( empty( $id ) ) {
+		if (empty($id)) {
 			$id = get_current_blog_id();
 		}
 
 		$option_name = $this->_get_installed_site_ids_option_name();
 
-		$sites = wordpoints_get_array_option( $option_name, 'site' );
+		$sites = wordpoints_get_array_option($option_name, 'site');
 		$sites[] = $id;
 
-		update_site_option( $option_name, $sites );
+		update_site_option($option_name, $sites);
 	}
 
 	/**
@@ -933,7 +933,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected function delete_installed_site_ids() {
-		delete_site_option( $this->_get_installed_site_ids_option_name() );
+		delete_site_option($this->_get_installed_site_ids_option_name());
 	}
 
 	/**
@@ -945,9 +945,9 @@ 
 	 *
 	 * @return array The validated site IDs.
 	 */
-	protected function validate_site_ids( $site_ids ) {
+	protected function validate_site_ids($site_ids) {
 
-		if ( empty( $site_ids ) || ! is_array( $site_ids ) ) {
+		if (empty($site_ids) || ! is_array($site_ids)) {
 			return array();
 		}
 
@@ -976,20 +976,20 @@ 
 	 */
 	protected function get_db_version() {
 
-		if ( $this->network_wide ) {
-			$wordpoints_data = wordpoints_get_array_option( 'wordpoints_data', 'site' );
+		if ($this->network_wide) {
+			$wordpoints_data = wordpoints_get_array_option('wordpoints_data', 'site');
 		} else {
-			$wordpoints_data = wordpoints_get_array_option( 'wordpoints_data' );
+			$wordpoints_data = wordpoints_get_array_option('wordpoints_data');
 		}
 
-		if ( 'wordpoints' === $this->slug ) {
+		if ('wordpoints' === $this->slug) {
 
-			if ( isset( $wordpoints_data['version'] ) ) {
+			if (isset($wordpoints_data['version'])) {
 				return $wordpoints_data['version'];
 			}
 
-		} elseif ( isset( $wordpoints_data[ "{$this->type}s" ][ $this->slug ]['version'] ) ) {
-			return $wordpoints_data[ "{$this->type}s" ][ $this->slug ]['version'];
+		} elseif (isset($wordpoints_data["{$this->type}s"][$this->slug]['version'])) {
+			return $wordpoints_data["{$this->type}s"][$this->slug]['version'];
 		}
 
 		return false;
@@ -1003,28 +1003,28 @@ 
 	 *
 	 * @param string $version The version of the entity.
 	 */
-	protected function set_db_version( $version = null ) {
+	protected function set_db_version($version = null) {
 
-		if ( null === $version ) {
+		if (null === $version) {
 			$version = $this->version;
 		}
 
-		if ( $this->network_wide ) {
-			$wordpoints_data = wordpoints_get_array_option( 'wordpoints_data', 'site' );
+		if ($this->network_wide) {
+			$wordpoints_data = wordpoints_get_array_option('wordpoints_data', 'site');
 		} else {
-			$wordpoints_data = wordpoints_get_array_option( 'wordpoints_data' );
+			$wordpoints_data = wordpoints_get_array_option('wordpoints_data');
 		}
 
-		if ( 'wordpoints' === $this->slug ) {
+		if ('wordpoints' === $this->slug) {
 			$wordpoints_data['version'] = $version;
 		} else {
-			$wordpoints_data[ "{$this->type}s" ][ $this->slug ]['version'] = $version;
+			$wordpoints_data["{$this->type}s"][$this->slug]['version'] = $version;
 		}
 
-		if ( $this->network_wide ) {
-			update_site_option( 'wordpoints_data', $wordpoints_data );
+		if ($this->network_wide) {
+			update_site_option('wordpoints_data', $wordpoints_data);
 		} else {
-			update_option( 'wordpoints_data', $wordpoints_data );
+			update_option('wordpoints_data', $wordpoints_data);
 		}
 	}
 
@@ -1036,22 +1036,22 @@ 
 	protected function unset_db_version() {
 
 		// The whole option will be deleted when WordPoints is uninstalled.
-		if ( 'wordpoints' === $this->slug ) {
+		if ('wordpoints' === $this->slug) {
 			return;
 		}
 
-		if ( 'network' === $this->context ) {
-			$wordpoints_data = wordpoints_get_array_option( 'wordpoints_data', 'site' );
+		if ('network' === $this->context) {
+			$wordpoints_data = wordpoints_get_array_option('wordpoints_data', 'site');
 		} else {
-			$wordpoints_data = wordpoints_get_array_option( 'wordpoints_data' );
+			$wordpoints_data = wordpoints_get_array_option('wordpoints_data');
 		}
 
-		unset( $wordpoints_data[ "{$this->type}s" ][ $this->slug ] );
+		unset($wordpoints_data["{$this->type}s"][$this->slug]);
 
-		if ( 'network' === $this->context ) {
-			update_site_option( 'wordpoints_data', $wordpoints_data );
+		if ('network' === $this->context) {
+			update_site_option('wordpoints_data', $wordpoints_data);
 		} else {
-			update_option( 'wordpoints_data', $wordpoints_data );
+			update_option('wordpoints_data', $wordpoints_data);
 		}
 	}
 
@@ -1066,19 +1066,19 @@ 
 	 * @param string $component The component's slug.
 	 * @param string $version   The installed component version.
 	 */
-	protected function set_component_version( $component, $version ) {
+	protected function set_component_version($component, $version) {
 
-		_deprecated_function( __METHOD__, '2.0.0', '::set_db_version()' );
+		_deprecated_function(__METHOD__, '2.0.0', '::set_db_version()');
 
 		$wordpoints_data = wordpoints_get_maybe_network_array_option(
 			'wordpoints_data'
 		);
 
-		if ( empty( $wordpoints_data['components'][ $component ]['version'] ) ) {
-			$wordpoints_data['components'][ $component ]['version'] = $version;
+		if (empty($wordpoints_data['components'][$component]['version'])) {
+			$wordpoints_data['components'][$component]['version'] = $version;
 		}
 
-		wordpoints_update_maybe_network_option( 'wordpoints_data', $wordpoints_data );
+		wordpoints_update_maybe_network_option('wordpoints_data', $wordpoints_data);
 	}
 
 	/**
@@ -1088,14 +1088,14 @@ 
 	 */
 	protected function maybe_load_custom_caps() {
 
-		if ( empty( $this->custom_caps_getter ) ) {
+		if (empty($this->custom_caps_getter)) {
 			return;
 		}
 
-		$this->custom_caps = call_user_func( $this->custom_caps_getter );
-		$this->custom_caps_keys = array_keys( $this->custom_caps );
+		$this->custom_caps = call_user_func($this->custom_caps_getter);
+		$this->custom_caps_keys = array_keys($this->custom_caps);
 
-		if ( 'uninstall' === $this->action ) {
+		if ('uninstall' === $this->action) {
 			$this->uninstall['local']['custom_caps'] = true;
 		}
 	}
@@ -1106,7 +1106,7 @@ 
 	 * @since 1.8.0
 	 */
 	protected function before_install() {
-		$this->map_shortcuts( 'schema' );
+		$this->map_shortcuts('schema');
 		$this->maybe_load_custom_caps();
 	}
 
@@ -1117,8 +1117,8 @@ 
 	 */
 	protected function install_custom_caps() {
 
-		if ( ! empty( $this->custom_caps ) ) {
-			wordpoints_add_custom_caps( $this->custom_caps );
+		if ( ! empty($this->custom_caps)) {
+			wordpoints_add_custom_caps($this->custom_caps);
 		}
 	}
 
@@ -1131,8 +1131,8 @@ 
 
 		$schema = $this->get_db_schema();
 
-		if ( ! empty( $schema ) ) {
-			dbDelta( $schema );
+		if ( ! empty($schema)) {
+			dbDelta($schema);
 		}
 	}
 
@@ -1145,7 +1145,7 @@ 
 	 */
 	public function get_db_schema() {
 
-		if ( ! isset( $this->schema[ $this->context ]['tables'] ) ) {
+		if ( ! isset($this->schema[$this->context]['tables'])) {
 			return '';
 		}
 
@@ -1155,16 +1155,16 @@ 
 
 		$charset_collate = $wpdb->get_charset_collate();
 
-		if ( 'site' === $this->context ) {
+		if ('site' === $this->context) {
 			$prefix = $wpdb->prefix;
 		} else {
 			$prefix = $wpdb->base_prefix;
 		}
 
-		foreach ( $this->schema[ $this->context ]['tables'] as $table_name => $table_schema ) {
+		foreach ($this->schema[$this->context]['tables'] as $table_name => $table_schema) {
 
-			$table_name   = str_replace( '`', '``', $table_name );
-			$table_schema = trim( $table_schema );
+			$table_name   = str_replace('`', '``', $table_name);
+			$table_schema = trim($table_schema);
 
 			$schema .= "CREATE TABLE {$prefix}{$table_name} (
 				{$table_schema}
@@ -1184,31 +1184,31 @@ 
 		$this->maybe_load_custom_caps();
 
 		$this->prepare_uninstall_list_tables();
-		$this->prepare_uninstall_non_per_site_items( 'meta_boxes' );
-		$this->map_uninstall_shortcut( 'widgets', 'options', array( 'prefix' => 'widget_' ) );
-		$this->map_uninstall_shortcut( 'points_hooks', 'options', array( 'prefix' => 'wordpoints_hook-' ) );
+		$this->prepare_uninstall_non_per_site_items('meta_boxes');
+		$this->map_uninstall_shortcut('widgets', 'options', array('prefix' => 'widget_'));
+		$this->map_uninstall_shortcut('points_hooks', 'options', array('prefix' => 'wordpoints_hook-'));
 
 		// Add any tables to uninstall based on the db schema.
-		foreach ( $this->schema as $context => $schema ) {
+		foreach ($this->schema as $context => $schema) {
 
-			if ( ! isset( $schema['tables'] ) ) {
+			if ( ! isset($schema['tables'])) {
 				continue;
 			}
 
-			if ( ! isset( $this->uninstall[ $context ]['tables'] ) ) {
-				$this->uninstall[ $context ]['tables'] = array();
+			if ( ! isset($this->uninstall[$context]['tables'])) {
+				$this->uninstall[$context]['tables'] = array();
 			}
 
-			$this->uninstall[ $context ]['tables'] = array_unique(
+			$this->uninstall[$context]['tables'] = array_unique(
 				array_merge(
-					$this->uninstall[ $context ]['tables']
-					, array_keys( $schema['tables'] )
+					$this->uninstall[$context]['tables']
+					, array_keys($schema['tables'])
 				)
 			);
 		}
 
 		// This *must* happen *after* the schema and list tables args are parsed.
-		$this->map_shortcuts( 'uninstall' );
+		$this->map_shortcuts('uninstall');
 	}
 
 	/**
@@ -1242,7 +1242,7 @@ 
 	 */
 	protected function prepare_uninstall_list_tables() {
 
-		if ( ! isset( $this->uninstall['list_tables'] ) ) {
+		if ( ! isset($this->uninstall['list_tables'])) {
 			return;
 		}
 
@@ -1253,17 +1253,17 @@ 
 		);
 
 		// Loop through all of the list table screens.
-		foreach ( $this->uninstall['list_tables'] as $screen_id => $args ) {
+		foreach ($this->uninstall['list_tables'] as $screen_id => $args) {
 
 			// Back-compat for pre-2.1.0.
-			if ( isset( $args['parent'] ) && '_page' === substr( $args['parent'], -5 /* _page */ ) ) {
-				$args['parent'] = substr( $args['parent'], 0, -5 );
+			if (isset($args['parent']) && '_page' === substr($args['parent'], -5 /* _page */)) {
+				$args['parent'] = substr($args['parent'], 0, -5);
 			}
 
-			$this->uninstall['universal']['list_tables'][ $screen_id ] = $args;
+			$this->uninstall['universal']['list_tables'][$screen_id] = $args;
 		}
 
-		$this->prepare_uninstall_non_per_site_items( 'list_tables' );
+		$this->prepare_uninstall_non_per_site_items('list_tables');
 	}
 
 	/**
@@ -1281,22 +1281,22 @@ 
 	 *
 	 * @param string $items_key The key name of the items in the uninstall[*] arrays.
 	 */
-	protected function prepare_uninstall_non_per_site_items( $items_key ) {
+	protected function prepare_uninstall_non_per_site_items($items_key) {
 
-		if ( isset( $this->uninstall['universal'][ $items_key ] ) ) {
+		if (isset($this->uninstall['universal'][$items_key])) {
 
-			$this->uninstall['global'][ $items_key ]
-				= $this->uninstall['universal'][ $items_key ];
+			$this->uninstall['global'][$items_key]
+				= $this->uninstall['universal'][$items_key];
 
-			unset( $this->uninstall['universal'][ $items_key ] );
+			unset($this->uninstall['universal'][$items_key]);
 		}
 
-		if ( isset( $this->uninstall['site'][ $items_key ] ) ) {
+		if (isset($this->uninstall['site'][$items_key])) {
 
-			$this->uninstall['network'][ $items_key ]
-				= $this->uninstall['site'][ $items_key ];
+			$this->uninstall['network'][$items_key]
+				= $this->uninstall['site'][$items_key];
 
-			unset( $this->uninstall['site'][ $items_key ] );
+			unset($this->uninstall['site'][$items_key]);
 		}
 	}
 
@@ -1333,20 +1333,20 @@ 
 	 *                             adding to them to the canonical array.
 	 * }
 	 */
-	protected function map_uninstall_shortcut( $shortcut, $canonical, $args ) {
+	protected function map_uninstall_shortcut($shortcut, $canonical, $args) {
 
-		$args = array_merge( array( 'prefix' => '' ), $args );
+		$args = array_merge(array('prefix' => ''), $args);
 
-		$types = array( 'single', 'site', 'network', 'local', 'global', 'universal' );
+		$types = array('single', 'site', 'network', 'local', 'global', 'universal');
 
-		foreach ( $types as $type ) {
+		foreach ($types as $type) {
 
-			if ( ! isset( $this->uninstall[ $type ][ $shortcut ] ) ) {
+			if ( ! isset($this->uninstall[$type][$shortcut])) {
 				continue;
 			}
 
-			foreach ( $this->uninstall[ $type ][ $shortcut ] as $slug ) {
-				$this->uninstall[ $type ][ $canonical ][] = $args['prefix'] . $slug;
+			foreach ($this->uninstall[$type][$shortcut] as $slug) {
+				$this->uninstall[$type][$canonical][] = $args['prefix'] . $slug;
 			}
 		}
 	}
@@ -1366,28 +1366,28 @@ 
 	 *
 	 * @param string $type The type of shortcuts to map. Corresponds to a member var.
 	 */
-	protected function map_shortcuts( $type ) {
+	protected function map_shortcuts($type) {
 
 		// shortcut => canonicals
 		$map = array(
-			'local'     => array( 'single', 'site', /*  -  */ ),
-			'global'    => array( 'single', /* - */ 'network' ),
-			'universal' => array( 'single', 'site', 'network' ),
+			'local'     => array('single', 'site', /*  -  */),
+			'global'    => array('single', /* - */ 'network'),
+			'universal' => array('single', 'site', 'network'),
 		);
 
 		$this->$type = array_merge(
 			array_fill_keys(
-				array( 'single', 'site', 'network', 'local', 'global', 'universal' )
+				array('single', 'site', 'network', 'local', 'global', 'universal')
 				, array()
 			)
 			, $this->$type
 		);
 
-		foreach ( $map as $shortcut => $canonicals ) {
-			foreach ( $canonicals as $canonical ) {
-				$this->{$type}[ $canonical ] = array_merge_recursive(
-					$this->{$type}[ $canonical ]
-					, $this->{$type}[ $shortcut ]
+		foreach ($map as $shortcut => $canonicals) {
+			foreach ($canonicals as $canonical) {
+				$this->{$type}[$canonical] = array_merge_recursive(
+					$this->{$type}[$canonical]
+					, $this->{$type}[$shortcut]
 				);
 			}
 		}
@@ -1418,9 +1418,9 @@ 
 	 *
 	 * @return array The versions that request this type of update.
 	 */
-	protected function get_updates_for( $type ) {
+	protected function get_updates_for($type) {
 
-		return array_keys( wp_list_filter( $this->updates, array( $type => true ) ) );
+		return array_keys(wp_list_filter($this->updates, array($type => true)));
 	}
 
 	/**
@@ -1431,9 +1431,9 @@ 
 	 * @param string $type     The type of update to run.
 	 * @param array  $versions The versions to run this type of update for.
 	 */
-	protected function update_( $type, $versions ) {
+	protected function update_($type, $versions) {
 
-		foreach ( $versions as $version ) {
+		foreach ($versions as $version) {
 			$this->{"update_{$type}_to_{$version}"}();
 		}
 	}
@@ -1445,22 +1445,22 @@ 
 	 *
 	 * @param string $type The type of tables to update.
 	 */
-	protected function maybe_update_tables_to_utf8mb4( $type ) {
+	protected function maybe_update_tables_to_utf8mb4($type) {
 
 		global $wpdb;
 
-		if ( 'utf8mb4' !== $wpdb->charset ) {
+		if ('utf8mb4' !== $wpdb->charset) {
 			return;
 		}
 
-		if ( 'global' === $type || 'network' === $type ) {
+		if ('global' === $type || 'network' === $type) {
 			$prefix = $wpdb->base_prefix;
 		} else {
 			$prefix = $wpdb->prefix;
 		}
 
-		foreach ( $this->schema[ $type ]['tables'] as $table_name => $schema ) {
-			maybe_convert_table_to_utf8mb4( $prefix . $table_name );
+		foreach ($this->schema[$type]['tables'] as $table_name => $schema) {
+			maybe_convert_table_to_utf8mb4($prefix . $table_name);
 		}
 	}
 
@@ -1471,9 +1471,9 @@ 
 	 *
 	 * @param string $type The type of uninstallation to perform.
 	 */
-	protected function uninstall_( $type ) {
+	protected function uninstall_($type) {
 
-		if ( empty( $this->uninstall[ $type ] ) ) {
+		if (empty($this->uninstall[$type])) {
 			return;
 		}
 
@@ -1486,35 +1486,35 @@ 
 				'meta_boxes'   => array(),
 				'list_tables'  => array(),
 			)
-			, $this->uninstall[ $type ]
+			, $this->uninstall[$type]
 		);
 
-		if ( ! empty( $uninstall['custom_caps'] ) ) {
-			$this->uninstall_custom_caps( $this->custom_caps_keys );
+		if ( ! empty($uninstall['custom_caps'])) {
+			$this->uninstall_custom_caps($this->custom_caps_keys);
 		}
 
-		foreach ( $uninstall['user_meta'] as $meta_key ) {
-			$this->uninstall_metadata( 'user', $meta_key );
+		foreach ($uninstall['user_meta'] as $meta_key) {
+			$this->uninstall_metadata('user', $meta_key);
 		}
 
-		foreach ( $uninstall['options'] as $option ) {
-			$this->uninstall_option( $option );
+		foreach ($uninstall['options'] as $option) {
+			$this->uninstall_option($option);
 		}
 
-		foreach ( $uninstall['tables'] as $table ) {
-			$this->uninstall_table( $table );
+		foreach ($uninstall['tables'] as $table) {
+			$this->uninstall_table($table);
 		}
 
-		foreach ( $uninstall['comment_meta'] as $meta_key ) {
-			$this->uninstall_metadata( 'comment', $meta_key );
+		foreach ($uninstall['comment_meta'] as $meta_key) {
+			$this->uninstall_metadata('comment', $meta_key);
 		}
 
-		foreach ( $uninstall['meta_boxes'] as $screen_id => $args ) {
-			$this->uninstall_meta_boxes( $screen_id, $args );
+		foreach ($uninstall['meta_boxes'] as $screen_id => $args) {
+			$this->uninstall_meta_boxes($screen_id, $args);
 		}
 
-		foreach ( $uninstall['list_tables'] as $screen_id => $args ) {
-			$this->uninstall_list_table( $screen_id, $args );
+		foreach ($uninstall['list_tables'] as $screen_id => $args) {
+			$this->uninstall_list_table($screen_id, $args);
 		}
 	}
 
@@ -1525,9 +1525,9 @@ 
 	 *
 	 * @param string[] $caps The capabilities to uninstall.
 	 */
-	protected function uninstall_custom_caps( $caps ) {
+	protected function uninstall_custom_caps($caps) {
 
-		wordpoints_remove_custom_caps( $caps );
+		wordpoints_remove_custom_caps($caps);
 	}
 
 	/**
@@ -1538,17 +1538,17 @@ 
 	 * @param string $type The type of metadata to uninstall, e.g., 'user', 'post'.
 	 * @param string $key  The metadata key to delete.
 	 */
-	protected function uninstall_metadata( $type, $key ) {
+	protected function uninstall_metadata($type, $key) {
 
-		if ( 'user' === $type && 'site' === $this->context ) {
+		if ('user' === $type && 'site' === $this->context) {
 			$key = $GLOBALS['wpdb']->get_blog_prefix() . $key;
 		}
 
-		if ( false !== strpos( $key, '%' ) ) {
+		if (false !== strpos($key, '%')) {
 
 			global $wpdb;
 
-			$table = wordpoints_escape_mysql_identifier( _get_meta_table( $type ) );
+			$table = wordpoints_escape_mysql_identifier(_get_meta_table($type));
 
 			$keys = $wpdb->get_col( // WPCS: unprepared SQL OK.
 				$wpdb->prepare( // WPCS: unprepared SQL OK.
@@ -1562,11 +1562,11 @@ 
 			); // WPCS: cache pass.
 
 		} else {
-			$keys = array( $key );
+			$keys = array($key);
 		}
 
-		foreach ( $keys as $key ) {
-			delete_metadata( $type, 0, wp_slash( $key ), '', true );
+		foreach ($keys as $key) {
+			delete_metadata($type, 0, wp_slash($key), '', true);
 		}
 	}
 
@@ -1600,25 +1600,25 @@ 
 	 *                                'meta-box-order'.
 	 * }
 	 */
-	protected function uninstall_meta_boxes( $screen_id, $args ) {
+	protected function uninstall_meta_boxes($screen_id, $args) {
 
 		$defaults = array(
 			'parent' => 'wordpoints',
-			'options' => array( 'closedpostboxes', 'metaboxhidden', 'meta-box-order' ),
+			'options' => array('closedpostboxes', 'metaboxhidden', 'meta-box-order'),
 		);
 
-		$args = array_merge( $defaults, $args );
-		$args['options'] = array_merge( $defaults['options'], $args['options'] );
+		$args = array_merge($defaults, $args);
+		$args['options'] = array_merge($defaults['options'], $args['options']);
 
 		// Each user gets to set the options to their liking.
-		foreach ( $args['options'] as $option ) {
+		foreach ($args['options'] as $option) {
 
 			$this->uninstall_metadata(
 				'user'
 				, "{$option}_{$args['parent']}_page_{$screen_id}"
 			);
 
-			if ( 'network' === $this->context ) {
+			if ('network' === $this->context) {
 				$this->uninstall_metadata(
 					'user'
 					, "{$option}_{$args['parent']}_page_{$screen_id}-network"
@@ -1659,21 +1659,21 @@ 
 	 *                                'per_page'.
 	 * }
 	 */
-	protected function uninstall_list_table( $screen_id, $args ) {
+	protected function uninstall_list_table($screen_id, $args) {
 
 		$defaults = array(
 			'parent' => 'wordpoints',
-			'options' => array( 'per_page' ),
+			'options' => array('per_page'),
 		);
 
-		$args = array_merge( $defaults, $args );
+		$args = array_merge($defaults, $args);
 
 		$network_parent = $args['parent'];
 		$parent = $network_parent;
 
 		// The parent page is usually the same on a multisite site, but we need to
 		// handle the special case of the modules screen.
-		if ( 'wordpoints_modules' === $screen_id && is_multisite() ) {
+		if ('wordpoints_modules' === $screen_id && is_multisite()) {
 			$parent = 'toplevel';
 		}
 
@@ -1682,23 +1682,23 @@ 
 		// Each user can hide specific columns of the table.
 		$meta_keys[] = "manage{$parent}_page_{$screen_id}columnshidden";
 
-		if ( 'network' === $this->context ) {
+		if ('network' === $this->context) {
 			$meta_keys[] = "manage{$network_parent}_page_{$screen_id}-networkcolumnshidden";
 		}
 
 		// Loop through each of the other options provided by this list table.
-		foreach ( $args['options'] as $option ) {
+		foreach ($args['options'] as $option) {
 
 			// Each user gets to set the options to their liking.
 			$meta_keys[]  = "{$parent}_page_{$screen_id}_{$option}";
 
-			if ( 'network' === $this->context ) {
+			if ('network' === $this->context) {
 				$meta_keys[] = "{$network_parent}_page_{$screen_id}_network_{$option}";
 			}
 		}
 
-		foreach ( $meta_keys as $meta_key ) {
-			$this->uninstall_metadata( 'user', $meta_key );
+		foreach ($meta_keys as $meta_key) {
+			$this->uninstall_metadata('user', $meta_key);
 		}
 	}
 
@@ -1713,14 +1713,14 @@ 
 	 *
 	 * @param string $option The option to uninstall.
 	 */
-	protected function uninstall_option( $option ) {
+	protected function uninstall_option($option) {
 
-		if ( 'network' === $this->context ) {
-			$this->uninstall_network_option( $option );
+		if ('network' === $this->context) {
+			$this->uninstall_network_option($option);
 			return;
 		}
 
-		if ( false !== strpos( $option, '%' ) ) {
+		if (false !== strpos($option, '%')) {
 
 			global $wpdb;
 
@@ -1736,10 +1736,10 @@ 
 			); // WPCS: cache pass.
 
 		} else {
-			$options = array( $option );
+			$options = array($option);
 		}
 
-		array_map( 'delete_option', $options );
+		array_map('delete_option', $options);
 	}
 
 	/**
@@ -1751,9 +1751,9 @@ 
 	 *
 	 * @param string $option The network option to uninstall.
 	 */
-	protected function uninstall_network_option( $option ) {
+	protected function uninstall_network_option($option) {
 
-		if ( false !== strpos( $option, '%' ) ) {
+		if (false !== strpos($option, '%')) {
 
 			global $wpdb;
 
@@ -1771,10 +1771,10 @@ 
 			); // WPCS: cache pass.
 
 		} else {
-			$options = array( $option );
+			$options = array($option);
 		}
 
-		array_map( 'delete_site_option', $options );
+		array_map('delete_site_option', $options);
 	}
 
 	/**
@@ -1784,9 +1784,9 @@ 
 	 *
 	 * @param string $id_base The base ID of the widget to uninstall (class name).
 	 */
-	protected function uninstall_widget( $id_base ) {
+	protected function uninstall_widget($id_base) {
 
-		$this->uninstall_option( "widget_{$id_base}" );
+		$this->uninstall_option("widget_{$id_base}");
 	}
 
 	/**
@@ -1796,9 +1796,9 @@ 
 	 *
 	 * @param string $id_base The base ID (class) of the points hook to uninstall.
 	 */
-	protected function uninstall_points_hook( $id_base ) {
+	protected function uninstall_points_hook($id_base) {
 
-		$this->uninstall_option( "wordpoints_hook-{$id_base}" );
+		$this->uninstall_option("wordpoints_hook-{$id_base}");
 	}
 
 	/**
@@ -1808,20 +1808,20 @@ 
 	 *
 	 * @param string $table The name of the table to uninstall, sans DB prefix.
 	 */
-	protected function uninstall_table( $table ) {
+	protected function uninstall_table($table) {
 
 		global $wpdb;
 
 		// Null will use the current blog's prefix, 0 the base prefix.
-		if ( 'site' === $this->context ) {
+		if ('site' === $this->context) {
 			$site_id = null;
 		} else {
 			$site_id = 0;
 		}
 
-		$table = str_replace( '`', '``', $table );
+		$table = str_replace('`', '``', $table);
 
-		$wpdb->query( 'DROP TABLE IF EXISTS `' . $wpdb->get_blog_prefix( $site_id ) . $table . '`' ); // WPCS: unprepared SQL, cache pass.
+		$wpdb->query('DROP TABLE IF EXISTS `' . $wpdb->get_blog_prefix($site_id) . $table . '`'); // WPCS: unprepared SQL, cache pass.
 	}
 
 	//
@@ -1841,7 +1841,7 @@ 
 
 		$this->install_db_schema();
 
-		if ( $this->network_wide ) {
+		if ($this->network_wide) {
 			$this->set_db_version();
 		}
 	}
@@ -1857,11 +1857,11 @@ 
 	 */
 	protected function install_site() {
 
-		if ( isset( $this->schema['site'] ) ) {
+		if (isset($this->schema['site'])) {
 			$this->install_db_schema();
 		}
 
-		if ( ! $this->network_wide ) {
+		if ( ! $this->network_wide) {
 			$this->set_db_version();
 		}
 
@@ -1891,10 +1891,10 @@ 
 	 */
 	protected function load_base_dependencies() {
 
-		require_once dirname( __FILE__ ) . '/constants.php';
+		require_once dirname(__FILE__) . '/constants.php';
 		require_once WORDPOINTS_DIR . '/classes/class/autoloader.php';
 
-		WordPoints_Class_Autoloader::register_dir( WORDPOINTS_DIR . '/classes' );
+		WordPoints_Class_Autoloader::register_dir(WORDPOINTS_DIR . '/classes');
 
 		require_once WORDPOINTS_DIR . '/includes/functions.php';
 		require_once WORDPOINTS_DIR . '/includes/apps.php';
@@ -1921,8 +1921,8 @@ 
 	 */
 	protected function uninstall_network() {
 
-		if ( ! empty( $this->uninstall['network'] ) ) {
-			$this->uninstall_( 'network' );
+		if ( ! empty($this->uninstall['network'])) {
+			$this->uninstall_('network');
 		}
 
 		$this->unset_db_version();
@@ -1939,8 +1939,8 @@ 
 	 */
 	protected function uninstall_site() {
 
-		if ( ! empty( $this->uninstall['site'] ) ) {
-			$this->uninstall_( 'site' );
+		if ( ! empty($this->uninstall['site'])) {
+			$this->uninstall_('site');
 		}
 
 		$this->unset_db_version();
@@ -1957,8 +1957,8 @@ 
 	 */
 	protected function uninstall_single() {
 
-		if ( ! empty( $this->uninstall['single'] ) ) {
-			$this->uninstall_( 'single' );
+		if ( ! empty($this->uninstall['single'])) {
+			$this->uninstall_('single');
 		}
 
 		$this->unset_db_version();

src/classes/hook/hit/query.php

Spacing +16 added lines, -16 removed lines

@@ -18,16 +18,16 @@ 
 	 * @since 2.1.0
 	 */
 	protected $columns = array(
-		'id' => array( 'format' => '%d', 'unsigned' => true ),
-		'action_type' => array( 'format' => '%s' ),
-		'signature_arg_guids' => array( 'format' => '%s' ),
-		'event' => array( 'format' => '%s' ),
-		'reactor' => array( 'format' => '%s' ),
-		'reaction_mode' => array( 'format' => '%s' ),
-		'reaction_store' => array( 'format' => '%s' ),
-		'reaction_context_id' => array( 'format' => '%s' ),
-		'reaction_id' => array( 'format' => '%d', 'unsigned' => true ),
-		'date' => array( 'format' => '%s', 'is_date' => true ),
+		'id' => array('format' => '%d', 'unsigned' => true),
+		'action_type' => array('format' => '%s'),
+		'signature_arg_guids' => array('format' => '%s'),
+		'event' => array('format' => '%s'),
+		'reactor' => array('format' => '%s'),
+		'reaction_mode' => array('format' => '%s'),
+		'reaction_store' => array('format' => '%s'),
+		'reaction_context_id' => array('format' => '%s'),
+		'reaction_id' => array('format' => '%d', 'unsigned' => true),
+		'date' => array('format' => '%s', 'is_date' => true),
 	);
 
 	/**
@@ -39,10 +39,10 @@ 
 	 * @since 2.3.0
 	 */
 	protected $deprecated_args = array(
-		'primary_arg_guid'          => array( 'replacement' => 'signature_arg_guids', 'version' => '2.3.0', 'class' => __CLASS__ ),
-		'primary_arg_guid__compare' => array( 'replacement' => 'signature_arg_guids__compare', 'version' => '2.3.0', 'class' => __CLASS__ ),
-		'primary_arg_guid__in'      => array( 'replacement' => 'signature_arg_guids__in', 'version' => '2.3.0', 'class' => __CLASS__ ),
-		'primary_arg_guid__not_in'  => array( 'replacement' => 'signature_arg_guids__not_in', 'version' => '2.3.0', 'class' => __CLASS__ ),
+		'primary_arg_guid'          => array('replacement' => 'signature_arg_guids', 'version' => '2.3.0', 'class' => __CLASS__),
+		'primary_arg_guid__compare' => array('replacement' => 'signature_arg_guids__compare', 'version' => '2.3.0', 'class' => __CLASS__),
+		'primary_arg_guid__in'      => array('replacement' => 'signature_arg_guids__in', 'version' => '2.3.0', 'class' => __CLASS__),
+		'primary_arg_guid__not_in'  => array('replacement' => 'signature_arg_guids__not_in', 'version' => '2.3.0', 'class' => __CLASS__),
 	);
 
 	//
@@ -121,7 +121,7 @@ 
 	 *        @type array        $meta_query                   See WP_Meta_Query.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 
 		global $wpdb;
 
@@ -129,7 +129,7 @@ 
 
 		$this->defaults['order_by'] = 'date';
 
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 }
 

src/classes/db/query.php

Spacing +129 added lines, -129 removed lines

@@ -231,24 +231,24 @@ 
 	 *        @type array        $meta_query          See WP_Meta_Query.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 
-		foreach ( $this->deprecated_args as $arg => $data ) {
-			if ( isset( $args[ $arg ] ) ) {
+		foreach ($this->deprecated_args as $arg => $data) {
+			if (isset($args[$arg])) {
 
 				_deprecated_argument(
-					esc_html( "{$data['class']}::__construct" )
-					, esc_html( $data['version'] )
-					, esc_html( "{$arg} is deprecated, use {$data['replacement']} instead" )
+					esc_html("{$data['class']}::__construct")
+					, esc_html($data['version'])
+					, esc_html("{$arg} is deprecated, use {$data['replacement']} instead")
 				);
 
-				$args[ $data['replacement'] ] = $args[ $arg ];
+				$args[$data['replacement']] = $args[$arg];
 
-				unset( $args[ $arg ] );
+				unset($args[$arg]);
 			}
 		}
 
-		$this->args = array_merge( $this->defaults, $args );
+		$this->args = array_merge($this->defaults, $args);
 	}
 
 	/**
@@ -260,21 +260,21 @@ 
 	 *
 	 * @return mixed|null The query arg's value, or null if it isn't set.
 	 */
-	public function get_arg( $arg ) {
+	public function get_arg($arg) {
 
-		if ( isset( $this->deprecated_args[ $arg ] ) ) {
+		if (isset($this->deprecated_args[$arg])) {
 
 			_deprecated_argument(
-				esc_html( "{$this->deprecated_args[ $arg ]['class']}::get_arg" )
-				, esc_html( $this->deprecated_args[ $arg ]['version'] )
-				, esc_html( "{$arg} is deprecated, use {$this->deprecated_args[ $arg ]['replacement']} instead" )
+				esc_html("{$this->deprecated_args[$arg]['class']}::get_arg")
+				, esc_html($this->deprecated_args[$arg]['version'])
+				, esc_html("{$arg} is deprecated, use {$this->deprecated_args[$arg]['replacement']} instead")
 			);
 
-			$arg = $this->deprecated_args[ $arg ]['replacement'];
+			$arg = $this->deprecated_args[$arg]['replacement'];
 		}
 
-		if ( isset( $this->args[ $arg ] ) ) {
-			return $this->args[ $arg ];
+		if (isset($this->args[$arg])) {
+			return $this->args[$arg];
 		} else {
 			return null;
 		}
@@ -292,24 +292,24 @@ 
 	 *
 	 * @return WordPoints_DB_Query To allow for method chaining.
 	 */
-	public function set_args( array $args ) {
+	public function set_args(array $args) {
 
-		foreach ( $this->deprecated_args as $arg => $data ) {
-			if ( isset( $args[ $arg ] ) ) {
+		foreach ($this->deprecated_args as $arg => $data) {
+			if (isset($args[$arg])) {
 
 				_deprecated_argument(
-					esc_html( "{$data['class']}::set_args" )
-					, esc_html( $data['version'] )
-					, esc_html( "{$arg} is deprecated, use {$data['replacement']} instead" )
+					esc_html("{$data['class']}::set_args")
+					, esc_html($data['version'])
+					, esc_html("{$arg} is deprecated, use {$data['replacement']} instead")
 				);
 
-				$args[ $data['replacement'] ] = $args[ $arg ];
+				$args[$data['replacement']] = $args[$arg];
 
-				unset( $args[ $arg ] );
+				unset($args[$arg]);
 			}
 		}
 
-		$this->args = array_merge( $this->args, $args );
+		$this->args = array_merge($this->args, $args);
 
 		$this->is_query_ready = false;
 
@@ -332,7 +332,7 @@ 
 
 		global $wpdb;
 
-		$count = (int) $wpdb->get_var( $this->get_sql( 'SELECT COUNT' ) ); // WPCS: unprepared SQL, cache OK
+		$count = (int) $wpdb->get_var($this->get_sql('SELECT COUNT')); // WPCS: unprepared SQL, cache OK
 
 		return $count;
 	}
@@ -347,20 +347,20 @@ 
 	 *
 	 * @return mixed The results of the query, or false on failure.
 	 */
-	public function get( $method = 'results' ) {
+	public function get($method = 'results') {
 
 		global $wpdb;
 
-		$methods = array( 'results', 'row', 'col', 'var' );
+		$methods = array('results', 'row', 'col', 'var');
 
-		if ( ! in_array( $method, $methods ) ) {
+		if ( ! in_array($method, $methods)) {
 
-			_doing_it_wrong( __METHOD__, esc_html( sprintf( 'WordPoints Debug Error: invalid get method %s, possible values are %s', $method, implode( ', ', $methods ) ) ), '1.0.0' );
+			_doing_it_wrong(__METHOD__, esc_html(sprintf('WordPoints Debug Error: invalid get method %s, possible values are %s', $method, implode(', ', $methods))), '1.0.0');
 
 			return false;
 		}
 
-		$result = $wpdb->{"get_{$method}"}( $this->get_sql() );
+		$result = $wpdb->{"get_{$method}"}($this->get_sql());
 
 		return $result;
 	}
@@ -380,11 +380,11 @@ 
 	 *
 	 * @return string The SQL for the query.
 	 */
-	public function get_sql( $select_type = 'SELECT' ) {
+	public function get_sql($select_type = 'SELECT') {
 
 		$this->prepare_query();
 
-		$select = ( 'SELECT COUNT' === $select_type )
+		$select = ('SELECT COUNT' === $select_type)
 			? $this->select_count
 			: $this->select;
 
@@ -412,12 +412,12 @@ 
 	 *
 	 * @return string[] The valid columns.
 	 */
-	public function date_query_valid_columns_filter( $valid_columns ) {
+	public function date_query_valid_columns_filter($valid_columns) {
 
 		$valid_columns = array_merge(
 			$valid_columns
 			, array_keys(
-				wp_list_filter( $this->columns, array( 'is_date' => true ) )
+				wp_list_filter($this->columns, array('is_date' => true))
 			)
 		);
 
@@ -435,7 +435,7 @@ 
 	 */
 	protected function prepare_query() {
 
-		if ( ! $this->is_query_ready ) {
+		if ( ! $this->is_query_ready) {
 
 			$this->prepare_select();
 			$this->prepare_where();
@@ -453,26 +453,26 @@ 
 	 */
 	protected function prepare_select() {
 
-		$all_fields = array_keys( $this->columns );
+		$all_fields = array_keys($this->columns);
 		$fields = array();
 
-		if ( ! empty( $this->args['fields'] ) ) {
+		if ( ! empty($this->args['fields'])) {
 
 			$fields = (array) $this->args['fields'];
-			$diff   = array_diff( $fields, $all_fields );
-			$fields = array_intersect( $all_fields, $fields );
+			$diff   = array_diff($fields, $all_fields);
+			$fields = array_intersect($all_fields, $fields);
 
-			if ( ! empty( $diff ) ) {
-				_doing_it_wrong( __METHOD__, esc_html( 'WordPoints Debug Error: invalid field(s) "' . implode( '", "', $diff ) . '" given' ), '1.0.0' );
+			if ( ! empty($diff)) {
+				_doing_it_wrong(__METHOD__, esc_html('WordPoints Debug Error: invalid field(s) "' . implode('", "', $diff) . '" given'), '1.0.0');
 			}
 		}
 
 		// Pull all fields by default.
-		if ( empty( $fields ) ) {
+		if (empty($fields)) {
 			$fields = $all_fields;
 		}
 
-		$fields = implode( ', ', array_map( 'wordpoints_escape_mysql_identifier', $fields ) );
+		$fields = implode(', ', array_map('wordpoints_escape_mysql_identifier', $fields));
 
 		$this->select = "SELECT {$fields}";
 	}
@@ -487,13 +487,13 @@ 
 	 *
 	 * @return mixed The validated value, or false if invalid.
 	 */
-	protected function validate_value( $value, $validators ) {
+	protected function validate_value($value, $validators) {
 
-		foreach ( $validators as $validator ) {
+		foreach ($validators as $validator) {
 
-			$value = call_user_func_array( $validator, array( &$value ) );
+			$value = call_user_func_array($validator, array(&$value));
 
-			if ( false === $value ) {
+			if (false === $value) {
 				break;
 			}
 		}
@@ -511,14 +511,14 @@ 
 	 *
 	 * @return array The validated values, with any invalid ones removed.
 	 */
-	protected function validate_values( $values, $validators ) {
+	protected function validate_values($values, $validators) {
 
-		foreach ( $values as $index => $value ) {
+		foreach ($values as $index => $value) {
 
-			$value = $this->validate_value( $value, $validators );
+			$value = $this->validate_value($value, $validators);
 
-			if ( false === $value ) {
-				unset( $values[ $index ] );
+			if (false === $value) {
+				unset($values[$index]);
 			}
 		}
 
@@ -537,9 +537,9 @@ 
 	 *
 	 * @return int|false The validated value or false.
 	 */
-	protected function validate_unsigned_column( $value ) {
+	protected function validate_unsigned_column($value) {
 
-		if ( false !== wordpoints_int( $value ) && $value >= 0 ) {
+		if (false !== wordpoints_int($value) && $value >= 0) {
 			return $value;
 		}
 
@@ -555,14 +555,14 @@ 
 	 *
 	 * @return callable[] The validation functions.
 	 */
-	protected function get_validators_for_column( $data ) {
+	protected function get_validators_for_column($data) {
 
 		$validators = array();
 
 		// Default validators for integer columns.
-		if ( '%d' === $data['format'] ) {
-			if ( ! empty( $data['unsigned'] ) ) {
-				$validators[] = array( $this, 'validate_unsigned_column' );
+		if ('%d' === $data['format']) {
+			if ( ! empty($data['unsigned'])) {
+				$validators[] = array($this, 'validate_unsigned_column');
 			} else {
 				$validators[] = 'wordpoints_int';
 			}
@@ -579,15 +579,15 @@ 
 	 * @param string $column The column name.
 	 * @param array  $data   The column data.
 	 */
-	protected function prepare_column_where( $column, $data ) {
+	protected function prepare_column_where($column, $data) {
 
 		// If a single value has been supplied for the column, it takes precedence.
-		if ( isset( $this->args[ $column ] ) ) {
-			$this->prepare_column( $column, $data );
-		} elseif ( isset( $this->args[ "{$column}__in" ] ) ) {
-			$this->prepare_column__in( $column, $data );
-		} elseif ( isset( $this->args[ "{$column}__not_in" ] ) ) {
-			$this->prepare_column__in( $column, $data, 'NOT IN' );
+		if (isset($this->args[$column])) {
+			$this->prepare_column($column, $data);
+		} elseif (isset($this->args["{$column}__in"])) {
+			$this->prepare_column__in($column, $data);
+		} elseif (isset($this->args["{$column}__not_in"])) {
+			$this->prepare_column__in($column, $data, 'NOT IN');
 		}
 	}
 
@@ -599,29 +599,29 @@ 
 	 * @param string $column The name of the column
 	 * @param array  $data   The column data.
 	 */
-	protected function prepare_column( $column, $data ) {
+	protected function prepare_column($column, $data) {
 
 		global $wpdb;
 
 		if (
-			isset( $data['values'] )
-			&& ! in_array( $this->args[ $column ], $data['values'], true )
+			isset($data['values'])
+			&& ! in_array($this->args[$column], $data['values'], true)
 		) {
 			return;
 		}
 
 		$value = $this->validate_value(
-			$this->args[ $column ]
-			, $this->get_validators_for_column( $data )
+			$this->args[$column]
+			, $this->get_validators_for_column($data)
 		);
 
-		if ( false === $value ) {
+		if (false === $value) {
 			return;
 		}
 
-		$compare = $this->get_comparator_for_column( $column, $data );
+		$compare = $this->get_comparator_for_column($column, $data);
 
-		$column = wordpoints_escape_mysql_identifier( $column );
+		$column = wordpoints_escape_mysql_identifier($column);
 
 		$this->wheres[] = $wpdb->prepare( // WPCS: unprepared SQL OK.
 			"{$column} {$compare} {$data['format']}"
@@ -639,23 +639,23 @@ 
 	 *
 	 * @return string The comparator for the column.
 	 */
-	protected function get_comparator_for_column( $column, $data ) {
+	protected function get_comparator_for_column($column, $data) {
 
-		$comparisons = array( '=', '<', '>', '<>', '!=', '<=', '>=' );
+		$comparisons = array('=', '<', '>', '<>', '!=', '<=', '>=');
 
 		// MySQL doesn't support LIKE and NOT LIKE for int columns.
 		// See https://stackoverflow.com/q/8422455/1924128
-		if ( '%s' === $data['format'] ) {
-			$comparisons = array_merge( $comparisons, array( 'LIKE', 'NOT LIKE' ) );
+		if ('%s' === $data['format']) {
+			$comparisons = array_merge($comparisons, array('LIKE', 'NOT LIKE'));
 		}
 
 		$comparator = '=';
 
 		if (
-			isset( $this->args[ "{$column}__compare" ] )
-			&& in_array( $this->args[ "{$column}__compare" ], $comparisons, true )
+			isset($this->args["{$column}__compare"])
+			&& in_array($this->args["{$column}__compare"], $comparisons, true)
 		) {
-			$comparator = $this->args[ "{$column}__compare" ];
+			$comparator = $this->args["{$column}__compare"];
 		}
 
 		return $comparator;
@@ -670,36 +670,36 @@ 
 	 * @param array  $data   The column data.
 	 * @param string $type   The type of IN clause, IN or NOT IN.
 	 */
-	protected function prepare_column__in( $column, $data, $type = 'IN' ) {
+	protected function prepare_column__in($column, $data, $type = 'IN') {
 
-		$key = "{$column}__" . strtolower( str_replace( ' ', '_', $type ) );
+		$key = "{$column}__" . strtolower(str_replace(' ', '_', $type));
 
-		if ( empty( $this->args[ $key ] ) || ! is_array( $this->args[ $key ] ) ) {
+		if (empty($this->args[$key]) || ! is_array($this->args[$key])) {
 			return;
 		}
 
-		$values = $this->args[ $key ];
+		$values = $this->args[$key];
 
-		if ( isset( $data['values'] ) ) {
-			$values = array_intersect( $values, $data['values'] );
+		if (isset($data['values'])) {
+			$values = array_intersect($values, $data['values']);
 		} else {
 			$values = $this->validate_values(
 				$values
-				, $this->get_validators_for_column( $data )
+				, $this->get_validators_for_column($data)
 			);
 		}
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return;
 		}
 
-		$in = wordpoints_prepare__in( $values, $data['format'] );
+		$in = wordpoints_prepare__in($values, $data['format']);
 
-		if ( false === $in ) {
+		if (false === $in) {
 			return;
 		}
 
-		$column = wordpoints_escape_mysql_identifier( $column );
+		$column = wordpoints_escape_mysql_identifier($column);
 
 		$this->wheres[] = "{$column} {$type} ({$in})";
 	}
@@ -713,19 +713,19 @@ 
 
 		$this->wheres = array();
 
-		foreach ( $this->columns as $column => $data ) {
+		foreach ($this->columns as $column => $data) {
 
-			if ( ! empty( $data['is_date'] ) ) {
-				$this->prepare_date_where( $column );
+			if ( ! empty($data['is_date'])) {
+				$this->prepare_date_where($column);
 			} else {
-				$this->prepare_column_where( $column, $data );
+				$this->prepare_column_where($column, $data);
 			}
 		}
 
 		$this->prepare_meta_where();
 
-		if ( ! empty( $this->wheres ) ) {
-			$this->where = 'WHERE ' . implode( ' AND ', $this->wheres ) . "\n";
+		if ( ! empty($this->wheres)) {
+			$this->where = 'WHERE ' . implode(' AND ', $this->wheres) . "\n";
 		}
 	}
 
@@ -738,32 +738,32 @@ 
 
 		// MySQL doesn't allow for the offset without a limit, so if no limit is set
 		// we can ignore the start arg. See https://stackoverflow.com/a/271650/1924128
-		if ( ! isset( $this->args['limit'] ) ) {
+		if ( ! isset($this->args['limit'])) {
 			return;
 		}
 
-		foreach ( array( 'limit', 'start' ) as $key ) {
+		foreach (array('limit', 'start') as $key) {
 
 			// Save a backup of the arg value since wordpoints_int() is by reference.
-			$arg = $this->args[ $key ];
+			$arg = $this->args[$key];
 
-			if ( false === wordpoints_int( $this->args[ $key ] ) ) {
+			if (false === wordpoints_int($this->args[$key])) {
 
 				_doing_it_wrong(
 					__METHOD__
 					, sprintf(
 						"WordPoints Debug Error: '%s' must be a positive integer, %s given"
-						, esc_html( $key )
-						, esc_html( strval( $arg ) ? $arg : gettype( $arg ) )
+						, esc_html($key)
+						, esc_html(strval($arg) ? $arg : gettype($arg))
 					)
 					, '1.0.0'
 				);
 
-				$this->args[ $key ] = 0;
+				$this->args[$key] = 0;
 			}
 		}
 
-		if ( $this->args['limit'] > 0 && $this->args['start'] >= 0 ) {
+		if ($this->args['limit'] > 0 && $this->args['start'] >= 0) {
 			$this->limit = "LIMIT {$this->args['start']}, {$this->args['limit']}";
 		}
 	}
@@ -775,20 +775,20 @@ 
 	 */
 	protected function prepare_order_by() {
 
-		if ( empty( $this->args['order_by'] ) ) {
+		if (empty($this->args['order_by'])) {
 			return;
 		}
 
 		$order    = $this->args['order'];
 		$order_by = $this->args['order_by'];
 
-		if ( ! in_array( $order, array( 'DESC', 'ASC' ) ) ) {
+		if ( ! in_array($order, array('DESC', 'ASC'))) {
 
-			_doing_it_wrong( __METHOD__, esc_html( "WordPoints Debug Error: invalid 'order' \"{$order}\", possible values are DESC and ASC" ), '1.0.0' );
+			_doing_it_wrong(__METHOD__, esc_html("WordPoints Debug Error: invalid 'order' \"{$order}\", possible values are DESC and ASC"), '1.0.0');
 			$order = 'DESC';
 		}
 
-		if ( 'meta_value' === $order_by ) {
+		if ('meta_value' === $order_by) {
 
 			global $wpdb;
 
@@ -796,9 +796,9 @@ 
 				$wpdb->{"{$this->meta_type}meta"}
 			);
 
-			if ( isset( $this->args['meta_type'] ) ) {
+			if (isset($this->args['meta_type'])) {
 
-				$meta_type = $this->meta_query->get_cast_for_type( $this->args['meta_type'] );
+				$meta_type = $this->meta_query->get_cast_for_type($this->args['meta_type']);
 				$order_by  = "CAST({$meta_table_name}.meta_value AS {$meta_type})";
 
 			} else {
@@ -806,13 +806,13 @@ 
 				$order_by = "{$meta_table_name}.meta_value";
 			}
 
-		} elseif ( isset( $this->columns[ $order_by ] ) ) {
+		} elseif (isset($this->columns[$order_by])) {
 
-			$order_by = wordpoints_escape_mysql_identifier( $order_by );
+			$order_by = wordpoints_escape_mysql_identifier($order_by);
 
 		} else {
 
-			_doing_it_wrong( __METHOD__, esc_html( "WordPoints Debug Error: invalid 'order_by' \"{$order_by}\", possible values are " . implode( ', ', array_keys( $this->columns ) ) ), '1.0.0' );
+			_doing_it_wrong(__METHOD__, esc_html("WordPoints Debug Error: invalid 'order_by' \"{$order_by}\", possible values are " . implode(', ', array_keys($this->columns))), '1.0.0');
 			return;
 		}
 
@@ -826,25 +826,25 @@ 
 	 *
 	 * @param string $column The name of the column.
 	 */
-	protected function prepare_date_where( $column ) {
+	protected function prepare_date_where($column) {
 
 		if (
-			empty( $this->args[ "{$column}_query" ] )
-			|| ! is_array( $this->args[ "{$column}_query" ] )
+			empty($this->args["{$column}_query"])
+			|| ! is_array($this->args["{$column}_query"])
 		) {
 			return;
 		}
 
-		add_filter( 'date_query_valid_columns', array( $this, 'date_query_valid_columns_filter' ) );
+		add_filter('date_query_valid_columns', array($this, 'date_query_valid_columns_filter'));
 
-		$date_query = new WP_Date_Query( $this->args[ "{$column}_query" ], $column );
+		$date_query = new WP_Date_Query($this->args["{$column}_query"], $column);
 		$date_query = $date_query->get_sql();
 
-		if ( ! empty( $date_query ) ) {
-			$this->wheres[] = ltrim( $date_query, ' AND' );
+		if ( ! empty($date_query)) {
+			$this->wheres[] = ltrim($date_query, ' AND');
 		}
 
-		remove_filter( 'date_query_valid_columns', array( $this, 'date_query_valid_columns_filter' ) );
+		remove_filter('date_query_valid_columns', array($this, 'date_query_valid_columns_filter'));
 	}
 
 	/**
@@ -854,7 +854,7 @@ 
 	 */
 	protected function prepare_meta_where() {
 
-		if ( empty( $this->meta_type ) ) {
+		if (empty($this->meta_type)) {
 			return;
 		}
 
@@ -869,12 +869,12 @@ 
 			)
 		);
 
-		if ( empty( $meta_args ) ) {
+		if (empty($meta_args)) {
 			return;
 		}
 
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $meta_args );
+		$this->meta_query->parse_query_vars($meta_args);
 
 		$meta_query = $this->meta_query->get_sql(
 			$this->meta_type
@@ -883,8 +883,8 @@ 
 			, $this
 		);
 
-		if ( ! empty( $meta_query['where'] ) ) {
-			$this->wheres[] = ltrim( $meta_query['where'], ' AND' );
+		if ( ! empty($meta_query['where'])) {
+			$this->wheres[] = ltrim($meta_query['where'], ' AND');
 		}
 
 		$this->meta_join = $meta_query['join'] . "\n";

src/admin/screens/configure-components.php

Spacing +52 added lines, -52 removed lines

@@ -17,62 +17,62 @@ 
 // Show messages and errors.
 //
 
-if ( isset( $_GET['wordpoints_component'], $_GET['_wpnonce'] ) && $wordpoints_components->is_registered( sanitize_key( $_GET['wordpoints_component'] ) ) ) {
+if (isset($_GET['wordpoints_component'], $_GET['_wpnonce']) && $wordpoints_components->is_registered(sanitize_key($_GET['wordpoints_component']))) {
 
-	$component = sanitize_key( $_GET['wordpoints_component'] );
+	$component = sanitize_key($_GET['wordpoints_component']);
 
-	if ( isset( $_GET['message'] ) && wordpoints_verify_nonce( '_wpnonce', "wordpoints_component_message-{$component}" ) ) {
+	if (isset($_GET['message']) && wordpoints_verify_nonce('_wpnonce', "wordpoints_component_message-{$component}")) {
 
-		switch ( (int) $_GET['message'] ) {
+		switch ((int) $_GET['message']) {
 
 			case 1:
-				if ( $wordpoints_components->is_active( $component ) ) {
+				if ($wordpoints_components->is_active($component)) {
 					// translators: Component name.
-					$message = __( 'Component “%s” activated!', 'wordpoints' );
+					$message = __('Component “%s” activated!', 'wordpoints');
 				}
 			break;
 
 			case 2:
-				if ( ! $wordpoints_components->is_active( $component ) ) {
+				if ( ! $wordpoints_components->is_active($component)) {
 					// translators: Component name.
-					$message = __( 'Component “%s” deactivated!', 'wordpoints' );
+					$message = __('Component “%s” deactivated!', 'wordpoints');
 				}
 			break;
 		}
 
-		if ( isset( $message ) ) {
+		if (isset($message)) {
 
 			wordpoints_show_admin_message(
-				esc_html( sprintf( $message, $components[ $component ]['name'] ) )
+				esc_html(sprintf($message, $components[$component]['name']))
 				, 'success'
-				, array( 'dismissible' => true )
+				, array('dismissible' => true)
 			);
 		}
 
-	} elseif ( isset( $_GET['error'] ) && wordpoints_verify_nonce( '_wpnonce', "wordpoints_component_error-{$component}" ) ) {
+	} elseif (isset($_GET['error']) && wordpoints_verify_nonce('_wpnonce', "wordpoints_component_error-{$component}")) {
 
-		switch ( (int) $_GET['error'] ) {
+		switch ((int) $_GET['error']) {
 
 			case 1:
-				if ( ! $wordpoints_components->is_active( $component ) ) {
+				if ( ! $wordpoints_components->is_active($component)) {
 					// translators: Component name.
-					$error = __( 'The component “%s” could not be activated. Please try again.', 'wordpoints' );
+					$error = __('The component “%s” could not be activated. Please try again.', 'wordpoints');
 				}
 			break;
 
 			case 2:
-				if ( $wordpoints_components->is_active( $component ) ) {
+				if ($wordpoints_components->is_active($component)) {
 					// translators: Component name.
-					$error = __( 'The component “%s” could not be deactivated. Please try again.', 'wordpoints' );
+					$error = __('The component “%s” could not be deactivated. Please try again.', 'wordpoints');
 				}
 			break;
 		}
 
-		if ( isset( $error ) ) {
+		if (isset($error)) {
 
 			wordpoints_show_admin_error(
-				esc_html( sprintf( $error, $components[ $component ]['name'] ) )
-				, array( 'dismissible' => true )
+				esc_html(sprintf($error, $components[$component]['name']))
+				, array('dismissible' => true)
 			);
 		}
 	} // End if ( message ) elseif ( error ).
@@ -88,74 +88,74 @@ 
  *
  * @since 1.0.0
  */
-do_action( 'wordpoints_admin_components_top' );
+do_action('wordpoints_admin_components_top');
 
 ?>
 
 <br />
 <table id="wordpoints_components_table" class="widefat">
-	<caption><?php esc_html_e( 'Installed WordPoints components.', 'wordpoints' ); ?></caption>
+	<caption><?php esc_html_e('Installed WordPoints components.', 'wordpoints'); ?></caption>
 	<thead>
 		<tr>
-			<th scope="col"><?php echo esc_html_x( 'Component', 'components table heading', 'wordpoints' ); ?></th>
-			<th scope="col"><?php echo esc_html_x( 'Description', 'components table heading', 'wordpoints' ); ?></th>
-			<th scope="col"><?php echo esc_html_x( 'Version', 'components table heading', 'wordpoints' ); ?></th>
-			<th scope="col"><?php echo esc_html_x( 'Action', 'components table heading', 'wordpoints' ); ?></th>
+			<th scope="col"><?php echo esc_html_x('Component', 'components table heading', 'wordpoints'); ?></th>
+			<th scope="col"><?php echo esc_html_x('Description', 'components table heading', 'wordpoints'); ?></th>
+			<th scope="col"><?php echo esc_html_x('Version', 'components table heading', 'wordpoints'); ?></th>
+			<th scope="col"><?php echo esc_html_x('Action', 'components table heading', 'wordpoints'); ?></th>
 		</tr>
 	</thead>
 
 	<tbody>
-		<?php foreach ( $components as $component ) : ?>
+		<?php foreach ($components as $component) : ?>
 
 		<?php
 
-		if ( $wordpoints_components->is_active( $component['slug'] ) ) {
+		if ($wordpoints_components->is_active($component['slug'])) {
 
 			$action = 'deactivate';
-			$button = __( 'Deactivate', 'wordpoints' );
+			$button = __('Deactivate', 'wordpoints');
 
 		} else {
 
 			$action = 'activate';
-			$button = __( 'Activate', 'wordpoints' );
+			$button = __('Activate', 'wordpoints');
 		}
 
 		?>
 
 		<tr>
 			<td>
-				<?php if ( '' !== $component['component_uri'] ) : ?>
-					<a href="<?php echo esc_url( $component['component_uri'] ); ?>">
+				<?php if ('' !== $component['component_uri']) : ?>
+					<a href="<?php echo esc_url($component['component_uri']); ?>">
 				<?php endif; ?>
-					<?php echo esc_html( $component['name'] ); ?>
-				<?php if ( '' !== $component['component_uri'] ) : ?>
+					<?php echo esc_html($component['name']); ?>
+				<?php if ('' !== $component['component_uri']) : ?>
 					</a>
 				<?php endif; ?>
 			</td>
 			<td>
-				<?php echo wp_kses( $component['description'], 'wordpoints_component_description' ); ?>
-				<?php if ( '' !== $component['author'] ) : ?>
+				<?php echo wp_kses($component['description'], 'wordpoints_component_description'); ?>
+				<?php if ('' !== $component['author']) : ?>
 					&nbsp;|&nbsp;
 					<?php
 					// translators: Author name.
-					echo esc_html( sprintf( __( 'By %s', 'wordpoints' ), '' /* This space intentionally left blank */ ) );
+					echo esc_html(sprintf(__('By %s', 'wordpoints'), '' /* This space intentionally left blank */));
 					?>
-					<?php if ( '' !== $component['author_uri'] ) : ?>
-						<a href="<?php echo esc_url( $component['author_uri'] ); ?>">
+					<?php if ('' !== $component['author_uri']) : ?>
+						<a href="<?php echo esc_url($component['author_uri']); ?>">
 					<?php endif; ?>
-						<?php echo esc_html( $component['author'] ); ?>
-					<?php if ( '' !== $component['author_uri'] ) : ?>
+						<?php echo esc_html($component['author']); ?>
+					<?php if ('' !== $component['author_uri']) : ?>
 						</a>
 					<?php endif; ?>
 				<?php endif; ?>
 			</td>
-			<td><?php echo esc_html( $component['version'] ); ?></td>
+			<td><?php echo esc_html($component['version']); ?></td>
 			<td>
-				<form method="post" name="wordpoints_components_form_<?php echo esc_attr( $component['slug'] ); ?>">
-					<input type="hidden" name="wordpoints_component_action" value="<?php echo esc_attr( $action ); ?>" />
-					<input type="hidden" name="wordpoints_component" value="<?php echo esc_attr( $component['slug'] ); ?>" />
-					<?php wp_nonce_field( "wordpoints_{$action}_component-{$component['slug']}" ); ?>
-					<?php submit_button( $button, "secondary wordpoints-component-{$action}", "wordpoints-component-{$action}_{$component['slug']}", false ); ?>
+				<form method="post" name="wordpoints_components_form_<?php echo esc_attr($component['slug']); ?>">
+					<input type="hidden" name="wordpoints_component_action" value="<?php echo esc_attr($action); ?>" />
+					<input type="hidden" name="wordpoints_component" value="<?php echo esc_attr($component['slug']); ?>" />
+					<?php wp_nonce_field("wordpoints_{$action}_component-{$component['slug']}"); ?>
+					<?php submit_button($button, "secondary wordpoints-component-{$action}", "wordpoints-component-{$action}_{$component['slug']}", false); ?>
 				</form>
 			</td>
 		</tr>
@@ -165,10 +165,10 @@ 
 
 	<tfoot>
 	<tr>
-		<th scope="col"><?php echo esc_html_x( 'Component', 'components table heading', 'wordpoints' ); ?></th>
-		<th scope="col"><?php echo esc_html_x( 'Description', 'components table heading', 'wordpoints' ); ?></th>
-		<th scope="col"><?php echo esc_html_x( 'Version', 'components table heading', 'wordpoints' ); ?></th>
-		<th scope="col"><?php echo esc_html_x( 'Action', 'components table heading', 'wordpoints' ); ?></th>
+		<th scope="col"><?php echo esc_html_x('Component', 'components table heading', 'wordpoints'); ?></th>
+		<th scope="col"><?php echo esc_html_x('Description', 'components table heading', 'wordpoints'); ?></th>
+		<th scope="col"><?php echo esc_html_x('Version', 'components table heading', 'wordpoints'); ?></th>
+		<th scope="col"><?php echo esc_html_x('Action', 'components table heading', 'wordpoints'); ?></th>
 	</tr>
 	</tfoot>
 </table>
@@ -180,6 +180,6 @@ 
  *
  * @since 1.0.0
  */
-do_action( 'wordpoints_admin_components_bottom' );
+do_action('wordpoints_admin_components_bottom');
 
 // EOF

src/admin/screens/modules-load.php

Spacing +163 added lines, -163 removed lines

@@ -9,56 +9,56 @@ 
 
 global $status, $wp_version;
 
-if ( isset( $_POST['clear-recent-list'] ) ) {
+if (isset($_POST['clear-recent-list'])) {
 	$action = 'clear-recent-list';
-} elseif ( isset( $_REQUEST['action'] ) && -1 !== (int) $_REQUEST['action'] ) {
-	$action = sanitize_key( $_REQUEST['action'] );
-} elseif ( isset( $_REQUEST['action2'] ) && -1 !== (int) $_REQUEST['action2'] ) {
-	$action = sanitize_key( $_REQUEST['action2'] );
+} elseif (isset($_REQUEST['action']) && -1 !== (int) $_REQUEST['action']) {
+	$action = sanitize_key($_REQUEST['action']);
+} elseif (isset($_REQUEST['action2']) && -1 !== (int) $_REQUEST['action2']) {
+	$action = sanitize_key($_REQUEST['action2']);
 } else {
 	$action = '';
 }
 
-$page   = ( isset( $_REQUEST['paged'] ) ) ? max( 1, absint( $_REQUEST['paged'] ) ) : 1;
-$module = ( isset( $_REQUEST['module'] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST['module'] ) ) : '';
-$s      = ( isset( $_REQUEST['s'] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ) : '';
+$page   = (isset($_REQUEST['paged'])) ? max(1, absint($_REQUEST['paged'])) : 1;
+$module = (isset($_REQUEST['module'])) ? sanitize_text_field(wp_unslash($_REQUEST['module'])) : '';
+$s      = (isset($_REQUEST['s'])) ? sanitize_text_field(wp_unslash($_REQUEST['s'])) : '';
 
 // Clean up request URI from temporary args for screen options/paging URI's to work as expected.
-$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce' ) );
+$_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'));
 
-$redirect_url = self_admin_url( "admin.php?page=wordpoints_modules&module_status={$status}&paged={$page}&s={$s}" );
+$redirect_url = self_admin_url("admin.php?page=wordpoints_modules&module_status={$status}&paged={$page}&s={$s}");
 
-switch ( $action ) {
+switch ($action) {
 
 	case '': break;
 
 	// Activate a single module.
 	case 'activate':
-		if ( ! current_user_can( 'activate_wordpoints_modules' ) ) {
-			wp_die( esc_html__( 'Sorry, you are not allowed to activate modules for this site.', 'wordpoints' ), '', array( 'response' => 403 ) );
+		if ( ! current_user_can('activate_wordpoints_modules')) {
+			wp_die(esc_html__('Sorry, you are not allowed to activate modules for this site.', 'wordpoints'), '', array('response' => 403));
 		}
 
-		if ( is_multisite() && ! is_network_admin() && is_network_only_wordpoints_module( $module ) ) {
+		if (is_multisite() && ! is_network_admin() && is_network_only_wordpoints_module($module)) {
 
-			wp_safe_redirect( $redirect_url );
+			wp_safe_redirect($redirect_url);
 			exit;
 		}
 
-		check_admin_referer( 'activate-module_' . $module );
+		check_admin_referer('activate-module_' . $module);
 
-		$result = wordpoints_activate_module( $module, self_admin_url( 'admin.php?page=wordpoints_modules&error=true&module=' . $module ), is_network_admin() );
+		$result = wordpoints_activate_module($module, self_admin_url('admin.php?page=wordpoints_modules&error=true&module=' . $module), is_network_admin());
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
-			if ( 'unexpected_output' === $result->get_error_code() ) {
+			if ('unexpected_output' === $result->get_error_code()) {
 
 				wp_safe_redirect(
 					add_query_arg(
 						array(
-							'_error_nonce' => wp_create_nonce( 'module-activation-error_' . $module ),
+							'_error_nonce' => wp_create_nonce('module-activation-error_' . $module),
 							'module' => $module,
 							'error' => true,
-							'charsout' => strlen( $result->get_error_data() ),
+							'charsout' => strlen($result->get_error_data()),
 						)
 						, $redirect_url
 					)
@@ -68,96 +68,96 @@ 
 
 			} else {
 
-				wp_die( wordpoints_sanitize_wp_error( $result ) );
+				wp_die(wordpoints_sanitize_wp_error($result));
 			}
 		}
 
-		if ( ! is_network_admin() ) {
+		if ( ! is_network_admin()) {
 
-			$recent = wordpoints_get_array_option( 'wordpoints_recently_activated_modules' );
-			unset( $recent[ $module ] );
-			update_option( 'wordpoints_recently_activated_modules', $recent );
+			$recent = wordpoints_get_array_option('wordpoints_recently_activated_modules');
+			unset($recent[$module]);
+			update_option('wordpoints_recently_activated_modules', $recent);
 		}
 
-		wp_safe_redirect( add_query_arg( 'activate', 'true', $redirect_url ) );
+		wp_safe_redirect(add_query_arg('activate', 'true', $redirect_url));
 	exit;
 
 	// Activate multiple modules.
 	case 'activate-selected':
-		if ( ! current_user_can( 'activate_wordpoints_modules' ) ) {
-			wp_die( esc_html__( 'Sorry, you are not allowed to activate modules for this site.', 'wordpoints' ), '', array( 'response' => 403 ) );
+		if ( ! current_user_can('activate_wordpoints_modules')) {
+			wp_die(esc_html__('Sorry, you are not allowed to activate modules for this site.', 'wordpoints'), '', array('response' => 403));
 		}
 
-		check_admin_referer( 'bulk-modules' );
+		check_admin_referer('bulk-modules');
 
-		$modules = isset( $_POST['checked'] )
-			? array_map( 'sanitize_text_field', (array) wp_unslash( $_POST['checked'] ) )
+		$modules = isset($_POST['checked'])
+			? array_map('sanitize_text_field', (array) wp_unslash($_POST['checked']))
 			: array();
 
 		// Only activate modules which are not already active.
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 
-			foreach ( $modules as $i => $module ) {
-				if ( is_wordpoints_module_active_for_network( $module ) ) {
-					unset( $modules[ $i ] );
+			foreach ($modules as $i => $module) {
+				if (is_wordpoints_module_active_for_network($module)) {
+					unset($modules[$i]);
 				}
 			}
 
 		} else {
 
-			foreach ( $modules as $i => $module ) {
-				if ( is_wordpoints_module_active( $module ) || is_network_only_wordpoints_module( $module ) ) {
-					unset( $modules[ $i ] );
+			foreach ($modules as $i => $module) {
+				if (is_wordpoints_module_active($module) || is_network_only_wordpoints_module($module)) {
+					unset($modules[$i]);
 				}
 			}
 		}
 
-		if ( empty( $modules ) ) {
-			wp_safe_redirect( $redirect_url );
+		if (empty($modules)) {
+			wp_safe_redirect($redirect_url);
 			exit;
 		}
 
-		$redirect = self_admin_url( 'admin.php?page=wordpoints_modules&error=true' );
+		$redirect = self_admin_url('admin.php?page=wordpoints_modules&error=true');
 
-		foreach ( $modules as $module ) {
+		foreach ($modules as $module) {
 
-			wordpoints_activate_module( $module, add_query_arg( 'module', $module, $redirect ), is_network_admin() );
+			wordpoints_activate_module($module, add_query_arg('module', $module, $redirect), is_network_admin());
 		}
 
-		if ( ! is_network_admin() ) {
+		if ( ! is_network_admin()) {
 
-			$recent = wordpoints_get_array_option( 'wordpoints_recently_activated_modules' );
+			$recent = wordpoints_get_array_option('wordpoints_recently_activated_modules');
 
-			foreach ( $modules as $module ) {
-				unset( $recent[ $module ] );
+			foreach ($modules as $module) {
+				unset($recent[$module]);
 			}
 
-			update_option( 'wordpoints_recently_activated_modules', $recent );
+			update_option('wordpoints_recently_activated_modules', $recent);
 		}
 
-		wp_safe_redirect( add_query_arg( 'activate-multi', 'true', $redirect_url ) );
+		wp_safe_redirect(add_query_arg('activate-multi', 'true', $redirect_url));
 	exit;
 
 	// Get the fatal error from a module.
 	case 'error_scrape':
-		if ( ! current_user_can( 'activate_wordpoints_modules' ) ) {
-			wp_die( esc_html__( 'Sorry, you are not allowed to activate modules for this site.', 'wordpoints' ), '', array( 'response' => 403 ) );
+		if ( ! current_user_can('activate_wordpoints_modules')) {
+			wp_die(esc_html__('Sorry, you are not allowed to activate modules for this site.', 'wordpoints'), '', array('response' => 403));
 		}
 
-		check_admin_referer( 'module-activation-error_' . $module );
+		check_admin_referer('module-activation-error_' . $module);
 
-		$valid = wordpoints_validate_module( $module );
+		$valid = wordpoints_validate_module($module);
 
-		if ( is_wp_error( $valid ) ) {
-			wp_die( wordpoints_sanitize_wp_error( $valid ), '', array( 'response' => 400 ) );
+		if (is_wp_error($valid)) {
+			wp_die(wordpoints_sanitize_wp_error($valid), '', array('response' => 400));
 		}
 
 		// Ensure that Fatal errors are displayed.
-		if ( ! WP_DEBUG ) {
-			error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR ); // @codingStandardsIgnoreLine
+		if ( ! WP_DEBUG) {
+			error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR); // @codingStandardsIgnoreLine
 		}
 
-		@ini_set( 'display_errors', true ); // @codingStandardsIgnoreLine
+		@ini_set('display_errors', true); // @codingStandardsIgnoreLine
 
 		/**
 		 * Go back to "sandbox" scope so we get the same errors as before.
@@ -167,119 +167,119 @@ 
 		 *
 		 * @param string $module The base path to the module to error scrape.
 		 */
-		function wordpoints_module_sandbox_scrape( $module ) {
+		function wordpoints_module_sandbox_scrape($module) {
 
 			$modules_dir = wordpoints_modules_dir();
-			WordPoints_Module_Paths::register( $modules_dir . '/' . $module );
-			include( $modules_dir . '/' . $module );
+			WordPoints_Module_Paths::register($modules_dir . '/' . $module);
+			include($modules_dir . '/' . $module);
 		}
 
-		wordpoints_module_sandbox_scrape( $module );
+		wordpoints_module_sandbox_scrape($module);
 
 		/**
 		 * @see wordpoints_activate_module()
 		 */
-		do_action( "wordpoints_module_activate-{$module}" );
+		do_action("wordpoints_module_activate-{$module}");
 	exit;
 
 	// Deactivate a module.
 	case 'deactivate':
-		if ( ! current_user_can( 'activate_wordpoints_modules' ) ) {
-			wp_die( esc_html__( 'Sorry, you are not allowed to deactivate modules for this site.', 'wordpoints' ), '', array( 'response' => 403 ) );
+		if ( ! current_user_can('activate_wordpoints_modules')) {
+			wp_die(esc_html__('Sorry, you are not allowed to deactivate modules for this site.', 'wordpoints'), '', array('response' => 403));
 		}
 
-		check_admin_referer( 'deactivate-module_' . $module );
+		check_admin_referer('deactivate-module_' . $module);
 
-		if ( ! is_network_admin() && is_wordpoints_module_active_for_network( $module ) ) {
-			wp_safe_redirect( $redirect_url );
+		if ( ! is_network_admin() && is_wordpoints_module_active_for_network($module)) {
+			wp_safe_redirect($redirect_url);
 			exit;
 		}
 
-		wordpoints_deactivate_modules( $module, false, is_network_admin() );
+		wordpoints_deactivate_modules($module, false, is_network_admin());
 
-		if ( ! is_network_admin() ) {
-			update_option( 'wordpoints_recently_activated_modules', array( $module => time() ) + wordpoints_get_array_option( 'wordpoints_recently_activated_modules' ) );
+		if ( ! is_network_admin()) {
+			update_option('wordpoints_recently_activated_modules', array($module => time()) + wordpoints_get_array_option('wordpoints_recently_activated_modules'));
 		}
 
-		$redirect_url = add_query_arg( 'deactivate', 'true', $redirect_url );
+		$redirect_url = add_query_arg('deactivate', 'true', $redirect_url);
 
-		if ( headers_sent() ) {
-			echo '<meta http-equiv="refresh" content="0;url=' . esc_url( $redirect_url ) . '" />';
+		if (headers_sent()) {
+			echo '<meta http-equiv="refresh" content="0;url=' . esc_url($redirect_url) . '" />';
 		} else {
-			wp_safe_redirect( $redirect_url );
+			wp_safe_redirect($redirect_url);
 		}
 	exit;
 
 	// Deactivate multiple modules.
 	case 'deactivate-selected':
-		if ( ! current_user_can( 'activate_wordpoints_modules' ) ) {
-			wp_die( esc_html__( 'Sorry, you are not allowed to deactivate modules for this site.', 'wordpoints' ), '', array( 'response' => 403 ) );
+		if ( ! current_user_can('activate_wordpoints_modules')) {
+			wp_die(esc_html__('Sorry, you are not allowed to deactivate modules for this site.', 'wordpoints'), '', array('response' => 403));
 		}
 
-		check_admin_referer( 'bulk-modules' );
+		check_admin_referer('bulk-modules');
 
-		$modules = isset( $_POST['checked'] )
-			? array_map( 'sanitize_text_field', (array) wp_unslash( $_POST['checked'] ) )
+		$modules = isset($_POST['checked'])
+			? array_map('sanitize_text_field', (array) wp_unslash($_POST['checked']))
 			: array();
 
-		$network_modules = array_filter( $modules, 'is_wordpoints_module_active_for_network' );
+		$network_modules = array_filter($modules, 'is_wordpoints_module_active_for_network');
 
 		// Do not deactivate modules which are already deactivated.
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			$modules = $network_modules;
 		} else {
-			$modules = array_diff( array_filter( $modules, 'is_wordpoints_module_active' ), $network_modules );
+			$modules = array_diff(array_filter($modules, 'is_wordpoints_module_active'), $network_modules);
 		}
 
-		if ( empty( $modules ) ) {
-			wp_safe_redirect( $redirect_url );
+		if (empty($modules)) {
+			wp_safe_redirect($redirect_url);
 			exit;
 		}
 
-		wordpoints_deactivate_modules( $modules, false, is_network_admin() );
+		wordpoints_deactivate_modules($modules, false, is_network_admin());
 
-		if ( ! is_network_admin() ) {
+		if ( ! is_network_admin()) {
 
 			$deactivated = array();
 
-			foreach ( $modules as $module ) {
-				$deactivated[ $module ] = time();
+			foreach ($modules as $module) {
+				$deactivated[$module] = time();
 			}
 
-			update_option( 'wordpoints_recently_activated_modules', $deactivated + wordpoints_get_array_option( 'wordpoints_recently_activated_modules' ) );
+			update_option('wordpoints_recently_activated_modules', $deactivated + wordpoints_get_array_option('wordpoints_recently_activated_modules'));
 		}
 
-		wp_safe_redirect( add_query_arg( 'deactivate-multi', 'true', $redirect_url ) );
+		wp_safe_redirect(add_query_arg('deactivate-multi', 'true', $redirect_url));
 	exit;
 
 	// Delete multiple modules.
 	case 'delete-selected':
-		if ( ! current_user_can( 'delete_wordpoints_modules' ) ) {
-			wp_die( esc_html__( 'Sorry, you are not allowed to delete modules for this site.', 'wordpoints' ), '', array( 'response' => 403 ) );
+		if ( ! current_user_can('delete_wordpoints_modules')) {
+			wp_die(esc_html__('Sorry, you are not allowed to delete modules for this site.', 'wordpoints'), '', array('response' => 403));
 		}
 
-		check_admin_referer( 'bulk-modules' );
+		check_admin_referer('bulk-modules');
 
 		// $_POST = from the module form; $_GET = from the FTP details screen.
-		$modules = isset( $_REQUEST['checked'] )
-			? array_map( 'sanitize_text_field', (array) wp_unslash( $_REQUEST['checked'] ) )
+		$modules = isset($_REQUEST['checked'])
+			? array_map('sanitize_text_field', (array) wp_unslash($_REQUEST['checked']))
 			: array();
 
-		if ( empty( $modules ) ) {
-			wp_safe_redirect( $redirect_url );
+		if (empty($modules)) {
+			wp_safe_redirect($redirect_url);
 			exit;
 		}
 
 		// Do not allow to delete activated modules.
-		foreach ( $modules as $key => $module ) {
+		foreach ($modules as $key => $module) {
 
-			if ( is_wordpoints_module_active( $module ) ) {
-				unset( $modules[ $key ] );
+			if (is_wordpoints_module_active($module)) {
+				unset($modules[$key]);
 			}
 		}
 
-		if ( empty( $modules ) ) {
-			wp_safe_redirect( add_query_arg( array( 'error' => 'true', 'main' => 'true' ), $redirect_url ) );
+		if (empty($modules)) {
+			wp_safe_redirect(add_query_arg(array('error' => 'true', 'main' => 'true'), $redirect_url));
 			exit;
 		}
 
@@ -287,9 +287,9 @@ 
 
 		$parent_file = 'admin.php';
 
-		if ( ! isset( $_REQUEST['verify-delete'] ) ) {
+		if ( ! isset($_REQUEST['verify-delete'])) {
 
-			wp_enqueue_script( 'jquery' );
+			wp_enqueue_script('jquery');
 			require_once ABSPATH . 'wp-admin/admin-header.php';
 
 			?>
@@ -303,19 +303,19 @@ 
 				$files_to_delete = array();
 				$have_non_network_modules = false;
 
-				foreach ( $modules as $module ) {
+				foreach ($modules as $module) {
 
-					if ( '.' === dirname( $module ) ) {
+					if ('.' === dirname($module)) {
 
 						$files_to_delete[] = $module_dir . '/' . $module;
-						$data = wordpoints_get_module_data( $module_dir . '/' . $module );
+						$data = wordpoints_get_module_data($module_dir . '/' . $module);
 
-						if ( ! empty( $data ) ) {
+						if ( ! empty($data)) {
 
-							$module_info[ $module ] = $data;
-							$module_info[ $module ]['is_uninstallable'] = is_uninstallable_wordpoints_module( $module );
+							$module_info[$module] = $data;
+							$module_info[$module]['is_uninstallable'] = is_uninstallable_wordpoints_module($module);
 
-							if ( ! $module_info[ $module ]['network'] ) {
+							if ( ! $module_info[$module]['network']) {
 								$have_non_network_modules = true;
 							}
 						}
@@ -323,21 +323,21 @@ 
 					} else {
 
 						// Locate all the files in that folder.
-						$files = list_files( $module_dir . '/' . dirname( $module ) );
+						$files = list_files($module_dir . '/' . dirname($module));
 
-						if ( $files ) {
-							$files_to_delete = array_merge( $files_to_delete, $files );
+						if ($files) {
+							$files_to_delete = array_merge($files_to_delete, $files);
 						}
 
 						// Get modules list from that folder.
-						$folder_modules = wordpoints_get_modules( '/' . dirname( $module ) );
+						$folder_modules = wordpoints_get_modules('/' . dirname($module));
 
-						foreach ( $folder_modules as $module_file => $data ) {
+						foreach ($folder_modules as $module_file => $data) {
 
-							$module_info[ $module_file ] = $data;
-							$module_info[ $module_file ]['is_uninstallable'] = is_uninstallable_wordpoints_module( $module );
+							$module_info[$module_file] = $data;
+							$module_info[$module_file]['is_uninstallable'] = is_uninstallable_wordpoints_module($module);
 
-							if ( ! $module_info[ $module_file ]['network'] ) {
+							if ( ! $module_info[$module_file]['network']) {
 								$have_non_network_modules = true;
 							}
 						}
@@ -346,13 +346,13 @@ 
 
 				} // End foreach( $modules ).
 
-				$modules_to_delete = count( $module_info );
+				$modules_to_delete = count($module_info);
 
-				echo '<h1>' . esc_html( _n( 'Delete module', 'Delete modules', $modules_to_delete, 'wordpoints' ) ) . '</h1>';
+				echo '<h1>' . esc_html(_n('Delete module', 'Delete modules', $modules_to_delete, 'wordpoints')) . '</h1>';
 
-				if ( $have_non_network_modules && is_network_admin() ) {
+				if ($have_non_network_modules && is_network_admin()) {
 					wordpoints_show_admin_message(
-						'<strong>' . esc_html__( 'Caution:', 'wordpoints' ) . '</strong>'
+						'<strong>' . esc_html__('Caution:', 'wordpoints') . '</strong>'
 							. esc_html(
 								_n(
 									'This module may be active on other sites in the network.'
@@ -367,25 +367,25 @@ 
 
 				?>
 
-				<p><?php echo esc_html( _n( 'You are about to remove the following module:', 'You are about to remove the following modules:', $modules_to_delete, 'wordpoints' ) ); ?></p>
+				<p><?php echo esc_html(_n('You are about to remove the following module:', 'You are about to remove the following modules:', $modules_to_delete, 'wordpoints')); ?></p>
 					<ul class="ul-disc">
 
 						<?php
 
 						$data_to_delete = false;
 
-						foreach ( $module_info as $module ) {
+						foreach ($module_info as $module) {
 
-							if ( $module['is_uninstallable'] ) {
+							if ($module['is_uninstallable']) {
 
 								// translators: 1. Module name; 2. Module author.
-								echo '<li>', wp_kses( sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)', 'wordpoints' ), esc_html( $module['name'] ), esc_html( $module['author_name'] ) ), array( 'strong' => array(), 'em' => array() ) ), '</li>';
+								echo '<li>', wp_kses(sprintf(__('<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)', 'wordpoints'), esc_html($module['name']), esc_html($module['author_name'])), array('strong' => array(), 'em' => array())), '</li>';
 								$data_to_delete = true;
 
 							} else {
 
 								// translators: 1. Module name; 2. Module author.
-								echo '<li>', wp_kses( sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em>', 'wordpoints' ), esc_html( $module['name'] ), esc_html( $module['author_name'] ) ), array( 'strong' => array(), 'em' => array() ) ), '</li>';
+								echo '<li>', wp_kses(sprintf(__('<strong>%1$s</strong> by <em>%2$s</em>', 'wordpoints'), esc_html($module['name']), esc_html($module['author_name'])), array('strong' => array(), 'em' => array())), '</li>';
 							}
 						}
 
@@ -395,10 +395,10 @@ 
 				<p>
 					<?php
 
-					if ( $data_to_delete ) {
-						esc_html_e( 'Are you sure you wish to delete these files and data?', 'wordpoints' );
+					if ($data_to_delete) {
+						esc_html_e('Are you sure you wish to delete these files and data?', 'wordpoints');
 					} else {
-						esc_html_e( 'Are you sure you wish to delete these files?', 'wordpoints' );
+						esc_html_e('Are you sure you wish to delete these files?', 'wordpoints');
 					}
 
 					?>
@@ -407,21 +407,21 @@ 
 				<form method="post" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
 					<input type="hidden" name="action" value="delete-selected" />
-					<?php foreach ( (array) $modules as $module ) : ?>
-						<input type="hidden" name="checked[]" value="<?php echo esc_attr( $module ); ?>" />
+					<?php foreach ((array) $modules as $module) : ?>
+						<input type="hidden" name="checked[]" value="<?php echo esc_attr($module); ?>" />
 					<?php endforeach; ?>
-					<?php wp_nonce_field( 'bulk-modules' ) ?>
-					<?php submit_button( $data_to_delete ? __( 'Yes, Delete these files and data', 'wordpoints' ) : __( 'Yes, Delete these files', 'wordpoints' ), 'button', 'submit', false ); ?>
+					<?php wp_nonce_field('bulk-modules') ?>
+					<?php submit_button($data_to_delete ? __('Yes, Delete these files and data', 'wordpoints') : __('Yes, Delete these files', 'wordpoints'), 'button', 'submit', false); ?>
 				</form>
-				<form method="post" action="<?php echo esc_url( wp_get_referer() ); ?>" style="display:inline;">
-					<?php submit_button( __( 'No, Return me to the module list', 'wordpoints' ), 'button', 'submit', false ); ?>
+				<form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
+					<?php submit_button(__('No, Return me to the module list', 'wordpoints'), 'button', 'submit', false); ?>
 				</form>
 
-				<p><a href="#" onclick="jQuery('#files-list').toggle(); return false;"><?php esc_html_e( 'Click to view entire list of files which will be deleted', 'wordpoints' ); ?></a></p>
+				<p><a href="#" onclick="jQuery('#files-list').toggle(); return false;"><?php esc_html_e('Click to view entire list of files which will be deleted', 'wordpoints'); ?></a></p>
 				<div id="files-list" class="hidden">
 					<ul class="code">
-						<?php foreach ( (array) $files_to_delete as $file ) : ?>
-							<li><?php echo esc_html( str_replace( $module_dir, '', $file ) ); ?></li>
+						<?php foreach ((array) $files_to_delete as $file) : ?>
+							<li><?php echo esc_html(str_replace($module_dir, '', $file)); ?></li>
 						<?php endforeach; ?>
 					</ul>
 				</div>
@@ -434,17 +434,17 @@ 
 
 		}  // End if ( ! isset( $_REQUEST['verify-delete'] ) ).
 
-		$delete_result = wordpoints_delete_modules( $modules );
+		$delete_result = wordpoints_delete_modules($modules);
 
 		// Store the result in a cache rather than a URL param due to object type & length
-		set_transient( 'wordpoints_modules_delete_result_' . get_current_user_id(), $delete_result );
+		set_transient('wordpoints_modules_delete_result_' . get_current_user_id(), $delete_result);
 
-		wp_safe_redirect( add_query_arg( 'deleted', 'true', $redirect_url ) );
+		wp_safe_redirect(add_query_arg('deleted', 'true', $redirect_url));
 	exit;
 
 	case 'clear-recent-list':
-		if ( ! is_network_admin() ) {
-			update_option( 'wordpoints_recently_activated_modules', array() );
+		if ( ! is_network_admin()) {
+			update_option('wordpoints_recently_activated_modules', array());
 		}
 	break;
 
@@ -454,56 +454,56 @@ 
 		 *
 		 * @since 1.1.0
 		 */
-		do_action( "wordpoints_modules_screen-{$action}" );
+		do_action("wordpoints_modules_screen-{$action}");
 
 } // End switch ( $action ).
 
-add_screen_option( 'per_page', array( 'default' => 999 ) );
+add_screen_option('per_page', array('default' => 999));
 
 $screen = get_current_screen();
 
 $screen->add_help_tab(
 	array(
 		'id'		=> 'overview',
-		'title'		=> __( 'Overview', 'wordpoints' ),
+		'title'		=> __('Overview', 'wordpoints'),
 		'content'	=>
-			'<p>' . esc_html__( 'Modules extend and expand the functionality of WordPoints. Once a module is installed, you may activate it or deactivate it here.', 'wordpoints' ) . '</p>' .
+			'<p>' . esc_html__('Modules extend and expand the functionality of WordPoints. Once a module is installed, you may activate it or deactivate it here.', 'wordpoints') . '</p>' .
 			// translators: 1. URL of module directory on WordPoints.org; 2. URL of Install Module admin screen; 3. Directory name.
-			'<p>' . wp_kses( sprintf( __( 'You can find modules for your site by by browsing the <a href="%1$s">WordPoints Module Directory</a>. To install a module you generally just need to <a href="%2$s">upload the module file</a> into your %3$s directory. Once a module has been installed, you can activate it here.', 'wordpoints' ), 'https://wordpoints.org/modules/', esc_url( self_admin_url( 'admin.php?page=wordpoints_install_modules' ) ), '<code>/wp-content/wordpoints-modules</code>' ), array( 'a' => array( 'href' => true, 'target' => true ), 'code' => array() ) ) . '</p>',
+			'<p>' . wp_kses(sprintf(__('You can find modules for your site by by browsing the <a href="%1$s">WordPoints Module Directory</a>. To install a module you generally just need to <a href="%2$s">upload the module file</a> into your %3$s directory. Once a module has been installed, you can activate it here.', 'wordpoints'), 'https://wordpoints.org/modules/', esc_url(self_admin_url('admin.php?page=wordpoints_install_modules')), '<code>/wp-content/wordpoints-modules</code>'), array('a' => array('href' => true, 'target' => true), 'code' => array())) . '</p>',
 	)
 );
 
 $screen->add_help_tab(
 	array(
 		'id'		=> 'compatibility-problems',
-		'title'		=> __( 'Troubleshooting', 'wordpoints' ),
+		'title'		=> __('Troubleshooting', 'wordpoints'),
 		'content'	=>
-			'<p>' . esc_html__( 'Most of the time, modules play nicely with the core of WordPoints and with other modules. Sometimes, though, a module&#8217;s code will get in the way of another module, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your modules and re-activating them in various combinations until you isolate which one(s) caused the issue.', 'wordpoints' ) . '</p>' .
+			'<p>' . esc_html__('Most of the time, modules play nicely with the core of WordPoints and with other modules. Sometimes, though, a module&#8217;s code will get in the way of another module, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your modules and re-activating them in various combinations until you isolate which one(s) caused the issue.', 'wordpoints') . '</p>' .
 			// translators: Directory name.
-			'<p>' . sprintf( esc_html__( 'If something goes wrong with a module and you can&#8217;t use WordPoints, delete or rename that file in the %s directory and it will be automatically deactivated.', 'wordpoints' ), '<code>' . esc_html( wordpoints_modules_dir() ) . '</code>' ) . '</p>', // XSS OK WPCS
+			'<p>' . sprintf(esc_html__('If something goes wrong with a module and you can&#8217;t use WordPoints, delete or rename that file in the %s directory and it will be automatically deactivated.', 'wordpoints'), '<code>' . esc_html(wordpoints_modules_dir()) . '</code>') . '</p>', // XSS OK WPCS
 	)
 );
 
 $screen->set_help_sidebar(
-	'<p><strong>' . esc_html__( 'For more information:', 'wordpoints' ) . '</strong></p>
-	<p><a href="https://wordpoints.org/developer-guide/modules/">' . esc_html__( 'Developer Documentation', 'wordpoints' ) . '</a></p>
-	<p><a href="https://wordpress.org/support/plugin/wordpoints">' . esc_html__( 'Support Forums', 'wordpoints' ) . '</a></p>'
+	'<p><strong>' . esc_html__('For more information:', 'wordpoints') . '</strong></p>
+	<p><a href="https://wordpoints.org/developer-guide/modules/">' . esc_html__('Developer Documentation', 'wordpoints') . '</a></p>
+	<p><a href="https://wordpress.org/support/plugin/wordpoints">' . esc_html__('Support Forums', 'wordpoints') . '</a></p>'
 );
 
 register_column_headers(
 	$screen
 	, array(
 		'cb'          => '<input type="checkbox" />',
-		'name'        => _x( 'Module', 'modules table heading', 'wordpoints' ),
-		'description' => _x( 'Description', 'modules table heading', 'wordpoints' ),
+		'name'        => _x('Module', 'modules table heading', 'wordpoints'),
+		'description' => _x('Description', 'modules table heading', 'wordpoints'),
 	)
 );
 
 $screen->set_screen_reader_content(
 	array(
-		'heading_views'      => __( 'Filter modules list', 'wordpoints' ),
-		'heading_pagination' => __( 'Modules list navigation', 'wordpoints' ),
-		'heading_list'       => __( 'Modules list', 'wordpoints' ),
+		'heading_views'      => __('Filter modules list', 'wordpoints'),
+		'heading_pagination' => __('Modules list navigation', 'wordpoints'),
+		'heading_list'       => __('Modules list', 'wordpoints'),
 	)
 );