WordPoints / wordpoints

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/hooks/abstracts/post-type.php

Spacing +81 added lines, -81 removed lines

@@ -41,17 +41,17 @@ 
 	/**
 	 * @since 1.9.0
 	 */
-	public function __construct( $title, $args ) {
+	public function __construct($title, $args) {
 
-		$this->init( $title, $args );
+		$this->init($title, $args);
 
-		add_filter( "wordpoints_points_log-{$this->log_type}", array( $this, 'logs' ), 10, 6 );
-		add_filter( "wordpoints_points_log-reverse_{$this->log_type}", array( $this, 'logs' ), 10, 6 );
+		add_filter("wordpoints_points_log-{$this->log_type}", array($this, 'logs'), 10, 6);
+		add_filter("wordpoints_points_log-reverse_{$this->log_type}", array($this, 'logs'), 10, 6);
 
-		add_action( 'delete_post', array( $this, 'clean_logs_on_post_deletion' ), 15 );
+		add_action('delete_post', array($this, 'clean_logs_on_post_deletion'), 15);
 
-		if ( ! $this->uses_points_logs_viewing_restriction_api ) {
-			add_filter( "wordpoints_user_can_view_points_log-{$this->log_type}", array( $this, 'user_can_view' ), 10, 3 );
+		if ( ! $this->uses_points_logs_viewing_restriction_api) {
+			add_filter("wordpoints_user_can_view_points_log-{$this->log_type}", array($this, 'user_can_view'), 10, 3);
 		}
 	}
 
@@ -65,14 +65,14 @@ 
 	 *
 	 * @return bool Whether this post type matches and points should be awarded.
 	 */
-	public function is_matching_post_type( $post_type, $instance_post_type ) {
+	public function is_matching_post_type($post_type, $instance_post_type) {
 
 		return (
 			$instance_post_type === $post_type
 			|| (
 				'ALL' === $instance_post_type
-				&& post_type_exists( $post_type )
-				&& get_post_type_object( $post_type )->public
+				&& post_type_exists($post_type)
+				&& get_post_type_object($post_type)->public
 			)
 		);
 	}
@@ -86,27 +86,27 @@ 
 	 *
 	 * @return bool True if auto-reversals should be done; false otherwise.
 	 */
-	protected function should_do_auto_reversals_for_post_type( $post_type ) {
+	protected function should_do_auto_reversals_for_post_type($post_type) {
 
 		// Check if this hook type allows auto-reversals to be disabled.
-		if ( ! $this->get_option( 'disable_auto_reverse_label' ) ) {
+		if ( ! $this->get_option('disable_auto_reverse_label')) {
 			return true;
 		}
 
 		$instances = $this->get_instances();
 
-		foreach ( $instances as $instance ) {
+		foreach ($instances as $instance) {
 
-			$instance = array_merge( $this->defaults, $instance );
+			$instance = array_merge($this->defaults, $instance);
 
-			if ( $post_type === $instance['post_type'] ) {
-				return ! empty( $instance['auto_reverse'] );
-			} elseif ( 'ALL' === $instance['post_type'] ) {
+			if ($post_type === $instance['post_type']) {
+				return ! empty($instance['auto_reverse']);
+			} elseif ('ALL' === $instance['post_type']) {
 				$all_posts_instance = $instance;
 			}
 		}
 
-		return ! empty( $all_posts_instance['auto_reverse'] );
+		return ! empty($all_posts_instance['auto_reverse']);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 *
 	 * @return array The logs to reverse.
 	 */
-	protected function get_logs_to_auto_reverse( array $meta_query ) {
+	protected function get_logs_to_auto_reverse(array $meta_query) {
 
 		$query = new WordPoints_Points_Logs_Query(
 			array(
@@ -135,7 +135,7 @@ 
 
 		$logs = $query->get();
 
-		if ( ! $logs ) {
+		if ( ! $logs) {
 			return array();
 		}
 
@@ -149,17 +149,17 @@ 
 	 *
 	 * @param object $log The log to reverse.
 	 */
-	protected function auto_reverse_log( $log ) {
+	protected function auto_reverse_log($log) {
 
 		wordpoints_alter_points(
 			$log->user_id
 			, -$log->points
 			, $log->points_type
 			, "reverse_{$this->log_type}"
-			, array( 'original_log_id' => $log->id )
+			, array('original_log_id' => $log->id)
 		);
 
-		wordpoints_add_points_log_meta( $log->id, 'auto_reversed', true );
+		wordpoints_add_points_log_meta($log->id, 'auto_reversed', true);
 	}
 
 	/**
@@ -176,47 +176,47 @@ 
 	 *
 	 * @return string
 	 */
-	public function logs( $text, $points, $points_type, $user_id, $log_type, $meta ) {
+	public function logs($text, $points, $points_type, $user_id, $log_type, $meta) {
 
 		$reverse = '';
 
-		if ( "reverse_{$this->log_type}" === $log_type ) {
+		if ("reverse_{$this->log_type}" === $log_type) {
 			$reverse = '_reverse';
 		}
 
 		$post = false;
 
-		if ( '' === $reverse && isset( $meta['post_id'] ) ) {
-			$post = get_post( $meta['post_id'] );
+		if ('' === $reverse && isset($meta['post_id'])) {
+			$post = get_post($meta['post_id']);
 		}
 
-		if ( $post ) {
+		if ($post) {
 
 			// This post exists, so we should include the permalink in the log text.
-			$text = $this->log_with_post_title_link( $post->ID, $reverse );
+			$text = $this->log_with_post_title_link($post->ID, $reverse);
 
 		} else {
 
 			// This post doesn't exist; we probably can't use the title.
-			$text = $this->get_option( 'log_text_no_post_title' . $reverse );
+			$text = $this->get_option('log_text_no_post_title' . $reverse);
 
 			if (
-				$this->get_option( 'log_text_post_type' . $reverse )
-				&& isset( $meta['post_type'] )
-				&& post_type_exists( $meta['post_type'] )
+				$this->get_option('log_text_post_type' . $reverse)
+				&& isset($meta['post_type'])
+				&& post_type_exists($meta['post_type'])
 			) {
 
 				// We do know the type of post though, so include that in the log.
 				$text = sprintf(
-					$this->get_option( 'log_text_post_type' . $reverse )
-					, get_post_type_object( $meta['post_type'] )->labels->singular_name
+					$this->get_option('log_text_post_type' . $reverse)
+					, get_post_type_object($meta['post_type'])->labels->singular_name
 				);
 
-			} elseif ( isset( $meta['post_title'] ) ) {
+			} elseif (isset($meta['post_title'])) {
 
 				// If the title is saved as metadata, then we can use it.
 				$text = sprintf(
-					$this->get_option( 'log_text_post_title' . $reverse )
+					$this->get_option('log_text_post_title' . $reverse)
 					, $meta['post_title']
 				);
 			}
@@ -236,31 +236,31 @@ 
 	 *
 	 * @return string The text for the log entry.
 	 */
-	protected function log_with_post_title_link( $post_id, $reverse = '', $url = null ) {
+	protected function log_with_post_title_link($post_id, $reverse = '', $url = null) {
 
-		if ( ! isset( $url ) ) {
-			$url = get_permalink( $post_id );
+		if ( ! isset($url)) {
+			$url = get_permalink($post_id);
 		}
 
-		$post_title = get_the_title( $post_id );
+		$post_title = get_the_title($post_id);
 
 		$args = array();
 
-		$args[] = '<a href="' . esc_url( $url ) . '">'
-			. ( $post_title ? $post_title : _x( '(no title)', 'post title', 'wordpoints' ) )
+		$args[] = '<a href="' . esc_url($url) . '">'
+			. ($post_title ? $post_title : _x('(no title)', 'post title', 'wordpoints'))
 			. '</a>';
 
-		$text = $this->get_option( 'log_text_post_title_and_type' . $reverse );
+		$text = $this->get_option('log_text_post_title_and_type' . $reverse);
 
-		$post_type = get_post_field( 'post_type', $post_id );
+		$post_type = get_post_field('post_type', $post_id);
 
-		if ( $text && $post_type && post_type_exists( $post_type ) ) {
-			$args[] = get_post_type_object( $post_type )->labels->singular_name;
+		if ($text && $post_type && post_type_exists($post_type)) {
+			$args[] = get_post_type_object($post_type)->labels->singular_name;
 		} else {
-			$text = $this->get_option( 'log_text_post_title' . $reverse );
+			$text = $this->get_option('log_text_post_title' . $reverse);
 		}
 
-		return vsprintf( $text, $args );
+		return vsprintf($text, $args);
 	}
 
 	/**
@@ -272,17 +272,17 @@ 
 	 *
 	 * @return string A description for the hook instance.
 	 */
-	protected function generate_description( $instance = array() ) {
+	protected function generate_description($instance = array()) {
 
-		if ( ! empty( $instance['post_type'] ) && 'ALL' !== $instance['post_type'] ) {
-			$post_type = get_post_type_object( $instance['post_type'] );
+		if ( ! empty($instance['post_type']) && 'ALL' !== $instance['post_type']) {
+			$post_type = get_post_type_object($instance['post_type']);
 
-			if ( $post_type ) {
-				return sprintf( $this->get_option( 'post_type_description' ), $post_type->labels->singular_name );
+			if ($post_type) {
+				return sprintf($this->get_option('post_type_description'), $post_type->labels->singular_name);
 			}
 		}
 
-		return parent::generate_description( $instance );
+		return parent::generate_description($instance);
 	}
 
 	/**
@@ -294,43 +294,43 @@ 
 	 *
 	 * @return bool True.
 	 */
-	protected function form( $instance ) {
+	protected function form($instance) {
 
-		$instance = array_merge( $this->defaults, $instance );
+		$instance = array_merge($this->defaults, $instance);
 
 		?>
 
 		<p>
-			<label for="<?php $this->the_field_id( 'post_type' ); ?>"><?php esc_html_e( 'Select post type:', 'wordpoints' ); ?></label>
+			<label for="<?php $this->the_field_id('post_type'); ?>"><?php esc_html_e('Select post type:', 'wordpoints'); ?></label>
 			<?php
 
 			wordpoints_list_post_types(
 				array(
 					'selected' => $instance['post_type'],
-					'id'       => $this->get_field_id( 'post_type' ),
-					'name'     => $this->get_field_name( 'post_type' ),
+					'id'       => $this->get_field_id('post_type'),
+					'name'     => $this->get_field_name('post_type'),
 					'class'    => 'widefat wordpoints-append-to-hook-title',
-					'filter'   => $this->get_option( 'post_type_filter' ),
+					'filter'   => $this->get_option('post_type_filter'),
 				)
-				, array( 'public' => true )
+				, array('public' => true)
 			);
 
 			?>
 		</p>
 
-		<?php parent::form( $instance ); ?>
+		<?php parent::form($instance); ?>
 
 		<?php
 
-		$disable_label = $this->get_option( 'disable_auto_reverse_label' );
+		$disable_label = $this->get_option('disable_auto_reverse_label');
 
-		if ( $disable_label ) {
+		if ($disable_label) {
 
 			?>
 
 			<p>
-				<input class="widefat" name="<?php $this->the_field_name( 'auto_reverse' ); ?>" id="<?php $this->the_field_id( 'auto_reverse' ); ?>" type="checkbox" value="1" <?php checked( '1', $instance['auto_reverse'] ); ?> />
-				<label for="<?php $this->the_field_id( 'auto_reverse' ); ?>"><?php echo esc_html( $disable_label ); ?></label>
+				<input class="widefat" name="<?php $this->the_field_name('auto_reverse'); ?>" id="<?php $this->the_field_id('auto_reverse'); ?>" type="checkbox" value="1" <?php checked('1', $instance['auto_reverse']); ?> />
+				<label for="<?php $this->the_field_id('auto_reverse'); ?>"><?php echo esc_html($disable_label); ?></label>
 			</p>
 
 		<?php
@@ -348,9 +348,9 @@ 
 	 *
 	 * @return bool True if the post type supports comments, false otherwise.
 	 */
-	public function post_type_supports_comments( $post_type ) {
+	public function post_type_supports_comments($post_type) {
 
-		return post_type_supports( $post_type->name, 'comments' );
+		return post_type_supports($post_type->name, 'comments');
 	}
 
 	/**
@@ -368,7 +368,7 @@ 
 	 *
 	 * @return bool Whether the user can view this log.
 	 */
-	public function user_can_view( $can_view, $log, $user_id ) {
+	public function user_can_view($can_view, $log, $user_id) {
 
 		_deprecated_function(
 			__METHOD__
@@ -376,13 +376,13 @@ 
 			, 'the points logs viewing restrictions API'
 		);
 
-		if ( $can_view ) {
+		if ($can_view) {
 
 			$restriction = new WordPoints_Points_Logs_Viewing_Restriction_Read_Post(
 				$log
 			);
 
-			$can_view = $restriction->user_can( $user_id );
+			$can_view = $restriction->user_can($user_id);
 		}
 
 		return $can_view;
@@ -403,13 +403,13 @@ 
 	 *
 	 * @param int $post_id The ID of the post being deleted.
 	 */
-	public function clean_logs_on_post_deletion( $post_id ) {
+	public function clean_logs_on_post_deletion($post_id) {
 
 		$this->clean_logs(
 			'post_id'
 			, $post_id
 			, 'post_type'
-			, get_post_field( 'post_type', $post_id )
+			, get_post_field('post_type', $post_id)
 		);
 	}
 
@@ -423,7 +423,7 @@ 
 	 * @param string $new_key   The key for the new meta value to add.
 	 * @param mixed  $new_value The new meta value to add. If falsey, new meta isn't added.
 	 */
-	protected function clean_logs( $key, $value, $new_key, $new_value ) {
+	protected function clean_logs($key, $value, $new_key, $new_value) {
 
 		$logs_query = new WordPoints_Points_Logs_Query(
 			array(
@@ -439,20 +439,20 @@ 
 
 		$logs = $logs_query->get();
 
-		if ( ! $logs ) {
+		if ( ! $logs) {
 			return;
 		}
 
-		foreach ( $logs as $log ) {
+		foreach ($logs as $log) {
 
-			wordpoints_delete_points_log_meta( $log->id, $key );
+			wordpoints_delete_points_log_meta($log->id, $key);
 
-			if ( $new_value ) {
-				wordpoints_add_points_log_meta( $log->id, $new_key, $new_value );
+			if ($new_value) {
+				wordpoints_add_points_log_meta($log->id, $new_key, $new_value);
 			}
 		}
 
-		wordpoints_regenerate_points_logs( $logs );
+		wordpoints_regenerate_points_logs($logs);
 	}
 }
 

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/logs.php

Spacing +88 added lines, -88 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	private static function init() {
 
-		if ( self::$initialized ) {
+		if (self::$initialized) {
 			return;
 		}
 
@@ -67,10 +67,10 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_register_points_logs_queries' );
+		do_action('wordpoints_register_points_logs_queries');
 
 		// Make sure that the default query is registered.
-		self::register_query( 'default', array(), array( 'cache_queries' => true ) );
+		self::register_query('default', array(), array('cache_queries' => true));
 
 		self::$initialized = true;
 	}
@@ -89,9 +89,9 @@ 
 	 *
 	 * @return bool Whether the query was registered.
 	 */
-	public static function register_query( $slug, array $args, array $data = array() ) {
+	public static function register_query($slug, array $args, array $data = array()) {
 
-		if ( empty( $slug ) || isset( self::$queries[ $slug ] ) ) {
+		if (empty($slug) || isset(self::$queries[$slug])) {
 			return false;
 		}
 
@@ -101,8 +101,8 @@ 
 			'network_wide'  => false,
 		);
 
-		self::$queries[ $slug ] = array_merge( $defaults, $data );
-		self::$queries[ $slug ]['args'] = $args;
+		self::$queries[$slug] = array_merge($defaults, $data);
+		self::$queries[$slug]['args'] = $args;
 
 		return true;
 	}
@@ -116,11 +116,11 @@ 
 	 *
 	 * @return bool Whether $slug is the slug of a registered query.
 	 */
-	public static function is_query( $slug ) {
+	public static function is_query($slug) {
 
 		self::init();
 
-		return isset( self::$queries[ $slug ] );
+		return isset(self::$queries[$slug]);
 	}
 
 	/**
@@ -146,9 +146,9 @@ 
 	 *
 	 * @return array The query's args.
 	 */
-	public static function get_query_args( $query_slug ) {
+	public static function get_query_args($query_slug) {
 
-		return self::get_query_data( $query_slug, 'args' );
+		return self::get_query_data($query_slug, 'args');
 	}
 
 	/**
@@ -162,16 +162,16 @@ 
 	 *
 	 * @return mixed The data, or null if not found.
 	 */
-	public static function get_query_data( $query_slug, $data = null ) {
+	public static function get_query_data($query_slug, $data = null) {
 
 		self::init();
 
-		if ( isset( self::$queries[ $query_slug ] ) ) {
+		if (isset(self::$queries[$query_slug])) {
 
-			if ( empty( $data ) ) {
-				return self::$queries[ $query_slug ];
-			} elseif ( isset( self::$queries[ $query_slug ][ $data ] ) ) {
-				return self::$queries[ $query_slug ][ $data ];
+			if (empty($data)) {
+				return self::$queries[$query_slug];
+			} elseif (isset(self::$queries[$query_slug][$data])) {
+				return self::$queries[$query_slug][$data];
 			}
 		}
 
@@ -212,9 +212,9 @@ 
  *
  * @return bool Whether the query was registered.
  */
-function wordpoints_register_points_logs_query( $slug, array $args, array $data = array() ) {
+function wordpoints_register_points_logs_query($slug, array $args, array $data = array()) {
 
-	return WordPoints_Points_Log_Queries::register_query( $slug, $args, $data );
+	return WordPoints_Points_Log_Queries::register_query($slug, $args, $data);
 }
 
 /**
@@ -228,9 +228,9 @@ 
  *
  * @return bool Whether $slug is the slug of a registered query.
  */
-function wordpoints_is_points_logs_query( $slug ) {
+function wordpoints_is_points_logs_query($slug) {
 
-	return WordPoints_Points_Log_Queries::is_query( $slug );
+	return WordPoints_Points_Log_Queries::is_query($slug);
 }
 
 /**
@@ -245,23 +245,23 @@ 
  *
  * @return array|false The args for the query, or false on failure.
  */
-function wordpoints_get_points_logs_query_args( $points_type, $query_slug = 'default' ) {
+function wordpoints_get_points_logs_query_args($points_type, $query_slug = 'default') {
 
-	$args = WordPoints_Points_Log_Queries::get_query_args( $query_slug );
+	$args = WordPoints_Points_Log_Queries::get_query_args($query_slug);
 
-	if ( is_null( $args ) || ! wordpoints_is_points_type( $points_type ) ) {
+	if (is_null($args) || ! wordpoints_is_points_type($points_type)) {
 		return false;
 	}
 
 	$defaults = array(
-		'user_id__not_in' => wordpoints_get_excluded_users( 'points_logs' ),
+		'user_id__not_in' => wordpoints_get_excluded_users('points_logs'),
 		'points_type'     => $points_type,
 	);
 
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
 	// The current user needs to be set dynamically, since it can change at times.
-	if ( 'current_user' === $query_slug ) {
+	if ('current_user' === $query_slug) {
 		$args['user_id'] = get_current_user_id();
 	}
 
@@ -278,7 +278,7 @@ 
 	 * @param string $query_slug  The slug for the query.
 	 * @param string $points_type The points type the query is being made for.
 	 */
-	return apply_filters( 'wordpoints_points_logs_query_args', $args, $query_slug, $points_type );
+	return apply_filters('wordpoints_points_logs_query_args', $args, $query_slug, $points_type);
 }
 
 /**
@@ -298,19 +298,19 @@ 
  *
  * @return WordPoints_Points_Logs_Query|false Logs query instance, or false.
  */
-function wordpoints_get_points_logs_query( $points_type, $query_slug = 'default' ) {
+function wordpoints_get_points_logs_query($points_type, $query_slug = 'default') {
 
-	$args = wordpoints_get_points_logs_query_args( $points_type, $query_slug );
+	$args = wordpoints_get_points_logs_query_args($points_type, $query_slug);
 
-	if ( ! $args ) {
+	if ( ! $args) {
 		return false;
 	}
 
-	$query = new WordPoints_Points_Logs_Query( $args );
+	$query = new WordPoints_Points_Logs_Query($args);
 
-	$query_data = WordPoints_Points_Log_Queries::get_query_data( $query_slug );
+	$query_data = WordPoints_Points_Log_Queries::get_query_data($query_slug);
 
-	if ( $query_data['cache_queries'] ) {
+	if ($query_data['cache_queries']) {
 
 		$query->prime_cache(
 			$query_data['cache_key']
@@ -353,9 +353,9 @@ 
  *
  * @return void
  */
-function wordpoints_show_points_logs( $logs_query, array $args = array() ) {
+function wordpoints_show_points_logs($logs_query, array $args = array()) {
 
-	if ( ! $logs_query instanceof WordPoints_Points_Logs_Query ) {
+	if ( ! $logs_query instanceof WordPoints_Points_Logs_Query) {
 		return;
 	}
 
@@ -367,9 +367,9 @@ 
 		'show_users' => true,
 	);
 
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
-	if ( ! $args['datatable'] ) {
+	if ( ! $args['datatable']) {
 
 		_deprecated_argument(
 			__FUNCTION__
@@ -380,12 +380,12 @@ 
 		$args['paginate'] = false;
 	}
 
-	$view = wordpoints_component( 'points' )
-		->get_sub_app( 'logs' )
-		->get_sub_app( 'views' )
-		->get( $args['view'], array( $logs_query, $args ) );
+	$view = wordpoints_component('points')
+		->get_sub_app('logs')
+		->get_sub_app('views')
+		->get($args['view'], array($logs_query, $args));
 
-	if ( ! $view instanceof WordPoints_Points_Logs_View ) {
+	if ( ! $view instanceof WordPoints_Points_Logs_View) {
 		return;
 	}
 
@@ -405,9 +405,9 @@ 
  * @param string $query_slug  The query to use to display the logs.
  * @param array  $args        Arguments to pass to wordpoints_show_points_logs().
  */
-function wordpoints_show_points_logs_query( $points_type, $query_slug = 'default', array $args = array() ) {
+function wordpoints_show_points_logs_query($points_type, $query_slug = 'default', array $args = array()) {
 
-	wordpoints_show_points_logs( wordpoints_get_points_logs_query( $points_type, $query_slug ), $args );
+	wordpoints_show_points_logs(wordpoints_get_points_logs_query($points_type, $query_slug), $args);
 }
 
 /**
@@ -426,7 +426,7 @@ 
 	 */
 	wordpoints_register_points_logs_query(
 		'current_user'
-		, array( 'user_id' => get_current_user_id() )
+		, array('user_id' => get_current_user_id())
 		, array(
 			'cache_key'     => 'current_user:%points_type%:%user_id%',
 			'cache_queries' => true,
@@ -440,7 +440,7 @@ 
 	 */
 	wordpoints_register_points_logs_query(
 		'network'
-		, array( 'blog_id' => false )
+		, array('blog_id' => false)
 		, array(
 			'network_wide'  => true,
 			'cache_queries' => true,
@@ -455,12 +455,12 @@ 
  *
  * @WordPress\action wordpoints_points_log-profile_edit
  */
-function wordpoints_points_logs_profile_edit( $text, $points, $points_type, $user_id, $log_type, $meta ) {
+function wordpoints_points_logs_profile_edit($text, $points, $points_type, $user_id, $log_type, $meta) {
 
-	$user_name = sanitize_user_field( 'display_name', get_userdata( $meta['user_id'] )->display_name, $meta['user_id'], 'display' );
+	$user_name = sanitize_user_field('display_name', get_userdata($meta['user_id'])->display_name, $meta['user_id'], 'display');
 
 	// translators: 1. User name; 2. Reason given.
-	return sprintf( _x( 'Points adjusted by %1$s. Reason: %2$s', 'points log description', 'wordpoints' ), $user_name, esc_html( $meta['reason'] ) );
+	return sprintf(_x('Points adjusted by %1$s. Reason: %2$s', 'points log description', 'wordpoints'), $user_name, esc_html($meta['reason']));
 }
 
 /**
@@ -470,20 +470,20 @@ 
  *
  * @WordPress\action wordpoints_points_log-comment_disapprove
  */
-function wordpoints_points_logs_comment_disapprove( $text, $points, $points_type, $user_id, $log_type, $meta ) {
+function wordpoints_points_logs_comment_disapprove($text, $points, $points_type, $user_id, $log_type, $meta) {
 
-	switch ( $meta['status'] ) {
+	switch ($meta['status']) {
 
 		case 'spam':
-			$text = _x( 'Comment marked as spam.', 'points log description', 'wordpoints' );
+			$text = _x('Comment marked as spam.', 'points log description', 'wordpoints');
 		break;
 
 		case 'trash':
-			$text = _x( 'Comment moved to trash.', 'points log description', 'wordpoints' );
+			$text = _x('Comment moved to trash.', 'points log description', 'wordpoints');
 		break;
 
 		default:
-			$text = _x( 'Comment unapproved.', 'points log description', 'wordpoints' );
+			$text = _x('Comment unapproved.', 'points log description', 'wordpoints');
 	}
 
 	return $text;
@@ -496,23 +496,23 @@ 
  *
  * @WordPress\action wordpoints_points_log-post_delete
  */
-function wordpoints_points_logs_post_delete( $text, $points, $points_type, $user_id, $log_type, $meta ) {
+function wordpoints_points_logs_post_delete($text, $points, $points_type, $user_id, $log_type, $meta) {
 
-	if ( isset( $meta['post_type'] ) ) {
+	if (isset($meta['post_type'])) {
 
-		$post_type = get_post_type_object( $meta['post_type'] );
+		$post_type = get_post_type_object($meta['post_type']);
 
-		if ( ! is_null( $post_type ) ) {
+		if ( ! is_null($post_type)) {
 
 			return sprintf(
 				// translators: Singular post type name.
-				_x( '%s deleted.', 'points log description', 'wordpoints' )
+				_x('%s deleted.', 'points log description', 'wordpoints')
 				, $post_type->labels->singular_name
 			);
 		}
 	}
 
-	return _x( 'Post deleted.', 'points log description', 'wordpoints' );
+	return _x('Post deleted.', 'points log description', 'wordpoints');
 }
 
 /**
@@ -528,10 +528,10 @@ 
  * @param int    $points      The number of points. Not used.
  * @param string $points_type The type of points being awarded.
  */
-function wordpoints_clean_points_logs_cache( $user_id, $points, $points_type ) {
+function wordpoints_clean_points_logs_cache($user_id, $points, $points_type) {
 
 	wordpoints_flush_points_logs_caches(
-		array( 'user_id' => $user_id, 'points_type' => $points_type )
+		array('user_id' => $user_id, 'points_type' => $points_type)
 	);
 }
 
@@ -553,27 +553,27 @@ 
  *        @type int             $user_id     Only clear the cache for this user.
  * }
  */
-function wordpoints_flush_points_logs_caches( $args = array() ) {
+function wordpoints_flush_points_logs_caches($args = array()) {
 
-	$args = array_merge( array( 'points_type' => false, 'user_id' => 0 ), $args );
+	$args = array_merge(array('points_type' => false, 'user_id' => 0), $args);
 
 	$find = array(
 		'%points_type%',
 		'%user_id%',
 	);
 
-	if ( empty( $args['points_type'] ) ) {
-		$points_types = array_keys( wordpoints_get_points_types() );
+	if (empty($args['points_type'])) {
+		$points_types = array_keys(wordpoints_get_points_types());
 	} else {
 		$points_types = (array) $args['points_type'];
 	}
 
-	foreach ( $points_types as $points_type ) {
-		foreach ( WordPoints_Points_Log_Queries::get_queries() as $query ) {
+	foreach ($points_types as $points_type) {
+		foreach (WordPoints_Points_Log_Queries::get_queries() as $query) {
 
-			if ( ! empty( $query['cache_key'] ) ) {
+			if ( ! empty($query['cache_key'])) {
 
-				if ( $query['network_wide'] ) {
+				if ($query['network_wide']) {
 					$group = 'wordpoints_network_points_logs_query';
 				} else {
 					$group = 'wordpoints_points_logs_query';
@@ -585,7 +585,7 @@ 
 				);
 
 				wp_cache_delete(
-					str_replace( $find, $replace, $query['cache_key'] )
+					str_replace($find, $replace, $query['cache_key'])
 					, $group
 				);
 			}
@@ -604,26 +604,26 @@ 
  *
  * @return bool Whether the user can view this points log entry.
  */
-function wordpoints_user_can_view_points_log( $user_id, $log ) {
+function wordpoints_user_can_view_points_log($user_id, $log) {
 
 	// We do this just once here for optimization, as otherwise it would run 3 times.
-	if ( $log->blog_id && get_current_blog_id() !== $log->blog_id ) {
-		$switched = switch_to_blog( $log->blog_id );
+	if ($log->blog_id && get_current_blog_id() !== $log->blog_id) {
+		$switched = switch_to_blog($log->blog_id);
 	}
 
 	/** @var WordPoints_Points_Logs_Viewing_Restrictions $viewing_restrictions */
-	$viewing_restrictions = wordpoints_component( 'points' )
-		->get_sub_app( 'logs' )
-		->get_sub_app( 'viewing_restrictions' );
+	$viewing_restrictions = wordpoints_component('points')
+		->get_sub_app('logs')
+		->get_sub_app('viewing_restrictions');
 
-	$can_view = $viewing_restrictions->get_restriction( $log )
-		->user_can( $user_id );
+	$can_view = $viewing_restrictions->get_restriction($log)
+		->user_can($user_id);
 
-	if ( $can_view ) {
-		$can_view = $viewing_restrictions->apply_legacy_filters( $user_id, $log );
+	if ($can_view) {
+		$can_view = $viewing_restrictions->apply_legacy_filters($user_id, $log);
 	}
 
-	if ( isset( $switched ) ) {
+	if (isset($switched)) {
 		restore_current_blog();
 	}
 
@@ -644,17 +644,17 @@ 
  *
  * @return bool Whether the user can view the points log.
  */
-function wordpoints_hooks_user_can_view_points_log( $can_view, $user_id, $log ) {
+function wordpoints_hooks_user_can_view_points_log($can_view, $user_id, $log) {
 
-	_deprecated_function( __FUNCTION__, '2.2.0' );
+	_deprecated_function(__FUNCTION__, '2.2.0');
 
-	if ( ! $can_view ) {
+	if ( ! $can_view) {
 		return $can_view;
 	}
 
-	$restriction = new WordPoints_Points_Logs_Viewing_Restriction_Hooks( $log );
+	$restriction = new WordPoints_Points_Logs_Viewing_Restriction_Hooks($log);
 
-	return $restriction->user_can( $user_id );
+	return $restriction->user_can($user_id);
 }
 
 // EOF

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/includes/class-wordpoints-points-hook.php

Spacing +103 added lines, -103 removed lines

@@ -105,18 +105,18 @@ 
 	 *
 	 * @return int|false The number of points for this instance, or false.
 	 */
-	public function get_points( $number = null ) {
+	public function get_points($number = null) {
 
-		if ( isset( $number ) ) {
-			$number = $this->get_number_by_id( $number );
+		if (isset($number)) {
+			$number = $this->get_number_by_id($number);
 		} else {
 			$number = $this->number;
 		}
 
 		$instances = $this->get_instances();
 
-		if ( isset( $instances[ $number ]['points'] ) ) {
-			return $instances[ $number ]['points'];
+		if (isset($instances[$number]['points'])) {
+			return $instances[$number]['points'];
 		}
 
 		return false;
@@ -147,12 +147,12 @@ 
 	 *
 	 * @return array|false Settings to save, or false to cancel saving.
 	 */
-	protected function update( $new_instance, $old_instance ) {
+	protected function update($new_instance, $old_instance) {
 
-		$new_instance = array_merge( array( 'points' => 0 ), $old_instance, $new_instance );
+		$new_instance = array_merge(array('points' => 0), $old_instance, $new_instance);
 
-		if ( false === wordpoints_posint( $new_instance['points'] ) ) {
-			if ( isset( $this->defaults['points'] ) ) {
+		if (false === wordpoints_posint($new_instance['points'])) {
+			if (isset($this->defaults['points'])) {
 				$new_instance['points'] = $this->defaults['points'];
 			} else {
 				return false;
@@ -178,11 +178,11 @@ 
 	 *
 	 * @return bool Whether the hook has a form.
 	 */
-	protected function form( $instance ) {
+	protected function form($instance) {
 
-		if ( ! isset( $instance['points'] ) ) {
+		if ( ! isset($instance['points'])) {
 
-			if ( isset( $this->defaults['points'] ) ) {
+			if (isset($this->defaults['points'])) {
 				$instance['points'] = $this->defaults['points'];
 			} else {
 				$instance['points'] = 0;
@@ -192,8 +192,8 @@ 
 		?>
 
 		<p>
-			<label for="<?php $this->the_field_id( 'points' ); ?>"><?php echo esc_html( $this->options['points_label'] ); ?></label>
-			<input class="widefat" name="<?php $this->the_field_name( 'points' ); ?>" id="<?php $this->the_field_id( 'points' ); ?>" type="number" min="0" value="<?php echo wordpoints_posint( $instance['points'] ); ?>" />
+			<label for="<?php $this->the_field_id('points'); ?>"><?php echo esc_html($this->options['points_label']); ?></label>
+			<input class="widefat" name="<?php $this->the_field_name('points'); ?>" id="<?php $this->the_field_id('points'); ?>" type="number" min="0" value="<?php echo wordpoints_posint($instance['points']); ?>" />
 		</p>
 
 		<?php
@@ -210,7 +210,7 @@ 
 	 *
 	 * @return string The hook instance's description.
 	 */
-	protected function generate_description( $instance = array() ) {
+	protected function generate_description($instance = array()) {
 
 		return $this->options['description'];
 	}
@@ -243,9 +243,9 @@ 
 	 *
 	 * @return string The unique ID for the instance.
 	 */
-	final public function get_id( $number = null ) {
+	final public function get_id($number = null) {
 
-		if ( ! isset( $number ) ) {
+		if ( ! isset($number)) {
 			$number = $this->number;
 		}
 
@@ -275,16 +275,16 @@ 
 	 *
 	 * @param int|string $instance_id The number or ID of an instance.
 	 */
-	final public function set_number( $instance_id ) {
+	final public function set_number($instance_id) {
 
-		$this->number = $this->get_number_by_id( $instance_id );
+		$this->number = $this->get_number_by_id($instance_id);
 
-		if ( '__i__' === $this->number ) {
+		if ('__i__' === $this->number) {
 			return;
-		} elseif ( '0' === $this->number ) {
+		} elseif ('0' === $this->number) {
 			$this->number = 0;
 		} else {
-			wordpoints_posint( $this->number );
+			wordpoints_posint($this->number);
 		}
 	}
 
@@ -298,9 +298,9 @@ 
 	 * @return string The number for the hook instance. Prefixed with 'network_' for
 	 *                network hooks.
 	 */
-	final public function get_number_by_id( $id ) {
+	final public function get_number_by_id($id) {
 
-		return str_replace( $this->id_base . '-', '', $id );
+		return str_replace($this->id_base . '-', '', $id);
 	}
 
 	/**
@@ -338,11 +338,11 @@ 
 	 *
 	 * @return mixed The option, or null if it doesn't exist.
 	 */
-	final public function get_option( $option ) {
+	final public function get_option($option) {
 
-		if ( isset( $this->options[ $option ] ) ) {
+		if (isset($this->options[$option])) {
 
-			return $this->options[ $option ];
+			return $this->options[$option];
 		}
 
 		return null;
@@ -356,7 +356,7 @@ 
 	 *
 	 * @param array $options The options for the hook.
 	 */
-	final public function set_options( array $options ) {
+	final public function set_options(array $options) {
 		$this->options = $options;
 	}
 
@@ -369,9 +369,9 @@ 
 	 * @param string $option The index for the option.
 	 * @param mixed  $value  The value to assign to this option.
 	 */
-	final public function set_option( $option, $value ) {
+	final public function set_option($option, $value) {
 
-		$this->options[ $option ] = $value;
+		$this->options[$option] = $value;
 	}
 
 	/**
@@ -387,13 +387,13 @@ 
 	 */
 	final public function next_hook_id_number() {
 
-		if ( WordPoints_Points_Hooks::get_network_mode() ) {
+		if (WordPoints_Points_Hooks::get_network_mode()) {
 			$type = 'network';
 		} else {
 			$type = 'standard';
 		}
 
-		return 1 + max( array_keys( $this->get_instances( $type ) ) + array( 0 ) );
+		return 1 + max(array_keys($this->get_instances($type)) + array(0));
 	}
 
 	/**
@@ -415,34 +415,34 @@ 
 	 *
 	 * @return array The saved instances of this hook.
 	 */
-	final public function get_instances( $type = 'all' ) {
+	final public function get_instances($type = 'all') {
 
-		switch ( $type ) {
+		switch ($type) {
 
 			case 'standard':
-				$instances = wordpoints_get_array_option( $this->option_name );
+				$instances = wordpoints_get_array_option($this->option_name);
 			break;
 
 			case 'network':
-				if ( is_multisite() ) {
-					$instances = wordpoints_get_array_option( $this->option_name, 'site' );
+				if (is_multisite()) {
+					$instances = wordpoints_get_array_option($this->option_name, 'site');
 				} else {
 					$instances = array();
 				}
 			break;
 
 			case 'all':
-				$instances = wordpoints_get_array_option( $this->option_name );
+				$instances = wordpoints_get_array_option($this->option_name);
 
-				if ( is_multisite() ) {
-					foreach ( wordpoints_get_array_option( $this->option_name, 'site' ) as $number => $instance ) {
-						$instances[ 'network_' . $number ] = $instance;
+				if (is_multisite()) {
+					foreach (wordpoints_get_array_option($this->option_name, 'site') as $number => $instance) {
+						$instances['network_' . $number] = $instance;
 					}
 				}
 			break;
 		}
 
-		unset( $instances['__i__'] );
+		unset($instances['__i__']);
 
 		return $instances;
 	}
@@ -457,22 +457,22 @@ 
 	 * @param array $new_instance The new instance of this hooks settings.
 	 * @param int   $number       The ID number for this hook.
 	 */
-	final public function update_callback( $new_instance, $number ) {
+	final public function update_callback($new_instance, $number) {
 
-		if ( WordPoints_Points_Hooks::get_network_mode() ) {
+		if (WordPoints_Points_Hooks::get_network_mode()) {
 			$type = 'network';
 		} else {
 			$type = 'standard';
 		}
 
 		// Get all saved instances of this points hook.
-		$all_instances = $this->get_instances( $type );
+		$all_instances = $this->get_instances($type);
 
-		$this->set_number( $number );
+		$this->set_number($number);
 
-		$old_instance = isset( $all_instances[ $this->number ] ) ? $all_instances[ $this->number ] : array();
+		$old_instance = isset($all_instances[$this->number]) ? $all_instances[$this->number] : array();
 
-		$instance = $this->update( $new_instance, $old_instance );
+		$instance = $this->update($new_instance, $old_instance);
 
 		/**
 		 * Filter a points hook's settings before saving.
@@ -488,13 +488,13 @@ 
 		 * @param array                  $old_instance The old instance of the hook.
 		 * @param WordPoints_Points_Hook $hook         The hook object.
 		 */
-		$instance = apply_filters( 'wordpoints_points_hook_update_callback', $instance, $new_instance, $old_instance, $this );
+		$instance = apply_filters('wordpoints_points_hook_update_callback', $instance, $new_instance, $old_instance, $this);
 
-		if ( false !== $instance ) {
-			$all_instances[ $this->number ] = $instance;
+		if (false !== $instance) {
+			$all_instances[$this->number] = $instance;
 		}
 
-		$this->_save_instances( $all_instances );
+		$this->_save_instances($all_instances);
 	}
 
 	/**
@@ -504,24 +504,24 @@ 
 	 *
 	 * @param string $hook_id The ID of the instance to delete.
 	 */
-	final public function delete_callback( $hook_id ) {
+	final public function delete_callback($hook_id) {
 
-		if ( WordPoints_Points_Hooks::get_network_mode() ) {
+		if (WordPoints_Points_Hooks::get_network_mode()) {
 			$type = 'network';
 		} else {
 			$type = 'standard';
 		}
 
 		// Get all saved instances of this points hook.
-		$all_instances = $this->get_instances( $type );
+		$all_instances = $this->get_instances($type);
 
-		$number = $this->get_number_by_id( $hook_id );
+		$number = $this->get_number_by_id($hook_id);
 
-		if ( isset( $all_instances[ $number ] ) ) {
+		if (isset($all_instances[$number])) {
 
-			unset( $all_instances[ $number ] );
+			unset($all_instances[$number]);
 
-			$this->_save_instances( $all_instances );
+			$this->_save_instances($all_instances);
 		}
 	}
 
@@ -534,27 +534,27 @@ 
 	 *
 	 * @return bool|null Whether the form was displayed.
 	 */
-	final public function form_callback( $number ) {
+	final public function form_callback($number) {
 
-		$this->set_number( $number );
+		$this->set_number($number);
 
-		if ( WordPoints_Points_Hooks::get_network_mode() ) {
+		if (WordPoints_Points_Hooks::get_network_mode()) {
 			$type = 'network';
 		} else {
 			$type = 'standard';
 		}
 
-		$all_instances = $this->get_instances( $type );
+		$all_instances = $this->get_instances($type);
 
-		if ( 0 === $this->number || '0' === $this->number ) {
+		if (0 === $this->number || '0' === $this->number) {
 
 			// We echo out a form where 'number' can be set later.
-			$this->set_number( '__i__' );
+			$this->set_number('__i__');
 			$instance = array();
 
 		} else {
 
-			$instance = $all_instances[ $this->number ];
+			$instance = $all_instances[$this->number];
 		}
 
 		/**
@@ -567,11 +567,11 @@ 
 		 * @param array                  $instance The settings for this instance.
 		 * @param WordPoints_Points_Hook $hook     The hook object.
 		 */
-		$instance = apply_filters( 'wordpoints_points_hook_form_callback', $instance, $this );
+		$instance = apply_filters('wordpoints_points_hook_form_callback', $instance, $this);
 
-		if ( false !== $instance ) {
+		if (false !== $instance) {
 
-			$has_form = $this->form( $instance );
+			$has_form = $this->form($instance);
 
 			/**
 			 * Inside the points hook form.
@@ -583,7 +583,7 @@ 
 			 * @param array                  $instance Settings for this instance.
 			 * @param WordPoints_Points_Hook $hook     The hook object.
 			 */
-			do_action( 'wordpoints_in_points_hook_form', $has_form, $instance, $this );
+			do_action('wordpoints_in_points_hook_form', $has_form, $instance, $this);
 
 			return $has_form;
 		}
@@ -606,9 +606,9 @@ 
 	 *
 	 * @return string Name attribute for $field_name.
 	 */
-	final public function get_field_name( $field_name ) {
+	final public function get_field_name($field_name) {
 
-		return esc_attr( 'hook-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']' );
+		return esc_attr('hook-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']');
 	}
 
 	/**
@@ -620,9 +620,9 @@ 
 	 *
 	 * @param string $field_name The field name.
 	 */
-	final public function the_field_name( $field_name ) {
+	final public function the_field_name($field_name) {
 
-		echo esc_attr( $this->get_field_name( $field_name ) );
+		echo esc_attr($this->get_field_name($field_name));
 	}
 
 	/**
@@ -640,9 +640,9 @@ 
 	 *
 	 * @return string ID attribute for $field_name.
 	 */
-	final public function get_field_id( $field_name ) {
+	final public function get_field_id($field_name) {
 
-		return esc_attr( 'hook-' . $this->id_base . '-' . $this->number . '-' . $field_name );
+		return esc_attr('hook-' . $this->id_base . '-' . $this->number . '-' . $field_name);
 	}
 
 	/**
@@ -654,9 +654,9 @@ 
 	 *
 	 * @param string $field_name The field name.
 	 */
-	final public function the_field_id( $field_name ) {
+	final public function the_field_id($field_name) {
 
-		echo esc_attr( $this->get_field_id( $field_name ) );
+		echo esc_attr($this->get_field_id($field_name));
 	}
 
 	/**
@@ -669,15 +669,15 @@ 
 	 *
 	 * @return string The hook's description.
 	 */
-	final public function get_description( $type = 'any' ) {
+	final public function get_description($type = 'any') {
 
 		$instances = $this->get_instances();
 
-		if ( 'generated' !== $type && ! empty( $instances[ $this->number ]['_description'] ) ) {
-			return $instances[ $this->number ]['_description'];
+		if ('generated' !== $type && ! empty($instances[$this->number]['_description'])) {
+			return $instances[$this->number]['_description'];
 		}
 
-		$instance = ( isset( $instances[ $this->number ] ) ) ? $instances[ $this->number ] : array();
+		$instance = (isset($instances[$this->number])) ? $instances[$this->number] : array();
 
 		/**
 		 * Filter the description for a points hook.
@@ -688,7 +688,7 @@ 
 		 * @param WordPoints_Points_Hook $hook        The points hook object.
 		 * @param array                  $instance    The settings for this instance.
 		 */
-		return apply_filters( 'wordpoints_points_hook_description', $this->generate_description( $instance ), $this, $instance );
+		return apply_filters('wordpoints_points_hook_description', $this->generate_description($instance), $this, $instance);
 	}
 
 	/**
@@ -701,31 +701,31 @@ 
 	 *
 	 * @return string|false The type of points, or false if none found.
 	 */
-	final public function points_type( $number = null ) {
+	final public function points_type($number = null) {
 
 		$network_mode = false;
 
-		if ( ! isset( $number ) ) {
+		if ( ! isset($number)) {
 
 			$number = $this->number;
 
-		} elseif ( is_string( $number ) && 'network_' === substr( $number, 0, 8 ) ) {
+		} elseif (is_string($number) && 'network_' === substr($number, 0, 8)) {
 
 			$network_mode = true;
-			$number = (int) substr( $number, 8 );
+			$number = (int) substr($number, 8);
 		}
 
 		$current_mode = WordPoints_Points_Hooks::get_network_mode();
 
-		if ( $current_mode !== $network_mode ) {
-			WordPoints_Points_Hooks::set_network_mode( $network_mode );
+		if ($current_mode !== $network_mode) {
+			WordPoints_Points_Hooks::set_network_mode($network_mode);
 		}
 
-		$points_type = WordPoints_Points_Hooks::get_points_type( $this->get_id( $number ) );
+		$points_type = WordPoints_Points_Hooks::get_points_type($this->get_id($number));
 
 		// Reset network mode if it was changed.
-		if ( $current_mode !== $network_mode ) {
-			WordPoints_Points_Hooks::set_network_mode( $current_mode );
+		if ($current_mode !== $network_mode) {
+			WordPoints_Points_Hooks::set_network_mode($current_mode);
 		}
 
 		return $points_type;
@@ -754,15 +754,15 @@ 
 	 *              overriding that function, you can ignore this option.
 	 * }
 	 */
-	final protected function init( $name, array $options = array() ) {
+	final protected function init($name, array $options = array()) {
 
-		$this->id_base     = strtolower( get_class( $this ) );
+		$this->id_base     = strtolower(get_class($this));
 		$this->name        = $name;
 		$this->option_name = 'wordpoints_hook-' . $this->id_base;
 
 		// Option names can only be 191 characters long.
-		if ( isset( $this->option_name{191} ) ) {
-			_doing_it_wrong( __METHOD__, sprintf( 'Points hook class names cannot be longer than 175 characters, %s is %s character(s) too long.', esc_html( $this->id_base ), (int) strlen( $this->id_base ) - 175 ), '1.5.0' );
+		if (isset($this->option_name{191} )) {
+			_doing_it_wrong(__METHOD__, sprintf('Points hook class names cannot be longer than 175 characters, %s is %s character(s) too long.', esc_html($this->id_base), (int) strlen($this->id_base) - 175), '1.5.0');
 			return;
 		}
 
@@ -770,12 +770,12 @@ 
 			array(
 				'width'        => 250,
 				'description'  => '',
-				'points_label' => __( 'Points:', 'wordpoints' ),
+				'points_label' => __('Points:', 'wordpoints'),
 			)
 			, $options
 		);
 
-		$this->options['_classname']   = $this->option_name;
+		$this->options['_classname'] = $this->option_name;
 	}
 
 	//
@@ -789,15 +789,15 @@ 
 	 *
 	 * @param array $instances All settings, indexed by instance number.
 	 */
-	final private function _save_instances( $instances ) {
+	final private function _save_instances($instances) {
 
 		// This needs to start at 1.
-		unset( $instances[0] );
+		unset($instances[0]);
 
-		if ( WordPoints_Points_Hooks::get_network_mode() ) {
-			update_site_option( $this->option_name, $instances );
+		if (WordPoints_Points_Hooks::get_network_mode()) {
+			update_site_option($this->option_name, $instances);
 		} else {
-			update_option( $this->option_name, $instances );
+			update_option($this->option_name, $instances);
 		}
 	}
 

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

src/components/points/admin/screens/hooks-no-js.php

Spacing +38 added lines, -38 removed lines

@@ -7,44 +7,44 @@ 
  * @since 1.0.0
  */
 
-if ( ! isset( $_GET['edithook'] ) ) {
+if ( ! isset($_GET['edithook'])) {
 	return;
 }
 
-$hook_id = sanitize_key( $_GET['edithook'] );
+$hook_id = sanitize_key($_GET['edithook']);
 
 $points_types = wordpoints_get_points_types();
 
-if ( isset( $_GET['addnew'] ) ) {
+if (isset($_GET['addnew'])) {
 
 	// - We are adding a new points hook.
 
 	$points_type = wordpoints_get_default_points_type();
 
 	// Default to the first points type.
-	if ( ! $points_type ) {
-		reset( $points_types );
-		$points_type = key( $points_types );
+	if ( ! $points_type) {
+		reset($points_types);
+		$points_type = key($points_types);
 	}
 
-	if ( ! $points_type ) {
+	if ( ! $points_type) {
 
-		wordpoints_show_admin_error( esc_html__( 'You need to add a points type before you can add any hooks.', 'wordpoints' ) );
+		wordpoints_show_admin_error(esc_html__('You need to add a points type before you can add any hooks.', 'wordpoints'));
 		return;
 	}
 
-	if ( isset( $_GET['base'], $_GET['num'] ) ) {
+	if (isset($_GET['base'], $_GET['num'])) {
 
 		// Copy minimal info from an existing instance of this hook to a new instance.
 		$hook = WordPoints_Points_Hooks::get_handler_by_id_base(
-			sanitize_key( $_GET['base'] )
+			sanitize_key($_GET['base'])
 		);
 
-		if ( ! $hook ) {
+		if ( ! $hook) {
 
 			wordpoints_show_admin_error(
-				esc_html__( 'Unable to add the points hook, please try again.', 'wordpoints' )
-				, array( 'dismissible' => true )
+				esc_html__('Unable to add the points hook, please try again.', 'wordpoints')
+				, array('dismissible' => true)
 			);
 
 			return;
@@ -52,15 +52,15 @@ 
 
 		$multi_number = (int) $_GET['num'];
 		$number       = 0;
-		$hook_id      = $hook->get_id( $multi_number );
+		$hook_id      = $hook->get_id($multi_number);
 		$_hook        = $hook;
 		$id_base      = $hook->get_id_base();
 
 	} else {
 
 		wordpoints_show_admin_error(
-			esc_html__( 'Unable to add the points hook, please try again.', 'wordpoints' )
-			, array( 'dismissible' => true )
+			esc_html__('Unable to add the points hook, please try again.', 'wordpoints')
+			, array('dismissible' => true)
 		);
 
 		return;
@@ -70,43 +70,43 @@ 
 
 	// We are editing an existing points hook.
 
-	$points_type = isset( $_GET['points_type'] ) ? sanitize_key( $_GET['points_type'] ) : '_inactive_hooks';
+	$points_type = isset($_GET['points_type']) ? sanitize_key($_GET['points_type']) : '_inactive_hooks';
 
-	$hook = WordPoints_Points_Hooks::get_handler( $hook_id );
+	$hook = WordPoints_Points_Hooks::get_handler($hook_id);
 
-	if ( ! $hook ) {
+	if ( ! $hook) {
 
-		wordpoints_show_admin_error( esc_html__( 'The hook you have asked to edit could not be found. Please go back and try again.', 'wordpoints' ) );
+		wordpoints_show_admin_error(esc_html__('The hook you have asked to edit could not be found. Please go back and try again.', 'wordpoints'));
 		return;
 	}
 
 	$id_base = $hook->get_id_base();
 	$multi_number = 0;
-	$number = $hook->get_number_by_id( $hook_id );
+	$number = $hook->get_number_by_id($hook_id);
 
 } // End if ( adding hook ) else { updating hook }.
 
-$name = esc_html( $hook->get_name() );
+$name = esc_html($hook->get_name());
 
 // Show the hook form.
 
 ?>
 
 <div class="wrap">
-	<h1><?php esc_html_e( 'Points Hooks', 'wordpoints' ); ?></h1>
-	<div class="edithook" style="width:<?php echo absint( $hook->get_option( 'width' ) ); ?>px">
+	<h1><?php esc_html_e('Points Hooks', 'wordpoints'); ?></h1>
+	<div class="edithook" style="width:<?php echo absint($hook->get_option('width')); ?>px">
 		<?php // translators: Hook name. ?>
-		<h2><?php echo esc_html( sprintf( __( 'Hook %s', 'wordpoints' ), $name ) ); ?></h2>
+		<h2><?php echo esc_html(sprintf(__('Hook %s', 'wordpoints'), $name)); ?></h2>
 
-		<form action="<?php echo esc_url( self_admin_url( 'admin.php?page=wordpoints_points_hooks' ) ); ?>" method="post">
+		<form action="<?php echo esc_url(self_admin_url('admin.php?page=wordpoints_points_hooks')); ?>" method="post">
 			<div class="hook-inside">
-				<?php $hook->form_callback( $number ); ?>
+				<?php $hook->form_callback($number); ?>
 			</div>
 
-			<p class="describe"><?php esc_html_e( 'Select the points type to attach this hook to.', 'wordpoints' ); ?></p>
+			<p class="describe"><?php esc_html_e('Select the points type to attach this hook to.', 'wordpoints'); ?></p>
 			<div class="hook-position">
 				<label for="points_type" class="screen-reader-text">
-					<?php esc_html_e( 'Points Type:', 'wordpoints' ); ?>
+					<?php esc_html_e('Points Type:', 'wordpoints'); ?>
 				</label>
 				<?php
 
@@ -116,7 +116,7 @@ 
 							'name'     => 'points_type',
 							'id'       => 'points_type',
 							'class'    => 'widefat',
-							'options'  => array( '_inactive_hooks' => __( 'Inactive Hooks', 'wordpoints' ) ),
+							'options'  => array('_inactive_hooks' => __('Inactive Hooks', 'wordpoints')),
 						)
 					);
 
@@ -124,19 +124,19 @@ 
 			</div>
 			<br />
 			<div class="hook-control-actions">
-				<?php if ( isset( $_GET['addnew'] ) ) : ?>
-					<a href="<?php echo esc_url( self_admin_url( 'admin.php?page=wordpoints_points_hooks' ) ); ?>" class="button alignleft"><?php esc_html_e( 'Cancel', 'wordpoints' ); ?></a>
+				<?php if (isset($_GET['addnew'])) : ?>
+					<a href="<?php echo esc_url(self_admin_url('admin.php?page=wordpoints_points_hooks')); ?>" class="button alignleft"><?php esc_html_e('Cancel', 'wordpoints'); ?></a>
 				<?php else :
-						submit_button( _x( 'Delete', 'points hook', 'wordpoints' ), 'button alignleft', 'removehook', false );
+						submit_button(_x('Delete', 'points hook', 'wordpoints'), 'button alignleft', 'removehook', false);
 					endif;
 
-					submit_button( __( 'Save Hook', 'wordpoints' ), 'button-primary alignright', 'savehook', false );
+					submit_button(__('Save Hook', 'wordpoints'), 'button-primary alignright', 'savehook', false);
 				?>
 
-				<input type="hidden" name="hook-id" class="hook-id" value="<?php echo esc_attr( $hook_id ); ?>" />
-				<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
-				<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
-				<?php wp_nonce_field( "save-delete-hook-{$hook_id}" ); ?>
+				<input type="hidden" name="hook-id" class="hook-id" value="<?php echo esc_attr($hook_id); ?>" />
+				<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
+				<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
+				<?php wp_nonce_field("save-delete-hook-{$hook_id}"); ?>
 				<br class="clear" />
 			</div>
 		</form>