WordPoints / wordpoints

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

Spacing +57 added lines, -57 removed lines

@@ -48,7 +48,7 @@ 
 		parent::__construct(
 			array(
 				'plural' => 'modules',
-				'screen' => ( isset( $args['screen'] ) ) ? $args['screen'] : null,
+				'screen' => ( isset( $args[ 'screen' ] ) ) ? $args[ 'screen' ] : null,
 			)
 		);
 
@@ -68,12 +68,12 @@ 
 		 */
 		$module_statuses = apply_filters( 'wordpoints_module_statuses', $module_statuses );
 
-		if ( isset( $_REQUEST['module_status'] ) && in_array( wp_unslash( $_REQUEST['module_status'] ), $module_statuses, true ) ) { // WPCS: CSRF OK.
-			$status = sanitize_key( $_REQUEST['module_status'] ); // WPCS: CSRF OK.
+		if ( isset( $_REQUEST[ 'module_status' ] ) && in_array( wp_unslash( $_REQUEST[ 'module_status' ] ), $module_statuses, true ) ) { // WPCS: CSRF OK.
+			$status = sanitize_key( $_REQUEST[ 'module_status' ] ); // WPCS: CSRF OK.
 		}
 
-		if ( isset( $_REQUEST['s'] ) ) { // WPCS: CSRF OK.
-			$_SERVER['REQUEST_URI'] = add_query_arg( 's', sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ) ); // WPCS: CSRF OK.
+		if ( isset( $_REQUEST[ 's' ] ) ) { // WPCS: CSRF OK.
+			$_SERVER[ 'REQUEST_URI' ] = add_query_arg( 's', sanitize_text_field( wp_unslash( $_REQUEST[ 's' ] ) ) ); // WPCS: CSRF OK.
 		}
 
 		$page = $this->get_pagenum();
@@ -88,7 +88,7 @@ 
 	 */
 	public function get_table_classes() {
 
-		return array( 'widefat', $this->_args['plural'], 'plugins' );
+		return array( 'widefat', $this->_args[ 'plural' ], 'plugins' );
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 
 		} // End if ( not network admin ).
 
-		foreach ( (array) $modules['all'] as $module_file => $module_data ) {
+		foreach ( (array) $modules[ 'all' ] as $module_file => $module_data ) {
 
 			// Filter into individual sections.
 			if (
@@ -190,9 +190,9 @@ 
 			) {
 
 				if ( $show_network_active ) {
-					$modules['inactive'][ $module_file ] = $module_data;
+					$modules[ 'inactive' ][ $module_file ] = $module_data;
 				} else {
-					unset( $modules['all'][ $module_file ] );
+					unset( $modules[ 'all' ][ $module_file ] );
 				}
 
 			} elseif (
@@ -201,9 +201,9 @@ 
 			) {
 
 				if ( $show_network_active ) {
-					$modules['active'][ $module_file ] = $module_data;
+					$modules[ 'active' ][ $module_file ] = $module_data;
 				} else {
-					unset( $modules['all'][ $module_file ] );
+					unset( $modules[ 'all' ][ $module_file ] );
 				}
 
 			} elseif (
@@ -216,16 +216,16 @@ 
 				)
 			) {
 
-				$modules['active'][ $module_file ] = $module_data;
+				$modules[ 'active' ][ $module_file ] = $module_data;
 
 			} else {
 
 				// Was the module recently activated?
 				if ( ! $this->screen->in_admin( 'network' ) && isset( $recently_activated[ $module_file ] ) ) {
-					$modules['recently_activated'][ $module_file ] = $module_data;
+					$modules[ 'recently_activated' ][ $module_file ] = $module_data;
 				}
 
-				$modules['inactive'][ $module_file ] = $module_data;
+				$modules[ 'inactive' ][ $module_file ] = $module_data;
 
 			} // End if ().
 
@@ -234,7 +234,7 @@ 
 		if ( $s ) {
 
 			$status = 'search';
-			$modules['search'] = array_filter( $modules['all'], array( $this, '_search_callback' ) );
+			$modules[ 'search' ] = array_filter( $modules[ 'all' ], array( $this, '_search_callback' ) );
 		}
 
 		/**
@@ -311,8 +311,8 @@ 
 
 		static $term;
 
-		if ( is_null( $term ) && isset( $_REQUEST['s'] ) ) { // WPCS: CSRF OK.
-			$term = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ); // WPCS: CSRF OK.
+		if ( is_null( $term ) && isset( $_REQUEST[ 's' ] ) ) { // WPCS: CSRF OK.
+			$term = sanitize_text_field( wp_unslash( $_REQUEST[ 's' ] ) ); // WPCS: CSRF OK.
 		}
 
 		foreach ( $module_data as $value ) {
@@ -364,7 +364,7 @@ 
 
 		global $modules;
 
-		if ( ! empty( $modules['all'] ) ) {
+		if ( ! empty( $modules[ 'all' ] ) ) {
 			esc_html_e( 'No modules found.', 'wordpoints' );
 		} else {
 			esc_html_e( 'There are not any modules installed.', 'wordpoints' );
@@ -478,11 +478,11 @@ 
 		$actions = array();
 
 		if ( 'active' !== $status ) {
-			$actions['activate-selected'] = ( $this->screen->in_admin( 'network' ) ) ? esc_html__( 'Network Activate', 'wordpoints' ) : esc_html__( 'Activate', 'wordpoints' );
+			$actions[ 'activate-selected' ] = ( $this->screen->in_admin( 'network' ) ) ? esc_html__( 'Network Activate', 'wordpoints' ) : esc_html__( 'Activate', 'wordpoints' );
 		}
 
 		if ( 'inactive' !== $status && 'recent' !== $status ) {
-			$actions['deactivate-selected'] = ( $this->screen->in_admin( 'network' ) ) ? esc_html__( 'Network Deactivate', 'wordpoints' ) : esc_html__( 'Deactivate', 'wordpoints' );
+			$actions[ 'deactivate-selected' ] = ( $this->screen->in_admin( 'network' ) ) ? esc_html__( 'Network Deactivate', 'wordpoints' ) : esc_html__( 'Deactivate', 'wordpoints' );
 		}
 
 		if (
@@ -490,7 +490,7 @@ 
 			&& current_user_can( 'delete_wordpoints_modules' )
 			&& 'active' !== $status
 		) {
-			$actions['delete-selected'] = esc_html__( 'Delete', 'wordpoints' );
+			$actions[ 'delete-selected' ] = esc_html__( 'Delete', 'wordpoints' );
 		}
 
 		/**
@@ -578,7 +578,7 @@ 
 		$class = apply_filters( 'wordpoints_module_list_row_class', $class, $module_file, $module_data, $context );
 
 		?>
-		<tr id="<?php echo esc_attr( sanitize_title( $module_data['name'] ) ); ?>" class="<?php echo esc_attr( $class ); ?>">
+		<tr id="<?php echo esc_attr( sanitize_title( $module_data[ 'name' ] ) ); ?>" class="<?php echo esc_attr( $class ); ?>">
 			<?php $this->single_row_columns( $item, $class, $is_active ); ?>
 		</tr>
 		<?php
@@ -618,7 +618,7 @@ 
 
 		list( $module_file, $module_data ) = $item;
 
-		$module_data['extra']['module_file'] = $module_file;
+		$module_data[ 'extra' ][ 'module_file' ] = $module_file;
 
 		if ( $this->screen->in_admin( 'network' ) ) {
 
@@ -631,11 +631,11 @@ 
 			$restricted_network_only = ( is_multisite() && is_network_only_wordpoints_module( $module_file ) && ! $is_active );
 		}
 
-		$module_data['extra']['is_active'] = $is_active;
-		$module_data['extra']['restricted_network_active'] = $restricted_network_active;
-		$module_data['extra']['restricted_network_only'] = $restricted_network_only;
+		$module_data[ 'extra' ][ 'is_active' ] = $is_active;
+		$module_data[ 'extra' ][ 'restricted_network_active' ] = $restricted_network_active;
+		$module_data[ 'extra' ][ 'restricted_network_only' ] = $restricted_network_only;
 
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
 
@@ -672,11 +672,11 @@ 
 	 */
 	protected function column_cb( $module_data ) {
 
-		$checkbox_id = 'checkbox_' . sanitize_key( $module_data['extra']['module_file'] );
+		$checkbox_id = 'checkbox_' . sanitize_key( $module_data[ 'extra' ][ 'module_file' ] );
 
 		?>
 		<th scope="row" class="check-column">
-			<?php if ( ! $module_data['extra']['restricted_network_active'] && ! $module_data['extra']['restricted_network_only'] ) : ?>
+			<?php if ( ! $module_data[ 'extra' ][ 'restricted_network_active' ] && ! $module_data[ 'extra' ][ 'restricted_network_only' ] ) : ?>
 				<label class="screen-reader-text" for="<?php echo esc_attr( $checkbox_id ); ?>">
 					<?php
 
@@ -684,13 +684,13 @@ 
 						sprintf(
 							// translators: Module name.
 							__( 'Select %s', 'wordpoints' )
-							, $module_data['name']
+							, $module_data[ 'name' ]
 						)
 					);
 
 					?>
 				</label>
-				<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $module_data['extra']['module_file'] ); ?>" id="<?php echo esc_attr( $checkbox_id ); ?>" />
+				<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $module_data[ 'extra' ][ 'module_file' ] ); ?>" id="<?php echo esc_attr( $checkbox_id ); ?>" />
 			<?php endif; ?>
 		</th>
 		<?php
@@ -709,7 +709,7 @@ 
 
 		?>
 		<td class="module-title<?php echo ( $is_hidden ) ? ' hidden' : ''; ?><?php echo ( $is_primary ) ? ' has-row-actions column-primary' : ''; ?>">
-			<strong><?php echo esc_html( $module_data['name'] ); ?></strong>
+			<strong><?php echo esc_html( $module_data[ 'name' ] ); ?></strong>
 			<?php if ( $is_primary ) : ?>
 				<?php echo $this->row_actions( $this->get_module_row_actions( $module_data ), true ); // WPCS XSS OK. ?>
 			<?php endif; ?>
@@ -735,8 +735,8 @@ 
 		<td class="column-description desc<?php echo ( $is_hidden ) ? ' hidden' : ''; ?><?php echo ( $is_primary ) ? ' has-row-actions column-primary' : ''; ?>">
 			<div class="module-description">
 				<p>
-					<?php if ( ! empty( $module_data['description'] ) ) : ?>
-						<?php echo wp_kses( $module_data['description'] , 'wordpoints_module_description' ); ?>
+					<?php if ( ! empty( $module_data[ 'description' ] ) ) : ?>
+						<?php echo wp_kses( $module_data[ 'description' ], 'wordpoints_module_description' ); ?>
 					<?php else : ?>
 						&nbsp;
 					<?php endif; ?>
@@ -747,25 +747,25 @@ 
 
 				$module_meta = array();
 
-				if ( ! empty( $module_data['version'] ) ) {
+				if ( ! empty( $module_data[ 'version' ] ) ) {
 					// translators: Module version.
-					$module_meta[] = sprintf( esc_html__( 'Version %s', 'wordpoints' ), $module_data['version'] );
+					$module_meta[ ] = sprintf( esc_html__( 'Version %s', 'wordpoints' ), $module_data[ 'version' ] );
 				}
 
-				if ( ! empty( $module_data['author'] ) ) {
+				if ( ! empty( $module_data[ 'author' ] ) ) {
 
-					$author = $module_data['author'];
+					$author = $module_data[ 'author' ];
 
-					if ( ! empty( $module_data['author_uri'] ) ) {
-						$author = '<a href="' . esc_url( $module_data['author_uri'] ) . '">' . esc_html( $module_data['author'] ) . '</a>';
+					if ( ! empty( $module_data[ 'author_uri' ] ) ) {
+						$author = '<a href="' . esc_url( $module_data[ 'author_uri' ] ) . '">' . esc_html( $module_data[ 'author' ] ) . '</a>';
 					}
 
 					// translators: Author name.
-					$module_meta[] = sprintf( __( 'By %s', 'wordpoints' ), $author );
+					$module_meta[ ] = sprintf( __( 'By %s', 'wordpoints' ), $author );
 				}
 
-				if ( ! empty( $module_data['module_uri'] ) ) {
-					$module_meta[] = '<a href="' . esc_url( $module_data['module_uri'] ) . '">' . esc_html__( 'Visit module site', 'wordpoints' ) . '</a>';
+				if ( ! empty( $module_data[ 'module_uri' ] ) ) {
+					$module_meta[ ] = '<a href="' . esc_url( $module_data[ 'module_uri' ] ) . '">' . esc_html__( 'Visit module site', 'wordpoints' ) . '</a>';
 				}
 
 				/**
@@ -781,7 +781,7 @@ 
 				 * @param array  $module_data The info about the module.
 				 * @param string $status      The module status being displayed.
 				 */
-				$module_meta = apply_filters( 'wordpoints_module_row_meta', $module_meta, $module_data['extra']['module_file'], $module_data, $status );
+				$module_meta = apply_filters( 'wordpoints_module_row_meta', $module_meta, $module_data[ 'extra' ][ 'module_file' ], $module_data, $status );
 
 				echo wp_kses( implode( ' | ', $module_meta ), 'data' );
 
@@ -818,7 +818,7 @@ 
 			 * @param string $module_file The main file of the current module.
 			 * @param array  $module_data The module's info.
 			 */
-			do_action( 'wordpoints_manage_modules_custom_column', $column_name, $module_data['module_file'], $module_data );
+			do_action( 'wordpoints_manage_modules_custom_column', $column_name, $module_data[ 'module_file' ], $module_data );
 			?>
 			<?php if ( $is_primary ) : ?>
 				<?php echo $this->row_actions( $this->get_module_row_actions( $module_data ), true ); // WPCS XSS OK. ?>
@@ -847,8 +847,8 @@ 
 
 		$context = $status;
 
-		$module_file = $module_data['extra']['module_file'];
-		$args        = $module_data['extra'];
+		$module_file = $module_data[ 'extra' ][ 'module_file' ];
+		$args        = $module_data[ 'extra' ];
 
 		// Pre-order.
 		$actions = array(
@@ -861,49 +861,49 @@ 
 
 		if ( $this->screen->in_admin( 'network' ) ) {
 
-			if ( $args['is_active'] ) {
+			if ( $args[ 'is_active' ] ) {
 
 				if ( current_user_can( 'manage_network_wordpoints_modules' ) ) {
 					// translators: Module name.
-					$actions['deactivate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'deactivate', $url ), "deactivate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Network deactivate %s', 'wordpoints' ), $module_data['name'] ) ) . '">' . esc_html__( 'Network Deactivate', 'wordpoints' ) . '</a>';
+					$actions[ 'deactivate' ] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'deactivate', $url ), "deactivate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Network deactivate %s', 'wordpoints' ), $module_data[ 'name' ] ) ) . '">' . esc_html__( 'Network Deactivate', 'wordpoints' ) . '</a>';
 				}
 
 			} else {
 
 				if ( current_user_can( 'manage_network_wordpoints_modules' ) ) {
 					// translators: Module name.
-					$actions['activate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'activate', $url ), "activate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Network activate %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="edit">' . esc_html__( 'Network Activate', 'wordpoints' ) . '</a>';
+					$actions[ 'activate' ] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'activate', $url ), "activate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Network activate %s', 'wordpoints' ), $module_data[ 'name' ] ) ) . '" class="edit">' . esc_html__( 'Network Activate', 'wordpoints' ) . '</a>';
 				}
 
 				if ( current_user_can( 'delete_wordpoints_modules' ) && ! is_wordpoints_module_active( $module_file ) ) {
 					// translators: Module name.
-					$actions['delete'] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s ), 'bulk-modules' ) . '" aria-label="' . esc_attr( sprintf( __( 'Delete %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="delete">' . esc_html__( 'Delete', 'wordpoints' ) . '</a>';
+					$actions[ 'delete' ] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s ), 'bulk-modules' ) . '" aria-label="' . esc_attr( sprintf( __( 'Delete %s', 'wordpoints' ), $module_data[ 'name' ] ) ) . '" class="delete">' . esc_html__( 'Delete', 'wordpoints' ) . '</a>';
 				}
 			}
 
 		} else {
 
-			if ( $args['restricted_network_active'] ) {
+			if ( $args[ 'restricted_network_active' ] ) {
 
 				$actions = array( 'network_active' => __( 'Network Active', 'wordpoints' ) );
 
-			} elseif ( $args['restricted_network_only'] ) {
+			} elseif ( $args[ 'restricted_network_only' ] ) {
 
 				$actions = array( 'network_only' => __( 'Network Only', 'wordpoints' ) );
 
-			} elseif ( $args['is_active'] ) {
+			} elseif ( $args[ 'is_active' ] ) {
 
 				// translators: Module name.
-				$actions['deactivate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'deactivate', $url ), "deactivate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s', 'wordpoints' ), $module_data['name'] ) ) . '">' . esc_html__( 'Deactivate', 'wordpoints' ) . '</a>';
+				$actions[ 'deactivate' ] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'deactivate', $url ), "deactivate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s', 'wordpoints' ), $module_data[ 'name' ] ) ) . '">' . esc_html__( 'Deactivate', 'wordpoints' ) . '</a>';
 
 			} else {
 
 				// translators: Module name.
-				$actions['activate'] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'activate', $url ), "activate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Activate %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="edit">' . esc_html__( 'Activate', 'wordpoints' ) . '</a>';
+				$actions[ 'activate' ] = '<a href="' . wp_nonce_url( add_query_arg( 'action', 'activate', $url ), "activate-module_{$module_file}" ) . '" aria-label="' . esc_attr( sprintf( __( 'Activate %s', 'wordpoints' ), $module_data[ 'name' ] ) ) . '" class="edit">' . esc_html__( 'Activate', 'wordpoints' ) . '</a>';
 
 				if ( ! is_multisite() && current_user_can( 'delete_wordpoints_modules' ) ) {
 					// translators: Module name.
-					$actions['delete'] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s ), 'bulk-modules' ) . '" aria-label="' . esc_attr( sprintf( __( 'Delete %s', 'wordpoints' ), $module_data['name'] ) ) . '" class="delete">' . esc_html__( 'Delete', 'wordpoints' ) . '</a>';
+					$actions[ 'delete' ] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&amp;checked[]=' . $module_file . '&amp;module_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s ), 'bulk-modules' ) . '" aria-label="' . esc_attr( sprintf( __( 'Delete %s', 'wordpoints' ), $module_data[ 'name' ] ) ) . '" class="delete">' . esc_html__( 'Delete', 'wordpoints' ) . '</a>';
 				}
 			}
 

Braces +11 added lines, -5 removed lines

@@ -68,11 +68,13 @@ 
 		 */
 		$module_statuses = apply_filters( 'wordpoints_module_statuses', $module_statuses );
 
-		if ( isset( $_REQUEST['module_status'] ) && in_array( wp_unslash( $_REQUEST['module_status'] ), $module_statuses, true ) ) { // WPCS: CSRF OK.
+		if ( isset( $_REQUEST['module_status'] ) && in_array( wp_unslash( $_REQUEST['module_status'] ), $module_statuses, true ) ) {
+// WPCS: CSRF OK.
 			$status = sanitize_key( $_REQUEST['module_status'] ); // WPCS: CSRF OK.
 		}
 
-		if ( isset( $_REQUEST['s'] ) ) { // WPCS: CSRF OK.
+		if ( isset( $_REQUEST['s'] ) ) {
+// WPCS: CSRF OK.
 			$_SERVER['REQUEST_URI'] = add_query_arg( 's', sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ) ); // WPCS: CSRF OK.
 		}
 
@@ -311,7 +313,8 @@ 
 
 		static $term;
 
-		if ( is_null( $term ) && isset( $_REQUEST['s'] ) ) { // WPCS: CSRF OK.
+		if ( is_null( $term ) && isset( $_REQUEST['s'] ) ) {
+// WPCS: CSRF OK.
 			$term = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ); // WPCS: CSRF OK.
 		}
 
@@ -737,9 +740,12 @@ 
 				<p>
 					<?php if ( ! empty( $module_data['description'] ) ) : ?>
 						<?php echo wp_kses( $module_data['description'] , 'wordpoints_module_description' ); ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						&nbsp;
-					<?php endif; ?>
+					<?php endif;
+}
+?>
 				</p>
 			</div>
 			<div class="<?php echo esc_attr( $class ); ?> second module-version-author-uri">

src/components/points/classes/shortcode/htgp.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 		$points_heading = _x( 'Points', 'column name', 'wordpoints' );
 
 		$points_type_name = wordpoints_get_points_type_setting(
-			$this->atts['points_type']
+			$this->atts[ 'points_type' ]
 			, 'name'
 		);
 
@@ -95,7 +95,7 @@ 
 		}
 
 		$hooks = WordPoints_Points_Hooks::get_points_type_hooks(
-			$this->atts['points_type']
+			$this->atts[ 'points_type' ]
 		);
 
 		$html = '';
@@ -116,7 +116,7 @@ 
 
 			$points = wordpoints_format_points(
 				$points
-				, $this->atts['points_type']
+				, $this->atts[ 'points_type' ]
 				, 'how-to-get-points-shortcode'
 			);
 
@@ -150,7 +150,7 @@ 
 
 			foreach ( $store->get_reactions() as $reaction ) {
 
-				if ( $reaction->get_meta( 'points_type' ) !== $this->atts['points_type'] ) {
+				if ( $reaction->get_meta( 'points_type' ) !== $this->atts[ 'points_type' ] ) {
 					continue;
 				}
 
@@ -186,7 +186,7 @@ 
 		if ( $points ) {
 			$points = wordpoints_format_points(
 				$points
-				, $this->atts['points_type']
+				, $this->atts[ 'points_type' ]
 				, 'how-to-get-points-shortcode'
 			);
 		}

src/components/points/classes/widget.php

Spacing +8 added lines, -8 removed lines

@@ -21,21 +21,21 @@ 
 	 */
 	protected function verify_settings( $instance ) {
 
-		if ( isset( $this->defaults['points_type'] ) ) {
+		if ( isset( $this->defaults[ 'points_type' ] ) ) {
 
 			// This happens when the widget is first created in the Customizer; the
 			// settings are completely empty.
-			if ( empty( $instance['points_type'] ) ) {
-				$default = $this->defaults['points_type'];
+			if ( empty( $instance[ 'points_type' ] ) ) {
+				$default = $this->defaults[ 'points_type' ];
 
 				if ( ! $default ) {
 					$this->make_a_points_type( $default );
 				}
 
-				$instance['points_type'] = $default;
+				$instance[ 'points_type' ] = $default;
 			}
 
-			if ( ! wordpoints_is_points_type( $instance['points_type'] ) ) {
+			if ( ! 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' )
@@ -79,7 +79,7 @@ 
 
 		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;
 	}
@@ -104,7 +104,7 @@ 
 	public function form_points_type_field() {
 
 		$dropdown_args = array(
-			'selected' => $this->instance['points_type'],
+			'selected' => $this->instance[ 'points_type' ],
 			'id'       => $this->get_field_id( 'points_type' ),
 			'name'     => $this->get_field_name( 'points_type' ),
 			'class'    => 'widefat',
@@ -113,7 +113,7 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $dropdown_args['id'] ); ?>"><?php echo esc_html_x( 'Points type', 'form label', 'wordpoints' ); ?></label>
+			<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>
 

src/components/points/classes/widget/logs.php

Spacing +35 added lines, -35 removed lines

@@ -78,8 +78,8 @@ 
 	 */
 	protected function verify_settings( $instance ) {
 
-		if ( ! wordpoints_posint( $instance['number_logs'] ) ) {
-			$instance['number_logs'] = $this->defaults['number_logs'];
+		if ( ! wordpoints_posint( $instance[ 'number_logs' ] ) ) {
+			$instance[ 'number_logs' ] = $this->defaults[ 'number_logs' ];
 		}
 
 		return parent::verify_settings( $instance );
@@ -92,11 +92,11 @@ 
 	protected function widget_body( $instance ) {
 
 		$query_args = wordpoints_get_points_logs_query_args(
-			$instance['points_type']
+			$instance[ 'points_type' ]
 			, $this->query_slug
 		);
 
-		$query_args['limit'] = $instance['number_logs'];
+		$query_args[ 'limit' ] = $instance[ 'number_logs' ];
 
 		$logs_query = new WordPoints_Points_Logs_Query( $query_args );
 		$logs_query->prime_cache( $this->cache_key );
@@ -127,20 +127,20 @@ 
 	 */
 	public function add_points_logs_table_extra_classes( $classes ) {
 
-		if ( $this->instance && isset( $this->instance['columns'] ) ) {
-			foreach ( $this->defaults['columns'] as $column => $unused ) {
-				if ( empty( $this->instance['columns'][ $column ] ) ) {
-					$classes[] = "wordpoints-hide-{$column}-column";
+		if ( $this->instance && isset( $this->instance[ 'columns' ] ) ) {
+			foreach ( $this->defaults[ 'columns' ] as $column => $unused ) {
+				if ( empty( $this->instance[ 'columns' ][ $column ] ) ) {
+					$classes[ ] = "wordpoints-hide-{$column}-column";
 				}
 			}
 		}
 
-		if ( ! empty( $this->instance['hide_user_names'] ) ) {
-			$classes[] = 'wordpoints-hide-user-names';
+		if ( ! empty( $this->instance[ 'hide_user_names' ] ) ) {
+			$classes[ ] = 'wordpoints-hide-user-names';
 		}
 
-		if ( ! empty( $this->instance['horizontal_scrolling'] ) ) {
-			$classes[] = 'wordpoints-force-horizontal-scrolling';
+		if ( ! empty( $this->instance[ 'horizontal_scrolling' ] ) ) {
+			$classes[ ] = 'wordpoints-force-horizontal-scrolling';
 		}
 
 		return $classes;
@@ -161,29 +161,29 @@ 
 
 		parent::update( $new_instance, $old_instance );
 
-		if ( ! wordpoints_posint( $this->instance['number_logs'] ) ) {
-			$this->instance['number_logs'] = $this->defaults['number_logs'];
+		if ( ! wordpoints_posint( $this->instance[ 'number_logs' ] ) ) {
+			$this->instance[ 'number_logs' ] = $this->defaults[ 'number_logs' ];
 		}
 
-		foreach ( $this->instance['columns'] as $column => $value ) {
+		foreach ( $this->instance[ 'columns' ] as $column => $value ) {
 
-			if ( ! isset( $this->defaults['columns'][ $column ] ) ) {
-				unset( $this->instance['columns'][ $column ] );
+			if ( ! isset( $this->defaults[ 'columns' ][ $column ] ) ) {
+				unset( $this->instance[ 'columns' ][ $column ] );
 			} elseif ( $value ) {
-				$this->instance['columns'][ $column ] = '1';
+				$this->instance[ 'columns' ][ $column ] = '1';
 			}
 		}
 
-		if ( ! isset( $new_instance['hide_user_names'] ) ) {
-			unset( $this->instance['hide_user_names'] );
-		} elseif ( ! empty( $this->instance['hide_user_names'] ) ) {
-			$this->instance['hide_user_names'] = '1';
+		if ( ! isset( $new_instance[ 'hide_user_names' ] ) ) {
+			unset( $this->instance[ 'hide_user_names' ] );
+		} elseif ( ! empty( $this->instance[ 'hide_user_names' ] ) ) {
+			$this->instance[ 'hide_user_names' ] = '1';
 		}
 
-		if ( ! isset( $new_instance['horizontal_scrolling'] ) ) {
-			unset( $this->instance['horizontal_scrolling'] );
-		} elseif ( ! empty( $this->instance['horizontal_scrolling'] ) ) {
-			$this->instance['horizontal_scrolling'] = '1';
+		if ( ! isset( $new_instance[ 'horizontal_scrolling' ] ) ) {
+			unset( $this->instance[ 'horizontal_scrolling' ] );
+		} elseif ( ! empty( $this->instance[ 'horizontal_scrolling' ] ) ) {
+			$this->instance[ 'horizontal_scrolling' ] = '1';
 		}
 
 		return $this->instance;
@@ -197,15 +197,15 @@ 
 
 		parent::form( $instance );
 
-		if ( ! wordpoints_posint( $this->instance['number_logs'] ) ) {
-			$this->instance['number_logs'] = $this->defaults['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'] ); ?>" />
+			<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
@@ -238,7 +238,7 @@ 
 					id="<?php echo esc_attr( $this->get_field_id( 'columns[user]' ) ); ?>"
 					name="<?php echo esc_attr( $this->get_field_name( 'columns[user]' ) ); ?>"
 					value="1"
-					<?php checked( ! empty( $this->instance['columns']['user'] ) ); ?>
+					<?php checked( ! empty( $this->instance[ 'columns' ][ 'user' ] ) ); ?>
 				/>
 				<?php esc_html_e( 'User', 'wordpoints' ); ?>
 			</label>
@@ -250,7 +250,7 @@ 
 					id="<?php echo esc_attr( $this->get_field_id( 'columns[points]' ) ); ?>"
 					name="<?php echo esc_attr( $this->get_field_name( 'columns[points]' ) ); ?>"
 					value="1"
-					<?php checked( ! empty( $this->instance['columns']['points'] ) ); ?>
+					<?php checked( ! empty( $this->instance[ 'columns' ][ 'points' ] ) ); ?>
 				/>
 				<?php esc_html_e( 'Points', 'wordpoints' ); ?>
 			</label>
@@ -262,7 +262,7 @@ 
 					id="<?php echo esc_attr( $this->get_field_id( 'columns[description]' ) ); ?>"
 					name="<?php echo esc_attr( $this->get_field_name( 'columns[description]' ) ); ?>"
 					value="1"
-					<?php checked( ! empty( $this->instance['columns']['description'] ) ); ?>
+					<?php checked( ! empty( $this->instance[ 'columns' ][ 'description' ] ) ); ?>
 				/>
 				<?php esc_html_e( 'Description', 'wordpoints' ); ?>
 			</label>
@@ -274,7 +274,7 @@ 
 					id="<?php echo esc_attr( $this->get_field_id( 'columns[time]' ) ); ?>"
 					name="<?php echo esc_attr( $this->get_field_name( 'columns[time]' ) ); ?>"
 					value="1"
-					<?php checked( ! empty( $this->instance['columns']['time'] ) ); ?>
+					<?php checked( ! empty( $this->instance[ 'columns' ][ 'time' ] ) ); ?>
 				/>
 				<?php esc_html_e( 'Time', 'wordpoints' ); ?>
 			</label>
@@ -301,7 +301,7 @@ 
 					id="<?php echo esc_attr( $this->get_field_id( 'hide_user_names' ) ); ?>"
 					name="<?php echo esc_attr( $this->get_field_name( 'hide_user_names' ) ); ?>"
 					value="1"
-					<?php checked( ! empty( $this->instance['hide_user_names'] ) ); ?>
+					<?php checked( ! empty( $this->instance[ 'hide_user_names' ] ) ); ?>
 				/>
 				<?php esc_html_e( 'Hide user names (but not avatars)', 'wordpoints' ); ?>
 			</label>
@@ -327,7 +327,7 @@ 
 					id="<?php echo esc_attr( $this->get_field_id( 'horizontal_scrolling' ) ); ?>"
 					name="<?php echo esc_attr( $this->get_field_name( 'horizontal_scrolling' ) ); ?>"
 					value="1"
-					<?php checked( ! empty( $this->instance['horizontal_scrolling'] ) ); ?>
+					<?php checked( ! empty( $this->instance[ 'horizontal_scrolling' ] ) ); ?>
 				/>
 				<?php esc_html_e( 'Enable horizontal scrolling', 'wordpoints' ); ?>
 			</label>

src/components/points/classes/widget/user/points.php

Spacing +17 added lines, -17 removed lines

@@ -72,22 +72,22 @@ 
 	 */
 	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;
+			$instance[ 'number_logs' ] = 0;
 		}
 
 		// In case the points type isn't set, we do this first.
 		$instance = WordPoints_Points_Widget::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;
@@ -104,16 +104,16 @@ 
 			$text = str_replace(
 				'%points%',
 				wordpoints_format_points(
-					wordpoints_get_points( get_current_user_id(), $instance['points_type'] ),
-					$instance['points_type'],
+					wordpoints_get_points( get_current_user_id(), $instance[ 'points_type' ] ),
+					$instance[ 'points_type' ],
 					'my_points_widget'
 				),
-				$instance['text']
+				$instance[ 'text' ]
 			);
 
 		} else {
 
-			$text = $instance['alt_text'];
+			$text = $instance[ 'alt_text' ];
 		}
 
 		/**
@@ -134,7 +134,7 @@ 
 
 		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' ] ) {
 			parent::widget_body( $instance );
 		}
 	}
@@ -152,12 +152,12 @@ 
 	 */
 	public function update( $new_instance, $old_instance ) {
 
-		$this->defaults['number_logs'] = 0;
+		$this->defaults[ 'number_logs' ] = 0;
 
 		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' ] );
 
 		return $this->instance;
 	}
@@ -174,7 +174,7 @@ 
 
 		<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'] ); ?>" />
+			<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>
 			<?php
@@ -192,12 +192,12 @@ 
 		</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'] ); ?>" />
+			<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'] ); ?>" />
+			<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>
 

src/components/points/classes/logs/view/table.php

Spacing +24 added lines, -24 removed lines

@@ -61,7 +61,7 @@ 
 			);
 
 			if ( ! empty( $points_type_name ) ) {
-				$this->column_headings['points'] = $points_type_name;
+				$this->column_headings[ 'points' ] = $points_type_name;
 			}
 		}
 
@@ -69,7 +69,7 @@ 
 
 		foreach ( array( 'searchable', 'paginate' ) as $arg ) {
 			if ( $this->args[ $arg ] ) {
-				$extra_classes[] = $arg;
+				$extra_classes[ ] = $arg;
 			}
 		}
 
@@ -92,19 +92,19 @@ 
 		?>
 
 		<div class="wordpoints-points-logs-wrapper">
-			<?php if ( $this->args['searchable'] ) : ?>
+			<?php if ( $this->args[ 'searchable' ] ) : ?>
 				<?php $this->search_box(); ?>
 			<?php endif; ?>
 
 			<table class="wordpoints-points-logs widefat <?php echo esc_attr( implode( ' ', $extra_classes ) ); ?>">
 				<thead>
 					<tr>
-						<?php if ( $this->args['show_users'] ) : ?>
-							<th scope="col"><?php echo esc_html( $this->column_headings['user'] ); ?></th>
+						<?php if ( $this->args[ 'show_users' ] ) : ?>
+							<th scope="col"><?php echo esc_html( $this->column_headings[ 'user' ] ); ?></th>
 						<?php endif; ?>
-						<th scope="col"><?php echo esc_html( $this->column_headings['points'] ); ?></th>
-						<th scope="col"><?php echo esc_html( $this->column_headings['description'] ); ?></th>
-						<th scope="col"><?php echo esc_html( $this->column_headings['time'] ); ?></th>
+						<th scope="col"><?php echo esc_html( $this->column_headings[ 'points' ] ); ?></th>
+						<th scope="col"><?php echo esc_html( $this->column_headings[ 'description' ] ); ?></th>
+						<th scope="col"><?php echo esc_html( $this->column_headings[ 'time' ] ); ?></th>
 					</tr>
 				</thead>
 				<tbody>
@@ -118,7 +118,7 @@ 
 
 		?>
 		<tr>
-			<td colspan="<?php echo ( $this->args['show_users'] ) ? 4 : 3; ?>">
+			<td colspan="<?php echo ( $this->args[ 'show_users' ] ) ? 4 : 3; ?>">
 				<?php esc_html_e( 'No matching logs found.', 'wordpoints' ); ?>
 			</td>
 		</tr>
@@ -135,7 +135,7 @@ 
 		?>
 
 		<tr class="wordpoints-log-id-<?php echo (int) $log->id; ?> <?php echo ( $this->i % 2 ) ? 'odd' : 'even'; ?>">
-			<?php if ( $this->args['show_users'] ) : ?>
+			<?php if ( $this->args[ 'show_users' ] ) : ?>
 				<td>
 					<?php echo get_avatar( $user->ID, 32 ); ?>
 					<span class="wordpoints-points-log-user-name">
@@ -199,17 +199,17 @@ 
 				</tbody>
 				<tfoot>
 					<tr>
-						<?php if ( $this->args['show_users'] ) : ?>
-							<th scope="col"><?php echo esc_html( $this->column_headings['user'] ); ?></th>
+						<?php if ( $this->args[ 'show_users' ] ) : ?>
+							<th scope="col"><?php echo esc_html( $this->column_headings[ 'user' ] ); ?></th>
 						<?php endif; ?>
-						<th scope="col"><?php echo esc_html( $this->column_headings['points'] ); ?></th>
-						<th scope="col"><?php echo esc_html( $this->column_headings['description'] ); ?></th>
-						<th scope="col"><?php echo esc_html( $this->column_headings['time'] ); ?></th>
+						<th scope="col"><?php echo esc_html( $this->column_headings[ 'points' ] ); ?></th>
+						<th scope="col"><?php echo esc_html( $this->column_headings[ 'description' ] ); ?></th>
+						<th scope="col"><?php echo esc_html( $this->column_headings[ 'time' ] ); ?></th>
 					</tr>
 				</tfoot>
 			</table>
 
-			<?php if ( $this->args['paginate'] ) : ?>
+			<?php if ( $this->args[ 'paginate' ] ) : ?>
 				<?php $this->pagination(); ?>
 			<?php endif; ?>
 		</div>
@@ -224,10 +224,10 @@ 
 
 		$search_term = '';
 
-		if ( isset( $_POST['wordpoints_points_logs_search'] ) ) { // WPCS: CSRF OK
+		if ( isset( $_POST[ 'wordpoints_points_logs_search' ] ) ) { // WPCS: CSRF OK
 			$search_term = trim(
 				sanitize_text_field(
-					wp_unslash( $_POST['wordpoints_points_logs_search'] ) // WPCS: CSRF OK
+					wp_unslash( $_POST[ 'wordpoints_points_logs_search' ] ) // WPCS: CSRF OK
 				)
 			);
 
@@ -245,10 +245,10 @@ 
 		$page = 1;
 
 		if (
-			isset( $_GET['wordpoints_points_logs_page'] ) // WPCS: CSRF OK.
-			&& wordpoints_posint( $_GET['wordpoints_points_logs_page'] ) // WPCS: CSRF OK.
+			isset( $_GET[ 'wordpoints_points_logs_page' ] ) // WPCS: CSRF OK.
+			&& wordpoints_posint( $_GET[ 'wordpoints_points_logs_page' ] ) // WPCS: CSRF OK.
 		) {
-			$page = (int) $_GET['wordpoints_points_logs_page'];
+			$page = (int) $_GET[ 'wordpoints_points_logs_page' ];
 		}
 
 		return $page;
@@ -262,10 +262,10 @@ 
 		$per_page = 25;
 
 		if (
-			isset( $_GET['wordpoints_points_logs_per_page'] ) // WPCS: CSRF OK.
-			&& wordpoints_posint( $_GET['wordpoints_points_logs_per_page'] ) // WPCS: CSRF OK.
+			isset( $_GET[ 'wordpoints_points_logs_per_page' ] ) // WPCS: CSRF OK.
+			&& wordpoints_posint( $_GET[ 'wordpoints_points_logs_per_page' ] ) // WPCS: CSRF OK.
 		) {
-			$per_page = (int) $_GET['wordpoints_points_logs_per_page'];
+			$per_page = (int) $_GET[ 'wordpoints_points_logs_per_page' ];
 		}
 
 		return $per_page;

src/components/points/includes/points.php

Spacing +24 added lines, -24 removed lines

@@ -117,11 +117,11 @@ 
  */
 function wordpoints_add_points_type( $settings ) {
 
-	if ( ! is_array( $settings ) || ! isset( $settings['name'] ) ) {
+	if ( ! is_array( $settings ) || ! isset( $settings[ 'name' ] ) ) {
 		return false;
 	}
 
-	$slug = $settings['name'];
+	$slug = $settings[ 'name' ];
 	$slug = preg_replace( '/\s+/', '-', $slug );
 	$slug = preg_replace( '/-+/', '-', $slug );
 	$slug = trim( $slug, '-' );
@@ -165,7 +165,7 @@ 
 
 	$points_types = wordpoints_get_points_types();
 
-	if ( ! is_array( $settings ) || ! isset( $points_types[ $slug ], $settings['name'] ) ) {
+	if ( ! is_array( $settings ) || ! isset( $points_types[ $slug ], $settings[ 'name' ] ) ) {
 		return false;
 	}
 
@@ -1094,13 +1094,13 @@ 
 				, array( '%d' )
 			);
 
-			if ( ! isset( $flushed['points_types'][ $log->points_type ], $flushed['user_ids'][ $log->user_id ] ) ) {
+			if ( ! isset( $flushed[ 'points_types' ][ $log->points_type ], $flushed[ 'user_ids' ][ $log->user_id ] ) ) {
 				wordpoints_flush_points_logs_caches(
 					array( 'user_id' => $log->user_id, 'points_type' => $log->points_type )
 				);
 
-				$flushed['points_types'][ $log->points_type ] = true;
-				$flushed['user_ids'][ $log->user_id ] = true;
+				$flushed[ 'points_types' ][ $log->points_type ] = true;
+				$flushed[ 'user_ids' ][ $log->user_id ] = true;
 			}
 		}
 
@@ -1134,9 +1134,9 @@ 
 		$cache = array( 'is_max' => false, 'top_users' => array() );
 	}
 
-	$cached_users = count( $cache['top_users'] );
+	$cached_users = count( $cache[ 'top_users' ] );
 
-	if ( $num_users > $cached_users && ! $cache['is_max'] ) {
+	if ( $num_users > $cached_users && ! $cache[ 'is_max' ] ) {
 
 		global $wpdb;
 
@@ -1185,19 +1185,19 @@ 
 			return array();
 		}
 
-		$cache['top_users'] = array_merge( $cache['top_users'], $top_users );
+		$cache[ 'top_users' ] = array_merge( $cache[ 'top_users' ], $top_users );
 
-		if ( count( $cache['top_users'] ) < $num_users ) {
-			$cache['is_max'] = true;
+		if ( count( $cache[ 'top_users' ] ) < $num_users ) {
+			$cache[ 'is_max' ] = true;
 		}
 
-		$cache['top_users'] = array_map( 'intval', $cache['top_users'] );
+		$cache[ 'top_users' ] = array_map( 'intval', $cache[ 'top_users' ] );
 
 		wp_cache_set( $points_type, $cache, 'wordpoints_points_top_users' );
 
 	} // End if ( not cached ).
 
-	return array_slice( $cache['top_users'], 0, $num_users );
+	return array_slice( $cache[ 'top_users' ], 0, $num_users );
 }
 
 /**
@@ -1229,7 +1229,7 @@ 
 	$points_type_name = wordpoints_get_points_type_setting( $points_type, 'name' );
 
 	if ( ! empty( $points_type_name ) ) {
-		$column_headers['points'] = $points_type_name;
+		$column_headers[ 'points' ] = $points_type_name;
 	}
 
 	/**
@@ -1254,11 +1254,11 @@ 
 		<thead>
 			<tr>
 				<th scope="col">
-					<span aria-hidden="true"><?php echo esc_html( $column_headers['#'] ); ?></span>
-					<span class="screen-reader-text"><?php echo esc_html( $column_headers['position'] ); ?></span>
+					<span aria-hidden="true"><?php echo esc_html( $column_headers[ '#' ] ); ?></span>
+					<span class="screen-reader-text"><?php echo esc_html( $column_headers[ 'position' ] ); ?></span>
 				</th>
-				<th scope="col"><?php echo esc_html( $column_headers['user'] ); ?></th>
-				<th scope="col"><?php echo esc_html( $column_headers['points'] ); ?></th>
+				<th scope="col"><?php echo esc_html( $column_headers[ 'user' ] ); ?></th>
+				<th scope="col"><?php echo esc_html( $column_headers[ 'points' ] ); ?></th>
 			</tr>
 		</thead>
 		<tbody>
@@ -1317,11 +1317,11 @@ 
 		<tfoot>
 		<tr>
 			<th scope="col">
-				<span aria-hidden="true"><?php echo esc_html( $column_headers['#'] ); ?></span>
-				<span class="screen-reader-text"><?php echo esc_html( $column_headers['position'] ); ?></span>
+				<span aria-hidden="true"><?php echo esc_html( $column_headers[ '#' ] ); ?></span>
+				<span class="screen-reader-text"><?php echo esc_html( $column_headers[ 'position' ] ); ?></span>
 			</th>
-			<th scope="col"><?php echo esc_html( $column_headers['user'] ); ?></th>
-			<th scope="col"><?php echo esc_html( $column_headers['points'] ); ?></th>
+			<th scope="col"><?php echo esc_html( $column_headers[ 'user' ] ); ?></th>
+			<th scope="col"><?php echo esc_html( $column_headers[ 'points' ] ); ?></th>
 		</tr>
 		</tfoot>
 	</table>
@@ -1360,7 +1360,7 @@ 
 		$cache = wp_cache_get( $slug, 'wordpoints_points_top_users' );
 
 		// If there aren't fewer users than the cache holds, we don't need to clear it.
-		if ( ! is_array( $cache ) || ! $cache['is_max'] ) {
+		if ( ! is_array( $cache ) || ! $cache[ 'is_max' ] ) {
 			continue;
 		}
 
@@ -1385,7 +1385,7 @@ 
 		$cache = wp_cache_get( $slug, 'wordpoints_points_top_users' );
 
 		// If this user isn't in the cache, we don't need to clear it.
-		if ( ! is_array( $cache ) || ! in_array( (int) $user_id, array_map( 'intval', $cache['top_users'] ), true ) ) {
+		if ( ! is_array( $cache ) || ! in_array( (int) $user_id, array_map( 'intval', $cache[ 'top_users' ] ), true ) ) {
 			continue;
 		}