WordPoints / wordpoints

src/admin/screens/configure.php

Spacing +5 added lines, -5 removed lines

@@ -30,16 +30,16 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_admin_configure_head' );
+		do_action('wordpoints_admin_configure_head');
 
 		wordpoints_admin_show_tabs(
 			array(
-				'general'    => __( 'General Settings', 'wordpoints' ),
-				'components' => __( 'Components', 'wordpoints' ),
+				'general'    => __('General Settings', 'wordpoints'),
+				'components' => __('Components', 'wordpoints'),
 			)
 		);
 
-		if ( 'components' === wordpoints_admin_get_current_tab() ) {
+		if ('components' === wordpoints_admin_get_current_tab()) {
 			/**
 			 * The Components screen.
 			 *
@@ -60,7 +60,7 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_admin_configure_foot' );
+		do_action('wordpoints_admin_configure_foot');
 
 		?>
 

src/admin/includes/filters.php

Spacing +19 added lines, -19 removed lines

@@ -7,37 +7,37 @@
  * @since 2.1.0
  */
 
-add_action( 'wordpoints_init_app-apps', 'wordpoints_hooks_register_admin_apps' );
+add_action('wordpoints_init_app-apps', 'wordpoints_hooks_register_admin_apps');
 
-add_action( 'admin_init', 'wordpoints_hooks_admin_ajax' );
-add_action( 'admin_init', 'wordpoints_register_admin_scripts' );
+add_action('admin_init', 'wordpoints_hooks_admin_ajax');
+add_action('admin_init', 'wordpoints_register_admin_scripts');
 
-add_filter( 'script_loader_tag', 'wordpoints_script_templates_filter', 10, 2 );
+add_filter('script_loader_tag', 'wordpoints_script_templates_filter', 10, 2);
 
-add_action( 'admin_menu', 'wordpoints_admin_menu' );
-add_action( 'network_admin_menu', 'wordpoints_admin_menu' );
+add_action('admin_menu', 'wordpoints_admin_menu');
+add_action('network_admin_menu', 'wordpoints_admin_menu');
 
-add_action( 'load-wordpoints_page_wordpoints_modules', 'wordpoints_admin_screen_modules_load' );
-add_action( 'load-toplevel_page_wordpoints_modules', 'wordpoints_admin_screen_modules_load' );
+add_action('load-wordpoints_page_wordpoints_modules', 'wordpoints_admin_screen_modules_load');
+add_action('load-toplevel_page_wordpoints_modules', 'wordpoints_admin_screen_modules_load');
 
-add_action( 'load-toplevel_page_wordpoints_configure', 'wordpoints_admin_screen_configure_load' );
+add_action('load-toplevel_page_wordpoints_configure', 'wordpoints_admin_screen_configure_load');
 
-add_action( 'load-toplevel_page_wordpoints_configure', 'wordpoints_admin_activate_components' );
+add_action('load-toplevel_page_wordpoints_configure', 'wordpoints_admin_activate_components');
 
-add_action( 'wordpoints_install_modules-upload', 'wordpoints_install_modules_upload' );
+add_action('wordpoints_install_modules-upload', 'wordpoints_install_modules_upload');
 
-add_action( 'update-custom_upload-wordpoints-module', 'wordpoints_upload_module_zip' );
+add_action('update-custom_upload-wordpoints-module', 'wordpoints_upload_module_zip');
 
-add_action( 'upgrader_source_selection', 'wordpoints_plugin_upload_error_filter', 5 );
-add_action( 'upgrader_source_selection', 'wordpoints_plugin_upload_error_filter', 20 );
+add_action('upgrader_source_selection', 'wordpoints_plugin_upload_error_filter', 5);
+add_action('upgrader_source_selection', 'wordpoints_plugin_upload_error_filter', 20);
 
-add_action( 'wordpoints_admin_configure_foot', 'wordpoints_admin_settings_screen_sidebar', 5 );
+add_action('wordpoints_admin_configure_foot', 'wordpoints_admin_settings_screen_sidebar', 5);
 
-add_action( 'admin_notices', 'wordpoints_admin_notices' );
+add_action('admin_notices', 'wordpoints_admin_notices');
 
-add_action( 'set-screen-option', 'wordpoints_admin_set_screen_option', 10, 3 );
+add_action('set-screen-option', 'wordpoints_admin_set_screen_option', 10, 3);
 
-add_action( 'wp_ajax_nopriv_wordpoints_breaking_module_check', 'wordpoints_admin_ajax_breaking_module_check' );
-add_action( 'wp_ajax_wordpoints-delete-admin-notice-option', 'wordpoints_delete_admin_notice_option' );
+add_action('wp_ajax_nopriv_wordpoints_breaking_module_check', 'wordpoints_admin_ajax_breaking_module_check');
+add_action('wp_ajax_wordpoints-delete-admin-notice-option', 'wordpoints_delete_admin_notice_option');
 
 // EOF

src/admin/includes/class-wordpoints-module-installer-skin.php

Spacing +14 added lines, -14 removed lines

@@ -50,7 +50,7 @@ 
 	 *        @type string $title  Text for H2 title used by WP_Upgrader_Skin::header().
 	 * }
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 
 		$defaults = array(
 			'type'   => 'upload',
@@ -59,11 +59,11 @@ 
 			'title'  => '',
 		);
 
-		$args = array_merge( $defaults, $args );
+		$args = array_merge($defaults, $args);
 
 		$this->type = $args['type'];
 
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	 */
 	public function after() {
 
-		if ( ! $this->upgrader instanceof WordPoints_Module_Installer ) {
+		if ( ! $this->upgrader instanceof WordPoints_Module_Installer) {
 			return;
 		}
 
@@ -81,20 +81,20 @@ 
 
 		$install_actions = array();
 
-		if ( $this->result && ! is_wp_error( $this->result ) ) {
+		if ($this->result && ! is_wp_error($this->result)) {
 
-			if ( is_multisite() && current_user_can( 'manage_network_wordpoints_modules' ) ) {
+			if (is_multisite() && current_user_can('manage_network_wordpoints_modules')) {
 
-				$install_actions['network_activate'] = '<a class="button button-primary" href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=activate&amp;networkwide=1&amp;module=' . urlencode( $module_file ) ), "activate-module_{$module_file}" ) . '" target="_parent">' . esc_html__( 'Network Activate', 'wordpoints' ) . '</a>';
+				$install_actions['network_activate'] = '<a class="button button-primary" href="' . wp_nonce_url(self_admin_url('admin.php?page=wordpoints_modules&action=activate&amp;networkwide=1&amp;module=' . urlencode($module_file)), "activate-module_{$module_file}") . '" target="_parent">' . esc_html__('Network Activate', 'wordpoints') . '</a>';
 
-			} elseif ( current_user_can( 'activate_wordpoints_modules' ) ) {
+			} elseif (current_user_can('activate_wordpoints_modules')) {
 
-				$install_actions['activate_module'] = '<a class="button button-primary" href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=activate&amp;module=' . urlencode( $module_file ) ), "activate-module_{$module_file}" ) . '" target="_parent">' . esc_html__( 'Activate Module', 'wordpoints' ) . '</a>';
+				$install_actions['activate_module'] = '<a class="button button-primary" href="' . wp_nonce_url(self_admin_url('admin.php?page=wordpoints_modules&action=activate&amp;module=' . urlencode($module_file)), "activate-module_{$module_file}") . '" target="_parent">' . esc_html__('Activate Module', 'wordpoints') . '</a>';
 			}
 		}
 
-		$install_actions['modules_page'] = '<a href="' . esc_url( self_admin_url( 'admin.php?page=wordpoints_modules' ) ) . '" target="_parent">' . esc_html__( 'Return to Modules page', 'wordpoints' ) . '</a>';
-		$install_actions['install_page'] = '<a href="' . esc_url( self_admin_url( 'admin.php?page=wordpoints_install_modules' ) ) . '" target="_parent">' . esc_html__( 'Return to Module Installer', 'wordpoints' ) . '</a>';
+		$install_actions['modules_page'] = '<a href="' . esc_url(self_admin_url('admin.php?page=wordpoints_modules')) . '" target="_parent">' . esc_html__('Return to Modules page', 'wordpoints') . '</a>';
+		$install_actions['install_page'] = '<a href="' . esc_url(self_admin_url('admin.php?page=wordpoints_install_modules')) . '" target="_parent">' . esc_html__('Return to Module Installer', 'wordpoints') . '</a>';
 
 		/**
 		 * The install module action links.
@@ -112,10 +112,10 @@ 
 		 * }
 		 * @param string $module_file The main module file.
 		 */
-		$install_actions = apply_filters( 'wordpoints_install_module_complete_actions', $install_actions, $module_file );
+		$install_actions = apply_filters('wordpoints_install_module_complete_actions', $install_actions, $module_file);
 
-		if ( ! empty( $install_actions ) ) {
-			$this->feedback( implode( '&nbsp;&nbsp;', (array) $install_actions ) );
+		if ( ! empty($install_actions)) {
+			$this->feedback(implode('&nbsp;&nbsp;', (array) $install_actions));
 		}
 
 	} // function after()

src/admin/includes/class-wordpoints-modules-list-table.php

Spacing +148 added lines, -148 removed lines

@@ -41,14 +41,14 @@ 
 	 *
 	 * @param array $args {@see WP_List_Table::__construct()}.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 
 		global $status, $page;
 
 		parent::__construct(
 			array(
 				'plural' => 'modules',
-				'screen' => ( isset( $args['screen'] ) ) ? $args['screen'] : null,
+				'screen' => (isset($args['screen'])) ? $args['screen'] : null,
 			)
 		);
 
@@ -56,7 +56,7 @@ 
 
 		$status = 'all';
 
-		$module_statuses = array( 'active', 'inactive', 'recently_activated', 'search' );
+		$module_statuses = array('active', 'inactive', 'recently_activated', 'search');
 
 		/**
 		 * Filter the module statuses on the modules administration panel.
@@ -66,14 +66,14 @@ 
 		 * @param array $statuses The module statuses. The defaults are 'active',
 		 *                        'inactive', 'recently_activated', and 'search'.
 		 */
-		$module_statuses = apply_filters( 'wordpoints_module_statuses', $module_statuses );
+		$module_statuses = apply_filters('wordpoints_module_statuses', $module_statuses);
 
-		if ( isset( $_REQUEST['module_status'] ) && in_array( wp_unslash( $_REQUEST['module_status'] ), $module_statuses ) ) {
-			$status = sanitize_key( $_REQUEST['module_status'] );
+		if (isset($_REQUEST['module_status']) && in_array(wp_unslash($_REQUEST['module_status']), $module_statuses)) {
+			$status = sanitize_key($_REQUEST['module_status']);
 		}
 
-		if ( isset( $_REQUEST['s'] ) ) {
-			$_SERVER['REQUEST_URI'] = add_query_arg( 's', sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ) );
+		if (isset($_REQUEST['s'])) {
+			$_SERVER['REQUEST_URI'] = add_query_arg('s', sanitize_text_field(wp_unslash($_REQUEST['s'])));
 		}
 
 		$page = $this->get_pagenum();
@@ -88,7 +88,7 @@ 
 	 */
 	public function get_table_classes() {
 
-		return array( 'widefat', $this->_args['plural'], 'plugins' );
+		return array('widefat', $this->_args['plural'], 'plugins');
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 */
 	public function ajax_user_can() {
 
-		return current_user_can( 'activate_wordpoints_modules' );
+		return current_user_can('activate_wordpoints_modules');
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 
 		global $status, $modules, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('orderby', 'order', 's'));
 
 		$modules = array(
 			/**
@@ -122,70 +122,70 @@ 
 			 *
 			 * @param array $modules All of the installed modules.
 			 */
-			'all'                => apply_filters( 'all_wordpoints_modules', wordpoints_get_modules() ),
+			'all'                => apply_filters('all_wordpoints_modules', wordpoints_get_modules()),
 			'search'             => array(),
 			'active'             => array(),
 			'inactive'           => array(),
 			'recently_activated' => array(),
 		);
 
-		if ( ! $this->screen->in_admin( 'network' ) ) {
+		if ( ! $this->screen->in_admin('network')) {
 
-			$recently_activated = get_option( 'wordpoints_recently_activated_modules' );
+			$recently_activated = get_option('wordpoints_recently_activated_modules');
 
-			if ( ! is_array( $recently_activated ) ) {
-				add_option( 'wordpoints_recently_activated_modules', array(), '', 'no' );
+			if ( ! is_array($recently_activated)) {
+				add_option('wordpoints_recently_activated_modules', array(), '', 'no');
 				$recently_activated = array();
 			}
 
-			foreach ( $recently_activated as $key => $time ) {
+			foreach ($recently_activated as $key => $time) {
 
-				if ( $time + WEEK_IN_SECONDS < time() ) {
-					unset( $recently_activated[ $key ] );
+				if ($time + WEEK_IN_SECONDS < time()) {
+					unset($recently_activated[$key]);
 				}
 			}
 
-			update_option( 'wordpoints_recently_activated_modules', $recently_activated );
+			update_option('wordpoints_recently_activated_modules', $recently_activated);
 		}
 
-		foreach ( (array) $modules['all'] as $module_file => $module_data ) {
+		foreach ((array) $modules['all'] as $module_file => $module_data) {
 
 			// Filter into individual sections.
-			if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && is_network_only_wordpoints_module( $module_file ) ) {
+			if (is_multisite() && ! $this->screen->in_admin('network') && is_network_only_wordpoints_module($module_file)) {
 
-				unset( $modules['all'][ $module_file ] );
+				unset($modules['all'][$module_file]);
 
-			} elseif ( ! $this->screen->in_admin( 'network' ) && is_wordpoints_module_active_for_network( $module_file ) ) {
+			} elseif ( ! $this->screen->in_admin('network') && is_wordpoints_module_active_for_network($module_file)) {
 
-				unset( $modules['all'][ $module_file ] );
+				unset($modules['all'][$module_file]);
 
 			} elseif (
 				(
-					! $this->screen->in_admin( 'network' )
-					&& is_wordpoints_module_active( $module_file )
+					! $this->screen->in_admin('network')
+					&& is_wordpoints_module_active($module_file)
 				) || (
-					$this->screen->in_admin( 'network' )
-					&& is_wordpoints_module_active_for_network( $module_file )
+					$this->screen->in_admin('network')
+					&& is_wordpoints_module_active_for_network($module_file)
 				)
 			) {
 
-				$modules['active'][ $module_file ] = $module_data;
+				$modules['active'][$module_file] = $module_data;
 
 			} else {
 
 				// Was the module recently activated?
-				if ( ! $this->screen->in_admin( 'network' ) && isset( $recently_activated[ $module_file ] ) ) {
-					$modules['recently_activated'][ $module_file ] = $module_data;
+				if ( ! $this->screen->in_admin('network') && isset($recently_activated[$module_file])) {
+					$modules['recently_activated'][$module_file] = $module_data;
 				}
 
-				$modules['inactive'][ $module_file ] = $module_data;
+				$modules['inactive'][$module_file] = $module_data;
 			}
 		}
 
-		if ( $s ) {
+		if ($s) {
 
 			$status = 'search';
-			$modules['search'] = array_filter( $modules['all'], array( $this, '_search_callback' ) );
+			$modules['search'] = array_filter($modules['all'], array($this, '_search_callback'));
 		}
 
 		/**
@@ -203,42 +203,42 @@ 
 		 *        @type array $recently_activated Modules that were recently active.
 		 * }
 		 */
-		$modules = apply_filters( 'wordpoints_modules_list_table_items', $modules );
+		$modules = apply_filters('wordpoints_modules_list_table_items', $modules);
 
 		// Calculate the totals.
 		$totals = array();
 
-		foreach ( $modules as $type => $list ) {
-			$totals[ $type ] = count( $list );
+		foreach ($modules as $type => $list) {
+			$totals[$type] = count($list);
 		}
 
-		if ( empty( $modules[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) {
+		if (empty($modules[$status]) && ! in_array($status, array('all', 'search'))) {
 			$status = 'all';
 		}
 
 		$this->items = array();
 
-		foreach ( $modules[ $status ] as $module_file => $module_data ) {
+		foreach ($modules[$status] as $module_file => $module_data) {
 
-			$this->items[ $module_file ] = wordpoints_get_module_data( wordpoints_modules_dir() . '/' . $module_file, false );
+			$this->items[$module_file] = wordpoints_get_module_data(wordpoints_modules_dir() . '/' . $module_file, false);
 		}
 
-		$total_this_page = $totals[ $status ];
+		$total_this_page = $totals[$status];
 
-		if ( ! $orderby ) {
+		if ( ! $orderby) {
 			$orderby = 'name';
 		}
 
-		$order = strtoupper( $order );
+		$order = strtoupper($order);
 
-		uasort( $this->items, array( $this, '_order_callback' ) );
+		uasort($this->items, array($this, '_order_callback'));
 
-		$modules_per_page = $this->get_items_per_page( str_replace( '-', '_', $this->screen->id . '_per_page' ), 999 );
+		$modules_per_page = $this->get_items_per_page(str_replace('-', '_', $this->screen->id . '_per_page'), 999);
 
-		$start = ( $page - 1 ) * $modules_per_page;
+		$start = ($page - 1) * $modules_per_page;
 
-		if ( $total_this_page > $modules_per_page ) {
-			$this->items = array_slice( $this->items, $start, $modules_per_page );
+		if ($total_this_page > $modules_per_page) {
+			$this->items = array_slice($this->items, $start, $modules_per_page);
 		}
 
 		$this->set_pagination_args(
@@ -258,17 +258,17 @@ 
 	 *
 	 * @return bool Whether any of the module's data matches the search.
 	 */
-	private function _search_callback( $module_data ) {
+	private function _search_callback($module_data) {
 
 		static $term;
 
-		if ( is_null( $term ) && isset( $_REQUEST['s'] ) ) {
-			$term = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
+		if (is_null($term) && isset($_REQUEST['s'])) {
+			$term = sanitize_text_field(wp_unslash($_REQUEST['s']));
 		}
 
-		foreach ( $module_data as $value ) {
+		foreach ($module_data as $value) {
 
-			if ( false !== stripos( strip_tags( $value ), $term ) ) {
+			if (false !== stripos(strip_tags($value), $term)) {
 				return true;
 			}
 		}
@@ -288,21 +288,21 @@ 
 	 *
 	 * @return int How the modules compare.
 	 */
-	private function _order_callback( $module_a, $module_b ) {
+	private function _order_callback($module_a, $module_b) {
 
 		global $orderby, $order;
 
-		$a = $module_a[ $orderby ];
-		$b = $module_b[ $orderby ];
+		$a = $module_a[$orderby];
+		$b = $module_b[$orderby];
 
-		if ( $a === $b ) {
+		if ($a === $b) {
 			return 0;
 		}
 
-		if ( 'DESC' === $order ) {
-			return strcasecmp( $b, $a );
+		if ('DESC' === $order) {
+			return strcasecmp($b, $a);
 		} else {
-			return strcasecmp( $a, $b );
+			return strcasecmp($a, $b);
 		}
 	}
 
@@ -315,10 +315,10 @@ 
 
 		global $modules;
 
-		if ( ! empty( $modules['all'] ) ) {
-			esc_html_e( 'No modules found.', 'wordpoints' );
+		if ( ! empty($modules['all'])) {
+			esc_html_e('No modules found.', 'wordpoints');
 		} else {
-			esc_html_e( 'There are not any modules installed.', 'wordpoints' );
+			esc_html_e('There are not any modules installed.', 'wordpoints');
 		}
 	}
 
@@ -333,8 +333,8 @@ 
 
 		return array(
 			'cb'          => '<input type="checkbox" />',
-			'name'        => esc_html__( 'Module', 'wordpoints' ),
-			'description' => esc_html__( 'Description', 'wordpoints' ),
+			'name'        => esc_html__('Module', 'wordpoints'),
+			'description' => esc_html__('Description', 'wordpoints'),
 		);
 	}
 
@@ -351,39 +351,39 @@ 
 
 		$status_links = array();
 
-		foreach ( $totals as $type => $count ) {
+		foreach ($totals as $type => $count) {
 
-			if ( ! $count ) {
+			if ( ! $count) {
 				continue;
 			}
 
-			switch ( $type ) {
+			switch ($type) {
 
 				case 'all':
 					// translators: Count.
-					$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'modules', 'wordpoints' );
+					$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'modules', 'wordpoints');
 				break;
 
 				case 'active':
 					// translators: Count.
-					$text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count, 'wordpoints' );
+					$text = _n('Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count, 'wordpoints');
 				break;
 
 				case 'recently_activated':
 					// translators: Count.
-					$text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count, 'wordpoints' );
+					$text = _n('Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count, 'wordpoints');
 				break;
 
 				case 'inactive':
 					// translators: Count.
-					$text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count, 'wordpoints' );
+					$text = _n('Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count, 'wordpoints');
 				break;
 
 				default:
 					$text = $type;
 			}
 
-			if ( 'search' !== $type ) {
+			if ('search' !== $type) {
 
 				/**
 				 * Filter the text for a module status link for the module list table.
@@ -393,13 +393,13 @@ 
 				 * @param string $text  The link text.
 				 * @param int    $count The number of modules matching this filter.
 				 */
-				$text = apply_filters( "wordpoints_modules_status_link_text-{$type}", $text, $count );
+				$text = apply_filters("wordpoints_modules_status_link_text-{$type}", $text, $count);
 
-				$status_links[ $type ] = sprintf(
+				$status_links[$type] = sprintf(
 					"<a href='%s' %s>%s</a>"
-					, esc_url( add_query_arg( 'module_status', $type, self_admin_url( 'admin.php?page=wordpoints_modules' ) ) )
-					, ( $type === $status ) ? ' class="current"' : ''
-					, sprintf( $text, number_format_i18n( $count ) )
+					, esc_url(add_query_arg('module_status', $type, self_admin_url('admin.php?page=wordpoints_modules')))
+					, ($type === $status) ? ' class="current"' : ''
+					, sprintf($text, number_format_i18n($count))
 				);
 			}
 
@@ -428,20 +428,20 @@ 
 
 		$actions = array();
 
-		if ( 'active' !== $status ) {
-			$actions['activate-selected'] = ( $this->screen->in_admin( 'network' ) ) ? esc_html__( 'Network Activate', 'wordpoints' ) : esc_html__( 'Activate', 'wordpoints' );
+		if ('active' !== $status) {
+			$actions['activate-selected'] = ($this->screen->in_admin('network')) ? esc_html__('Network Activate', 'wordpoints') : esc_html__('Activate', 'wordpoints');
 		}
 
-		if ( 'inactive' !== $status && 'recent' !== $status ) {
-			$actions['deactivate-selected'] = ( $this->screen->in_admin( 'network' ) ) ? esc_html__( 'Network Deactivate', 'wordpoints' ) : esc_html__( 'Deactivate', 'wordpoints' );
+		if ('inactive' !== $status && 'recent' !== $status) {
+			$actions['deactivate-selected'] = ($this->screen->in_admin('network')) ? esc_html__('Network Deactivate', 'wordpoints') : esc_html__('Deactivate', 'wordpoints');
 		}
 
 		if (
-			( ! is_multisite() || $this->screen->in_admin( 'network' ) )
-			&& current_user_can( 'delete_wordpoints_modules' )
+			( ! is_multisite() || $this->screen->in_admin('network'))
+			&& current_user_can('delete_wordpoints_modules')
 			&& 'active' !== $status
 		) {
-			$actions['delete-selected'] = esc_html__( 'Delete', 'wordpoints' );
+			$actions['delete-selected'] = esc_html__('Delete', 'wordpoints');
 		}
 
 		/**
@@ -452,7 +452,7 @@ 
 		 * @param array  $actions The bulk action links.
 		 * @param string $status  The current module status being displayed.
 		 */
-		$actions = apply_filters( 'wordpoints_module_bulk_actions', $actions, $status );
+		$actions = apply_filters('wordpoints_module_bulk_actions', $actions, $status);
 
 		return $actions;
 	}
@@ -464,18 +464,18 @@ 
 	 *
 	 * @param string $which Not used.
 	 */
-	public function extra_tablenav( $which ) {
+	public function extra_tablenav($which) {
 
 		global $status;
 
-		if ( 'recently_activated' !== $status ) {
+		if ('recently_activated' !== $status) {
 			return;
 		}
 
 		echo '<div class="alignleft actions">';
 
-		if ( ! $this->screen->in_admin( 'network' ) ) {
-			submit_button( __( 'Clear List', 'wordpoints' ), 'button', 'clear-recent-list', false );
+		if ( ! $this->screen->in_admin('network')) {
+			submit_button(__('Clear List', 'wordpoints'), 'button', 'clear-recent-list', false);
 		}
 
 		echo '</div>';
@@ -488,9 +488,9 @@ 
 	 */
 	public function display_rows() {
 
-		foreach ( $this->items as $module_file => $module_data ) {
+		foreach ($this->items as $module_file => $module_data) {
 
-			$this->single_row( array( $module_file, $module_data ) );
+			$this->single_row(array($module_file, $module_data));
 		}
 	}
 
@@ -501,20 +501,20 @@ 
 	 *
 	 * @param array $item The module file and the module data.
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 
 		global $status;
 
-		list( $module_file, $module_data ) = $item;
+		list($module_file, $module_data) = $item;
 		$context = $status;
 
-		if ( $this->screen->in_admin( 'network' ) ) {
-			$is_active = is_wordpoints_module_active_for_network( $module_file );
+		if ($this->screen->in_admin('network')) {
+			$is_active = is_wordpoints_module_active_for_network($module_file);
 		} else {
-			$is_active = is_wordpoints_module_active( $module_file );
+			$is_active = is_wordpoints_module_active($module_file);
 		}
 
-		$class = ( $is_active ) ? 'active' : 'inactive';
+		$class = ($is_active) ? 'active' : 'inactive';
 
 		/**
 		 * Filter the class of a row of the module's list table.
@@ -526,88 +526,88 @@ 
 		 * @param string $module_data The module's data.
 		 * @param string $context     The current status context in which the modules are being displayed.
 		 */
-		$class = apply_filters( 'wordpoints_module_list_row_class', $class, $module_file, $module_data, $context );
+		$class = apply_filters('wordpoints_module_list_row_class', $class, $module_file, $module_data, $context);
 
 		?>
-		<tr id="<?php echo esc_attr( sanitize_title( $module_data['name'] ) ); ?>" class="<?php echo esc_attr( $class ); ?>">
+		<tr id="<?php echo esc_attr(sanitize_title($module_data['name'])); ?>" class="<?php echo esc_attr($class); ?>">
 			<?php
 
-			list( $columns, $hidden ) = $this->get_column_info();
+			list($columns, $hidden) = $this->get_column_info();
 
-			foreach ( $columns as $column_name => $column_display_name ) {
+			foreach ($columns as $column_name => $column_display_name) {
 
-				$is_hidden = in_array( $column_name, $hidden );
+				$is_hidden = in_array($column_name, $hidden);
 
-				switch ( $column_name ) {
+				switch ($column_name) {
 
 					case 'cb':
-						$checkbox_id = 'checkbox_' . sanitize_key( $module_file );
+						$checkbox_id = 'checkbox_' . sanitize_key($module_file);
 
 						?>
 						<th scope="row" class="check-column">
-							<label class="screen-reader-text" for="<?php echo esc_attr( $checkbox_id ); ?>">
+							<label class="screen-reader-text" for="<?php echo esc_attr($checkbox_id); ?>">
 								<?php
 
 								echo esc_html(
 									sprintf(
 										// translators: Module name.
-										__( 'Select %s', 'wordpoints' )
+										__('Select %s', 'wordpoints')
 										, $module_data['name']
 									)
 								);
 
 								?>
 							</label>
-							<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $module_file ); ?>" id="<?php echo esc_attr( $checkbox_id ); ?>" />
+							<input type="checkbox" name="checked[]" value="<?php echo esc_attr($module_file); ?>" id="<?php echo esc_attr($checkbox_id); ?>" />
 						</th>
 						<?php
 					break;
 
 					case 'name':
 						?>
-						<td class="module-title<?php echo ( $is_hidden ) ? ' hidden' : ''; ?>">
-							<strong><?php echo esc_html( $module_data['name'] ); ?></strong>
-							<?php echo $this->row_actions( $this->get_module_row_actions( $module_file, $module_data, $is_active ), true ); // XSS OK WPCS ?>
+						<td class="module-title<?php echo ($is_hidden) ? ' hidden' : ''; ?>">
+							<strong><?php echo esc_html($module_data['name']); ?></strong>
+							<?php echo $this->row_actions($this->get_module_row_actions($module_file, $module_data, $is_active), true); // XSS OK WPCS ?>
 						</td>
 						<?php
 					break;
 
 					case 'description':
 						?>
-						<td class="column-description desc<?php echo ( $is_hidden ) ? ' hidden' : ''; ?>">
+						<td class="column-description desc<?php echo ($is_hidden) ? ' hidden' : ''; ?>">
 							<div class="module-description">
 								<p>
-									<?php if ( ! empty( $module_data['description'] ) ) : ?>
-										<?php echo wp_kses( $module_data['description'] , 'wordpoints_module_description' ); ?>
+									<?php if ( ! empty($module_data['description'])) : ?>
+										<?php echo wp_kses($module_data['description'], 'wordpoints_module_description'); ?>
 									<?php else : ?>
 										&nbsp;
 									<?php endif; ?>
 								</p>
 							</div>
-							<div class="<?php echo esc_attr( $class ); ?> second module-version-author-uri">
+							<div class="<?php echo esc_attr($class); ?> second module-version-author-uri">
 								<?php
 
 								$module_meta = array();
 
-								if ( ! empty( $module_data['version'] ) ) {
+								if ( ! empty($module_data['version'])) {
 									// translators: Module version.
-									$module_meta[] = sprintf( esc_html__( 'Version %s', 'wordpoints' ), $module_data['version'] );
+									$module_meta[] = sprintf(esc_html__('Version %s', 'wordpoints'), $module_data['version']);
 								}
 
-								if ( ! empty( $module_data['author'] ) ) {
+								if ( ! empty($module_data['author'])) {
 
 									$author = $module_data['author'];
 
-									if ( ! empty( $module_data['author_uri'] ) ) {
-										$author = '<a href="' . esc_url( $module_data['author_uri'] ) . '">' . esc_html( $module_data['author'] ) . '</a>';
+									if ( ! empty($module_data['author_uri'])) {
+										$author = '<a href="' . esc_url($module_data['author_uri']) . '">' . esc_html($module_data['author']) . '</a>';
 									}
 
 									// translators: Author name.
-									$module_meta[] = sprintf( __( 'By %s', 'wordpoints' ), $author );
+									$module_meta[] = sprintf(__('By %s', 'wordpoints'), $author);
 								}
 
-								if ( ! empty( $module_data['module_uri'] ) ) {
-									$module_meta[] = '<a href="' . esc_url( $module_data['module_uri'] ) . '">' . esc_html__( 'Visit module site', 'wordpoints' ) . '</a>';
+								if ( ! empty($module_data['module_uri'])) {
+									$module_meta[] = '<a href="' . esc_url($module_data['module_uri']) . '">' . esc_html__('Visit module site', 'wordpoints') . '</a>';
 								}
 
 								/**
@@ -623,9 +623,9 @@ 
 								 * @param array  $module_data The info about the module.
 								 * @param string $status      The module status being displayed.
 								 */
-								$module_meta = apply_filters( 'wordpoints_module_row_meta', $module_meta, $module_file, $module_data, $status );
+								$module_meta = apply_filters('wordpoints_module_row_meta', $module_meta, $module_file, $module_data, $status);
 
-								echo wp_kses( implode( ' | ', $module_meta ), 'data' );
+								echo wp_kses(implode(' | ', $module_meta), 'data');
 
 								?>
 							</div>
@@ -635,7 +635,7 @@ 
 
 					default:
 						?>
-						<td class="<?php echo sanitize_html_class( $column_name ); ?> column-<?php echo sanitize_html_class( $column_name ); ?><?php echo ( $is_hidden ) ? ' hidden' : ''; ?>">
+						<td class="<?php echo sanitize_html_class($column_name); ?> column-<?php echo sanitize_html_class($column_name); ?><?php echo ($is_hidden) ? ' hidden' : ''; ?>">
 							<?php
 							/**
 							 * Display the row contents for a custom column in the module list table.
@@ -646,7 +646,7 @@ 
 							 * @param string $module_file The main file of the current module.
 							 * @param array  $module_data The module's info.
 							 */
-							do_action( 'wordpoints_manage_modules_custom_column', $column_name, $module_file, $module_data );
+							do_action('wordpoints_manage_modules_custom_column', $column_name, $module_file, $module_data);
 							?>
 						</td>
 						<?php
@@ -668,7 +668,7 @@ 
 		 * @param array  $module_data The module's info.
 		 * @param string $status      The status of the module's being displayed.
 		 */
-		do_action( 'wordpoints_after_module_row', $module_file, $module_data, $status );
+		do_action('wordpoints_after_module_row', $module_file, $module_data, $status);
 
 		/**
 		 * After row for a module is displayed in the list table.
@@ -677,7 +677,7 @@ 
 		 *
 		 * @since 1.1.0
 		 */
-		do_action( "wordpoints_after_module_row_{$module_file}", $module_file, $module_data, $status );
+		do_action("wordpoints_after_module_row_{$module_file}", $module_file, $module_data, $status);
 
 	} // function single_row()
 
@@ -692,7 +692,7 @@ 
 	 *
 	 * @return string[] The action links for this module.
 	 */
-	private function get_module_row_actions( $module_file, $module_data, $is_active ) {
+	private function get_module_row_actions($module_file, $module_data, $is_active) {
 
 		global $page, $s, $status;
 
@@ -705,51 +705,51 @@ 
 			'delete'     => '',
 		);
 
-		$url = self_admin_url( 'admin.php?page=wordpoints_modules&module=' . $module_file . '&module_status=' . $context . '&paged=' . $page . '&s=' . $s );
+		$url = self_admin_url('admin.php?page=wordpoints_modules&module=' . $module_file . '&module_status=' . $context . '&paged=' . $page . '&s=' . $s);
 
-		if ( $this->screen->in_admin( 'network' ) ) {
+		if ($this->screen->in_admin('network')) {
 
-			if ( $is_active ) {
+			if ($is_active) {
 
-				if ( current_user_can( 'manage_network_wordpoints_modules' ) ) {
+				if (current_user_can('manage_network_wordpoints_modules')) {
 					// translators: Module name.
-					$actions['deactivate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'deactivate', $url ), "deactivate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Network deactivate %s', 'wordpoints' ), $module_data['name'] ) ) . '">' . esc_html__( 'Network Deactivate', 'wordpoints' ) . '</a>';
+					$actions['deactivate'] = '<a href="' . wp_nonce_url(add_query_arg('action', 'deactivate', $url), "deactivate-module_{$module_file}") . '" aria-label="' . esc_attr(sprintf(__('Network deactivate %s', 'wordpoints'), $module_data['name'])) . '">' . esc_html__('Network Deactivate', 'wordpoints') . '</a>';
 				}
 
 			} else {
 
-				if ( current_user_can( 'manage_network_wordpoints_modules' ) ) {
+				if (current_user_can('manage_network_wordpoints_modules')) {
 					// translators: Module name.
-					$actions['activate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'activate', $url ), "activate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Network activate %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="edit">' . esc_html__( 'Network Activate', 'wordpoints' ) . '</a>';
+					$actions['activate'] = '<a href="' . wp_nonce_url(add_query_arg('action', 'activate', $url), "activate-module_{$module_file}") . '" aria-label="' . esc_attr(sprintf(__('Network activate %s', 'wordpoints'), $module_data['name'])) . '" class="edit">' . esc_html__('Network Activate', 'wordpoints') . '</a>';
 				}
 
-				if ( current_user_can( 'delete_wordpoints_modules' ) && ! is_wordpoints_module_active( $module_file ) ) {
+				if (current_user_can('delete_wordpoints_modules') && ! is_wordpoints_module_active($module_file)) {
 					// translators: Module name.
-					$actions['delete'] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s ), 'bulk-modules' ) . '" aria-label="' . esc_attr( sprintf( __( 'Delete %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="delete">' . esc_html__( 'Delete', 'wordpoints' ) . '</a>';
+					$actions['delete'] = '<a href="' . wp_nonce_url(self_admin_url('admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s), 'bulk-modules') . '" aria-label="' . esc_attr(sprintf(__('Delete %s', 'wordpoints'), $module_data['name'])) . '" class="delete">' . esc_html__('Delete', 'wordpoints') . '</a>';
 				}
 			}
 
 		} else {
 
-			if ( $is_active ) {
+			if ($is_active) {
 
 				// translators: Module name.
-				$actions['deactivate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'deactivate', $url ), "deactivate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s', 'wordpoints' ), $module_data['name'] ) ) . '">' . esc_html__( 'Deactivate', 'wordpoints' ) . '</a>';
+				$actions['deactivate'] = '<a href="' . wp_nonce_url(add_query_arg('action', 'deactivate', $url), "deactivate-module_{$module_file}") . '" aria-label="' . esc_attr(sprintf(__('Deactivate %s', 'wordpoints'), $module_data['name'])) . '">' . esc_html__('Deactivate', 'wordpoints') . '</a>';
 
 			} else {
 
 				// translators: Module name.
-				$actions['activate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'activate', $url ), "activate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Activate %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="edit">' . esc_html__( 'Activate', 'wordpoints' ) . '</a>';
+				$actions['activate'] = '<a href="' . wp_nonce_url(add_query_arg('action', 'activate', $url), "activate-module_{$module_file}") . '" aria-label="' . esc_attr(sprintf(__('Activate %s', 'wordpoints'), $module_data['name'])) . '" class="edit">' . esc_html__('Activate', 'wordpoints') . '</a>';
 
-				if ( ! is_multisite() && current_user_can( 'delete_wordpoints_modules' ) ) {
+				if ( ! is_multisite() && current_user_can('delete_wordpoints_modules')) {
 					// translators: Module name.
-					$actions['delete'] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s ), 'bulk-modules' ) . '" aria-label="' . esc_attr( sprintf( __( 'Delete %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="delete">' . esc_html__( 'Delete', 'wordpoints' ) . '</a>';
+					$actions['delete'] = '<a href="' . wp_nonce_url(self_admin_url('admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s), 'bulk-modules') . '" aria-label="' . esc_attr(sprintf(__('Delete %s', 'wordpoints'), $module_data['name'])) . '" class="delete">' . esc_html__('Delete', 'wordpoints') . '</a>';
 				}
 			}
 
 		} // End if ( network admin ) {} else {}.
 
-		$prefix = $this->screen->in_admin( 'network' ) ? 'network_admin_' : '';
+		$prefix = $this->screen->in_admin('network') ? 'network_admin_' : '';
 
 		/**
 		 * Filter the module action links.
@@ -771,7 +771,7 @@ 
 		 * @param array  $module_data The module's info.
 		 * @param string $context     The status of the modules being displayed.
 		 */
-		$actions = apply_filters( $prefix . 'wordpoints_module_action_links', array_filter( $actions ), $module_file, $module_data, $context );
+		$actions = apply_filters($prefix . 'wordpoints_module_action_links', array_filter($actions), $module_file, $module_data, $context);
 
 		/**
 		 * Filter the action links for a specific module.
@@ -780,7 +780,7 @@ 
 		 *
 		 * @since 1.1.0
 		 */
-		return apply_filters( $prefix . "wordpoints_module_action_links_{$module_file}", $actions, $module_file, $module_data, $context );
+		return apply_filters($prefix . "wordpoints_module_action_links_{$module_file}", $actions, $module_file, $module_data, $context);
 	}
 
 } // class WordPoints_Modules_List_Table

src/admin/includes/class-wordpoints-module-installer.php

Spacing +38 added lines, -38 removed lines

@@ -49,16 +49,16 @@ 
 	private function install_strings() {
 
 		$install_strings = array(
-			'no_package'           => esc_html__( 'Install package not available.', 'wordpoints' ),
-			'unpack_package'       => esc_html__( 'Unpacking the package…', 'wordpoints' ),
-			'installing_package'   => esc_html__( 'Installing the module…', 'wordpoints' ),
-			'no_files'             => esc_html__( 'The module contains no files.', 'wordpoints' ),
-			'process_failed'       => esc_html__( 'Module install failed.', 'wordpoints' ),
-			'process_success'      => esc_html__( 'Module installed successfully.', 'wordpoints' ),
-			'mkdir_failed_modules' => esc_html__( 'Could not create the modules directory.', 'wordpoints' ),
+			'no_package'           => esc_html__('Install package not available.', 'wordpoints'),
+			'unpack_package'       => esc_html__('Unpacking the package…', 'wordpoints'),
+			'installing_package'   => esc_html__('Installing the module…', 'wordpoints'),
+			'no_files'             => esc_html__('The module contains no files.', 'wordpoints'),
+			'process_failed'       => esc_html__('Module install failed.', 'wordpoints'),
+			'process_success'      => esc_html__('Module installed successfully.', 'wordpoints'),
+			'mkdir_failed_modules' => esc_html__('Could not create the modules directory.', 'wordpoints'),
 		);
 
-		$this->strings = array_merge( $this->strings, $install_strings );
+		$this->strings = array_merge($this->strings, $install_strings);
 	}
 
 	//
@@ -77,31 +77,31 @@ 
 	 *
 	 * @return array|WP_Error {@see WP_Upgrader::install_package()}
 	 */
-	public function install_package( $args = array() ) {
+	public function install_package($args = array()) {
 
 		global $wp_filesystem, $wp_theme_directories;
 
 		$modules_dir = wordpoints_modules_dir();
 
 		// Attempt to create the /wp-content/wordpoints-modules directory if needed.
-		if ( ! $wp_filesystem->exists( $modules_dir ) ) {
+		if ( ! $wp_filesystem->exists($modules_dir)) {
 
-			if ( $wp_filesystem->mkdir( $modules_dir, FS_CHMOD_DIR ) ) {
-				$wp_filesystem->put_contents( $modules_dir . '/index.php', '<?php // Gold is silent.' );
+			if ($wp_filesystem->mkdir($modules_dir, FS_CHMOD_DIR)) {
+				$wp_filesystem->put_contents($modules_dir . '/index.php', '<?php // Gold is silent.');
 			} else {
-				return new WP_Error( 'mkdir_failed_modules', $this->strings['mkdir_failed_modules'], $modules_dir );
+				return new WP_Error('mkdir_failed_modules', $this->strings['mkdir_failed_modules'], $modules_dir);
 			}
 		}
 
 		$module_dir = wordpoints_modules_dir();
 		$wp_theme_directories[] = $module_dir;
 
-		$result = parent::install_package( $args );
+		$result = parent::install_package($args);
 
-		$key = array_search( $module_dir, $wp_theme_directories );
+		$key = array_search($module_dir, $wp_theme_directories);
 
-		if ( false !== $key ) {
-			unset( $wp_theme_directories[ $key ] );
+		if (false !== $key) {
+			unset($wp_theme_directories[$key]);
 		}
 
 		return $result;
@@ -116,12 +116,12 @@ 
 	 *
 	 * @return bool|WP_Error True on success, false or a WP_Error on failure.
 	 */
-	public function install( $package ) {
+	public function install($package) {
 
 		$this->init();
 		$this->install_strings();
 
-		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
+		add_filter('upgrader_source_selection', array($this, 'check_package'));
 
 		$result = $this->run(
 			array(
@@ -133,18 +133,18 @@ 
 			)
 		);
 
-		remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
+		remove_filter('upgrader_source_selection', array($this, 'check_package'));
 
-		if ( ! $result || is_wp_error( $result ) ) {
+		if ( ! $result || is_wp_error($result)) {
 			return $result;
 		}
 
-		if ( ! $this->result || is_wp_error( $this->result ) ) {
+		if ( ! $this->result || is_wp_error($this->result)) {
 			return $this->result;
 		}
 
 		// Force refresh of plugin update information.
-		wp_cache_delete( 'wordpoints_modules', 'wordpoints_modules' );
+		wp_cache_delete('wordpoints_modules', 'wordpoints_modules');
 
 		return true;
 	}
@@ -162,40 +162,40 @@ 
 	 *
 	 * @return string|WP_Error The path to the source package or a WP_Error.
 	 */
-	public function check_package( $source ) {
+	public function check_package($source) {
 
 		global $wp_filesystem;
 
-		if ( is_wp_error( $source ) ) {
+		if (is_wp_error($source)) {
 			return $source;
 		}
 
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source );
+		$working_directory = str_replace($wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
 
-		if ( ! is_dir( $working_directory ) ) {
+		if ( ! is_dir($working_directory)) {
 			return $source;
 		}
 
 		$modules_found = false;
 
-		$files = glob( $working_directory . '*.php' );
+		$files = glob($working_directory . '*.php');
 
-		if ( false === $files ) {
+		if (false === $files) {
 			return $source;
 		}
 
-		foreach ( $files as $file ) {
+		foreach ($files as $file) {
 
-			$module_data = wordpoints_get_module_data( $file, false, false );
+			$module_data = wordpoints_get_module_data($file, false, false);
 
-			if ( ! empty( $module_data['name'] ) ) {
+			if ( ! empty($module_data['name'])) {
 				$modules_found = true;
 				break;
 			}
 		}
 
-		if ( ! $modules_found ) {
-			return new WP_Error( 'incompatible_archive_no_modules', $this->strings['incompatible_archive'], esc_html__( 'No valid modules were found.', 'wordpoints' ) );
+		if ( ! $modules_found) {
+			return new WP_Error('incompatible_archive_no_modules', $this->strings['incompatible_archive'], esc_html__('No valid modules were found.', 'wordpoints'));
 		}
 
 		return $source;
@@ -212,18 +212,18 @@ 
 	 */
 	public function module_info() {
 
-		if ( ! is_array( $this->result ) || empty( $this->result['destination_name'] ) ) {
+		if ( ! is_array($this->result) || empty($this->result['destination_name'])) {
 			return false;
 		}
 
-		$module = wordpoints_get_modules( '/' . $this->result['destination_name'] );
+		$module = wordpoints_get_modules('/' . $this->result['destination_name']);
 
-		if ( empty( $module ) ) {
+		if (empty($module)) {
 			return false;
 		}
 
 		// Assume the requested module is the first in the list.
-		$module_files = array_keys( $module );
+		$module_files = array_keys($module);
 
 		return $this->result['destination_name'] . '/' . $module_files[0];
 	}

src/admin/includes/functions.php

Spacing +187 added lines, -187 removed lines

@@ -16,16 +16,16 @@ 
  *
  * @param WordPoints_App $app The main WordPoints app.
  */
-function wordpoints_hooks_register_admin_apps( $app ) {
+function wordpoints_hooks_register_admin_apps($app) {
 
 	$apps = $app->sub_apps();
 
-	$apps->register( 'admin', 'WordPoints_App' );
+	$apps->register('admin', 'WordPoints_App');
 
 	/** @var WordPoints_App $admin */
-	$admin = $apps->get( 'admin' );
+	$admin = $apps->get('admin');
 
-	$admin->sub_apps()->register( 'screen', 'WordPoints_Admin_Screens' );
+	$admin->sub_apps()->register('screen', 'WordPoints_Admin_Screens');
 }
 
 /**
@@ -48,7 +48,7 @@ 
 	 * the modules screen should be the main one (the configure menu is only for the
 	 * network admin when network active).
 	 */
-	if ( is_wordpoints_network_active() && 'admin_menu' === current_filter() ) {
+	if (is_wordpoints_network_active() && 'admin_menu' === current_filter()) {
 		$slug = 'wordpoints_modules';
 	}
 
@@ -66,18 +66,18 @@ 
 function wordpoints_admin_menu() {
 
 	$main_menu  = wordpoints_get_main_admin_menu();
-	$wordpoints = __( 'WordPoints', 'wordpoints' );
+	$wordpoints = __('WordPoints', 'wordpoints');
 
 	/*
 	 * The settings page is always the main menu, except when the plugin is network
 	 * active on multisite. Then it is only the main menu when in the network admin.
 	 */
-	if ( 'wordpoints_configure' === $main_menu ) {
+	if ('wordpoints_configure' === $main_menu) {
 
 		// Main page.
 		add_menu_page(
 			$wordpoints
-			,esc_html( $wordpoints )
+			,esc_html($wordpoints)
 			,'manage_options'
 			,'wordpoints_configure'
 			,'wordpoints_admin_screen_configure'
@@ -86,8 +86,8 @@ 
 		// Settings page.
 		add_submenu_page(
 			'wordpoints_configure'
-			,__( 'WordPoints — Configure', 'wordpoints' )
-			,esc_html__( 'Configure', 'wordpoints' )
+			,__('WordPoints — Configure', 'wordpoints')
+			,esc_html__('Configure', 'wordpoints')
 			,'manage_options'
 			,'wordpoints_configure'
 			,'wordpoints_admin_screen_configure'
@@ -103,7 +103,7 @@ 
 		// Main page.
 		add_menu_page(
 			$wordpoints
-			,esc_html( $wordpoints )
+			,esc_html($wordpoints)
 			,'activate_wordpoints_modules'
 			,'wordpoints_modules'
 			,'wordpoints_admin_screen_modules'
@@ -114,8 +114,8 @@ 
 	// Modules page.
 	add_submenu_page(
 		$main_menu
-		,__( 'WordPoints — Modules', 'wordpoints' )
-		,esc_html__( 'Modules', 'wordpoints' )
+		,__('WordPoints — Modules', 'wordpoints')
+		,esc_html__('Modules', 'wordpoints')
 		,'activate_wordpoints_modules'
 		,'wordpoints_modules'
 		,'wordpoints_admin_screen_modules'
@@ -124,8 +124,8 @@ 
 	// Module install page.
 	add_submenu_page(
 		'_wordpoints_modules' // Fake menu.
-		,__( 'WordPoints — Install Modules', 'wordpoints' )
-		,esc_html__( 'Install Modules', 'wordpoints' )
+		,__('WordPoints — Install Modules', 'wordpoints')
+		,esc_html__('Install Modules', 'wordpoints')
 		,'install_wordpoints_modules'
 		,'wordpoints_install_modules'
 		,'wordpoints_admin_screen_install_modules'
@@ -253,15 +253,15 @@ 
 	wp_register_style(
 		'wordpoints-hooks-admin'
 		, "{$assets_url}/css/hooks{$suffix}.css"
-		, array( 'dashicons', 'wp-jquery-ui-dialog' )
+		, array('dashicons', 'wp-jquery-ui-dialog')
 		, WORDPOINTS_VERSION
 	);
 
 	$styles = wp_styles();
-	$styles->add_data( 'wordpoints-hooks-admin', 'rtl', 'replace' );
+	$styles->add_data('wordpoints-hooks-admin', 'rtl', 'replace');
 
-	if ( $suffix ) {
-		$styles->add_data( 'wordpoints-hooks-admin', 'suffix', $suffix );
+	if ($suffix) {
+		$styles->add_data('wordpoints-hooks-admin', 'suffix', $suffix);
 	}
 
 	// JS
@@ -269,21 +269,21 @@ 
 	wp_register_script(
 		'wordpoints-admin-dismiss-notice'
 		, "{$assets_url}/js/dismiss-notice{$suffix}.js"
-		, array( 'jquery', 'wp-util' )
+		, array('jquery', 'wp-util')
 		, WORDPOINTS_VERSION
 	);
 
 	wp_register_script(
 		'wordpoints-hooks-models'
 		, "{$assets_url}/js/hooks/models{$manifested_suffix}.js"
-		, array( 'backbone', 'jquery-ui-dialog', 'wp-util' )
+		, array('backbone', 'jquery-ui-dialog', 'wp-util')
 		, WORDPOINTS_VERSION
 	);
 
 	wp_register_script(
 		'wordpoints-hooks-views'
 		, "{$assets_url}/js/hooks/views{$manifested_suffix}.js"
-		, array( 'wordpoints-hooks-models' )
+		, array('wordpoints-hooks-models')
 		, WORDPOINTS_VERSION
 	);
 
@@ -291,19 +291,19 @@ 
 		'wordpoints-hooks-views'
 		, 'WordPointsHooksAdminL10n'
 		, array(
-			'unexpectedError' => __( 'There was an unexpected error. Try reloading the page.', 'wordpoints' ),
-			'changesSaved'    => __( 'Your changes have been saved.', 'wordpoints' ),
+			'unexpectedError' => __('There was an unexpected error. Try reloading the page.', 'wordpoints'),
+			'changesSaved'    => __('Your changes have been saved.', 'wordpoints'),
 			// translators: Form field name.
-			'emptyField'      => sprintf( __( '%s cannot be empty.', 'wordpoints' ), '{{ data.label }}' ),
-			'confirmDelete'   => __( 'Are you sure that you want to delete this reaction? This action cannot be undone.', 'wordpoints' ),
-			'confirmTitle'    => __( 'Are you sure?', 'wordpoints' ),
-			'deleteText'      => __( 'Delete', 'wordpoints' ),
-			'cancelText'      => __( 'Cancel', 'wordpoints' ),
+			'emptyField'      => sprintf(__('%s cannot be empty.', 'wordpoints'), '{{ data.label }}'),
+			'confirmDelete'   => __('Are you sure that you want to delete this reaction? This action cannot be undone.', 'wordpoints'),
+			'confirmTitle'    => __('Are you sure?', 'wordpoints'),
+			'deleteText'      => __('Delete', 'wordpoints'),
+			'cancelText'      => __('Cancel', 'wordpoints'),
 			'separator'       => is_rtl() ? ' « ' : ' » ',
-			'target_label'    => __( 'Target', 'wordpoints' ),
+			'target_label'    => __('Target', 'wordpoints'),
 			// translators: Form field.
-			'cannotBeChanged' => __( '(cannot be changed)', 'wordpoints' ),
-			'fieldsInvalid'   => __( 'Error: the values of some fields are invalid. Please correct these and then try again.', 'wordpoints' ),
+			'cannotBeChanged' => __('(cannot be changed)', 'wordpoints'),
+			'fieldsInvalid'   => __('Error: the values of some fields are invalid. Please correct these and then try again.', 'wordpoints'),
 		)
 	);
 
@@ -315,10 +315,10 @@ 
 			<div class="view">
 				<div class="title"></div>
 				<button type="button" class="edit button-secondary">
-					' . esc_html__( 'Edit', 'wordpoints' ) . '
+					' . esc_html__('Edit', 'wordpoints') . '
 				</button>
 				<button type="button" class="close button-secondary">
-					' . esc_html__( 'Close', 'wordpoints' ) . '
+					' . esc_html__('Close', 'wordpoints') . '
 				</button>
 			</div>
 			<div class="form">
@@ -337,16 +337,16 @@ 
 						</div>
 						<div class="action-buttons">
 							<button type="button" class="save button-primary" disabled>
-								' . esc_html__( 'Save', 'wordpoints' ) . '
+								' . esc_html__('Save', 'wordpoints') . '
 							</button>
 							<button type="button" class="cancel button-secondary">
-								' . esc_html__( 'Cancel', 'wordpoints' ) . '
+								' . esc_html__('Cancel', 'wordpoints') . '
 							</button>
 							<button type="button" class="close button-secondary">
-								' . esc_html__( 'Close', 'wordpoints' ) . '
+								' . esc_html__('Close', 'wordpoints') . '
 							</button>
 							<button type="button" class="delete button-secondary">
-								' . esc_html__( 'Delete', 'wordpoints' ) . '
+								' . esc_html__('Delete', 'wordpoints') . '
 							</button>
 						</div>
 					</div>
@@ -395,7 +395,7 @@ 
 	wp_register_script(
 		'wordpoints-hooks-extension-conditions'
 		, "{$assets_url}/js/hooks/extensions/conditions{$manifested_suffix}.js"
-		, array( 'wordpoints-hooks-views' )
+		, array('wordpoints-hooks-views')
 		, WORDPOINTS_VERSION
 	);
 
@@ -405,25 +405,25 @@ 
 		, '
 			<script type="text/template" id="tmpl-wordpoints-hook-condition-groups">
 				<div class="conditions-title section-title">
-					<h4>' . esc_html__( 'Conditions', 'wordpoints' ) . '</h4>
+					<h4>' . esc_html__('Conditions', 'wordpoints') . '</h4>
 					<button type="button" class="add-new button-secondary button-link">
-						<span class="screen-reader-text">' . esc_html__( 'Add New Condition', 'wordpoints' ) . '</span>
+						<span class="screen-reader-text">' . esc_html__('Add New Condition', 'wordpoints') . '</span>
 						<span class="dashicons dashicons-plus"></span>
 					</button>
 				</div>
 				<div class="add-condition-form hidden">
 					<div class="no-conditions hidden">
-						' . esc_html__( 'No conditions available.', 'wordpoints' ) . '
+						' . esc_html__('No conditions available.', 'wordpoints') . '
 					</div>
 					<div class="condition-selectors">
 						<div class="arg-selectors"></div>
 						<div class="condition-selector"></div>
 					</div>
-					<button type="button" class="confirm-add-new button-secondary" disabled aria-label="' . esc_attr__( 'Add Condition', 'wordpoints' ) . '">
-						' . esc_html_x( 'Add', 'reaction condition', 'wordpoints' ) . '
+					<button type="button" class="confirm-add-new button-secondary" disabled aria-label="' . esc_attr__('Add Condition', 'wordpoints') . '">
+						' . esc_html_x('Add', 'reaction condition', 'wordpoints') . '
 					</button>
-					<button type="button" class="cancel-add-new button-secondary" aria-label="' . esc_attr__( 'Cancel Adding New Condition', 'wordpoints' ) . '">
-						' . esc_html_x( 'Cancel', 'reaction condition', 'wordpoints' ) . '
+					<button type="button" class="cancel-add-new button-secondary" aria-label="' . esc_attr__('Cancel Adding New Condition', 'wordpoints') . '">
+						' . esc_html_x('Cancel', 'reaction condition', 'wordpoints') . '
 					</button>
 				</div>
 				<div class="condition-groups section-content"></div>
@@ -437,7 +437,7 @@ 
 				<div class="condition-controls">
 					<div class="condition-title"></div>
 					<button type="button" class="delete button-secondary button-link">
-						<span class="screen-reader-text">' . esc_html__( 'Remove Condition', 'wordpoints' ) . '</span>
+						<span class="screen-reader-text">' . esc_html__('Remove Condition', 'wordpoints') . '</span>
 						<span class="dashicons dashicons-no"></span>
 					</button>
 				</div>
@@ -456,7 +456,7 @@ 
 	wp_register_script(
 		'wordpoints-hooks-extension-periods'
 		, "{$assets_url}/js/hooks/extensions/periods{$manifested_suffix}.js"
-		, array( 'wordpoints-hooks-views' )
+		, array('wordpoints-hooks-views')
 		, WORDPOINTS_VERSION
 	);
 
@@ -467,7 +467,7 @@ 
 			<script type="text/template" id="tmpl-wordpoints-hook-periods">
 				<div class="wordpoints-hook-periods">
 					<div class="periods-title section-title">
-						<h4>' . esc_html__( 'Rate Limit', 'wordpoints' ) . '</h4>
+						<h4>' . esc_html__('Rate Limit', 'wordpoints') . '</h4>
 					</div>
 					<div class="periods section-content"></div>
 				</div>
@@ -480,11 +480,11 @@ 
 						<p class="description description-thin">
 							<legend>{{ data.length_in_units_label }}</legend>
 							<label>
-								<span class="screen-reader-text">' . esc_html__( 'Time Units:', 'wordpoints' ) . '</span>
+								<span class="screen-reader-text">' . esc_html__('Time Units:', 'wordpoints') . '</span>
 								<select class="widefat wordpoints-hook-period-sync wordpoints-hook-period-units"></select>
 							</label>
 							<label>
-								<span class="screen-reader-text">' . esc_html__( 'Number:', 'wordpoints' ) . '</span>
+								<span class="screen-reader-text">' . esc_html__('Number:', 'wordpoints') . '</span>
 								<input type="number" value="{{ data.length_in_units }}" class="widefat wordpoints-hook-period-sync wordpoints-hook-period-length-in-units" />
 							</label>
 						</p>
@@ -505,12 +505,12 @@ 
 	$hooks = wordpoints_hooks();
 
 	$extensions_data = wordpoints_hooks_ui_get_script_data_from_objects(
-		$hooks->get_sub_app( 'extensions' )->get_all()
+		$hooks->get_sub_app('extensions')->get_all()
 		, 'extension'
 	);
 
 	$reactor_data = wordpoints_hooks_ui_get_script_data_from_objects(
-		$hooks->get_sub_app( 'reactors' )->get_all()
+		$hooks->get_sub_app('reactors')->get_all()
 		, 'reactor'
 	);
 
@@ -536,7 +536,7 @@ 
 	 *
 	 * @param array $data The data.
 	 */
-	$data = apply_filters( 'wordpoints_hooks_ui_data', $data );
+	$data = apply_filters('wordpoints_hooks_ui_data', $data);
 
 	wp_localize_script(
 		'wordpoints-hooks-models'
@@ -556,18 +556,18 @@ 
  *
  * @return array The data extracted from the objects.
  */
-function wordpoints_hooks_ui_get_script_data_from_objects( $objects, $type ) {
+function wordpoints_hooks_ui_get_script_data_from_objects($objects, $type) {
 
 	$data = array();
 
-	foreach ( $objects as $slug => $object ) {
+	foreach ($objects as $slug => $object) {
 
-		if ( $object instanceof WordPoints_Hook_UI_Script_Data_ProviderI ) {
-			$data[ $slug ] = $object->get_ui_script_data();
+		if ($object instanceof WordPoints_Hook_UI_Script_Data_ProviderI) {
+			$data[$slug] = $object->get_ui_script_data();
 		}
 
-		if ( wp_script_is( "wordpoints-hooks-{$type}-{$slug}", 'registered' ) ) {
-			wp_enqueue_script( "wordpoints-hooks-{$type}-{$slug}" );
+		if (wp_script_is("wordpoints-hooks-{$type}-{$slug}", 'registered')) {
+			wp_enqueue_script("wordpoints-hooks-{$type}-{$slug}");
 		}
 	}
 
@@ -588,31 +588,31 @@ 
 	$entities_data = array();
 
 	/** @var WordPoints_Class_Registry_Children $entity_children */
-	$entity_children = $entities->get_sub_app( 'children' );
+	$entity_children = $entities->get_sub_app('children');
 
 	/** @var WordPoints_Entity $entity */
-	foreach ( $entities->get_all() as $slug => $entity ) {
+	foreach ($entities->get_all() as $slug => $entity) {
 
 		$child_data = array();
 
 		/** @var WordPoints_EntityishI $child */
-		foreach ( $entity_children->get_children( $slug ) as $child_slug => $child ) {
+		foreach ($entity_children->get_children($slug) as $child_slug => $child) {
 
-			$child_data[ $child_slug ] = array(
+			$child_data[$child_slug] = array(
 				'slug'  => $child_slug,
 				'title' => $child->get_title(),
 			);
 
-			if ( $child instanceof WordPoints_Entity_Attr ) {
+			if ($child instanceof WordPoints_Entity_Attr) {
 
-				$child_data[ $child_slug ]['_type']     = 'attr';
-				$child_data[ $child_slug ]['data_type'] = $child->get_data_type();
+				$child_data[$child_slug]['_type']     = 'attr';
+				$child_data[$child_slug]['data_type'] = $child->get_data_type();
 
-			} elseif ( $child instanceof WordPoints_Entity_Relationship ) {
+			} elseif ($child instanceof WordPoints_Entity_Relationship) {
 
-				$child_data[ $child_slug ]['_type']     = 'relationship';
-				$child_data[ $child_slug ]['primary']   = $child->get_primary_entity_slug();
-				$child_data[ $child_slug ]['secondary'] = $child->get_related_entity_slug();
+				$child_data[$child_slug]['_type']     = 'relationship';
+				$child_data[$child_slug]['primary']   = $child->get_primary_entity_slug();
+				$child_data[$child_slug]['secondary'] = $child->get_related_entity_slug();
 			}
 
 			/**
@@ -623,14 +623,14 @@ 
 			 * @param array                $data  The data for the entity child.
 			 * @param WordPoints_Entityish $child The child's object.
 			 */
-			$child_data[ $child_slug ] = apply_filters(
+			$child_data[$child_slug] = apply_filters(
 				'wordpoints_hooks_ui_data_entity_child'
-				, $child_data[ $child_slug ]
+				, $child_data[$child_slug]
 				, $child
 			);
 		}
 
-		$entities_data[ $slug ] = array(
+		$entities_data[$slug] = array(
 			'slug'     => $slug,
 			'title'    => $entity->get_title(),
 			'children' => $child_data,
@@ -638,12 +638,12 @@ 
 			'_type'    => 'entity',
 		);
 
-		if ( $entity instanceof WordPoints_Entity_EnumerableI ) {
+		if ($entity instanceof WordPoints_Entity_EnumerableI) {
 
 			$values = array();
 
-			foreach ( $entity->get_enumerated_values() as $value ) {
-				if ( $entity->set_the_value( $value ) ) {
+			foreach ($entity->get_enumerated_values() as $value) {
+				if ($entity->set_the_value($value)) {
 					$values[] = array(
 						'value' => $entity->get_the_id(),
 						'label' => $entity->get_the_human_id(),
@@ -651,7 +651,7 @@ 
 				}
 			}
 
-			$entities_data[ $slug ]['values'] = $values;
+			$entities_data[$slug]['values'] = $values;
 		}
 
 		/**
@@ -660,9 +660,9 @@ 
 		 * @param array             $data   The data for the entity.
 		 * @param WordPoints_Entity $entity The entity object.
 		 */
-		$entities_data[ $slug ] = apply_filters(
+		$entities_data[$slug] = apply_filters(
 			'wordpoints_hooks_ui_data_entity'
-			, $entities_data[ $slug ]
+			, $entities_data[$slug]
 			, $entity
 		);
 
@@ -683,19 +683,19 @@ 
 	// We want a list of the action types for each event. We can start with this list
 	// but it is indexed by action slug and then action type and then event slug, so
 	// we ned to do some processing.
-	$event_index = wordpoints_hooks()->get_sub_app( 'router' )->get_event_index();
+	$event_index = wordpoints_hooks()->get_sub_app('router')->get_event_index();
 
 	// We don't care about the action slugs, so first we get rid of that bottom level
 	// of the array.
-	$event_index = call_user_func_array( 'array_merge_recursive', $event_index );
+	$event_index = call_user_func_array('array_merge_recursive', $event_index);
 
 	$event_action_types = array();
 
 	// This leaves us the event indexed by action type. But we actually need to flip
 	// this, so that we have the action types indexed by event slug.
-	foreach ( $event_index as $action_type => $events ) {
-		foreach ( $events as $event => $unused ) {
-			$event_action_types[ $event ][ $action_type ] = true;
+	foreach ($event_index as $action_type => $events) {
+		foreach ($events as $event => $unused) {
+			$event_action_types[$event][$action_type] = true;
 		}
 	}
 
@@ -718,13 +718,13 @@ 
  *
  * @return string The HTML with templates appended.
  */
-function wordpoints_script_templates_filter( $html, $handle ) {
+function wordpoints_script_templates_filter($html, $handle) {
 
 	global $wp_scripts;
 
-	$templates = $wp_scripts->get_data( $handle, 'wordpoints-templates' );
+	$templates = $wp_scripts->get_data($handle, 'wordpoints-templates');
 
-	if ( $templates ) {
+	if ($templates) {
 		$html .= $templates;
 	}
 
@@ -742,9 +742,9 @@ 
  * @param string $message The text for the error message.
  * @param array  $args    Other optional arguments.
  */
-function wordpoints_show_admin_error( $message, array $args = array() ) {
+function wordpoints_show_admin_error($message, array $args = array()) {
 
-	wordpoints_show_admin_message( $message, 'error', $args );
+	wordpoints_show_admin_message($message, 'error', $args);
 }
 
 /**
@@ -774,16 +774,16 @@ 
  *                                  Required when $dismissible is true.
  * }
  */
-function wordpoints_show_admin_message( $message, $type = 'success', array $args = array() ) {
+function wordpoints_show_admin_message($message, $type = 'success', array $args = array()) {
 
 	$defaults = array(
 		'dismissible' => false,
 		'option'      => '',
 	);
 
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
-	if ( isset( $args['dismissable'] ) ) {
+	if (isset($args['dismissable'])) {
 
 		$args['dismissible'] = $args['dismissable'];
 
@@ -794,7 +794,7 @@ 
 		);
 	}
 
-	if ( 'updated' === $type ) {
+	if ('updated' === $type) {
 
 		$type = 'success';
 
@@ -805,27 +805,27 @@ 
 		);
 	}
 
-	if ( $args['dismissible'] && $args['option'] ) {
-		wp_enqueue_script( 'wordpoints-admin-dismiss-notice' );
+	if ($args['dismissible'] && $args['option']) {
+		wp_enqueue_script('wordpoints-admin-dismiss-notice');
 	}
 
 	?>
 
 	<div
-		class="notice notice-<?php echo sanitize_html_class( $type, 'success' ); ?><?php echo ( $args['dismissible'] ) ? ' is-dismissible' : ''; ?>"
-		<?php if ( $args['dismissible'] && $args['option'] ) : ?>
-			data-nonce="<?php echo esc_attr( wp_create_nonce( "wordpoints_dismiss_notice-{$args['option']}" ) ); ?>"
-			data-option="<?php echo esc_attr( $args['option'] ); ?>"
+		class="notice notice-<?php echo sanitize_html_class($type, 'success'); ?><?php echo ($args['dismissible']) ? ' is-dismissible' : ''; ?>"
+		<?php if ($args['dismissible'] && $args['option']) : ?>
+			data-nonce="<?php echo esc_attr(wp_create_nonce("wordpoints_dismiss_notice-{$args['option']}")); ?>"
+			data-option="<?php echo esc_attr($args['option']); ?>"
 		<?php endif; ?>
 		>
 		<p>
-			<?php echo wp_kses( $message, 'wordpoints_admin_message' ); ?>
+			<?php echo wp_kses($message, 'wordpoints_admin_message'); ?>
 		</p>
-		<?php if ( $args['dismissible'] && $args['option'] ) : ?>
+		<?php if ($args['dismissible'] && $args['option']) : ?>
 			<form method="post" class="wordpoints-notice-dismiss-form" style="padding-bottom: 5px;">
-				<input type="hidden" name="wordpoints_notice" value="<?php echo esc_html( $args['option'] ); ?>" />
-				<?php wp_nonce_field( "wordpoints_dismiss_notice-{$args['option']}" ); ?>
-				<?php submit_button( __( 'Hide This Notice', 'wordpoints' ), 'secondary', 'wordpoints_dismiss_notice', false ); ?>
+				<input type="hidden" name="wordpoints_notice" value="<?php echo esc_html($args['option']); ?>" />
+				<?php wp_nonce_field("wordpoints_dismiss_notice-{$args['option']}"); ?>
+				<?php submit_button(__('Hide This Notice', 'wordpoints'), 'secondary', 'wordpoints_dismiss_notice', false); ?>
 			</form>
 		<?php endif; ?>
 	</div>
@@ -843,19 +843,19 @@ 
  *
  * @return string
  */
-function wordpoints_admin_get_current_tab( array $tabs = null ) {
+function wordpoints_admin_get_current_tab(array $tabs = null) {
 
 	$tab = '';
 
-	if ( isset( $_GET['tab'] ) ) {
+	if (isset($_GET['tab'])) {
 
-		$tab = sanitize_key( $_GET['tab'] );
+		$tab = sanitize_key($_GET['tab']);
 	}
 
-	if ( isset( $tabs ) && ! isset( $tabs[ $tab ] ) ) {
+	if (isset($tabs) && ! isset($tabs[$tab])) {
 
-		reset( $tabs );
-		$tab = key( $tabs );
+		reset($tabs);
+		$tab = key($tabs);
 	}
 
 	return $tab;
@@ -872,29 +872,29 @@ 
  * @param bool     $show_heading Whether to show an <h1> element using the current
  *                               tab. Default is true.
  */
-function wordpoints_admin_show_tabs( $tabs, $show_heading = true ) {
+function wordpoints_admin_show_tabs($tabs, $show_heading = true) {
 
-	$current = wordpoints_admin_get_current_tab( $tabs );
+	$current = wordpoints_admin_get_current_tab($tabs);
 
-	if ( $show_heading ) {
+	if ($show_heading) {
 
 		// translators: Current tab name.
-		echo '<h1>', esc_html( sprintf( __( 'WordPoints — %s', 'wordpoints' ), $tabs[ $current ] ) ), '</h1>';
+		echo '<h1>', esc_html(sprintf(__('WordPoints — %s', 'wordpoints'), $tabs[$current])), '</h1>';
 	}
 
 	echo '<h2 class="nav-tab-wrapper">';
 
 	$page = '';
 
-	if ( isset( $_GET['page'] ) ) {
-		$page = sanitize_key( $_GET['page'] );
+	if (isset($_GET['page'])) {
+		$page = sanitize_key($_GET['page']);
 	}
 
-	foreach ( $tabs as $tab => $name ) {
+	foreach ($tabs as $tab => $name) {
 
-		$class = ( $tab === $current ) ? ' nav-tab-active' : '';
+		$class = ($tab === $current) ? ' nav-tab-active' : '';
 
-		echo '<a class="nav-tab ', sanitize_html_class( $class ), '" href="?page=', rawurlencode( $page ), '&amp;tab=', rawurlencode( $tab ), '">', esc_html( $name ), '</a>';
+		echo '<a class="nav-tab ', sanitize_html_class($class), '" href="?page=', rawurlencode($page), '&amp;tab=', rawurlencode($tab), '">', esc_html($name), '</a>';
 	}
 
 	echo '</h2>';
@@ -918,12 +918,12 @@ 
 	</style>
 
 	<div class="upload-plugin wordpoints-upload-module">
-		<p class="install-help"><?php esc_html_e( 'If you have a module in a .zip format, you may install it by uploading it here.', 'wordpoints' ); ?></p>
-		<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo esc_url( self_admin_url( 'update.php?action=upload-wordpoints-module' ) ); ?>">
-			<?php wp_nonce_field( 'wordpoints-module-upload' ); ?>
-			<label class="screen-reader-text" for="modulezip"><?php esc_html_e( 'Module zip file', 'wordpoints' ); ?></label>
+		<p class="install-help"><?php esc_html_e('If you have a module in a .zip format, you may install it by uploading it here.', 'wordpoints'); ?></p>
+		<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo esc_url(self_admin_url('update.php?action=upload-wordpoints-module')); ?>">
+			<?php wp_nonce_field('wordpoints-module-upload'); ?>
+			<label class="screen-reader-text" for="modulezip"><?php esc_html_e('Module zip file', 'wordpoints'); ?></label>
 			<input type="file" id="modulezip" name="modulezip" />
-			<?php submit_button( __( 'Install Now', 'wordpoints' ), 'button', 'install-module-submit', false ); ?>
+			<?php submit_button(__('Install Now', 'wordpoints'), 'button', 'install-module-submit', false); ?>
 		</form>
 	</div>
 
@@ -941,15 +941,15 @@ 
 
 	global $title, $parent_file, $submenu_file;
 
-	if ( ! current_user_can( 'install_wordpoints_modules' ) ) {
-		wp_die( esc_html__( 'Sorry, you are not allowed to install WordPoints modules on this site.', 'wordpoints' ), '', array( 'response' => 403 ) );
+	if ( ! current_user_can('install_wordpoints_modules')) {
+		wp_die(esc_html__('Sorry, you are not allowed to install WordPoints modules on this site.', 'wordpoints'), '', array('response' => 403));
 	}
 
-	check_admin_referer( 'wordpoints-module-upload' );
+	check_admin_referer('wordpoints-module-upload');
 
-	$file_upload = new File_Upload_Upgrader( 'modulezip', 'package' );
+	$file_upload = new File_Upload_Upgrader('modulezip', 'package');
 
-	$title = esc_html__( 'Upload WordPoints Module', 'wordpoints' );
+	$title = esc_html__('Upload WordPoints Module', 'wordpoints');
 	$parent_file  = 'admin.php';
 	$submenu_file = 'admin.php';
 
@@ -959,17 +959,17 @@ 
 		new WordPoints_Module_Installer_Skin(
 			array(
 				// translators: File name.
-				'title' => sprintf( esc_html__( 'Installing Module from uploaded file: %s', 'wordpoints' ), esc_html( basename( $file_upload->filename ) ) ),
+				'title' => sprintf(esc_html__('Installing Module from uploaded file: %s', 'wordpoints'), esc_html(basename($file_upload->filename))),
 				'nonce' => 'wordpoints-module-upload',
-				'url'   => add_query_arg( array( 'package' => $file_upload->id ), self_admin_url( 'update.php?action=upload-wordpoints-module' ) ),
+				'url'   => add_query_arg(array('package' => $file_upload->id), self_admin_url('update.php?action=upload-wordpoints-module')),
 				'type'  => 'upload',
 			)
 		)
 	);
 
-	$result = $upgrader->install( $file_upload->package );
+	$result = $upgrader->install($file_upload->package);
 
-	if ( $result || is_wp_error( $result ) ) {
+	if ($result || is_wp_error($result)) {
 		$file_upload->cleanup();
 	}
 
@@ -993,11 +993,11 @@ 
  *
  * @return string|WP_Error The filtered module source.
  */
-function wordpoints_plugin_upload_error_filter( $source ) {
+function wordpoints_plugin_upload_error_filter($source) {
 
 	static $_source;
 
-	if ( ! isset( $_source ) ) {
+	if ( ! isset($_source)) {
 
 		$_source = $source;
 
@@ -1006,33 +1006,33 @@ 
 		global $wp_filesystem;
 
 		if (
-			! is_wp_error( $_source )
-			&& is_wp_error( $source )
+			! is_wp_error($_source)
+			&& is_wp_error($source)
 			&& 'incompatible_archive_no_plugins' === $source->get_error_code()
 		) {
 
 			$working_directory = str_replace(
 				$wp_filesystem->wp_content_dir()
-				, trailingslashit( WP_CONTENT_DIR )
+				, trailingslashit(WP_CONTENT_DIR)
 				, $_source
 			);
 
-			if ( is_dir( $working_directory ) ) {
+			if (is_dir($working_directory)) {
 
-				$files = glob( $working_directory . '*.php' );
+				$files = glob($working_directory . '*.php');
 
-				if ( is_array( $files ) ) {
+				if (is_array($files)) {
 
 					// Check if the folder contains a module.
-					foreach ( $files as $file ) {
+					foreach ($files as $file) {
 
-						$info = wordpoints_get_module_data( $file, false, false );
+						$info = wordpoints_get_module_data($file, false, false);
 
-						if ( ! empty( $info['name'] ) ) {
+						if ( ! empty($info['name'])) {
 							$source = new WP_Error(
 								'wordpoints_module_archive_not_plugin'
 								, $source->get_error_message()
-								, __( 'This appears to be a WordPoints module archive. Try installing it on the WordPoints module install screen instead.', 'wordpoints' )
+								, __('This appears to be a WordPoints module archive. Try installing it on the WordPoints module install screen instead.', 'wordpoints')
 							);
 
 							break;
@@ -1042,7 +1042,7 @@ 
 			}
 		}
 
-		unset( $_source );
+		unset($_source);
 
 	} // End if ( ! isset( $_source ) ) else.
 
@@ -1062,16 +1062,16 @@ 
 
 	<div style="height: 120px;border: none;padding: 1px 12px;background-color: #fff;border-left: 4px solid rgb(122, 208, 58);box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);margin-top: 50px;">
 		<div style="width:48%;float:left;">
-			<h3><?php esc_html_e( 'Like this plugin?', 'wordpoints' ); ?></h3>
+			<h3><?php esc_html_e('Like this plugin?', 'wordpoints'); ?></h3>
 			<?php // translators: URL for leaving a review of WordPoints on WordPress.org. ?>
-			<p><?php echo wp_kses( sprintf( __( 'If you think WordPoints is great, let everyone know by giving it a <a href="%s">5 star rating</a>.', 'wordpoints' ), 'https://wordpress.org/support/view/plugin-reviews/wordpoints?rate=5#postform' ), array( 'a' => array( 'href' => true ) ) ); ?></p>
-			<p><?php esc_html_e( 'If you don&#8217;t think this plugin deserves 5 stars, please let us know how we can improve it.', 'wordpoints' ); ?></p>
+			<p><?php echo wp_kses(sprintf(__('If you think WordPoints is great, let everyone know by giving it a <a href="%s">5 star rating</a>.', 'wordpoints'), 'https://wordpress.org/support/view/plugin-reviews/wordpoints?rate=5#postform'), array('a' => array('href' => true))); ?></p>
+			<p><?php esc_html_e('If you don&#8217;t think this plugin deserves 5 stars, please let us know how we can improve it.', 'wordpoints'); ?></p>
 		</div>
 		<div style="width:48%;float:left;">
-			<h3><?php esc_html_e( 'Need help?', 'wordpoints' ); ?></h3>
+			<h3><?php esc_html_e('Need help?', 'wordpoints'); ?></h3>
 			<?php // translators: URL of WordPoints plugin support forums WordPress.org. ?>
-			<p><?php echo wp_kses( sprintf( __( 'Post your feature request or support question in the <a href="%s">support forums</a>', 'wordpoints' ), 'https://wordpress.org/support/plugin/wordpoints' ), array( 'a' => array( 'href' => true ) ) ); ?></p>
-			<p><em><?php esc_html_e( 'Thank you for using WordPoints!', 'wordpoints' ); ?></em></p>
+			<p><?php echo wp_kses(sprintf(__('Post your feature request or support question in the <a href="%s">support forums</a>', 'wordpoints'), 'https://wordpress.org/support/plugin/wordpoints'), array('a' => array('href' => true))); ?></p>
+			<p><em><?php esc_html_e('Thank you for using WordPoints!', 'wordpoints'); ?></em></p>
 		</div>
 	</div>
 
@@ -1089,19 +1089,19 @@ 
 
 	wordpoints_delete_admin_notice_option();
 
-	if ( current_user_can( 'activate_wordpoints_modules' ) ) {
+	if (current_user_can('activate_wordpoints_modules')) {
 
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 
-			$deactivated_modules = get_site_option( 'wordpoints_breaking_deactivated_modules' );
+			$deactivated_modules = get_site_option('wordpoints_breaking_deactivated_modules');
 
-			if ( is_array( $deactivated_modules ) ) {
+			if (is_array($deactivated_modules)) {
 				wordpoints_show_admin_error(
 					sprintf(
 						// translators: 1. Plugin version; 2. List of modules.
-						__( 'WordPoints has deactivated the following modules because of incompatibilities with WordPoints %1$s: %2$s', 'wordpoints' )
+						__('WordPoints has deactivated the following modules because of incompatibilities with WordPoints %1$s: %2$s', 'wordpoints')
 						, WORDPOINTS_VERSION
-						, implode( ', ', $deactivated_modules )
+						, implode(', ', $deactivated_modules)
 					)
 					, array(
 						'dismissible' => true,
@@ -1110,15 +1110,15 @@ 
 				);
 			}
 
-			$incompatible_modules = get_site_option( 'wordpoints_incompatible_modules' );
+			$incompatible_modules = get_site_option('wordpoints_incompatible_modules');
 
-			if ( is_array( $incompatible_modules ) ) {
+			if (is_array($incompatible_modules)) {
 				wordpoints_show_admin_error(
 					sprintf(
 						// translators: 1. Plugin version; 2. List of modules.
-						__( 'WordPoints has deactivated the following network-active modules because of incompatibilities with WordPoints %1$s: %2$s', 'wordpoints' )
+						__('WordPoints has deactivated the following network-active modules because of incompatibilities with WordPoints %1$s: %2$s', 'wordpoints')
 						, WORDPOINTS_VERSION
-						, implode( ', ', $incompatible_modules )
+						, implode(', ', $incompatible_modules)
 					)
 					, array(
 						'dismissible' => true,
@@ -1129,15 +1129,15 @@ 
 
 		} else {
 
-			$incompatible_modules = get_option( 'wordpoints_incompatible_modules' );
+			$incompatible_modules = get_option('wordpoints_incompatible_modules');
 
-			if ( is_array( $incompatible_modules ) ) {
+			if (is_array($incompatible_modules)) {
 				wordpoints_show_admin_error(
 					sprintf(
 						// translators: 1. Plugin version; 2. List of modules.
-						__( 'WordPoints has deactivated the following modules on this site because of incompatibilities with WordPoints %1$s: %2$s', 'wordpoints' )
+						__('WordPoints has deactivated the following modules on this site because of incompatibilities with WordPoints %1$s: %2$s', 'wordpoints')
 						, WORDPOINTS_VERSION
-						, implode( ', ', $incompatible_modules )
+						, implode(', ', $incompatible_modules)
 					)
 					, array(
 						'dismissible' => true,
@@ -1164,23 +1164,23 @@ 
 	$is_notice_dismissed = wordpoints_verify_nonce(
 		'_wpnonce'
 		, 'wordpoints_dismiss_notice-%s'
-		, array( 'wordpoints_notice' )
+		, array('wordpoints_notice')
 		, 'post'
 	);
 
-	if ( $is_notice_dismissed && isset( $_POST['wordpoints_notice'] ) ) {
+	if ($is_notice_dismissed && isset($_POST['wordpoints_notice'])) {
 
-		$option = sanitize_key( $_POST['wordpoints_notice'] );
+		$option = sanitize_key($_POST['wordpoints_notice']);
 
-		if ( ! is_network_admin() && 'wordpoints_incompatible_modules' === $option ) {
-			delete_option( $option );
+		if ( ! is_network_admin() && 'wordpoints_incompatible_modules' === $option) {
+			delete_option($option);
 		} else {
-			wordpoints_delete_maybe_network_option( $option );
+			wordpoints_delete_maybe_network_option($option);
 		}
 	}
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		wp_die( '', 200 );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		wp_die('', 200);
 	}
 }
 
@@ -1197,14 +1197,14 @@ 
  *
  * @return mixed The option value, sanitized if it is for one of the plugin's screens.
  */
-function wordpoints_admin_set_screen_option( $sanitized, $option, $value ) {
+function wordpoints_admin_set_screen_option($sanitized, $option, $value) {
 
-	switch ( $option ) {
+	switch ($option) {
 
 		case 'wordpoints_page_wordpoints_modules_per_page':
 		case 'wordpoints_page_wordpoints_modules_network_per_page':
 		case 'toplevel_page_wordpoints_modules_per_page':
-			$sanitized = wordpoints_posint( $value );
+			$sanitized = wordpoints_posint($value);
 			break;
 	}
 
@@ -1225,18 +1225,18 @@ 
  */
 function wordpoints_admin_ajax_breaking_module_check() {
 
-	if ( ! isset( $_GET['wordpoints_module_check'] ) ) {
-		wp_die( '', 400 );
+	if ( ! isset($_GET['wordpoints_module_check'])) {
+		wp_die('', 400);
 	}
 
-	if ( is_network_admin() ) {
-		$nonce = get_site_option( 'wordpoints_module_check_nonce' );
+	if (is_network_admin()) {
+		$nonce = get_site_option('wordpoints_module_check_nonce');
 	} else {
-		$nonce = get_option( 'wordpoints_module_check_nonce' );
+		$nonce = get_option('wordpoints_module_check_nonce');
 	}
 
-	if ( ! $nonce || ! hash_equals( $nonce, sanitize_key( $_GET['wordpoints_module_check'] ) ) ) {
-		wp_die( '', 403 );
+	if ( ! $nonce || ! hash_equals($nonce, sanitize_key($_GET['wordpoints_module_check']))) {
+		wp_die('', 403);
 	}
 
 	// The list table constructor calls WP_Screen::get(), which expects this.
@@ -1244,7 +1244,7 @@ 
 
 	wordpoints_admin_screen_modules();
 
-	wp_die( '', 200 );
+	wp_die('', 200);
 }
 
 /**
@@ -1256,7 +1256,7 @@ 
  */
 function wordpoints_hooks_admin_ajax() {
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+	if (defined('DOING_AJAX') && DOING_AJAX) {
 		new WordPoints_Admin_Ajax_Hooks;
 	}
 }

src/components/ranks/includes/rank-types/points.php

Spacing +25 added lines, -25 removed lines

@@ -38,13 +38,13 @@ 
 	 *
 	 * @since 1.7.0
 	 */
-	public function __construct( array $args ) {
+	public function __construct(array $args) {
 
-		parent::__construct( $args );
+		parent::__construct($args);
 
-		$this->name = _x( 'Points', 'rank type', 'wordpoints' );
+		$this->name = _x('Points', 'rank type', 'wordpoints');
 
-		if ( ! isset( $args['points_type'] ) ) {
+		if ( ! isset($args['points_type'])) {
 			_doing_it_wrong(
 				__METHOD__
 				, 'WordPoints Error: The "points_type" argument is required.'
@@ -53,10 +53,10 @@ 
 			return;
 		}
 
-		$this->meta_fields['points']['label'] = _x( 'Points', 'form label', 'wordpoints' );
+		$this->meta_fields['points']['label'] = _x('Points', 'form label', 'wordpoints');
 		$this->meta_fields['points_type']['default'] = $args['points_type'];
 
-		add_action( 'wordpoints_points_altered', array( $this, 'hook' ), 10, 3 );
+		add_action('wordpoints_points_altered', array($this, 'hook'), 10, 3);
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 */
 	public function destruct() {
 
-		remove_action( 'wordpoints_points_altered', array( $this, 'hook' ), 10 );
+		remove_action('wordpoints_points_altered', array($this, 'hook'), 10);
 	}
 
 	/**
@@ -78,47 +78,47 @@ 
 	 * @param int    $points      The number of points.
 	 * @param string $points_type The type of points.
 	 */
-	public function hook( $user_id, $points, $points_type ) {
+	public function hook($user_id, $points, $points_type) {
 
-		if ( $points_type !== $this->meta_fields['points_type']['default'] ) {
+		if ($points_type !== $this->meta_fields['points_type']['default']) {
 			return;
 		}
 
-		$this->maybe_transition_user_ranks( $user_id, $points > 0 );
+		$this->maybe_transition_user_ranks($user_id, $points > 0);
 	}
 
 	/**
 	 * @since 1.7.0
 	 */
-	public function validate_rank_meta( array $meta ) {
+	public function validate_rank_meta(array $meta) {
 
-		if ( ! isset( $meta['points'] ) || false === wordpoints_int( $meta['points'] ) ) {
+		if ( ! isset($meta['points']) || false === wordpoints_int($meta['points'])) {
 			return new WP_Error(
 				'wordpoints_points_rank_type_invalid_points'
-				, __( 'The amount of points is required, and must be a valid number.', 'wordpoints' )
-				, array( 'field' => 'points' )
+				, __('The amount of points is required, and must be a valid number.', 'wordpoints')
+				, array('field' => 'points')
 			);
 		}
 
 		if (
-			! isset( $meta['points_type'] )
-			|| ! wordpoints_is_points_type( $meta['points_type'] )
+			! isset($meta['points_type'])
+			|| ! wordpoints_is_points_type($meta['points_type'])
 		) {
 			return false;
 		}
 
-		$minimum = wordpoints_get_points_minimum( $meta['points_type'] );
+		$minimum = wordpoints_get_points_minimum($meta['points_type']);
 
-		if ( $meta['points'] < $minimum ) {
+		if ($meta['points'] < $minimum) {
 
 			return new WP_Error(
 				'wordpoints_points_rank_type_points_less_than_minimum'
 				, sprintf(
 					// translators: Minimum number of points.
-					__( 'The number of points must be more than the minimum (%s).', 'wordpoints' )
-					, wordpoints_format_points( $minimum, $meta['points_type'], 'points_rank_error' )
+					__('The number of points must be more than the minimum (%s).', 'wordpoints')
+					, wordpoints_format_points($minimum, $meta['points_type'], 'points_rank_error')
 				)
-				, array( 'field' => 'points' )
+				, array('field' => 'points')
 			);
 		}
 
@@ -141,15 +141,15 @@ 
 	 *
 	 * @return bool Whether the user meets the requirements for this rank.
 	 */
-	protected function can_transition_user_rank( $user_id, $rank, array $args ) {
+	protected function can_transition_user_rank($user_id, $rank, array $args) {
 
-		if ( $rank->points_type !== $this->meta_fields['points_type']['default'] ) {
+		if ($rank->points_type !== $this->meta_fields['points_type']['default']) {
 			return false;
 		}
 
-		$user_points = wordpoints_get_points( $user_id, $rank->points_type );
+		$user_points = wordpoints_get_points($user_id, $rank->points_type);
 
-		if ( $rank->points > $user_points ) {
+		if ($rank->points > $user_points) {
 			return false;
 		}
 

src/components/ranks/includes/integration/points/functions.php

Spacing +18 added lines, -18 removed lines

@@ -14,18 +14,18 @@ 
  *
  * @WordPress\filter wordpoints_points_widget_text 30 After esc_html().
  */
-function wordpoints_ranks_points_widget_text_filter( $text, $instance ) {
+function wordpoints_ranks_points_widget_text_filter($text, $instance) {
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 
 		$rank = wordpoints_get_formatted_user_rank(
 			get_current_user_id()
 			, "points_type-{$instance['points_type']}"
 			, 'my-points-widget'
-			, array( 'widget_settings' => $instance )
+			, array('widget_settings' => $instance)
 		);
 
-		$text = str_replace( '%rank%', $rank, $text );
+		$text = str_replace('%rank%', $rank, $text);
 	}
 
 	return $text;
@@ -43,7 +43,7 @@ 
 	?>
 	<br />
 	<?php // translators: Placeholder name. ?>
-	<small><i><?php echo esc_html( sprintf( __( '%s will be replaced with the rank of the logged in user', 'wordpoints' ), '%rank%' ) ); ?></i></small>
+	<small><i><?php echo esc_html(sprintf(__('%s will be replaced with the rank of the logged in user', 'wordpoints'), '%rank%')); ?></i></small>
 	<?php
 }
 
@@ -54,7 +54,7 @@ 
  *
  * @WordPress\filter wordpoints_points_top_users_username
  */
-function wordpoints_ranks_points_top_users_username_filter( $name, $user_id, $points_type, $context ) {
+function wordpoints_ranks_points_top_users_username_filter($name, $user_id, $points_type, $context) {
 
 	$rank = wordpoints_get_formatted_user_rank(
 		$user_id
@@ -74,11 +74,11 @@ 
  *
  * @WordPress\filter shortcode_atts_wordpoints_user_rank
  */
-function wordpoints_user_rank_shortcode_points_type_attr( $out, $pairs, $atts ) {
+function wordpoints_user_rank_shortcode_points_type_attr($out, $pairs, $atts) {
 
-	if ( empty( $out['rank_group'] ) ) {
+	if (empty($out['rank_group'])) {
 
-		if ( isset( $atts['points_type'] ) ) {
+		if (isset($atts['points_type'])) {
 
 			$out['rank_group'] = "points_type-{$atts['points_type']}";
 
@@ -86,7 +86,7 @@ 
 
 			$points_type = wordpoints_get_default_points_type();
 
-			if ( $points_type ) {
+			if ($points_type) {
 				$out['rank_group'] = "points_type-{$points_type}";
 			}
 		}
@@ -104,7 +104,7 @@ 
  */
 function wordpoints_register_points_ranks() {
 
-	foreach ( wordpoints_get_points_types() as $slug => $points_type ) {
+	foreach (wordpoints_get_points_types() as $slug => $points_type) {
 
 		WordPoints_Rank_Groups::register_group(
 			"points_type-{$slug}"
@@ -112,7 +112,7 @@ 
 				'name' => $points_type['name'],
 				'description' => sprintf(
 					// translators: Points type name.
-					__( 'This rank group is associated with the &#8220;%s&#8221; points type.', 'wordpoints' )
+					__('This rank group is associated with the &#8220;%s&#8221; points type.', 'wordpoints')
 					, $points_type['name']
 				),
 			)
@@ -121,7 +121,7 @@ 
 		WordPoints_Rank_Types::register_type(
 			"points-{$slug}"
 			, 'WordPoints_Points_Rank_Type'
-			, array( 'points_type' => $slug )
+			, array('points_type' => $slug)
 		);
 
 		WordPoints_Rank_Groups::register_type_for_group(
@@ -145,13 +145,13 @@ 
 
 	$tab = wordpoints_admin_get_current_tab();
 
-	if ( 'add-new' === $tab ) {
+	if ('add-new' === $tab) {
 		return;
 	}
 
 	add_meta_box(
 		'ranks'
-		, _x( 'Ranks', 'Points Types screen meta box title', 'wordpoints' )
+		, _x('Ranks', 'Points Types screen meta box title', 'wordpoints')
 		, 'wordpoints_ranks_display_points_types_meta_box_ranks'
 		, 'wordpoints_page_wordpoints_points_types'
 		, 'side'
@@ -166,12 +166,12 @@ 
  *
  * @param array $points_type The data for the points type being edited.
  */
-function wordpoints_ranks_display_points_types_meta_box_ranks( $points_type ) {
+function wordpoints_ranks_display_points_types_meta_box_ranks($points_type) {
 
 	?>
 
-	<a href="<?php echo esc_url( self_admin_url( 'admin.php?page=wordpoints_ranks&tab=points_type-' . $points_type['slug'] ) ); ?>">
-		<?php esc_html_e( 'Go to the ranks for this points type.', 'wordpoints' ); ?>
+	<a href="<?php echo esc_url(self_admin_url('admin.php?page=wordpoints_ranks&tab=points_type-' . $points_type['slug'])); ?>">
+		<?php esc_html_e('Go to the ranks for this points type.', 'wordpoints'); ?>
 	</a>
 
 	<?php

src/components/ranks/admin/screens/ranks.php

Spacing +34 added lines, -34 removed lines

@@ -9,25 +9,25 @@ 
 
 $rank_groups = WordPoints_Rank_Groups::get();
 
-if ( empty( $rank_groups ) ) {
+if (empty($rank_groups)) {
 
 	?>
 	<div class="wrap">
-		<?php wordpoints_show_admin_error( esc_html__( 'No rank groups are currently available.', 'wordpoints' ) ); ?>
+		<?php wordpoints_show_admin_error(esc_html__('No rank groups are currently available.', 'wordpoints')); ?>
 	</div>
 	<?php
 
 	return;
 }
 
-$rank_group = $rank_groups[ wordpoints_admin_get_current_tab( $rank_groups ) ];
+$rank_group = $rank_groups[wordpoints_admin_get_current_tab($rank_groups)];
 
 ?>
 
 <div class="wrap">
-	<h1><?php esc_html_e( 'Ranks', 'wordpoints' ); ?></h1>
+	<h1><?php esc_html_e('Ranks', 'wordpoints'); ?></h1>
 
-	<?php wordpoints_admin_show_tabs( wp_list_pluck( $rank_groups, 'name' ), false ) ?>
+	<?php wordpoints_admin_show_tabs(wp_list_pluck($rank_groups, 'name'), false) ?>
 
 	<div id="ranks-error-message" class="notice notice-error hidden">
 		<p></p>
@@ -42,34 +42,34 @@ 
 	 *
 	 * @param WordPoints_Rank_Group $rank_group The rank group being displayed.
 	 */
-	do_action( 'wordpoints_ranks_admin_screen_top', $rank_group );
+	do_action('wordpoints_ranks_admin_screen_top', $rank_group);
 
 	?>
 
 	<div class="wordpoints-rank-group-container">
-		<p class="description group-description"><?php echo esc_html( $rank_group->description ); ?></p>
+		<p class="description group-description"><?php echo esc_html($rank_group->description); ?></p>
 		<ul
-			id="wordpoints-rank-group_<?php echo esc_attr( $rank_group->slug ); ?>"
+			id="wordpoints-rank-group_<?php echo esc_attr($rank_group->slug); ?>"
 			class="wordpoints-rank-group"
-			data-slug="<?php echo esc_attr( $rank_group->slug ); ?>"
-			data-nonce="<?php echo esc_attr( wp_create_nonce( "wordpoints_get_ranks-{$rank_group->slug}" ) ); ?>"
+			data-slug="<?php echo esc_attr($rank_group->slug); ?>"
+			data-nonce="<?php echo esc_attr(wp_create_nonce("wordpoints_get_ranks-{$rank_group->slug}")); ?>"
 		>
 		</ul>
 		<div class="spinner-overlay" style="display: block;">
 			<span class="spinner is-active"></span>
 		</div>
 		<div class="controls">
-			<button class="add-rank button-primary"><?php esc_html_e( 'Add Rank', 'wordpoints' ); ?></button>
+			<button class="add-rank button-primary"><?php esc_html_e('Add Rank', 'wordpoints'); ?></button>
 			<label class="wordpoints-rank-types">
-				<?php esc_html_e( 'Rank Type:', 'wordpoints' ); ?>
+				<?php esc_html_e('Rank Type:', 'wordpoints'); ?>
 				<select>
-					<?php foreach ( $rank_group->get_types() as $rank_type ) : ?>
-						<?php if ( 'base' !== $rank_type ) : ?>
+					<?php foreach ($rank_group->get_types() as $rank_type) : ?>
+						<?php if ('base' !== $rank_type) : ?>
 							<option
-								value="<?php echo esc_attr( $rank_type ); ?>"
-								data-nonce="<?php echo esc_attr( wp_create_nonce( "wordpoints_create_rank|{$rank_group->slug}|{$rank_type}" ) ); ?>"
+								value="<?php echo esc_attr($rank_type); ?>"
+								data-nonce="<?php echo esc_attr(wp_create_nonce("wordpoints_create_rank|{$rank_group->slug}|{$rank_type}")); ?>"
 							>
-								<?php echo esc_html( WordPoints_Rank_Types::get_type( $rank_type )->get_name() ); ?>
+								<?php echo esc_html(WordPoints_Rank_Types::get_type($rank_type)->get_name()); ?>
 							</option>
 						<?php endif; ?>
 					<?php endforeach; ?>
@@ -86,13 +86,13 @@ 
 	 *
 	 * @param WordPoints_Rank_Group $rank_group The rank group being displayed.
 	 */
-	do_action( 'wordpoints_ranks_admin_screen_bottom', $rank_group );
+	do_action('wordpoints_ranks_admin_screen_bottom', $rank_group);
 
 	?>
 </div>
 
-<?php foreach ( $rank_group->get_types() as $rank_type ) : ?>
-	<script type="text/template" class="rank-template_<?php echo sanitize_html_class( $rank_type ); ?>">
+<?php foreach ($rank_group->get_types() as $rank_type) : ?>
+	<script type="text/template" class="rank-template_<?php echo sanitize_html_class($rank_type); ?>">
 		<div class="view">
 			<div>
 				<%- name %>
@@ -100,31 +100,31 @@ 
 
 				$field = key(
 					wp_list_filter(
-						WordPoints_Rank_Types::get_type( $rank_type )->get_meta_fields()
-						, array( 'in_title' => true )
+						WordPoints_Rank_Types::get_type($rank_type)->get_meta_fields()
+						, array('in_title' => true)
 					)
 				);
 
 				?>
-				<?php if ( $field ) : ?>
-					<span><% if ( typeof <?php echo preg_replace( '/[^a-z0-9_]/i', '', $field ); // WPCS: XSS OK ?> !== "undefined" ) { print( <?php echo preg_replace( '/[^a-z0-9_]/i', '', $field ); // WPCS: XSS OK ?> ); } %></span>
+				<?php if ($field) : ?>
+					<span><% if ( typeof <?php echo preg_replace('/[^a-z0-9_]/i', '', $field); // WPCS: XSS OK ?> !== "undefined" ) { print( <?php echo preg_replace('/[^a-z0-9_]/i', '', $field); // WPCS: XSS OK ?> ); } %></span>
 				<?php endif; ?>
 			</div>
-			<a class="edit"><?php echo esc_html_x( 'Edit', 'rank', 'wordpoints' ); ?></a>
-			<a class="close"><?php esc_html_e( 'Close', 'wordpoints' ); ?></a>
+			<a class="edit"><?php echo esc_html_x('Edit', 'rank', 'wordpoints'); ?></a>
+			<a class="close"><?php esc_html_e('Close', 'wordpoints'); ?></a>
 		</div>
 		<form>
 			<div class="fields">
 				<p class="description description-thin">
 				<label>
-					<?php echo esc_html_x( 'Title', 'rank', 'wordpoints' ); ?>
+					<?php echo esc_html_x('Title', 'rank', 'wordpoints'); ?>
 					<input class="widefat" type="text" value="<%- name %>" name="name" />
 				</label>
 				</p>
-				<input type="hidden" name="type" value="<?php echo esc_attr( $rank_type ); ?>" />
+				<input type="hidden" name="type" value="<?php echo esc_attr($rank_type); ?>" />
 				<input type="hidden" name="order" value="<%- order %>" />
 				<input type="hidden" name="nonce" value="<%- nonce %>" />
-				<?php WordPoints_Rank_Types::get_type( $rank_type )->display_rank_meta_form_fields( array(), array( 'placeholders' => true ) ); ?>
+				<?php WordPoints_Rank_Types::get_type($rank_type)->display_rank_meta_form_fields(array(), array('placeholders' => true)); ?>
 			</div>
 			<div class="messages">
 				<div class="success"></div>
@@ -135,11 +135,11 @@ 
 					<span class="spinner is-active"></span>
 				</div>
 				<div class="action-buttons">
-					<button class="save button-primary" disabled><?php esc_html_e( 'Save', 'wordpoints' ); ?></button>
-					<button class="cancel button-secondary"><?php esc_html_e( 'Cancel', 'wordpoints' ); ?></button>
-					<button class="close button-secondary"><?php esc_html_e( 'Close', 'wordpoints' ); ?></button>
-					<?php if ( 'base' !== $rank_type ) : ?>
-						<button class="delete button-secondary"><?php esc_html_e( 'Delete', 'wordpoints' ); ?></button>
+					<button class="save button-primary" disabled><?php esc_html_e('Save', 'wordpoints'); ?></button>
+					<button class="cancel button-secondary"><?php esc_html_e('Cancel', 'wordpoints'); ?></button>
+					<button class="close button-secondary"><?php esc_html_e('Close', 'wordpoints'); ?></button>
+					<?php if ('base' !== $rank_type) : ?>
+						<button class="delete button-secondary"><?php esc_html_e('Delete', 'wordpoints'); ?></button>
 					<?php endif; ?>
 				</div>
 			</div>