WordPoints / wordpoints

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>

src/components/ranks/admin/includes/ajax.php

Spacing +73 added lines, -73 removed lines

@@ -66,8 +66,8 @@ 
 		$rank_groups = WordPoints_Rank_Groups::get();
 		$ranks = array();
 
-		foreach ( $rank_groups as $group ) {
-			$ranks[ $group->slug ] = self::prepare_group_ranks( $group );
+		foreach ($rank_groups as $group) {
+			$ranks[$group->slug] = self::prepare_group_ranks($group);
 		}
 
 		return $ranks;
@@ -82,20 +82,20 @@ 
 	 *
 	 * @return array The ranks of this group, prepared for sending to the JS.
 	 */
-	public static function prepare_group_ranks( $group ) {
+	public static function prepare_group_ranks($group) {
 
 		$rank_ids = $group->get_ranks();
 		$ranks = array();
 
-		foreach ( $rank_ids as $order => $rank_id ) {
+		foreach ($rank_ids as $order => $rank_id) {
 
-			$rank = wordpoints_get_rank( $rank_id );
+			$rank = wordpoints_get_rank($rank_id);
 
-			if ( ! $rank ) {
+			if ( ! $rank) {
 				continue;
 			}
 
-			$ranks[] = self::_prepare_rank( $rank );
+			$ranks[] = self::_prepare_rank($rank);
 		}
 
 		return $ranks;
@@ -112,8 +112,8 @@ 
 	 */
 	public function __construct() {
 
-		if ( isset( self::$instance ) ) {
-			_doing_it_wrong( __METHOD__, 'Class should only be constructed once.', '1.7.0' );
+		if (isset(self::$instance)) {
+			_doing_it_wrong(__METHOD__, 'Class should only be constructed once.', '1.7.0');
 		}
 
 		self::$instance = $this;
@@ -128,10 +128,10 @@ 
 	 */
 	public function hooks() {
 
-		add_action( 'wp_ajax_wordpoints_admin_get_ranks', array( $this, 'get_ranks' ) );
-		add_action( 'wp_ajax_wordpoints_admin_create_rank', array( $this, 'create_rank' ) );
-		add_action( 'wp_ajax_wordpoints_admin_update_rank', array( $this, 'update_rank' ) );
-		add_action( 'wp_ajax_wordpoints_admin_delete_rank', array( $this, 'delete_rank' ) );
+		add_action('wp_ajax_wordpoints_admin_get_ranks', array($this, 'get_ranks'));
+		add_action('wp_ajax_wordpoints_admin_create_rank', array($this, 'create_rank'));
+		add_action('wp_ajax_wordpoints_admin_update_rank', array($this, 'update_rank'));
+		add_action('wp_ajax_wordpoints_admin_delete_rank', array($this, 'delete_rank'));
 	}
 
 	/**
@@ -145,9 +145,9 @@ 
 
 		$group = $this->_get_group();
 
-		$this->_verify_request( "wordpoints_get_ranks-{$group->slug}" );
+		$this->_verify_request("wordpoints_get_ranks-{$group->slug}");
 
-		wp_send_json_success( self::prepare_group_ranks( $group ) );
+		wp_send_json_success(self::prepare_group_ranks($group));
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 		$group = $this->_get_group();
 		$type = $this->_get_rank_type()->get_slug();
 
-		$this->_verify_request( "wordpoints_create_rank|{$group->slug}|{$type}" );
+		$this->_verify_request("wordpoints_create_rank|{$group->slug}|{$type}");
 
 		// Attempt to save the rank.
 		$result = wordpoints_add_rank(
@@ -173,7 +173,7 @@ 
 			, $this->_get_rank_meta()
 		);
 
-		$this->_send_json_result( $result, 'create' );
+		$this->_send_json_result($result, 'create');
 	}
 
 	/**
@@ -194,8 +194,8 @@ 
 
 		$type = $this->_get_rank_type()->get_slug();
 
-		if ( $type !== $rank->type ) {
-			wp_send_json_error( array( 'message' => __( 'This rank does not match any rank in the database, perhaps it was deleted. Refresh the page to update the list of ranks.', 'wordpoints' ) ) );
+		if ($type !== $rank->type) {
+			wp_send_json_error(array('message' => __('This rank does not match any rank in the database, perhaps it was deleted. Refresh the page to update the list of ranks.', 'wordpoints')));
 		}
 
 		$result = wordpoints_update_rank(
@@ -207,7 +207,7 @@ 
 			, $this->_get_rank_meta()
 		);
 
-		$this->_send_json_result( $result, 'update' );
+		$this->_send_json_result($result, 'update');
 	}
 
 	/**
@@ -226,10 +226,10 @@ 
 			"wordpoints_delete_rank|{$group->slug}|{$rank->ID}"
 		);
 
-		$result = wordpoints_delete_rank( $rank->ID );
+		$result = wordpoints_delete_rank($rank->ID);
 
-		if ( ! $result ) {
-			wp_send_json_error( array( 'message' => __( 'There was an error deleting the rank. Please try again.', 'wordpoints' ) ) );
+		if ( ! $result) {
+			wp_send_json_error(array('message' => __('There was an error deleting the rank. Please try again.', 'wordpoints')));
 		}
 
 		wp_send_json_success();
@@ -250,11 +250,11 @@ 
 	 *
 	 * @param string $debug_context Context sent with the message (for debugging).
 	 */
-	private function _unexpected_error( $debug_context ) {
+	private function _unexpected_error($debug_context) {
 
 		wp_send_json_error(
 			array(
-				'message' => __( 'There was an unexpected error. Try reloading the page.', 'wordpoints' ),
+				'message' => __('There was an unexpected error. Try reloading the page.', 'wordpoints'),
 				'debug'   => $debug_context,
 			)
 		);
@@ -270,8 +270,8 @@ 
 	 */
 	private function _verify_user_can() {
 
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( array( 'message' => __( 'Sorry, you are not allowed to perform this action. Maybe you have been logged out?', 'wordpoints' ) ) );
+		if ( ! current_user_can('manage_options')) {
+			wp_send_json_error(array('message' => __('Sorry, you are not allowed to perform this action. Maybe you have been logged out?', 'wordpoints')));
 		}
 	}
 
@@ -284,14 +284,14 @@ 
 	 *
 	 * @param string $action The action the nonce should be for.
 	 */
-	private function _verify_request( $action ) {
+	private function _verify_request($action) {
 
 		if (
-			empty( $_POST['nonce'] )
-			|| ! wordpoints_verify_nonce( 'nonce', $action, null, 'post' )
+			empty($_POST['nonce'])
+			|| ! wordpoints_verify_nonce('nonce', $action, null, 'post')
 		) {
 			wp_send_json_error(
-				array( 'message' => __( 'Your security token for this action has expired. Refresh the page and try again.', 'wordpoints' ) )
+				array('message' => __('Your security token for this action has expired. Refresh the page and try again.', 'wordpoints'))
 			);
 		}
 	}
@@ -305,14 +305,14 @@ 
 	 */
 	private function _get_group() {
 
-		if ( ! isset( $_POST['group'] ) ) { // WPCS: CSRF OK.
-			$this->_unexpected_error( 'group' );
+		if ( ! isset($_POST['group'])) { // WPCS: CSRF OK.
+			$this->_unexpected_error('group');
 		}
 
-		$group = WordPoints_Rank_Groups::get_group( sanitize_key( $_POST['group'] ) ); // WPCS: CSRF OK.
+		$group = WordPoints_Rank_Groups::get_group(sanitize_key($_POST['group'])); // WPCS: CSRF OK.
 
-		if ( ! $group ) {
-			wp_send_json_error( array( 'message' => __( 'The rank group passed to the server is invalid. Perhaps it has been deleted. Try reloading the page.', 'wordpoints' ) ) );
+		if ( ! $group) {
+			wp_send_json_error(array('message' => __('The rank group passed to the server is invalid. Perhaps it has been deleted. Try reloading the page.', 'wordpoints')));
 		}
 
 		return $group;
@@ -327,14 +327,14 @@ 
 	 */
 	private function _get_rank() {
 
-		if ( ! isset( $_POST['id'] ) ) { // WPCS: CSRF OK.
-			$this->_unexpected_error( 'id' );
+		if ( ! isset($_POST['id'])) { // WPCS: CSRF OK.
+			$this->_unexpected_error('id');
 		}
 
-		$rank = wordpoints_get_rank( wordpoints_int( $_POST['id'] ) ); // WPCS: CSRF OK.
+		$rank = wordpoints_get_rank(wordpoints_int($_POST['id'])); // WPCS: CSRF OK.
 
-		if ( ! $rank ) {
-			wp_send_json_error( array( 'message' => __( 'The rank ID passed to the server is invalid. Perhaps it has been deleted. Try reloading the page.', 'wordpoints' ) ) );
+		if ( ! $rank) {
+			wp_send_json_error(array('message' => __('The rank ID passed to the server is invalid. Perhaps it has been deleted. Try reloading the page.', 'wordpoints')));
 		}
 
 		return $rank;
@@ -351,14 +351,14 @@ 
 
 		$name = '';
 
-		if ( ! empty( $_POST['name'] ) ) { // WPCS: CSRF OK.
-			$name = sanitize_text_field( wp_unslash( $_POST['name'] ) ); // WPCS: CSRF OK.
+		if ( ! empty($_POST['name'])) { // WPCS: CSRF OK.
+			$name = sanitize_text_field(wp_unslash($_POST['name'])); // WPCS: CSRF OK.
 		}
 
-		if ( ! $name ) {
+		if ( ! $name) {
 			wp_send_json_error(
 				array(
-					'message' => __( 'Please enter a name for this rank.', 'wordpoints' ),
+					'message' => __('Please enter a name for this rank.', 'wordpoints'),
 					'field'   => 'name',
 				)
 			);
@@ -376,17 +376,17 @@ 
 	 */
 	private function _get_rank_type() {
 
-		if ( empty( $_POST['type'] ) ) { // WPCS: CSRF OK.
-			$this->_unexpected_error( 'type' );
+		if (empty($_POST['type'])) { // WPCS: CSRF OK.
+			$this->_unexpected_error('type');
 		}
 
-		$type = sanitize_text_field( wp_unslash( $_POST['type'] ) ); // WPCS: CSRF OK.
+		$type = sanitize_text_field(wp_unslash($_POST['type'])); // WPCS: CSRF OK.
 
-		if ( ! WordPoints_Rank_Types::is_type_registered( $type ) ) {
-			wp_send_json_error( array( 'message' => __( 'That rank type was not recognized. It may no longer be available. Try reloading the page.', 'wordpoints' ) ) );
+		if ( ! WordPoints_Rank_Types::is_type_registered($type)) {
+			wp_send_json_error(array('message' => __('That rank type was not recognized. It may no longer be available. Try reloading the page.', 'wordpoints')));
 		}
 
-		$this->rank_type = WordPoints_Rank_Types::get_type( $type );
+		$this->rank_type = WordPoints_Rank_Types::get_type($type);
 
 		return $this->rank_type;
 	}
@@ -401,10 +401,10 @@ 
 	private function _get_rank_position() {
 
 		if (
-			! isset( $_POST['order'] ) // WPCS: CSRF OK.
-			|| false === wordpoints_int( $_POST['order'] ) // WPCS: CSRF OK.
+			! isset($_POST['order']) // WPCS: CSRF OK.
+			|| false === wordpoints_int($_POST['order']) // WPCS: CSRF OK.
 		) {
-			$this->_unexpected_error( 'order' );
+			$this->_unexpected_error('order');
 		}
 
 		return (int) $_POST['order'];
@@ -420,7 +420,7 @@ 
 	private function _get_rank_meta() {
 
 		return array_intersect_key(
-			wp_unslash( $_POST ) // WPCS: CSRF OK.
+			wp_unslash($_POST) // WPCS: CSRF OK.
 			, $this->rank_type->get_meta_fields()
 		);
 	}
@@ -433,19 +433,19 @@ 
 	 * @param mixed  $result The result of the action.
 	 * @param string $action The action being performed: 'create' or 'update'.
 	 */
-	private function _send_json_result( $result, $action ) {
+	private function _send_json_result($result, $action) {
 
-		if ( ! $result ) {
+		if ( ! $result) {
 
-			if ( 'create' === $action ) {
-				$message = __( 'There was an error adding the rank. Please try again.', 'wordpoints' );
+			if ('create' === $action) {
+				$message = __('There was an error adding the rank. Please try again.', 'wordpoints');
 			} else {
-				$message = __( 'There was an error updating the rank. Please try again.', 'wordpoints' );
+				$message = __('There was an error updating the rank. Please try again.', 'wordpoints');
 			}
 
-			wp_send_json_error( array( 'message' => $message ) );
+			wp_send_json_error(array('message' => $message));
 
-		} elseif ( is_wp_error( $result ) ) {
+		} elseif (is_wp_error($result)) {
 
 			wp_send_json_error(
 				array(
@@ -457,11 +457,11 @@ 
 
 		$data = null;
 
-		if ( 'create' === $action ) {
-			$data = self::_prepare_rank( wordpoints_get_rank( $result ) );
+		if ('create' === $action) {
+			$data = self::_prepare_rank(wordpoints_get_rank($result));
 		}
 
-		wp_send_json_success( $data );
+		wp_send_json_success($data);
 	}
 
 	//
@@ -477,15 +477,15 @@ 
 	 *
 	 * @return array The rank data extracted into an array.
 	 */
-	private static function _prepare_rank( $rank ) {
+	private static function _prepare_rank($rank) {
 
 		$name = $rank->name;
-		if ( empty( $name ) ) {
-			$name = __( '(no title)', 'wordpoints' );
+		if (empty($name)) {
+			$name = __('(no title)', 'wordpoints');
 		}
 
-		$order = WordPoints_Rank_Groups::get_group( $rank->rank_group )
-			->get_rank_position( $rank->ID );
+		$order = WordPoints_Rank_Groups::get_group($rank->rank_group)
+			->get_rank_position($rank->ID);
 
 		$prepared_rank = array(
 			'id'    => $rank->ID,
@@ -500,10 +500,10 @@ 
 			),
 		);
 
-		$rank_type = WordPoints_Rank_Types::get_type( $rank->type );
+		$rank_type = WordPoints_Rank_Types::get_type($rank->type);
 
-		foreach ( $rank_type->get_meta_fields() as $field => $data ) {
-			$prepared_rank[ $field ] = $rank->{$field};
+		foreach ($rank_type->get_meta_fields() as $field => $data) {
+			$prepared_rank[$field] = $rank->{$field};
 		}
 
 		return $prepared_rank;

src/components/points/includes/class-wordpoints-points-hooks.php

Spacing +125 added lines, -125 removed lines

@@ -98,7 +98,7 @@ 
 	 * @deprecated 2.1.0
 	 */
 	public static function init() {
-		_deprecated_function( __METHOD__, '2.1.0' );
+		_deprecated_function(__METHOD__, '2.1.0');
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 *
 	 * @param string $class_name A 'WordPoints_Points_Hook' class name.
 	 */
-	public static function register( $class_name ) {
+	public static function register($class_name) {
 
 		self::$classes[] = $class_name;
 	}
@@ -127,14 +127,14 @@ 
 		 *
 		 * @since 1.4.0
 		 */
-		do_action( 'wordpoints_points_hooks_register' );
+		do_action('wordpoints_points_hooks_register');
 
-		$classes = array_unique( self::$classes );
+		$classes = array_unique(self::$classes);
 
-		foreach ( $classes as $class_name ) {
+		foreach ($classes as $class_name) {
 
 			$hook_type = new $class_name();
-			self::$hook_types[ $hook_type->get_id_base() ] = $hook_type;
+			self::$hook_types[$hook_type->get_id_base()] = $hook_type;
 		}
 
 		/**
@@ -142,7 +142,7 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_points_hooks_registered' );
+		do_action('wordpoints_points_hooks_registered');
 	}
 
 	/**
@@ -166,25 +166,25 @@ 
 	 *
 	 * @return WordPoints_Points_Hook|false The hook object, or false for invalid ID.
 	 */
-	public static function get_handler( $hook_id ) {
+	public static function get_handler($hook_id) {
 
-		list( $hook_type, $id_number ) = explode( '-', $hook_id );
+		list($hook_type, $id_number) = explode('-', $hook_id);
 
-		$hook_type = self::get_handler_by_id_base( $hook_type );
+		$hook_type = self::get_handler_by_id_base($hook_type);
 
-		if ( false === $hook_type ) {
+		if (false === $hook_type) {
 			return false;
 		}
 
-		$type = ( self::$network_mode ) ? 'network' : 'standard';
+		$type = (self::$network_mode) ? 'network' : 'standard';
 
-		$instances = $hook_type->get_instances( $type );
+		$instances = $hook_type->get_instances($type);
 
-		if ( ! isset( $instances[ $id_number ] ) ) {
+		if ( ! isset($instances[$id_number])) {
 			return false;
 		}
 
-		$hook_type->set_number( $id_number );
+		$hook_type->set_number($id_number);
 
 		return $hook_type;
 	}
@@ -201,13 +201,13 @@ 
 	 *
 	 * @return WordPoints_Points_Hook|false False if no handler found.
 	 */
-	public static function get_handler_by_id_base( $id_base ) {
+	public static function get_handler_by_id_base($id_base) {
 
-		if ( ! isset( self::$hook_types[ $id_base ] ) ) {
+		if ( ! isset(self::$hook_types[$id_base])) {
 			return false;
 		}
 
-		return self::$hook_types[ $id_base ];
+		return self::$hook_types[$id_base];
 	}
 
 	/**
@@ -221,35 +221,35 @@ 
 	 *                                 installed. Only needed if on multisite. If
 	 *                                 omitted, the current site ID is used.
 	 */
-	public static function uninstall_hook_types( $hook_types, array $site_ids = null ) {
+	public static function uninstall_hook_types($hook_types, array $site_ids = null) {
 
-		_deprecated_function( __METHOD__, '2.0.0', 'WordPoints_Un_Installer_Base::$uninstall' );
+		_deprecated_function(__METHOD__, '2.0.0', 'WordPoints_Un_Installer_Base::$uninstall');
 
 		$hook_types = (array) $hook_types;
 
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 
-			foreach ( $hook_types as $hook_type ) {
-				delete_site_option( "wordpoints_hook-{$hook_type}" );
+			foreach ($hook_types as $hook_type) {
+				delete_site_option("wordpoints_hook-{$hook_type}");
 			}
 
-			if ( ! isset( $site_ids ) ) {
-				$site_ids = array( get_current_blog_id() );
+			if ( ! isset($site_ids)) {
+				$site_ids = array(get_current_blog_id());
 			}
 
-			foreach ( $site_ids as $site_id ) {
+			foreach ($site_ids as $site_id) {
 
-				switch_to_blog( $site_id );
-				foreach ( $hook_types as $hook_type ) {
-					delete_option( "wordpoints_hook-{$hook_type}" );
+				switch_to_blog($site_id);
+				foreach ($hook_types as $hook_type) {
+					delete_option("wordpoints_hook-{$hook_type}");
 				}
 				restore_current_blog();
 			}
 
 		} else {
 
-			foreach ( $hook_types as $hook_type ) {
-				delete_option( "wordpoints_hook-{$hook_type}" );
+			foreach ($hook_types as $hook_type) {
+				delete_option("wordpoints_hook-{$hook_type}");
 			}
 		}
 	}
@@ -266,7 +266,7 @@ 
 
 		// Sort the hooks by name.
 		$hook_types = self::$hook_types;
-		uasort( $hook_types, array( __CLASS__, '_sort_name_callback' ) );
+		uasort($hook_types, array(__CLASS__, '_sort_name_callback'));
 
 		$disabled_hooks = wordpoints_get_maybe_network_array_option(
 			'wordpoints_legacy_points_hooks_disabled'
@@ -276,9 +276,9 @@ 
 		$i = 0;
 
 		// Display a representative for each hook type.
-		foreach ( $hook_types as $id_base => $hook_type ) {
+		foreach ($hook_types as $id_base => $hook_type) {
 
-			if ( isset( $disabled_hooks[ $id_base ] ) ) {
+			if (isset($disabled_hooks[$id_base])) {
 				continue;
 			}
 
@@ -291,16 +291,16 @@ 
 			$args['_multi_num'] = $hook_type->next_hook_id_number();
 			$args['_id_slug']   = $i;
 
-			$hook_type->set_options( $args );
+			$hook_type->set_options($args);
 
-			self::_list_hook( $hook_type->get_id( 0 ), $hook_type );
+			self::_list_hook($hook_type->get_id(0), $hook_type);
 		}
 
 		// If there were none, give the user a message.
-		if ( empty( $hook_types ) ) {
+		if (empty($hook_types)) {
 
 			echo '<div class="wordpoints-no-hooks">'
-				. esc_html__( 'There are no points hooks currently available.', 'wordpoints' )
+				. esc_html__('There are no points hooks currently available.', 'wordpoints')
 				. '</div>';
 		}
 	}
@@ -318,21 +318,21 @@ 
 	 *
 	 * @return void
 	 */
-	public static function list_by_points_type( $slug ) {
+	public static function list_by_points_type($slug) {
 
-		if ( '_inactive_hooks' !== $slug && ! wordpoints_is_points_type( $slug ) ) {
+		if ('_inactive_hooks' !== $slug && ! wordpoints_is_points_type($slug)) {
 			return;
 		}
 
-		$points_type_hooks = self::get_points_type_hooks( $slug );
+		$points_type_hooks = self::get_points_type_hooks($slug);
 
-		foreach ( $points_type_hooks as $hook_id ) {
+		foreach ($points_type_hooks as $hook_id) {
 
-			list( $hook_type ) = explode( '-', $hook_id );
+			list($hook_type) = explode('-', $hook_id);
 
-			$hook_type = self::get_handler_by_id_base( $hook_type );
+			$hook_type = self::get_handler_by_id_base($hook_type);
 
-			if ( false === $hook_type ) {
+			if (false === $hook_type) {
 				continue;
 			}
 
@@ -340,13 +340,13 @@ 
 
 			$options['_display'] = 'instance';
 
-			unset( $options['_add'] );
+			unset($options['_add']);
 
 			$options['_id_slug'] = $slug;
 
-			$hook_type->set_options( $options );
+			$hook_type->set_options($options);
 
-			self::_list_hook( $hook_id, $hook_type, $slug );
+			self::_list_hook($hook_id, $hook_type, $slug);
 		}
 	}
 
@@ -362,9 +362,9 @@ 
 	 *
 	 * @param bool $on Whether to turn network mode on or off.
 	 */
-	public static function set_network_mode( $on ) {
+	public static function set_network_mode($on) {
 
-		if ( $on !== self::$network_mode ) {
+		if ($on !== self::$network_mode) {
 			self::$network_mode = (bool) $on;
 		}
 	}
@@ -408,12 +408,12 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_points_type_hooks( $slug ) {
+	public static function get_points_type_hooks($slug) {
 
 		$points_types_hooks = self::get_points_types_hooks();
 
-		if ( isset( $points_types_hooks[ $slug ] ) && is_array( $points_types_hooks[ $slug ] ) ) {
-			$points_type_hooks = $points_types_hooks[ $slug ];
+		if (isset($points_types_hooks[$slug]) && is_array($points_types_hooks[$slug])) {
+			$points_type_hooks = $points_types_hooks[$slug];
 		} else {
 			$points_type_hooks = array();
 		}
@@ -428,12 +428,12 @@ 
 	 *
 	 * @param array $points_types_hooks The list of points types and their hooks.
 	 */
-	public static function save_points_types_hooks( array $points_types_hooks ) {
+	public static function save_points_types_hooks(array $points_types_hooks) {
 
-		if ( self::$network_mode ) {
-			update_site_option( 'wordpoints_points_types_hooks', $points_types_hooks );
+		if (self::$network_mode) {
+			update_site_option('wordpoints_points_types_hooks', $points_types_hooks);
 		} else {
-			update_option( 'wordpoints_points_types_hooks', $points_types_hooks );
+			update_option('wordpoints_points_types_hooks', $points_types_hooks);
 		}
 	}
 
@@ -446,11 +446,11 @@ 
 	 *
 	 * @return string|false The points type for the hook. False if not found.
 	 */
-	public static function get_points_type( $hook_id ) {
+	public static function get_points_type($hook_id) {
 
-		foreach ( self::get_points_types_hooks() as $points_type => $hooks ) {
+		foreach (self::get_points_types_hooks() as $points_type => $hooks) {
 
-			if ( in_array( $hook_id, $hooks ) ) {
+			if (in_array($hook_id, $hooks)) {
 				return $points_type;
 			}
 		}
@@ -469,9 +469,9 @@ 
 
 		$defaults = array();
 
-		foreach ( wordpoints_get_points_types() as $slug => $settings ) {
+		foreach (wordpoints_get_points_types() as $slug => $settings) {
 
-			$defaults[ $slug ] = array();
+			$defaults[$slug] = array();
 		}
 
 		return $defaults;
@@ -496,7 +496,7 @@ 
 	 * @param string $slug The slug for this type of points.
 	 * @param string $wrap Whether to wrap the form inputs in a "widget" or not.
 	 */
-	public static function points_type_form( $slug = null, $wrap = 'hook' ) {
+	public static function points_type_form($slug = null, $wrap = 'hook') {
 
 		_deprecated_function(
 			__METHOD__
@@ -506,12 +506,12 @@ 
 
 		$add_new = 0;
 
-		$points_type = wordpoints_get_points_type( $slug );
+		$points_type = wordpoints_get_points_type($slug);
 
-		if ( ! $points_type ) {
+		if ( ! $points_type) {
 
 			$points_type = array();
-			$add_new     = wp_create_nonce( 'wordpoints_add_new_points_type' );
+			$add_new     = wp_create_nonce('wordpoints_add_new_points_type');
 		}
 
 		$points_type = array_merge(
@@ -523,11 +523,11 @@ 
 			,$points_type
 		);
 
-		if ( ! isset( $slug ) && 'hook' === $wrap ) {
+		if ( ! isset($slug) && 'hook' === $wrap) {
 			$wrap = 'hook-content';
 		}
 
-		switch ( $wrap ) {
+		switch ($wrap) {
 
 			case 'hook':
 				$hook_wrap = true;
@@ -546,25 +546,25 @@ 
 
 		?>
 
-		<?php if ( $hook_wrap ) : ?>
+		<?php if ($hook_wrap) : ?>
 			<div class="hook points-settings">
 				<div class="hook-top">
 					<div class="hook-title-action">
 						<a class="hook-action hide-if-no-js" href="#available-hooks"></a>
 					</div>
-					<div class="hook-title"><h3><?php esc_html_e( 'Settings', 'wordpoints' ); ?><span class="in-hook-title"></span></h3></div>
+					<div class="hook-title"><h3><?php esc_html_e('Settings', 'wordpoints'); ?><span class="in-hook-title"></span></h3></div>
 				</div>
 
 				<div class="hook-inside">
 		<?php endif; ?>
 
-			<?php if ( $hook_content_wrap ) : ?>
+			<?php if ($hook_content_wrap) : ?>
 				<form method="post">
 					<div class="hook-content">
 			<?php endif; ?>
 
-						<?php if ( $slug ) : ?>
-						<p><span class="wordpoints-points-slug"><em><?php esc_html_e( 'Slug', 'wordpoints' ); ?>: <?php echo esc_html( $slug ); ?></em></span></p>
+						<?php if ($slug) : ?>
+						<p><span class="wordpoints-points-slug"><em><?php esc_html_e('Slug', 'wordpoints'); ?>: <?php echo esc_html($slug); ?></em></span></p>
 						<?php endif; ?>
 
 						<?php
@@ -578,33 +578,33 @@ 
 						 *
 						 * @param string $points_type The slug of the points type.
 						 */
-						do_action( 'wordpoints_points_type_form_top', $slug );
+						do_action('wordpoints_points_type_form_top', $slug);
 
-						if ( 'hook-content' === $wrap ) {
+						if ('hook-content' === $wrap) {
 
 							// Mark the prefix and suffix optional on the add new form.
-							$prefix = _x( 'Prefix (optional):', 'points type', 'wordpoints' );
-							$suffix = _x( 'Suffix (optional):', 'points type', 'wordpoints' );
+							$prefix = _x('Prefix (optional):', 'points type', 'wordpoints');
+							$suffix = _x('Suffix (optional):', 'points type', 'wordpoints');
 
 						} else {
 
-							$prefix = _x( 'Prefix:', 'points type', 'wordpoints' );
-							$suffix = _x( 'Suffix:', 'points type', 'wordpoints' );
+							$prefix = _x('Prefix:', 'points type', 'wordpoints');
+							$suffix = _x('Suffix:', 'points type', 'wordpoints');
 						}
 
 						?>
 
 						<p>
-							<label for="points-name-<?php echo esc_attr( $slug ); ?>"><?php echo esc_html_x( 'Name:', 'points type', 'wordpoints' ); ?></label>
-							<input class="widefat" type="text" id="points-name-<?php echo esc_attr( $slug ); ?>" name="points-name" value="<?php echo esc_attr( $points_type['name'] ); ?>" />
+							<label for="points-name-<?php echo esc_attr($slug); ?>"><?php echo esc_html_x('Name:', 'points type', 'wordpoints'); ?></label>
+							<input class="widefat" type="text" id="points-name-<?php echo esc_attr($slug); ?>" name="points-name" value="<?php echo esc_attr($points_type['name']); ?>" />
 						</p>
 						<p>
-							<label for="points-prefix-<?php echo esc_attr( $slug ); ?>"><?php echo esc_html( $prefix ); ?></label>
-							<input class="widefat" type="text" id="points-prefix-<?php echo esc_attr( $slug ); ?>" name="points-prefix" value="<?php echo esc_attr( $points_type['prefix'] ); ?>" />
+							<label for="points-prefix-<?php echo esc_attr($slug); ?>"><?php echo esc_html($prefix); ?></label>
+							<input class="widefat" type="text" id="points-prefix-<?php echo esc_attr($slug); ?>" name="points-prefix" value="<?php echo esc_attr($points_type['prefix']); ?>" />
 						</p>
 						<p>
-							<label for="points-suffix-<?php echo esc_attr( $slug ); ?>"><?php echo esc_html( $suffix ); ?></label>
-							<input class="widefat" type="text" id="points-suffix-<?php echo esc_attr( $slug ); ?>" name="points-suffix" value="<?php echo esc_attr( $points_type['suffix'] ); ?>" />
+							<label for="points-suffix-<?php echo esc_attr($slug); ?>"><?php echo esc_html($suffix); ?></label>
+							<input class="widefat" type="text" id="points-suffix-<?php echo esc_attr($slug); ?>" name="points-suffix" value="<?php echo esc_attr($points_type['suffix']); ?>" />
 						</p>
 
 						<?php
@@ -618,30 +618,30 @@ 
 						 *
 						 * @param string $points_type The slug of the points type.
 						 */
-						do_action( 'wordpoints_points_type_form_bottom', $slug );
+						do_action('wordpoints_points_type_form_bottom', $slug);
 
 						?>
 
-			<?php if ( $hook_content_wrap ) : ?>
+			<?php if ($hook_content_wrap) : ?>
 					</div>
 
-					<input type="hidden" name="points-slug" value="<?php echo esc_attr( $slug ); ?>" />
-					<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr( $add_new ); ?>" />
+					<input type="hidden" name="points-slug" value="<?php echo esc_attr($slug); ?>" />
+					<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
 
 					<div class="hook-control-actions">
 						<div class="alignleft">
 							<?php
 
-							if ( ! $add_new ) {
-								wp_nonce_field( "wordpoints_delete_points_type-{$slug}", 'delete-points-type-nonce' );
-								submit_button( _x( 'Delete', 'points type', 'wordpoints' ), 'delete', 'delete-points-type', false, array( 'id' => "delete_points_type-{$slug}" ) );
+							if ( ! $add_new) {
+								wp_nonce_field("wordpoints_delete_points_type-{$slug}", 'delete-points-type-nonce');
+								submit_button(_x('Delete', 'points type', 'wordpoints'), 'delete', 'delete-points-type', false, array('id' => "delete_points_type-{$slug}"));
 							}
 
 							?>
-							<a class="hook-control-close" href="#close"><?php esc_html_e( 'Close', 'wordpoints' ); ?></a>
+							<a class="hook-control-close" href="#close"><?php esc_html_e('Close', 'wordpoints'); ?></a>
 						</div>
 						<div class="alignright">
-							<?php submit_button( _x( 'Save', 'points type', 'wordpoints' ), 'button-primary hook-control-save right', 'save-points-type', false, array( 'id' => "points-{$slug}-save" ) ); ?>
+							<?php submit_button(_x('Save', 'points type', 'wordpoints'), 'button-primary hook-control-save right', 'save-points-type', false, array('id' => "points-{$slug}-save")); ?>
 							<span class="spinner"></span>
 						</div>
 						<br class="clear" />
@@ -649,7 +649,7 @@ 
 				</form>
 			<?php endif; ?>
 
-		<?php if ( $hook_wrap ) : ?>
+		<?php if ($hook_wrap) : ?>
 				</div>
 			</div>
 
@@ -669,25 +669,25 @@ 
 	 * @param WordPoints_Points_Hook $hook        A points hook object.
 	 * @param string                 $points_type The slug for a points type.
 	 */
-	private static function _list_hook( $hook_id, $hook, $points_type = null ) {
+	private static function _list_hook($hook_id, $hook, $points_type = null) {
 
-		$number  = $hook->get_number_by_id( $hook_id );
+		$number  = $hook->get_number_by_id($hook_id);
 		$id_base = $hook->get_id_base();
 		$options = $hook->get_options();
 
 		$id_format = $hook_id;
 
-		$multi_number = ( isset( $options['_multi_num'] ) ) ? $options['_multi_num'] : '';
-		$add_new      = ( isset( $options['_add'] ) )       ? $options['_add']       : '';
+		$multi_number = (isset($options['_multi_num'])) ? $options['_multi_num'] : '';
+		$add_new      = (isset($options['_add'])) ? $options['_add'] : '';
 
 		// Prepare the URL query string.
-		$query_arg = array( 'edithook' => $id_format );
+		$query_arg = array('edithook' => $id_format);
 
-		if ( $add_new ) {
+		if ($add_new) {
 
 			$query_arg['addnew'] = 1;
 
-			if ( $multi_number ) {
+			if ($multi_number) {
 
 				$query_arg['num']  = $multi_number;
 				$query_arg['base'] = $id_base;
@@ -698,7 +698,7 @@ 
 			$query_arg['points_type'] = $points_type;
 		}
 
-		if ( isset( $options['_display'] ) && 'template' === $options['_display'] ) {
+		if (isset($options['_display']) && 'template' === $options['_display']) {
 
 			/*
 			 * We aren't outputting the form for a hook, but a template form for this
@@ -714,17 +714,17 @@ 
 
 		?>
 
-		<div id="hook-<?php echo esc_html( $options['_id_slug'] ); ?>_<?php echo esc_attr( $id_format ); ?>" class="hook <?php echo esc_attr( $options['_classname'] ); ?>">
+		<div id="hook-<?php echo esc_html($options['_id_slug']); ?>_<?php echo esc_attr($id_format); ?>" class="hook <?php echo esc_attr($options['_classname']); ?>">
 		<div class="hook-top">
 			<div class="hook-title-action">
 				<a class="hook-action hide-if-no-js" href="#available-hooks"></a>
-				<a class="hook-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
-					<span class="edit"><?php echo esc_html_x( 'Edit', 'hook', 'wordpoints' ); ?></span>
-					<span class="add"><?php echo esc_html_x( 'Add', 'hook', 'wordpoints' ); ?></span>
-					<span class="screen-reader-text"><?php echo esc_html( strip_tags( $hook->get_name() ) ); ?></span>
+				<a class="hook-control-edit hide-if-js" href="<?php echo esc_url(add_query_arg($query_arg)); ?>">
+					<span class="edit"><?php echo esc_html_x('Edit', 'hook', 'wordpoints'); ?></span>
+					<span class="add"><?php echo esc_html_x('Add', 'hook', 'wordpoints'); ?></span>
+					<span class="screen-reader-text"><?php echo esc_html(strip_tags($hook->get_name())); ?></span>
 				</a>
 			</div>
-			<div class="hook-title"><h3><?php echo esc_html( strip_tags( $hook->get_name() ) ) ?><span class="in-hook-title"></span></h3></div>
+			<div class="hook-title"><h3><?php echo esc_html(strip_tags($hook->get_name())) ?><span class="in-hook-title"></span></h3></div>
 		</div>
 
 		<div class="hook-inside">
@@ -732,26 +732,26 @@ 
 				<div class="hook-content">
 					<?php
 
-					$has_form = $hook->form_callback( $number );
+					$has_form = $hook->form_callback($number);
 
 					?>
 				</div>
 
-				<input type="hidden" name="hook-id" class="hook-id" value="<?php echo esc_attr( $id_format ); ?>" />
-				<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
-				<input type="hidden" name="hook-width" class="hook-width" value="<?php echo isset( $options['width'] ) ? esc_attr( $options['width'] ) : ''; ?>" />
-				<input type="hidden" name="hook-height" class="hook-height" value="<?php echo isset( $options['height'] ) ? esc_attr( $options['height'] ) : ''; ?>" />
-				<input type="hidden" name="hook_number" class="hook_number" value="<?php echo esc_attr( $number ); ?>" />
-				<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
-				<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr( $add_new ); ?>" />
+				<input type="hidden" name="hook-id" class="hook-id" value="<?php echo esc_attr($id_format); ?>" />
+				<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
+				<input type="hidden" name="hook-width" class="hook-width" value="<?php echo isset($options['width']) ? esc_attr($options['width']) : ''; ?>" />
+				<input type="hidden" name="hook-height" class="hook-height" value="<?php echo isset($options['height']) ? esc_attr($options['height']) : ''; ?>" />
+				<input type="hidden" name="hook_number" class="hook_number" value="<?php echo esc_attr($number); ?>" />
+				<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
+				<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
 
 				<div class="hook-control-actions">
 					<div class="alignleft">
-						<a class="hook-control-remove" href="#remove"><?php esc_html_e( 'Delete', 'wordpoints' ); ?></a> |
-						<a class="hook-control-close" href="#close"><?php esc_html_e( 'Close', 'wordpoints' ); ?></a>
+						<a class="hook-control-remove" href="#remove"><?php esc_html_e('Delete', 'wordpoints'); ?></a> |
+						<a class="hook-control-close" href="#close"><?php esc_html_e('Close', 'wordpoints'); ?></a>
 					</div>
-					<div class="alignright<?php echo ( false === $has_form ) ? ' hook-control-noform' : ''; ?>">
-						<?php submit_button( __( 'Save', 'wordpoints' ), 'button-primary hook-control-save right', 'savehook', false, array( 'id' => "hook-{$id_format}-savehook" ) ); ?>
+					<div class="alignright<?php echo (false === $has_form) ? ' hook-control-noform' : ''; ?>">
+						<?php submit_button(__('Save', 'wordpoints'), 'button-primary hook-control-save right', 'savehook', false, array('id' => "hook-{$id_format}-savehook")); ?>
 						<span class="spinner"></span>
 					</div>
 					<br class="clear" />
@@ -760,8 +760,8 @@ 
 		</div>
 
 		<div class="hook-description">
-			<?php if ( ! empty( $options['description'] ) ) : ?>
-				<?php echo esc_html( $options['description'] ); ?>
+			<?php if ( ! empty($options['description'])) : ?>
+				<?php echo esc_html($options['description']); ?>
 			<?php endif; ?>
 		</div>
 		</div>
@@ -781,9 +781,9 @@ 
 	 *
 	 * @return int
 	 */
-	private static function _sort_name_callback( $a, $b ) {
+	private static function _sort_name_callback($a, $b) {
 
-		return strnatcasecmp( $a->get_name(), $b->get_name() );
+		return strnatcasecmp($a->get_name(), $b->get_name());
 	}
 
 } // class WordPoints_Points_Hooks

src/components/points/includes/class-wordpoints-points-logs-query.php

Spacing +85 added lines, -85 removed lines

@@ -27,15 +27,15 @@ 
 	 * @since 2.3.0
 	 */
 	protected $columns = array(
-		'id'          => array( 'format' => '%d', 'unsigned' => true ),
-		'user_id'     => array( 'format' => '%d', 'unsigned' => true ),
-		'log_type'    => array( 'format' => '%s' ),
-		'points'      => array( 'format' => '%d' ),
-		'points_type' => array( 'format' => '%s' ),
-		'text'        => array( 'format' => '%s' ),
-		'blog_id'     => array( 'format' => '%d', 'unsigned' => true ),
-		'site_id'     => array( 'format' => '%d', 'unsigned' => true ),
-		'date'        => array( 'format' => '%s', 'is_date' => true ),
+		'id'          => array('format' => '%d', 'unsigned' => true),
+		'user_id'     => array('format' => '%d', 'unsigned' => true),
+		'log_type'    => array('format' => '%s'),
+		'points'      => array('format' => '%d'),
+		'points_type' => array('format' => '%s'),
+		'text'        => array('format' => '%s'),
+		'blog_id'     => array('format' => '%d', 'unsigned' => true),
+		'site_id'     => array('format' => '%d', 'unsigned' => true),
+		'date'        => array('format' => '%s', 'is_date' => true),
 	);
 
 	/**
@@ -47,11 +47,11 @@ 
 	 * @since 2.3.0
 	 */
 	protected $deprecated_args = array(
-		'orderby'      => array( 'replacement' => 'order_by', 'version' => '2.3.0', 'class' => __CLASS__ ),
-		'user__in'     => array( 'replacement' => 'user_id__in', 'version' => '2.3.0', 'class' => __CLASS__ ),
-		'user__not_in' => array( 'replacement' => 'user_id__not_in', 'version' => '2.3.0', 'class' => __CLASS__ ),
-		'blog__in'     => array( 'replacement' => 'blog_id__in', 'version' => '2.3.0', 'class' => __CLASS__ ),
-		'blog__not_in' => array( 'replacement' => 'blog_id__not_in', 'version' => '2.3.0', 'class' => __CLASS__ ),
+		'orderby'      => array('replacement' => 'order_by', 'version' => '2.3.0', 'class' => __CLASS__),
+		'user__in'     => array('replacement' => 'user_id__in', 'version' => '2.3.0', 'class' => __CLASS__),
+		'user__not_in' => array('replacement' => 'user_id__not_in', 'version' => '2.3.0', 'class' => __CLASS__),
+		'blog__in'     => array('replacement' => 'blog_id__in', 'version' => '2.3.0', 'class' => __CLASS__),
+		'blog__not_in' => array('replacement' => 'blog_id__not_in', 'version' => '2.3.0', 'class' => __CLASS__),
 	);
 
 	//
@@ -177,7 +177,7 @@ 
 	 *        @type array        $meta_query          See WP_Meta_Query.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 
 		global $wpdb;
 
@@ -191,21 +191,21 @@ 
 		$this->defaults['text__compare'] = 'LIKE';
 
 		// Back-compat for pre-2.3.0, in case an object or string is passed.
-		$args = wp_parse_args( $args );
-		$args = $this->convert_deprecated_arg_values( $args );
+		$args = wp_parse_args($args);
+		$args = $this->convert_deprecated_arg_values($args);
 
-		parent::__construct( $args );
+		parent::__construct($args);
 
-		if ( is_multisite() ) {
-			foreach ( array( 'blog', 'site' ) as $arg ) {
+		if (is_multisite()) {
+			foreach (array('blog', 'site') as $arg) {
 
 				if (
 					// Support passing these as null to override the defaults.
-					! array_key_exists( "{$arg}_id", $this->args )
-					&& ! isset( $this->args[ "{$arg}_id__in" ] )
-					&& ! isset( $this->args[ "{$arg}_id__not_in" ] )
+					! array_key_exists("{$arg}_id", $this->args)
+					&& ! isset($this->args["{$arg}_id__in"])
+					&& ! isset($this->args["{$arg}_id__not_in"])
 				) {
-					$this->args[ "{$arg}_id" ] = $wpdb->{"{$arg}id"};
+					$this->args["{$arg}_id"] = $wpdb->{"{$arg}id"};
 				}
 			}
 		}
@@ -220,31 +220,31 @@ 
 	 *
 	 * @return array $args The args, with any values converted as needed.
 	 */
-	protected function convert_deprecated_arg_values( $args ) {
+	protected function convert_deprecated_arg_values($args) {
 
 		// Back-compat for pre-2.3.0, when the fields arg supported 'all'.
-		if ( isset( $args['fields'] ) && 'all' === $args['fields'] ) {
+		if (isset($args['fields']) && 'all' === $args['fields']) {
 
 			_deprecated_argument(
 				__METHOD__
 				, '2.3.0'
-				, esc_html( "Passing 'fields' => 'all' is deprecated, just omit the 'fields' arg instead, since all fields returned by default." )
+				, esc_html("Passing 'fields' => 'all' is deprecated, just omit the 'fields' arg instead, since all fields returned by default.")
 			);
 
-			unset( $args['fields'] );
+			unset($args['fields']);
 		}
 
 		// Back-compat for pre-2.3.0, when the orderby arg supported 'none'.
-		if ( isset( $args['orderby'] ) && 'none' === $args['orderby'] ) {
+		if (isset($args['orderby']) && 'none' === $args['orderby']) {
 
 			_deprecated_argument(
 				__METHOD__
 				, '2.3.0'
-				, esc_html( "Passing 'orderby' => 'none' is deprecated, pass 'order_by' => null instead." )
+				, esc_html("Passing 'orderby' => 'none' is deprecated, pass 'order_by' => null instead.")
 			);
 
 			$args['order_by'] = null;
-			unset( $args['orderby'] );
+			unset($args['orderby']);
 
 			return $args;
 		}
@@ -256,11 +256,11 @@ 
 	 * @since 1.6.0
 	 * @since 2.3.0 Now returns $this.
 	 */
-	public function set_args( array $args ) {
+	public function set_args(array $args) {
 
 		$this->_cache_query_hash = null;
 
-		return parent::set_args( $this->convert_deprecated_arg_values( $args ) );
+		return parent::set_args($this->convert_deprecated_arg_values($args));
 	}
 
 	/**
@@ -279,18 +279,18 @@ 
 	 */
 	public function count() {
 
-		if ( $this->_is_cached_query ) {
-			$cache = $this->_cache_get( 'count' );
+		if ($this->_is_cached_query) {
+			$cache = $this->_cache_get('count');
 
-			if ( false !== $cache ) {
+			if (false !== $cache) {
 				return $cache;
 			}
 		}
 
 		$count = parent::count();
 
-		if ( $this->_is_cached_query ) {
-			$this->_cache_set( $count, 'count' );
+		if ($this->_is_cached_query) {
+			$this->_cache_set($count, 'count');
 		}
 
 		return $count;
@@ -308,23 +308,23 @@ 
 	 *
 	 * @return mixed The results of the query, or false on failure.
 	 */
-	public function get( $method = 'results' ) {
+	public function get($method = 'results') {
 
-		if ( $this->_is_cached_query ) {
-			$cache = $this->_cache_get( "get_{$method}" );
+		if ($this->_is_cached_query) {
+			$cache = $this->_cache_get("get_{$method}");
 
-			if ( false !== $cache ) {
+			if (false !== $cache) {
 				return $cache;
 			}
 		}
 
-		$result = parent::get( $method );
+		$result = parent::get($method);
 
-		if ( $this->_is_cached_query ) {
-			$this->_cache_set( $result, "get_{$method}" );
+		if ($this->_is_cached_query) {
+			$this->_cache_set($result, "get_{$method}");
 
-			if ( 'results' === $method || 'col' === $method ) {
-				$this->_cache_set( count( $result ), 'count' );
+			if ('results' === $method || 'col' === $method) {
+				$this->_cache_set(count($result), 'count');
 			}
 		}
 
@@ -351,20 +351,20 @@ 
 	 *
 	 * @return object[]|false The logs for this page, or false if $page or $per_page is invalid.
 	 */
-	public function get_page( $page, $per_page = 25 ) {
+	public function get_page($page, $per_page = 25) {
 
-		if ( ! wordpoints_posint( $page ) || ! wordpoints_posint( $per_page ) ) {
+		if ( ! wordpoints_posint($page) || ! wordpoints_posint($per_page)) {
 			return false;
 		}
 
-		$start = ( $page - 1 ) * $per_page;
+		$start = ($page - 1) * $per_page;
 
 		// First try the main cache.
-		if ( $this->_is_cached_query ) {
+		if ($this->_is_cached_query) {
 
-			$cache = $this->_cache_get( 'get_results' );
+			$cache = $this->_cache_get('get_results');
 
-			if ( false !== $cache ) {
+			if (false !== $cache) {
 				return array_slice(
 					$cache
 					, $start - $this->args['start']
@@ -378,18 +378,18 @@ 
 
 		$this->args['start'] += $start;
 
-		if ( ! empty( $this->args['limit'] ) ) {
+		if ( ! empty($this->args['limit'])) {
 			$this->args['limit'] -= $start;
 		}
 
-		if ( empty( $this->args['limit'] ) || $this->args['limit'] > $per_page ) {
+		if (empty($this->args['limit']) || $this->args['limit'] > $per_page) {
 			$this->args['limit'] = $per_page;
 		}
 
 		// Regenerate the query limit after changing the start and limit args.
 		$this->prepare_limit();
 
-		unset( $this->_cache_query_hash );
+		unset($this->_cache_query_hash);
 
 		$results = $this->get();
 
@@ -400,7 +400,7 @@ 
 		$this->limit = '';
 		$this->prepare_limit();
 
-		unset( $this->_cache_query_hash );
+		unset($this->_cache_query_hash);
 
 		return $results;
 	}
@@ -448,9 +448,9 @@ 
 	 * @param string $deprecated Deprecated; no longer used.
 	 * @param bool   $network    Whether this is a network-wide query.
 	 */
-	public function prime_cache( $key = 'default:%points_type%', $deprecated = null, $network = false ) {
+	public function prime_cache($key = 'default:%points_type%', $deprecated = null, $network = false) {
 
-		if ( ! is_null( $deprecated ) ) {
+		if ( ! is_null($deprecated)) {
 			_deprecated_argument(
 				__METHOD__
 				, '1.9.0'
@@ -466,13 +466,13 @@ 
 				'%user_id%',
 			)
 			, array(
-				isset( $this->args['points_type'] ) ? $this->args['points_type'] : '',
-				isset( $this->args['user_id'] ) ? $this->args['user_id'] : 0,
+				isset($this->args['points_type']) ? $this->args['points_type'] : '',
+				isset($this->args['user_id']) ? $this->args['user_id'] : 0,
 			)
 			, $key
 		);
 
-		if ( $network ) {
+		if ($network) {
 			$this->_cache_group = 'wordpoints_network_points_logs_query';
 		} else {
 			$this->_cache_group = 'wordpoints_points_logs_query';
@@ -488,9 +488,9 @@ 
 	 *
 	 * @return string The correct meta table ID column, if the key is wordpoints_points_log_.
 	 */
-	public function meta_query_meta_table_id_filter( $key ) {
+	public function meta_query_meta_table_id_filter($key) {
 
-		if ( 'wordpoints_points_log__id' === $key ) {
+		if ('wordpoints_points_log__id' === $key) {
 			$key = 'log_id';
 		}
 
@@ -506,9 +506,9 @@ 
 	 */
 	protected function prepare_meta_where() {
 
-		add_filter( 'sanitize_key', array( $this, 'meta_query_meta_table_id_filter' ) );
+		add_filter('sanitize_key', array($this, 'meta_query_meta_table_id_filter'));
 		parent::prepare_meta_where();
-		remove_filter( 'sanitize_key', array( $this, 'meta_query_meta_table_id_filter' ) );
+		remove_filter('sanitize_key', array($this, 'meta_query_meta_table_id_filter'));
 	}
 
 	//
@@ -525,29 +525,29 @@ 
 	 *
 	 * @return mixed Cached value, or false if none.
 	 */
-	private function _cache_get( $type = null ) {
+	private function _cache_get($type = null) {
 
-		$cache = wp_cache_get( $this->_cache_key, $this->_cache_group );
+		$cache = wp_cache_get($this->_cache_key, $this->_cache_group);
 
-		if ( ! is_array( $cache ) ) {
+		if ( ! is_array($cache)) {
 			return false;
 		}
 
 		$this->_calc_cache_query_hash();
 
-		if ( ! isset( $cache[ $this->_cache_query_hash ] ) ) {
+		if ( ! isset($cache[$this->_cache_query_hash])) {
 			return false;
 		}
 
-		if ( isset( $type ) ) {
-			if ( isset( $cache[ $this->_cache_query_hash ][ $type ] ) ) {
-				return $cache[ $this->_cache_query_hash ][ $type ];
+		if (isset($type)) {
+			if (isset($cache[$this->_cache_query_hash][$type])) {
+				return $cache[$this->_cache_query_hash][$type];
 			} else {
 				return false;
 			}
 		}
 
-		return $cache[ $this->_cache_query_hash ];
+		return $cache[$this->_cache_query_hash];
 	}
 
 	/**
@@ -559,26 +559,26 @@ 
 	 * @param string $type  Optionally specify a results type to cache. Default is
 	 *                      null, or all types.
 	 */
-	private function _cache_set( $value, $type = null ) {
+	private function _cache_set($value, $type = null) {
 
-		$cache = wp_cache_get( $this->_cache_key, $this->_cache_group );
+		$cache = wp_cache_get($this->_cache_key, $this->_cache_group);
 
 		$this->_calc_cache_query_hash();
 
 		if (
-			! isset( $cache[ $this->_cache_query_hash ] )
-			|| ! is_array( $cache[ $this->_cache_query_hash ] )
+			! isset($cache[$this->_cache_query_hash])
+			|| ! is_array($cache[$this->_cache_query_hash])
 		) {
-			$cache[ $this->_cache_query_hash ] = array();
+			$cache[$this->_cache_query_hash] = array();
 		}
 
-		if ( isset( $type ) ) {
-			$cache[ $this->_cache_query_hash ][ $type ] = $value;
+		if (isset($type)) {
+			$cache[$this->_cache_query_hash][$type] = $value;
 		} else {
-			$cache[ $this->_cache_query_hash ] = $value;
+			$cache[$this->_cache_query_hash] = $value;
 		}
 
-		wp_cache_set( $this->_cache_key, $cache, $this->_cache_group );
+		wp_cache_set($this->_cache_key, $cache, $this->_cache_group);
 	}
 
 	/**
@@ -588,8 +588,8 @@ 
 	 */
 	private function _calc_cache_query_hash() {
 
-		if ( ! isset( $this->_cache_query_hash ) ) {
-			$this->_cache_query_hash = wordpoints_hash( $this->get_sql() );
+		if ( ! isset($this->_cache_query_hash)) {
+			$this->_cache_query_hash = wordpoints_hash($this->get_sql());
 		}
 	}
 

src/components/points/includes/functions.php

Spacing +55 added lines, -55 removed lines

@@ -16,10 +16,10 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $reactors The reactors registry.
  */
-function wordpoints_points_hook_reactors_init( $reactors ) {
+function wordpoints_points_hook_reactors_init($reactors) {
 
-	$reactors->register( 'points', 'WordPoints_Points_Hook_Reactor' );
-	$reactors->register( 'points_legacy', 'WordPoints_Points_Hook_Reactor_Legacy' );
+	$reactors->register('points', 'WordPoints_Points_Hook_Reactor');
+	$reactors->register('points_legacy', 'WordPoints_Points_Hook_Reactor_Legacy');
 }
 
 /**
@@ -31,7 +31,7 @@ 
  *
  * @param WordPoints_Class_Registry_Children $reaction_stores The store registry.
  */
-function wordpoints_points_hook_reaction_stores_init( $reaction_stores ) {
+function wordpoints_points_hook_reaction_stores_init($reaction_stores) {
 
 	$reaction_stores->register(
 		'standard'
@@ -39,7 +39,7 @@ 
 		, 'WordPoints_Hook_Reaction_Store_Options'
 	);
 
-	if ( is_wordpoints_network_active() ) {
+	if (is_wordpoints_network_active()) {
 		$reaction_stores->register(
 			'network'
 			, 'points'
@@ -57,7 +57,7 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $extensions The extension registry.
  */
-function wordpoints_points_hook_extensions_init( $extensions ) {
+function wordpoints_points_hook_extensions_init($extensions) {
 
 	$extensions->register(
 		'points_legacy_reversals'
@@ -85,13 +85,13 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_points_register_legacy_post_publish_events( $slug ) {
+function wordpoints_points_register_legacy_post_publish_events($slug) {
 
-	if ( 'attachment' === $slug ) {
+	if ('attachment' === $slug) {
 		return;
 	}
 
-	$events = wordpoints_hooks()->get_sub_app( 'events' );
+	$events = wordpoints_hooks()->get_sub_app('events');
 
 	$events->register(
 		"points_legacy_post_publish\\{$slug}"
@@ -131,19 +131,19 @@ 
 	wp_register_style(
 		'wordpoints-points-logs'
 		, "{$assets_url}/css/points-logs{$suffix}.css"
-		, array( 'dashicons' )
+		, array('dashicons')
 		, WORDPOINTS_VERSION
 	);
 
 	$styles = wp_styles();
-	$rtl_styles = array( 'wordpoints-top-users', 'wordpoints-points-logs' );
+	$rtl_styles = array('wordpoints-top-users', 'wordpoints-points-logs');
 
-	foreach ( $rtl_styles as $rtl_style ) {
+	foreach ($rtl_styles as $rtl_style) {
 
-		$styles->add_data( $rtl_style, 'rtl', 'replace' );
+		$styles->add_data($rtl_style, 'rtl', 'replace');
 
-		if ( $suffix ) {
-			$styles->add_data( $rtl_style, 'suffix', $suffix );
+		if ($suffix) {
+			$styles->add_data($rtl_style, 'suffix', $suffix);
 		}
 	}
 }
@@ -160,7 +160,7 @@ 
 	return array(
 		'set_wordpoints_points'                  => 'manage_options',
 		'manage_network_wordpoints_points_hooks' => 'manage_network_options',
-		'manage_wordpoints_points_types'         => ( is_wordpoints_network_active() ) ? 'manage_network_options' : 'manage_options',
+		'manage_wordpoints_points_types'         => (is_wordpoints_network_active()) ? 'manage_network_options' : 'manage_options',
 	);
 }
 
@@ -178,23 +178,23 @@ 
  *
  * @return string $points formatted with prefix and suffix.
  */
-function wordpoints_format_points_filter( $formatted, $points, $type ) {
+function wordpoints_format_points_filter($formatted, $points, $type) {
 
-	$points_type = wordpoints_get_points_type( $type );
+	$points_type = wordpoints_get_points_type($type);
 
-	if ( isset( $points_type['prefix'] ) ) {
+	if (isset($points_type['prefix'])) {
 
-		if ( $points < 0 ) {
+		if ($points < 0) {
 
-			$points = abs( $points );
+			$points = abs($points);
 			$points_type['prefix'] = '-' . $points_type['prefix'];
 		}
 
-		$formatted = esc_html( $points_type['prefix'] . $points );
+		$formatted = esc_html($points_type['prefix'] . $points);
 	}
 
-	if ( isset( $points_type['suffix'] ) ) {
-		$formatted = $formatted . esc_html( $points_type['suffix'] );
+	if (isset($points_type['suffix'])) {
+		$formatted = $formatted . esc_html($points_type['suffix']);
 	}
 
 	return $formatted;
@@ -211,20 +211,20 @@ 
  * @param array $args The arguments for the dropdown {@see
  *        WordPoints_Dropdown_Builder::$args}.
  */
-function wordpoints_points_types_dropdown( array $args ) {
+function wordpoints_points_types_dropdown(array $args) {
 
 	$points_types = array();
 
-	foreach ( wordpoints_get_points_types() as $slug => $settings ) {
+	foreach (wordpoints_get_points_types() as $slug => $settings) {
 
-		$points_types[ $slug ] = $settings['name'];
+		$points_types[$slug] = $settings['name'];
 	}
 
-	if ( isset( $args['options'] ) && is_array( $args['options'] ) ) {
+	if (isset($args['options']) && is_array($args['options'])) {
 		$points_types = $args['options'] + $points_types;
 	}
 
-	$dropdown = new WordPoints_Dropdown_Builder( $points_types, $args );
+	$dropdown = new WordPoints_Dropdown_Builder($points_types, $args);
 
 	$dropdown->display();
 }
@@ -238,27 +238,27 @@ 
  *
  * @param int $user_id The ID of the user just deleted.
  */
-function wordpoints_delete_points_logs_for_user( $user_id ) {
+function wordpoints_delete_points_logs_for_user($user_id) {
 
 	global $wpdb;
 
-	$query_args = array( 'fields' => 'id', 'user_id' => $user_id );
+	$query_args = array('fields' => 'id', 'user_id' => $user_id);
 
 	// If the user is being deleted from all blogs on multisite.
-	if ( is_multisite() && ! get_userdata( $user_id ) ) {
+	if (is_multisite() && ! get_userdata($user_id)) {
 		$query_args['blog_id'] = 0;
 	}
 
 	// Delete log meta.
-	$query = new WordPoints_Points_Logs_Query( $query_args );
+	$query = new WordPoints_Points_Logs_Query($query_args);
 
-	foreach ( $query->get( 'col' ) as $log_id ) {
-		wordpoints_points_log_delete_all_metadata( $log_id );
+	foreach ($query->get('col') as $log_id) {
+		wordpoints_points_log_delete_all_metadata($log_id);
 	}
 
-	$where = array( 'user_id' => $user_id );
+	$where = array('user_id' => $user_id);
 
-	if ( ! isset( $query_args['blog_id'] ) ) {
+	if ( ! isset($query_args['blog_id'])) {
 		$where['blog_id'] = $wpdb->blogid;
 	}
 
@@ -269,7 +269,7 @@ 
 		,'%d'
 	);
 
-	wordpoints_flush_points_logs_caches( array( 'user_id' => $user_id ) );
+	wordpoints_flush_points_logs_caches(array('user_id' => $user_id));
 }
 
 /**
@@ -281,21 +281,21 @@ 
  *
  * @param int $blog_id The ID of the blog being deleted.
  */
-function wordpoints_delete_points_logs_for_blog( $blog_id ) {
+function wordpoints_delete_points_logs_for_blog($blog_id) {
 
 	global $wpdb;
 
 	// Delete log meta.
-	$query = new WordPoints_Points_Logs_Query( array( 'fields' => 'id' ) );
+	$query = new WordPoints_Points_Logs_Query(array('fields' => 'id'));
 
-	foreach ( $query->get( 'col' ) as $log_id ) {
-		wordpoints_points_log_delete_all_metadata( $log_id );
+	foreach ($query->get('col') as $log_id) {
+		wordpoints_points_log_delete_all_metadata($log_id);
 	}
 
 	// Now delete the logs.
 	$wpdb->delete(
 		$wpdb->wordpoints_points_logs
-		,array( 'blog_id' => $blog_id )
+		,array('blog_id' => $blog_id)
 		,'%d'
 	);
 
@@ -311,13 +311,13 @@ 
  *
  * @param string $points_type The type of points the settings are being shown for.
  */
-function wordpoints_points_settings_custom_meta_key_message( $points_type ) {
+function wordpoints_points_settings_custom_meta_key_message($points_type) {
 
-	$custom_key = wordpoints_get_points_type_setting( $points_type, 'meta_key' );
+	$custom_key = wordpoints_get_points_type_setting($points_type, 'meta_key');
 
-	if ( ! empty( $custom_key ) ) {
+	if ( ! empty($custom_key)) {
 		// translators: 1. Meta key.
-		echo '<p>' . esc_html( sprintf( __( 'This points type uses a custom meta key: %s', 'wordpoints' ), $custom_key ) ) . '</p>';
+		echo '<p>' . esc_html(sprintf(__('This points type uses a custom meta key: %s', 'wordpoints'), $custom_key)) . '</p>';
 	}
 }
 
@@ -330,20 +330,20 @@ 
  *
  * @param string $points_type The type of points whose logs are being displayed.
  */
-function wordpoints_points_logs_custom_meta_key_message( $points_type ) {
+function wordpoints_points_logs_custom_meta_key_message($points_type) {
 
-	if ( ! current_user_can( 'manage_options' ) ) {
+	if ( ! current_user_can('manage_options')) {
 		return;
 	}
 
-	$custom_key = wordpoints_get_points_type_setting( $points_type, 'meta_key' );
+	$custom_key = wordpoints_get_points_type_setting($points_type, 'meta_key');
 
-	if ( ! empty( $custom_key ) ) {
+	if ( ! empty($custom_key)) {
 		wordpoints_show_admin_message(
 			esc_html(
 				sprintf(
 					// translators: Meta key.
-					__( 'This points type uses a custom meta key (&#8220;%s&#8221;). If this key is also used by another plugin, changes made by it will not be logged. Only transactions performed by WordPoints are included in the logs.', 'wordpoints' )
+					__('This points type uses a custom meta key (&#8220;%s&#8221;). If this key is also used by another plugin, changes made by it will not be logged. Only transactions performed by WordPoints are included in the logs.', 'wordpoints')
 					, $custom_key
 				)
 			)
@@ -362,18 +362,18 @@ 
  */
 function wordpoints_points_add_global_cache_groups() {
 
-	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
+	if (function_exists('wp_cache_add_global_groups')) {
 
 		$groups = array(
 			'wordpoints_network_points_logs_query',
 			'wordpoints_points_log_meta',
 		);
 
-		if ( is_wordpoints_network_active() ) {
+		if (is_wordpoints_network_active()) {
 			$groups[] = 'wordpoints_points_top_users';
 		}
 
-		wp_cache_add_global_groups( $groups );
+		wp_cache_add_global_groups($groups);
 	}
 }
 

src/components/points/includes/widgets.php

Spacing +94 added lines, -94 removed lines

@@ -17,13 +17,13 @@ 
 function wordpoints_register_points_widgets() {
 
 	// My points widget.
-	register_widget( 'WordPoints_My_Points_Widget' );
+	register_widget('WordPoints_My_Points_Widget');
 
 	// Top users widget.
-	register_widget( 'WordPoints_Top_Users_Points_Widget' );
+	register_widget('WordPoints_Top_Users_Points_Widget');
 
 	// Points logs widget.
-	register_widget( 'WordPoints_Points_Logs_Widget' );
+	register_widget('WordPoints_Points_Logs_Widget');
 }
 
 /**
@@ -38,22 +38,22 @@ 
 	/**
 	 * @since 1.9.0
 	 */
-	protected function verify_settings( $instance ) {
+	protected function verify_settings($instance) {
 
-		if ( isset( $this->defaults['points_type'] ) ) {
+		if (isset($this->defaults['points_type'])) {
 
 			if (
-				empty( $instance['points_type'] )
-				|| ! wordpoints_is_points_type( $instance['points_type'] )
+				empty($instance['points_type'])
+				|| ! wordpoints_is_points_type($instance['points_type'])
 			) {
 				return new WP_Error(
 					'wordpoints_widget_invalid_points_type'
-					, esc_html__( 'Please select a valid points type.', 'wordpoints' )
+					, esc_html__('Please select a valid points type.', 'wordpoints')
 				);
 			}
 		}
 
-		return parent::verify_settings( $instance );
+		return parent::verify_settings($instance);
 	}
 
 	/**
@@ -67,17 +67,17 @@ 
 	 *
 	 * @param string $maybe_points_type The variable to insure is a points type.
 	 */
-	protected function make_a_points_type( &$maybe_points_type ) {
+	protected function make_a_points_type(&$maybe_points_type) {
 
-		if ( ! wordpoints_is_points_type( $maybe_points_type ) ) {
+		if ( ! wordpoints_is_points_type($maybe_points_type)) {
 
 			$maybe_points_type = wordpoints_get_default_points_type();
 
-			if ( ! $maybe_points_type ) {
+			if ( ! $maybe_points_type) {
 
 				$points_types = wordpoints_get_points_types();
 
-				$maybe_points_type = key( $points_types );
+				$maybe_points_type = key($points_types);
 			}
 		}
 	}
@@ -85,11 +85,11 @@ 
 	/**
 	 * @since 2.0.0
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
-		parent::update( $new_instance, $old_instance );
+		parent::update($new_instance, $old_instance);
 
-		$this->make_a_points_type( $this->instance['points_type'] );
+		$this->make_a_points_type($this->instance['points_type']);
 
 		return $this->instance;
 	}
@@ -97,9 +97,9 @@ 
 	/**
 	 * @since 2.0.0
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		parent::form( $instance );
+		parent::form($instance);
 
 		$this->form_points_type_field();
 
@@ -115,16 +115,16 @@ 
 
 		$dropdown_args = array(
 			'selected' => $this->instance['points_type'],
-			'id'       => $this->get_field_id( 'points_type' ),
-			'name'     => $this->get_field_name( 'points_type' ),
+			'id'       => $this->get_field_id('points_type'),
+			'name'     => $this->get_field_name('points_type'),
 			'class'    => 'widefat',
 		);
 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $dropdown_args['id'] ); ?>"><?php echo esc_html_x( 'Points type', 'form label', 'wordpoints' ); ?></label>
-			<?php wordpoints_points_types_dropdown( $dropdown_args ); ?>
+			<label for="<?php echo esc_attr($dropdown_args['id']); ?>"><?php echo esc_html_x('Points type', 'form label', 'wordpoints'); ?></label>
+			<?php wordpoints_points_types_dropdown($dropdown_args); ?>
 		</p>
 
 		<?php
@@ -152,46 +152,46 @@ 
 
 		parent::__construct(
 			'WordPoints_Points_Widget'
-			, __( 'WordPoints', 'wordpoints' )
+			, __('WordPoints', 'wordpoints')
 			, array(
-				'description' => __( 'Display the points of the current logged in user.', 'wordpoints' ),
+				'description' => __('Display the points of the current logged in user.', 'wordpoints'),
 				'wordpoints_hook_slug' => 'points',
 			)
 		);
 
 		$this->defaults = array(
-			'title'       => _x( 'My Points', 'widget title', 'wordpoints' ),
+			'title'       => _x('My Points', 'widget title', 'wordpoints'),
 			'points_type' => wordpoints_get_default_points_type(),
 			// translators: Number of points.
-			'text'        => sprintf( __( 'Points: %s', 'wordpoints' ), '%points%' ),
-			'alt_text'    => __( 'You must be logged in to view your points.', 'wordpoints' ),
+			'text'        => sprintf(__('Points: %s', 'wordpoints'), '%points%'),
+			'alt_text'    => __('You must be logged in to view your points.', 'wordpoints'),
 			'number_logs' => 5,
 		);
 
-		add_filter( 'wordpoints_points_widget_text', 'esc_html', 20 );
+		add_filter('wordpoints_points_widget_text', 'esc_html', 20);
 	}
 
 	/**
 	 * @since 1.9.0
 	 */
-	protected function verify_settings( $instance ) {
+	protected function verify_settings($instance) {
 
-		if ( ! is_user_logged_in() && empty( $instance['alt_text'] ) ) {
+		if ( ! is_user_logged_in() && empty($instance['alt_text'])) {
 			return new WP_Error;
 		}
 
 		if (
-			! isset( $instance['number_logs'] )
-			|| ! wordpoints_posint( $instance['number_logs'] )
+			! isset($instance['number_logs'])
+			|| ! wordpoints_posint($instance['number_logs'])
 		) {
 			$instance['number_logs'] = 0;
 		}
 
 		// In case the points type isn't set, we do this first.
-		$instance = parent::verify_settings( $instance );
+		$instance = parent::verify_settings($instance);
 
-		if ( ! is_wp_error( $instance ) && is_user_logged_in() && empty( $instance['text'] ) ) {
-			$instance['text'] = wordpoints_get_points_type_setting( $instance['points_type'], 'name' ) . ': %points%';
+		if ( ! is_wp_error($instance) && is_user_logged_in() && empty($instance['text'])) {
+			$instance['text'] = wordpoints_get_points_type_setting($instance['points_type'], 'name') . ': %points%';
 		}
 
 		return $instance;
@@ -200,14 +200,14 @@ 
 	/**
 	 * @since 1.9.0
 	 */
-	protected function widget_body( $instance ) {
+	protected function widget_body($instance) {
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 
 			$text = str_replace(
 				'%points%',
 				wordpoints_format_points(
-					wordpoints_get_points( get_current_user_id(), $instance['points_type'] ),
+					wordpoints_get_points(get_current_user_id(), $instance['points_type']),
 					$instance['points_type'],
 					'my_points_widget'
 				),
@@ -233,20 +233,20 @@ 
 		 * @param string $text The text for the widget set by the user.
 		 * @param array  $instance The settings for this instance of the widget.
 		 */
-		$text = apply_filters( 'wordpoints_points_widget_text', $text, $instance );
+		$text = apply_filters('wordpoints_points_widget_text', $text, $instance);
 
 		echo '<div class="wordpoints-points-widget-text">', $text, '</div><br />'; // XSS OK, WPCS
 
-		if ( is_user_logged_in() && 0 !== $instance['number_logs'] ) {
+		if (is_user_logged_in() && 0 !== $instance['number_logs']) {
 
-			$query_args = wordpoints_get_points_logs_query_args( $instance['points_type'], 'current_user' );
+			$query_args = wordpoints_get_points_logs_query_args($instance['points_type'], 'current_user');
 
 			$query_args['limit'] = $instance['number_logs'];
 
-			$logs_query = new WordPoints_Points_Logs_Query( $query_args );
-			$logs_query->prime_cache( 'current_user:%points_type%:%user_id%' );
+			$logs_query = new WordPoints_Points_Logs_Query($query_args);
+			$logs_query->prime_cache('current_user:%points_type%:%user_id%');
 
-			wordpoints_show_points_logs( $logs_query, array( 'paginate' => false, 'searchable' => false, 'show_users' => false ) );
+			wordpoints_show_points_logs($logs_query, array('paginate' => false, 'searchable' => false, 'show_users' => false));
 		}
 	}
 
@@ -260,14 +260,14 @@ 
 	 *
 	 * @return array The updated settings for the widget instance.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
-		parent::update( $new_instance, $old_instance );
+		parent::update($new_instance, $old_instance);
 
-		$this->instance['text']     = trim( $this->instance['text'] );
-		$this->instance['alt_text'] = trim( $this->instance['alt_text'] );
+		$this->instance['text']     = trim($this->instance['text']);
+		$this->instance['alt_text'] = trim($this->instance['alt_text']);
 
-		if ( ! wordpoints_posint( $this->instance['number_logs'] ) ) {
+		if ( ! wordpoints_posint($this->instance['number_logs'])) {
 			$this->instance['number_logs'] = 0;
 		}
 
@@ -277,17 +277,17 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		parent::form( $instance );
+		parent::form($instance);
 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'text' ) ); ?>"><?php esc_html_e( 'Widget text', 'wordpoints' ); ?></label>
-			<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'text' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'text' ) ); ?>" value="<?php echo esc_attr( $this->instance['text'] ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('text')); ?>"><?php esc_html_e('Widget text', 'wordpoints'); ?></label>
+			<input type="text" class="widefat" id="<?php echo esc_attr($this->get_field_id('text')); ?>" name="<?php echo esc_attr($this->get_field_name('text')); ?>" value="<?php echo esc_attr($this->instance['text']); ?>" />
 			<?php // translators: Placeholder name. ?>
-			<small><i><?php echo esc_html( sprintf( __( '%s will be replaced with the points of the logged in user', 'wordpoints' ), '%points%' ) ); ?></i></small>
+			<small><i><?php echo esc_html(sprintf(__('%s will be replaced with the points of the logged in user', 'wordpoints'), '%points%')); ?></i></small>
 			<?php
 
 			/**
@@ -297,19 +297,19 @@ 
 			 *
 			 * @param array $instance The settings of the current widget instance.
 			 */
-			do_action( 'wordpoints_my_points_widget_below_text_field', $this->instance );
+			do_action('wordpoints_my_points_widget_below_text_field', $this->instance);
 
 			?>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'alt_text' ) ); ?>"><?php esc_html_e( 'Text if the user is not logged in', 'wordpoints' ); ?></label>
-			<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'alt_text' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'alt_text' ) ); ?>" value="<?php echo esc_attr( $this->instance['alt_text'] ); ?>" />
-			<small><i><?php esc_html_e( 'Leave this field blank to hide the widget if the user is not logged in', 'wordpoints' ); ?></i></small>
+			<label for="<?php echo esc_attr($this->get_field_id('alt_text')); ?>"><?php esc_html_e('Text if the user is not logged in', 'wordpoints'); ?></label>
+			<input type="text" class="widefat" id="<?php echo esc_attr($this->get_field_id('alt_text')); ?>" name="<?php echo esc_attr($this->get_field_name('alt_text')); ?>" value="<?php echo esc_attr($this->instance['alt_text']); ?>" />
+			<small><i><?php esc_html_e('Leave this field blank to hide the widget if the user is not logged in', 'wordpoints'); ?></i></small>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'number_logs' ) ); ?>"><?php esc_html_e( 'Number of latest log entries for this user to display', 'wordpoints' ); ?></label>
-			<input type="number" min="0" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'number_logs' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'number_logs' ) ); ?>" value="<?php echo esc_attr( $this->instance['number_logs'] ); ?>" />
-			<small><i><?php esc_html_e( 'Set this to 0 to keep from showing any logs', 'wordpoints' ); ?></i></small>
+			<label for="<?php echo esc_attr($this->get_field_id('number_logs')); ?>"><?php esc_html_e('Number of latest log entries for this user to display', 'wordpoints'); ?></label>
+			<input type="number" min="0" class="widefat" id="<?php echo esc_attr($this->get_field_id('number_logs')); ?>" name="<?php echo esc_attr($this->get_field_name('number_logs')); ?>" value="<?php echo esc_attr($this->instance['number_logs']); ?>" />
+			<small><i><?php esc_html_e('Set this to 0 to keep from showing any logs', 'wordpoints'); ?></i></small>
 		</p>
 
 		<?php
@@ -340,15 +340,15 @@ 
 
 		parent::__construct(
 			'WordPoints_Top_Users_Widget'
-			, _x( 'WordPoints Top Users', 'widget name', 'wordpoints' )
+			, _x('WordPoints Top Users', 'widget name', 'wordpoints')
 			, array(
-				'description' => __( 'Showcase the users with the most points.', 'wordpoints' ),
+				'description' => __('Showcase the users with the most points.', 'wordpoints'),
 				'wordpoints_hook_slug' => 'top_users',
 			)
 		);
 
 		$this->defaults = array(
-			'title'       => _x( 'Top Users', 'widget title', 'wordpoints' ),
+			'title'       => _x('Top Users', 'widget title', 'wordpoints'),
 			'points_type' => wordpoints_get_default_points_type(),
 			'num_users'   => 3,
 		);
@@ -357,19 +357,19 @@ 
 	/**
 	 * @since 1.9.0
 	 */
-	protected function verify_settings( $instance ) {
+	protected function verify_settings($instance) {
 
-		if ( empty( $instance['num_users'] ) ) {
+		if (empty($instance['num_users'])) {
 			$instance['num_users'] = $this->defaults['num_users'];
 		}
 
-		return parent::verify_settings( $instance );
+		return parent::verify_settings($instance);
 	}
 
 	/**
 	 * @since 1.9.0
 	 */
-	protected function widget_body( $instance ) {
+	protected function widget_body($instance) {
 
 		wordpoints_points_show_top_users(
 			$instance['num_users']
@@ -388,11 +388,11 @@ 
 	 *
 	 * @return array The updated settings for the widget instance.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
-		parent::update( $new_instance, $old_instance );
+		parent::update($new_instance, $old_instance);
 
-		if ( ! wordpoints_posint( $this->instance['num_users'] ) ) {
+		if ( ! wordpoints_posint($this->instance['num_users'])) {
 			$this->instance['num_users'] = $this->defaults['num_users'];
 		}
 
@@ -402,19 +402,19 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		parent::form( $instance );
+		parent::form($instance);
 
-		if ( ! wordpoints_posint( $this->instance['num_users'] ) ) {
+		if ( ! wordpoints_posint($this->instance['num_users'])) {
 			$this->instance['num_users'] = $this->defaults['num_users'];
 		}
 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'num_users' ) ); ?>"><?php esc_html_e( 'Number of top users to show', 'wordpoints' ); ?></label>
-			<input type="number" min="1" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'num_users' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'num_users' ) ); ?>" value="<?php echo absint( $this->instance['num_users'] ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('num_users')); ?>"><?php esc_html_e('Number of top users to show', 'wordpoints'); ?></label>
+			<input type="number" min="1" class="widefat" id="<?php echo esc_attr($this->get_field_id('num_users')); ?>" name="<?php echo esc_attr($this->get_field_name('num_users')); ?>" value="<?php echo absint($this->instance['num_users']); ?>" />
 		</p>
 
 		<?php
@@ -439,15 +439,15 @@ 
 
 		parent::__construct(
 			'WordPoints_Points_Logs_Widget'
-			, _x( 'Points Logs', 'widget name', 'wordpoints' )
+			, _x('Points Logs', 'widget name', 'wordpoints')
 			, array(
-				'description' => __( 'Display the latest points activity.', 'wordpoints' ),
+				'description' => __('Display the latest points activity.', 'wordpoints'),
 				'wordpoints_hook_slug' => 'points_logs',
 			)
 		);
 
 		$this->defaults = array(
-			'title'       => _x( 'Points Logs', 'widget title', 'wordpoints' ),
+			'title'       => _x('Points Logs', 'widget title', 'wordpoints'),
 			'number_logs' => 10,
 			'points_type' => wordpoints_get_default_points_type(),
 		);
@@ -456,28 +456,28 @@ 
 	/**
 	 * @since 1.9.0
 	 */
-	protected function verify_settings( $instance ) {
+	protected function verify_settings($instance) {
 
-		if ( ! wordpoints_posint( $instance['number_logs'] ) ) {
+		if ( ! wordpoints_posint($instance['number_logs'])) {
 			$instance['number_logs'] = $this->defaults['number_logs'];
 		}
 
-		return parent::verify_settings( $instance );
+		return parent::verify_settings($instance);
 	}
 
 	/**
 	 * @since 1.9.0
 	 */
-	public function widget_body( $instance ) {
+	public function widget_body($instance) {
 
-		$query_args = wordpoints_get_points_logs_query_args( $instance['points_type'] );
+		$query_args = wordpoints_get_points_logs_query_args($instance['points_type']);
 
 		$query_args['limit'] = $instance['number_logs'];
 
-		$logs_query = new WordPoints_Points_Logs_Query( $query_args );
+		$logs_query = new WordPoints_Points_Logs_Query($query_args);
 		$logs_query->prime_cache();
 
-		wordpoints_show_points_logs( $logs_query, array( 'paginate' => false, 'searchable' => false ) );
+		wordpoints_show_points_logs($logs_query, array('paginate' => false, 'searchable' => false));
 	}
 
 	/**
@@ -490,11 +490,11 @@ 
 	 *
 	 * @return array The updated settings for the widget instance.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
-		parent::update( $new_instance, $old_instance );
+		parent::update($new_instance, $old_instance);
 
-		if ( ! wordpoints_posint( $this->instance['number_logs'] ) ) {
+		if ( ! wordpoints_posint($this->instance['number_logs'])) {
 			$this->instance['number_logs'] = $this->defaults['number_logs'];
 		}
 
@@ -504,19 +504,19 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		parent::form( $instance );
+		parent::form($instance);
 
-		if ( ! wordpoints_posint( $this->instance['number_logs'] ) ) {
+		if ( ! wordpoints_posint($this->instance['number_logs'])) {
 			$this->instance['number_logs'] = $this->defaults['number_logs'];
 		}
 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'number_logs' ) ); ?>"><?php esc_html_e( 'Number of log entries to display', 'wordpoints' ); ?></label>
-			<input type="number" min="1" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'number_logs' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'number_logs' ) ); ?>" value="<?php echo absint( $this->instance['number_logs'] ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('number_logs')); ?>"><?php esc_html_e('Number of log entries to display', 'wordpoints'); ?></label>
+			<input type="number" min="1" class="widefat" id="<?php echo esc_attr($this->get_field_id('number_logs')); ?>" name="<?php echo esc_attr($this->get_field_name('number_logs')); ?>" value="<?php echo absint($this->instance['number_logs']); ?>" />
 		</p>
 
 		<?php

src/components/points/classes/logs/viewing/restriction/read/comment/post.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 	 * @since 2.2.0
 	 */
 	public function get_description() {
-		return __( 'This log entry is only visible to users who can view the post that the comment is on.', 'wordpoints' );
+		return __('This log entry is only visible to users who can view the post that the comment is on.', 'wordpoints');
 	}
 
 	/**
@@ -33,10 +33,10 @@ 
 			, true
 		);
 
-		if ( $comment_id ) {
-			$comment = get_comment( $comment_id );
+		if ($comment_id) {
+			$comment = get_comment($comment_id);
 
-			if ( $comment ) {
+			if ($comment) {
 				return $comment->comment_post_ID;
 			}
 		}