WordPoints / wordpoints

src/classes/hook/hit/query.php

Spacing +16 added lines, -16 removed lines

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

src/classes/db/query.php

Spacing +129 added lines, -129 removed lines

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

src/admin/screens/configure-components.php

Spacing +52 added lines, -52 removed lines

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

src/admin/screens/modules-load.php

Spacing +163 added lines, -163 removed lines

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

src/admin/screens/modules.php

Spacing +56 added lines, -56 removed lines

@@ -11,62 +11,62 @@ 
 
 $invalid = wordpoints_validate_active_modules();
 
-if ( ! empty( $invalid ) ) {
-	foreach ( $invalid as $module_file => $error ) {
+if ( ! empty($invalid)) {
+	foreach ($invalid as $module_file => $error) {
 		wordpoints_show_admin_error(
 			sprintf(
 				// translators: 1. Module name; 2. Error message.
-				__( 'The module %1$s has been <strong>deactivated</strong> due to an error: %2$s', 'wordpoints' )
-				, esc_html( $module_file )
-				, '<code>' . esc_html( $error->get_error_message() ) . '</code>'
+				__('The module %1$s has been <strong>deactivated</strong> due to an error: %2$s', 'wordpoints')
+				, esc_html($module_file)
+				, '<code>' . esc_html($error->get_error_message()) . '</code>'
 			)
-			, array( 'dismissible' => true )
+			, array('dismissible' => true)
 		);
 	}
 }
 
-if ( isset( $_GET['error'] ) ) {
+if (isset($_GET['error'])) {
 
-	if ( isset( $_GET['main'] ) ) {
+	if (isset($_GET['main'])) {
 
 		wordpoints_show_admin_error(
-			esc_html__( 'You cannot delete a module while it is active on the main site.', 'wordpoints' )
-			, array( 'dismissible' => true )
+			esc_html__('You cannot delete a module while it is active on the main site.', 'wordpoints')
+			, array('dismissible' => true)
 		);
 
-	} elseif ( isset( $_GET['charsout'] ) ) {
+	} elseif (isset($_GET['charsout'])) {
 
 		wordpoints_show_admin_message(
 			sprintf(
 				// translators: Number of characters.
-				__( 'The module generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this module.', 'wordpoints' )
+				__('The module generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this module.', 'wordpoints')
 				, (int) $_GET['charsout']
 			)
 			, 'warning'
-			, array( 'dismissible' => true )
+			, array('dismissible' => true)
 		);
 
 	} else {
 
-		$error_message = __( 'Module could not be activated because it triggered a <strong>fatal error</strong>.', 'wordpoints' );
+		$error_message = __('Module could not be activated because it triggered a <strong>fatal error</strong>.', 'wordpoints');
 
 		if (
-			isset( $_GET['_error_nonce'], $_GET['module'] )
-			&& wordpoints_verify_nonce( '_error_nonce', 'module-activation-error_%s', array( 'module' ) )
+			isset($_GET['_error_nonce'], $_GET['module'])
+			&& wordpoints_verify_nonce('_error_nonce', 'module-activation-error_%s', array('module'))
 		) {
 
 			$url = self_admin_url(
 				'admin.php?page=wordpoints_modules&action=error_scrape&amp;module='
-					. sanitize_text_field( wp_unslash( $_GET['module'] ) )
-					. '&amp;_wpnonce=' . sanitize_key( $_GET['_error_nonce'] )
+					. sanitize_text_field(wp_unslash($_GET['module']))
+					. '&amp;_wpnonce=' . sanitize_key($_GET['_error_nonce'])
 			);
 
 			?>
 
 			<div class="notice notice-error is-dismissible">
 				<p>
-					<?php echo wp_kses( $error_message, '' ); ?>
-					<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $url ); ?>"></iframe>
+					<?php echo wp_kses($error_message, ''); ?>
+					<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url($url); ?>"></iframe>
 				</p>
 			</div>
 
@@ -76,78 +76,78 @@ 
 
 			wordpoints_show_admin_error(
 				$error_message
-				, array( 'dismissible' => true )
+				, array('dismissible' => true)
 			);
 		}
 
 	} // End if ( main error ) elseif ( unexpected output error ) else.
 
-} elseif ( isset( $_GET['deleted'] ) ) {
+} elseif (isset($_GET['deleted'])) {
 
 	$user_id       = get_current_user_id();
-	$delete_result = get_transient( 'wordpoints_modules_delete_result_' . $user_id );
+	$delete_result = get_transient('wordpoints_modules_delete_result_' . $user_id);
 
 	// Delete it once we're done.
-	delete_transient( 'wordpoints_modules_delete_result_' . $user_id );
+	delete_transient('wordpoints_modules_delete_result_' . $user_id);
 
-	if ( is_wp_error( $delete_result ) ) {
+	if (is_wp_error($delete_result)) {
 
 		wordpoints_show_admin_error(
 			sprintf(
 				// translators: Error message.
-				__( 'Module could not be deleted due to an error: %s', 'wordpoints' )
+				__('Module could not be deleted due to an error: %s', 'wordpoints')
 				, $delete_result->get_error_message()
 			)
-			, array( 'dismissible' => true )
+			, array('dismissible' => true)
 		);
 
 	} else {
 
 		wordpoints_show_admin_message(
-			__( 'The selected modules have been <strong>deleted</strong>.', 'wordpoints' )
+			__('The selected modules have been <strong>deleted</strong>.', 'wordpoints')
 			, 'success'
-			, array( 'dismissible' => true )
+			, array('dismissible' => true)
 		);
 	}
 
-} elseif ( isset( $_GET['activate'] ) ) {
+} elseif (isset($_GET['activate'])) {
 
 	wordpoints_show_admin_message(
-		__( 'Module <strong>activated</strong>.', 'wordpoints' )
+		__('Module <strong>activated</strong>.', 'wordpoints')
 		, 'success'
-		, array( 'dismissible' => true )
+		, array('dismissible' => true)
 	);
 
-} elseif ( isset( $_GET['activate-multi'] ) ) {
+} elseif (isset($_GET['activate-multi'])) {
 
 	wordpoints_show_admin_message(
-		__( 'Selected modules <strong>activated</strong>.', 'wordpoints' )
+		__('Selected modules <strong>activated</strong>.', 'wordpoints')
 		, 'success'
-		, array( 'dismissible' => true )
+		, array('dismissible' => true)
 	);
 
-} elseif ( isset( $_GET['deactivate'] ) ) {
+} elseif (isset($_GET['deactivate'])) {
 
 	wordpoints_show_admin_message(
-		__( 'Module <strong>deactivated</strong>.', 'wordpoints' )
+		__('Module <strong>deactivated</strong>.', 'wordpoints')
 		, 'success'
-		, array( 'dismissible' => true )
+		, array('dismissible' => true)
 	);
 
-} elseif ( isset( $_GET['deactivate-multi'] ) ) {
+} elseif (isset($_GET['deactivate-multi'])) {
 
 	wordpoints_show_admin_message(
-		__( 'Selected modules <strong>deactivated</strong>.', 'wordpoints' )
+		__('Selected modules <strong>deactivated</strong>.', 'wordpoints')
 		, 'success'
-		, array( 'dismissible' => true )
+		, array('dismissible' => true)
 	);
 
-} elseif ( isset( $_REQUEST['action'] ) && 'update-selected' === sanitize_key( $_REQUEST['action'] ) ) {
+} elseif (isset($_REQUEST['action']) && 'update-selected' === sanitize_key($_REQUEST['action'])) {
 
 	wordpoints_show_admin_message(
-		esc_html__( 'No out of date modules were selected.', 'wordpoints' )
+		esc_html__('No out of date modules were selected.', 'wordpoints')
 		, 'warning'
-		, array( 'dismissible' => true )
+		, array('dismissible' => true)
 	);
 
 } // End if ( error ) elseif ( other messages/errors ).
@@ -156,21 +156,21 @@ 
 
 <div class="wrap">
 	<h1>
-		<?php esc_html_e( 'WordPoints Modules', 'wordpoints' ); ?>
+		<?php esc_html_e('WordPoints Modules', 'wordpoints'); ?>
 
-		<?php if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_wordpoints_modules' ) ) : ?>
-			<a href="<?php echo esc_url( self_admin_url( 'admin.php?page=wordpoints_install_modules' ) ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'module', 'wordpoints' ); ?></a>
+		<?php if (( ! is_multisite() || is_network_admin()) && current_user_can('install_wordpoints_modules')) : ?>
+			<a href="<?php echo esc_url(self_admin_url('admin.php?page=wordpoints_install_modules')); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'module', 'wordpoints'); ?></a>
 		<?php endif; ?>
 
-		<?php if ( ! empty( $_REQUEST['s'] ) ) : ?>
+		<?php if ( ! empty($_REQUEST['s'])) : ?>
 			<span class="subtitle">
 				<?php
 
 				echo esc_html(
 					sprintf(
 						// translators: Search term.
-						__( 'Search results for &#8220;%s&#8221;', 'wordpoints' )
-						, sanitize_text_field( wp_unslash( $_REQUEST['s'] ) )
+						__('Search results for &#8220;%s&#8221;', 'wordpoints')
+						, sanitize_text_field(wp_unslash($_REQUEST['s']))
 					)
 				);
 
@@ -188,14 +188,14 @@ 
 
 	<?php $wp_list_table->views(); ?>
 
-	<form method="get" action="<?php echo esc_url( self_admin_url( 'admin.php' ) ); ?>">
+	<form method="get" action="<?php echo esc_url(self_admin_url('admin.php')); ?>">
 		<input type="hidden" name="page" value="wordpoints_modules" />
-		<?php $wp_list_table->search_box( esc_html__( 'Search Installed Modules', 'wordpoints' ), 'module' ); ?>
+		<?php $wp_list_table->search_box(esc_html__('Search Installed Modules', 'wordpoints'), 'module'); ?>
 	</form>
 
-	<form method="post" action="<?php echo esc_url( self_admin_url( 'admin.php?page=wordpoints_modules' ) ); ?>">
-		<input type="hidden" name="module_status" value="<?php echo esc_attr( $status ) ?>" />
-		<input type="hidden" name="paged" value="<?php echo esc_attr( $page ) ?>" />
+	<form method="post" action="<?php echo esc_url(self_admin_url('admin.php?page=wordpoints_modules')); ?>">
+		<input type="hidden" name="module_status" value="<?php echo esc_attr($status) ?>" />
+		<input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
 		<?php $wp_list_table->display(); ?>
 	</form>
 
@@ -205,7 +205,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	do_action( 'wordpoints_admin_modules' );
+	do_action('wordpoints_admin_modules');
 	?>
 
 </div>

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