WordPoints / wordpoints

src/components/points/includes/hooks/periodic.php

Spacing +12 added lines, -12 removed lines

@@ -85,15 +85,15 @@ 
 
 			if (
 				! isset( $last_visit[ $points_type ] )
-				|| (int) ( $last_visit[ $points_type ] / $instance['period'] ) < (int) ( $now / $instance['period'] )
+				|| (int) ( $last_visit[ $points_type ] / $instance[ 'period' ] ) < (int) ( $now / $instance[ 'period' ] )
 			) {
 
 				wordpoints_add_points(
 					$user_id
-					, $instance['points']
+					, $instance[ 'points' ]
 					, $points_type
 					, 'periodic'
-					, array( 'period' => $instance['period'] )
+					, array( 'period' => $instance[ 'period' ] )
 				);
 
 				$last_visit[ $points_type ] = $now;
@@ -133,7 +133,7 @@ 
 	 */
 	public function logs( $text, $points, $points_type, $user_id, $log_type, $meta ) {
 
-		switch ( $meta['period'] ) {
+		switch ( $meta[ 'period' ] ) {
 
 			case HOUR_IN_SECONDS:
 				$message = _x( 'Hourly points.', 'points log description', 'wordpoints' );
@@ -169,9 +169,9 @@ 
 	 */
 	protected function generate_description( $instance = array() ) {
 
-		if ( ! empty( $instance['period'] ) ) {
+		if ( ! empty( $instance[ 'period' ] ) ) {
 
-			switch ( $instance['period'] ) {
+			switch ( $instance[ 'period' ] ) {
 
 				case HOUR_IN_SECONDS:
 					return __( 'Visiting the site at least once in an hour.', 'wordpoints' );
@@ -207,8 +207,8 @@ 
 
 		$new_instance = array_merge( $this->defaults, $old_instance, $new_instance );
 
-		wordpoints_posint( $new_instance['points'] );
-		wordpoints_posint( $new_instance['period'] );
+		wordpoints_posint( $new_instance[ 'points' ] );
+		wordpoints_posint( $new_instance[ 'period' ] );
 
 		return $new_instance;
 	}
@@ -227,7 +227,7 @@ 
 		$instance = array_merge( $this->defaults, $instance );
 
 		$dropdown_args = array(
-			'selected' => $instance['period'],
+			'selected' => $instance[ 'period' ],
 			'id'       => $this->get_field_id( 'period' ),
 			'name'     => $this->get_field_name( 'period' ),
 			'class'    => 'widefat wordpoints-append-to-hook-title',
@@ -261,9 +261,9 @@ 
 	protected function get_periods() {
 
 		$periods = array(
-			HOUR_IN_SECONDS     => __( 'hourly' , 'wordpoints' ),
-			DAY_IN_SECONDS      => __( 'daily'  , 'wordpoints' ),
-			WEEK_IN_SECONDS     => __( 'weekly' , 'wordpoints' ),
+			HOUR_IN_SECONDS     => __( 'hourly', 'wordpoints' ),
+			DAY_IN_SECONDS      => __( 'daily', 'wordpoints' ),
+			WEEK_IN_SECONDS     => __( 'weekly', 'wordpoints' ),
 			30 * DAY_IN_SECONDS => __( 'monthly', 'wordpoints' ),
 		);
 

src/admin/classes/list/table/extensions.php

Spacing +61 added lines, -61 removed lines

@@ -49,7 +49,7 @@ 
 		parent::__construct(
 			array(
 				'plural' => 'wordpoints-extensions',
-				'screen' => ( isset( $args['screen'] ) ) ? $args['screen'] : null,
+				'screen' => ( isset( $args[ 'screen' ] ) ) ? $args[ 'screen' ] : null,
 			)
 		);
 
@@ -76,12 +76,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();
@@ -96,7 +96,7 @@ 
 	 */
 	public function get_table_classes() {
 
-		return array( 'widefat', $this->_args['plural'], 'modules', 'plugins' );
+		return array( 'widefat', $this->_args[ 'plural' ], 'modules', 'plugins' );
 	}
 
 	/**
@@ -202,7 +202,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 (
@@ -212,9 +212,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 (
@@ -223,9 +223,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 (
@@ -238,16 +238,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 ().
 
@@ -256,7 +256,7 @@ 
 			 * for modules that have an available update.
 			 */
 			if ( $user_can_update && $updates->has_update( $module_file ) ) {
-				$modules['upgrade'][ $module_file ] = $modules['all'][ $module_file ];
+				$modules[ 'upgrade' ][ $module_file ] = $modules[ 'all' ][ $module_file ];
 			}
 
 		} // End foreach ( modules ).
@@ -264,7 +264,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' ) );
 		}
 
 		/**
@@ -342,8 +342,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 ) {
@@ -395,7 +395,7 @@ 
 
 		global $modules;
 
-		if ( ! empty( $modules['all'] ) ) {
+		if ( ! empty( $modules[ 'all' ] ) ) {
 			esc_html_e( 'No extensions found.', 'wordpoints' );
 		} else {
 			esc_html_e( 'There are not any extensions installed.', 'wordpoints' );
@@ -514,11 +514,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 (
@@ -526,14 +526,14 @@ 
 			&& current_user_can( 'delete_wordpoints_extensions' )
 			&& 'active' !== $status
 		) {
-			$actions['delete-selected'] = esc_html__( 'Delete', 'wordpoints' );
+			$actions[ 'delete-selected' ] = esc_html__( 'Delete', 'wordpoints' );
 		}
 
 		if (
 			( ! is_multisite() || is_network_admin() )
 			&& current_user_can( 'update_wordpoints_extensions' )
 		) {
-			$actions['update-selected'] = esc_html__( 'Update', 'wordpoints' );
+			$actions[ 'update-selected' ] = esc_html__( 'Update', 'wordpoints' );
 		}
 
 		/**
@@ -555,11 +555,11 @@ 
 	protected function display_tablenav( $which ) {
 
 		// Back-compat for the old nonce name.
-		$this->_args['plural'] = 'modules';
+		$this->_args[ 'plural' ] = 'modules';
 
 		parent::display_tablenav( $which );
 
-		$this->_args['plural'] = 'wordpoints-extensions';
+		$this->_args[ 'plural' ] = 'wordpoints-extensions';
 	}
 
 	/**
@@ -643,7 +643,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
@@ -683,7 +683,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' ) ) {
 
@@ -696,11 +696,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 ) {
 
@@ -737,11 +737,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
 
@@ -749,13 +749,13 @@ 
 						sprintf(
 							// translators: Extension 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
@@ -774,7 +774,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; ?>
@@ -800,8 +800,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; ?>
@@ -812,25 +812,25 @@ 
 
 				$module_meta = array();
 
-				if ( ! empty( $module_data['version'] ) ) {
+				if ( ! empty( $module_data[ 'version' ] ) ) {
 					// translators: Extension 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['uri'] ) ) {
-					$module_meta[] = '<a href="' . esc_url( $module_data['uri'] ) . '">' . esc_html__( 'Visit extension site', 'wordpoints' ) . '</a>';
+				if ( ! empty( $module_data[ 'uri' ] ) ) {
+					$module_meta[ ] = '<a href="' . esc_url( $module_data[ 'uri' ] ) . '">' . esc_html__( 'Visit extension site', 'wordpoints' ) . '</a>';
 				}
 
 				/**
@@ -846,7 +846,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' );
 
@@ -883,7 +883,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. */ ?>
@@ -912,8 +912,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(
@@ -926,49 +926,49 @@ 
 
 		if ( $this->screen->in_admin( 'network' ) ) {
 
-			if ( $args['is_active'] ) {
+			if ( $args[ 'is_active' ] ) {
 
 				if ( current_user_can( 'manage_network_wordpoints_extensions' ) ) {
 					// translators: Extension 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_extensions' ) ) {
 					// translators: Extension 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_extensions' ) && ! is_wordpoints_module_active( $module_file ) ) {
 					// translators: Extension name.
-					$actions['delete'] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_extensions&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_extensions&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: Extension 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: Extension 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_extensions' ) ) {
 					// translators: Extension name.
-					$actions['delete'] = '<a href="' . wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_extensions&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_extensions&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

@@ -76,11 +76,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.
 		}
 
@@ -342,7 +344,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.
 		}
 
@@ -802,9 +805,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/includes/modules.php

Spacing +63 added lines, -63 removed lines

@@ -88,7 +88,7 @@ 
 
 	$module_data = wordpoints_get_module_data( wordpoints_extensions_dir() . '/' . $module );
 
-	return $module_data['network'];
+	return $module_data[ 'network' ];
 }
 
 /**
@@ -209,8 +209,8 @@ 
 	if (
 		get_site_option( 'wordpoints_legacy_extensions_dir' )
 		|| (
-			isset( $wordpoints_data['version'] )
-			&& version_compare( $wordpoints_data['version'], '2.4.0-alpha-3', '<' )
+			isset( $wordpoints_data[ 'version' ] )
+			&& version_compare( $wordpoints_data[ 'version' ], '2.4.0-alpha-3', '<' )
 		)
 	) {
 		$path = str_replace(
@@ -430,36 +430,36 @@ 
 
 	$module_data = WordPoints_Modules::get_data( $module_file );
 
-	if ( $module_data && wp_normalize_path( $module_file ) === $module_data['raw_file'] ) {
-		unset( $module_data['raw'], $module_data['raw_file'] );
+	if ( $module_data && wp_normalize_path( $module_file ) === $module_data[ 'raw_file' ] ) {
+		unset( $module_data[ 'raw' ], $module_data[ 'raw_file' ] );
 	} else {
 		$module_data = get_file_data( $module_file, $default_headers, 'wordpoints_module' );
 	}
 
-	if ( ! empty( $module_data['update_api'] ) ) {
+	if ( ! empty( $module_data[ 'update_api' ] ) ) {
 		_deprecated_argument( __FUNCTION__, '1.10.0', 'The "Update API" module header has been deprecated in favor of "Server".' );
 	}
 
-	if ( ! empty( $module_data['channel'] ) ) {
+	if ( ! empty( $module_data[ 'channel' ] ) ) {
 		_deprecated_argument( __FUNCTION__, '2.4.0', 'The "Channel" extension header has been deprecated in favor of "Server".' );
-		$module_data['server'] = $module_data['channel'];
+		$module_data[ 'server' ] = $module_data[ 'channel' ];
 	}
 
-	if ( ! empty( $module_data['module_name'] ) ) {
+	if ( ! empty( $module_data[ 'module_name' ] ) ) {
 		_deprecated_argument( __FUNCTION__, '2.4.0', 'The "Module Name" extension header has been deprecated in favor of "Extension Name".' );
-		$module_data['name'] = $module_data['module_name'];
+		$module_data[ 'name' ] = $module_data[ 'module_name' ];
 	}
 
-	unset( $module_data['module_name'] );
+	unset( $module_data[ 'module_name' ] );
 
-	if ( ! empty( $module_data['module_uri'] ) ) {
+	if ( ! empty( $module_data[ 'module_uri' ] ) ) {
 		_deprecated_argument( __FUNCTION__, '2.4.0', 'The "Module URI" extension header has been deprecated in favor of "Extension URI".' );
-		$module_data['uri'] = $module_data['module_uri'];
+		$module_data[ 'uri' ] = $module_data[ 'module_uri' ];
 	} else {
-		$module_data['module_uri'] = $module_data['uri'];
+		$module_data[ 'module_uri' ] = $module_data[ 'uri' ];
 	}
 
-	$module_data['network'] = ( 'true' === strtolower( $module_data['network'] ) );
+	$module_data[ 'network' ] = ( 'true' === strtolower( $module_data[ 'network' ] ) );
 
 	/**
 	 * Filters the header data for an extension.
@@ -479,7 +479,7 @@ 
 		// Translate fields
 		if ( $translate ) {
 
-			$textdomain = $module_data['text_domain'];
+			$textdomain = $module_data[ 'text_domain' ];
 
 			if ( $textdomain ) {
 
@@ -487,8 +487,8 @@ 
 
 					$domain_path = dirname( $module_file );
 
-					if ( $module_data['domain_path'] ) {
-						$domain_path .= $module_data['domain_path'];
+					if ( $module_data[ 'domain_path' ] ) {
+						$domain_path .= $module_data[ 'domain_path' ];
 					}
 
 					wordpoints_load_module_textdomain( $textdomain, $domain_path );
@@ -511,49 +511,49 @@ 
 		);
 
 		$allowed_tags      = $allowed_tags_in_links;
-		$allowed_tags['a'] = array( 'href' => true, 'title' => true );
+		$allowed_tags[ 'a' ] = array( 'href' => true, 'title' => true );
 
 		// Name and author ar marked up inside <a> tags. Don't allow these.
-		$module_data['name']   = wp_kses( $module_data['name']  , $allowed_tags_in_links );
-		$module_data['author'] = wp_kses( $module_data['author'], $allowed_tags_in_links );
+		$module_data[ 'name' ]   = wp_kses( $module_data[ 'name' ], $allowed_tags_in_links );
+		$module_data[ 'author' ] = wp_kses( $module_data[ 'author' ], $allowed_tags_in_links );
 
-		$module_data['description'] = wp_kses( $module_data['description'], $allowed_tags );
-		$module_data['version']     = wp_kses( $module_data['version']    , $allowed_tags );
+		$module_data[ 'description' ] = wp_kses( $module_data[ 'description' ], $allowed_tags );
+		$module_data[ 'version' ]     = wp_kses( $module_data[ 'version' ], $allowed_tags );
 
-		$module_data['uri']        = esc_url( $module_data['uri'] );
-		$module_data['module_uri'] = esc_url( $module_data['module_uri'] );
-		$module_data['author_uri'] = esc_url( $module_data['author_uri'] );
+		$module_data[ 'uri' ]        = esc_url( $module_data[ 'uri' ] );
+		$module_data[ 'module_uri' ] = esc_url( $module_data[ 'module_uri' ] );
+		$module_data[ 'author_uri' ] = esc_url( $module_data[ 'author_uri' ] );
 
-		$module_data['title']       = $module_data['name'];
-		$module_data['author_name'] = $module_data['author'];
+		$module_data[ 'title' ]       = $module_data[ 'name' ];
+		$module_data[ 'author_name' ] = $module_data[ 'author' ];
 
 		// Apply markup.
 		if ( $markup ) {
 
-			if ( $module_data['uri'] && $module_data['name'] ) {
-				$module_data['title'] = '<a href="' . $module_data['uri']
-					. '">' . $module_data['name'] . '</a>';
+			if ( $module_data[ 'uri' ] && $module_data[ 'name' ] ) {
+				$module_data[ 'title' ] = '<a href="' . $module_data[ 'uri' ]
+					. '">' . $module_data[ 'name' ] . '</a>';
 			}
 
-			if ( $module_data['author_uri'] && $module_data['author'] ) {
-				$module_data['author'] = '<a href="' . $module_data['author_uri']
-					. '">' . $module_data['author'] . '</a>';
+			if ( $module_data[ 'author_uri' ] && $module_data[ 'author' ] ) {
+				$module_data[ 'author' ] = '<a href="' . $module_data[ 'author_uri' ]
+					. '">' . $module_data[ 'author' ] . '</a>';
 			}
 
-			$module_data['description'] = wptexturize( $module_data['description'] );
+			$module_data[ 'description' ] = wptexturize( $module_data[ 'description' ] );
 
-			if ( $module_data['author'] ) {
-				$module_data['description'] .= ' <cite>'
+			if ( $module_data[ 'author' ] ) {
+				$module_data[ 'description' ] .= ' <cite>'
 					// translators: Author name.
-					. sprintf( __( 'By %s.', 'wordpoints' ), $module_data['author'] )
+					. sprintf( __( 'By %s.', 'wordpoints' ), $module_data[ 'author' ] )
 					. '</cite>';
 			}
 		}
 
 	} else {
 
-		$module_data['title']       = $module_data['name'];
-		$module_data['author_name'] = $module_data['author'];
+		$module_data[ 'title' ]       = $module_data[ 'name' ];
+		$module_data[ 'author_name' ] = $module_data[ 'author' ];
 
 	} // End if ( $markup || $translate ) else.
 
@@ -574,8 +574,8 @@ 
 
 	$server = false;
 
-	if ( isset( $extension['server'] ) ) {
-		$server = $extension['server'];
+	if ( isset( $extension[ 'server' ] ) ) {
+		$server = $extension[ 'server' ];
 	}
 
 	/**
@@ -728,7 +728,7 @@ 
 
 		$module_data = wordpoints_get_module_data( $module_file, $markup, $translate );
 
-		if ( empty( $module_data['name'] ) ) {
+		if ( empty( $module_data[ 'name' ] ) ) {
 			continue;
 		}
 
@@ -827,7 +827,7 @@ 
  */
 function _wordpoints_sort_uname_callback( $a, $b ) {
 
-	return strnatcasecmp( $a['name'], $b['name'] );
+	return strnatcasecmp( $a[ 'name' ], $b[ 'name' ] );
 }
 
 /**
@@ -951,7 +951,7 @@ 
 
 	} else {
 
-		$current[] = $module;
+		$current[ ] = $module;
 		sort( $current );
 		update_option( 'wordpoints_active_modules', $current );
 	}
@@ -1117,7 +1117,7 @@ 
 	$checked = array();
 
 	foreach ( $modules as $module ) {
-		$checked[] = 'checked[]=' . $module;
+		$checked[ ] = 'checked[]=' . $module;
 	}
 
 	ob_start();
@@ -1182,7 +1182,7 @@ 
 		$validate = wordpoints_validate_module( $module_file );
 
 		if ( is_wp_error( $validate ) ) {
-			$errors[] = $module_file;
+			$errors[ ] = $module_file;
 			continue;
 		}
 
@@ -1201,7 +1201,7 @@ 
 		}
 
 		if ( ! $deleted ) {
-			$errors[] = $module_file;
+			$errors[ ] = $module_file;
 		}
 	}
 
@@ -1265,7 +1265,7 @@ 
 		$slug = WordPoints_Modules::get_slug( $module );
 		$data = wordpoints_get_module_data( $module_file, false, false );
 
-		$class = "WordPoints_{$data['namespace']}_Installable";
+		$class = "WordPoints_{$data[ 'namespace' ]}_Installable";
 
 		$uninstaller = new WordPoints_Uninstaller( new $class( $slug ) );
 		$uninstaller->run();
@@ -1499,7 +1499,7 @@ 
  */
 function wordpoints_recheck_for_extension_updates_after_upgrade( $upgrader, $data ) {
 
-	if ( isset( $data['type'] ) && 'translation' === $data['type'] ) {
+	if ( isset( $data[ 'type' ] ) && 'translation' === $data[ 'type' ] ) {
 		return;
 	}
 
@@ -1555,34 +1555,34 @@ 
  */
 function wordpoints_extension_update_counts( $update_data ) {
 
-	$update_data['counts']['wordpoints_extensions'] = 0;
+	$update_data[ 'counts' ][ 'wordpoints_extensions' ] = 0;
 
 	if ( current_user_can( 'update_wordpoints_extensions' ) ) {
 		$extension_updates = wordpoints_get_extension_updates()->get_new_versions();
 
 		if ( ! empty( $extension_updates ) ) {
-			$update_data['counts']['wordpoints_extensions'] = count( $extension_updates );
+			$update_data[ 'counts' ][ 'wordpoints_extensions' ] = count( $extension_updates );
 
 			$title = sprintf(
 				// translators: Number of updates.
 				_n(
 					'%d WordPoints Extension Update'
 					, '%d WordPoints Extension Updates'
-					, $update_data['counts']['wordpoints_extensions']
+					, $update_data[ 'counts' ][ 'wordpoints_extensions' ]
 					, 'wordpoints'
 				)
-				, $update_data['counts']['wordpoints_extensions']
+				, $update_data[ 'counts' ][ 'wordpoints_extensions' ]
 			);
 
-			if ( ! empty( $update_data['title'] ) ) {
-				$update_data['title'] .= ', ';
+			if ( ! empty( $update_data[ 'title' ] ) ) {
+				$update_data[ 'title' ] .= ', ';
 			}
 
-			$update_data['title'] .= esc_attr( $title );
+			$update_data[ 'title' ] .= esc_attr( $title );
 		}
 	}
 
-	$update_data['counts']['total'] += $update_data['counts']['wordpoints_extensions'];
+	$update_data[ 'counts' ][ 'total' ] += $update_data[ 'counts' ][ 'wordpoints_extensions' ];
 
 	return $update_data;
 }
@@ -1614,12 +1614,12 @@ 
 	);
 
 	if (
-		empty( $data['ID'] )
-		&& ( 'J.D. Grimes' === $data['author'] || 'WordPoints' === $data['author'] )
-		&& isset( $missing_headers[ $data['name'] ] )
+		empty( $data[ 'ID' ] )
+		&& ( 'J.D. Grimes' === $data[ 'author' ] || 'WordPoints' === $data[ 'author' ] )
+		&& isset( $missing_headers[ $data[ 'name' ] ] )
 	) {
-		$data['server'] = 'wordpoints.org';
-		$data['ID']     = $missing_headers[ $data['name'] ];
+		$data[ 'server' ] = 'wordpoints.org';
+		$data[ 'ID' ]     = $missing_headers[ $data[ 'name' ] ];
 	}
 
 	return $data;