Changeset 13200

Timestamp:

02/12/2024 06:40:39 AM (3 years ago)

Author:

dd32

Message:

Registration: Admin tools: Sort the recently banned list by the banned date.

This also includes a PHP Warning fix and whitespace changes.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php

@@ -70 +70 @@
                                 }
 
-                                $url = add_query_arg( 'view', $item[0], $url );
+                                if ( 'all' !== $item[0] ) {
+                                        $url = add_query_arg( 'view', $item[0], $url );
+                                }
 
                                 return sprintf(
@@ -128 +130 @@
 
                 // Join if the view needs the users or description table.
-                if ( strpos( $where . $join, 'users.' ) || strpos( $where, 'description.' ) ) {
+                if ( strpos( $where . $join, 'users.' ) || strpos( $where, 'description.' ) || (  'banned-users' === $view ?: ( $_REQUEST['view'] ?? 'all' )  ) ) {
                         $join .= " LEFT JOIN {$wpdb->users} users ON registrations.created = 1 AND registrations.user_login = users.user_login";
                 }
                 if ( strpos( $where, 'description.' ) ) {
                         $join .= " LEFT JOIN {$wpdb->usermeta} description ON users.ID = description.user_id AND description.meta_key = 'description'";
+                }
+
+                if ( 'banned-users' === $view ?: ( $_REQUEST['view'] ?? 'all' ) ) {
+                        $join .= " LEFT JOIN {$wpdb->usermeta} notes ON users.ID = notes.user_id AND notes.meta_key = '_wporg_bbp_user_notes'";
                 }
 
@@ -162 +168 @@
                         array(),
                         $this->get_sortable_columns(),
-           );
-
-           $sort_column = $_GET['orderby'] ?? 'pending_id';
-           $sort_order = strtoupper( $_GET['order'] ?? 'DESC' );
-
-           if ( ! in_array( $sort_order, [ 'DESC', 'ASC' ] ) ) {
-                   $sort_order = 'DESC';
-           }
-           if ( ! isset( $this->get_sortable_columns()[ $sort_column ] ) ) {
-                   $sort_column = 'pending_id';
-           }
-
-           $per_page     = $this->get_items_per_page( 'users_per_page', 100 );
-           $current_page = $this->get_pagenum();
-
-           $join_where = $this->get_join_where_sql();
-
-           $per_page_offset = ($current_page-1) * $per_page;
+                );
+
+                $sort_column = $_GET['orderby'] ?? 'pending_id';
+                $sort_order = strtoupper( $_GET['order'] ?? 'DESC' );
+
+                if ( ! in_array( $sort_order, [ 'DESC', 'ASC' ] ) ) {
+                        $sort_order = 'DESC';
+                }
+                if ( ! isset( $this->get_sortable_columns()[ $sort_column ] ) ) {
+                        $sort_column = 'pending_id';
+                }
+                if ( 'banned-users' === ( $_GET['view'] ?? '' ) ) {
+                        $sort_column = 'notes.umeta_id';
+                        $sort_order = 'DESC';
+                }
+
+                $per_page     = $this->get_items_per_page( 'users_per_page', 100 );
+                $current_page = $this->get_pagenum();
+
+                $join_where = $this->get_join_where_sql();
+
+                $per_page_offset = ($current_page-1) * $per_page;
 
                 $this->items = $wpdb->get_results(
@@ -431 +441 @@
         function link_to_search( $s ) {
                 $parts = preg_split( '/([^\w\.-])/ui', $s, -1, PREG_SPLIT_DELIM_CAPTURE );
+                if ( ! $parts ) {
+                        $parts = array( $s );
+                }
 
                 return implode( '', array_map( function( $s ) {