WordPoints / wordpoints

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>