Changeset 16582

Timestamp:

11/25/2010 09:13:38 AM (14 years ago)

Author:

PeteMall

Message:

Update and error messages for site-users. See #15558.

File:

• trunk/wp-admin/network/site-users.php (modified) (9 diffs)

trunk/wp-admin/network/site-users.php

@@ -52 +52 @@
 $action = $wp_list_table->current_action();
 
+if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] )
+    wp_redirect( wp_get_referer() );
+
 if ( $action ) {
     switch_to_blog( $id );
@@ -58 +61 @@
         case 'adduser':
             if ( !empty( $_POST['newuser'] ) ) {
-                $newuser = $_POST['newuser'];
+                $update = 'add';
+                $newuser = $_POST['newuser'];               
                 $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
                 if ( $userid ) {
@@ -64 +68 @@
                     if ( $user == false )
                         add_user_to_blog( $id, $userid, $_POST['new_role'] );
+                    else
+                        $update = 'err_add_member';
+                } else {
+                    $update = 'err_add_notfound';
                 }
+            } else {
+                $update = 'err_add_notfound';
             }
             break;
@@ -71 +81 @@
             if ( !current_user_can('remove_users')  )
                 die(__('You can’t remove users.'));
-
+                
+            $update = 'remove';
             if ( isset( $_REQUEST['users'] ) ) {
                 $userids = $_REQUEST['users'];
@@ -79 +90 @@
                     remove_user_from_blog( $user_id, $id );
                 }
+            } elseif ( isset( $_GET['user'] ) ) {
+                remove_user_from_blog( $_GET['user'] );
             } else {
-                remove_user_from_blog( $_GET['user'] );
+                $update = 'err_remove';
             }
             break;
@@ -89 +102 @@
                 wp_die(__('You can’t give users that role.'));
 
-            $userids = $_REQUEST['users'];
-            $update = 'promote';
-            foreach ( $userids as $user_id ) {
-                $user_id = (int) $user_id;
-
-                // If the user doesn't already belong to the blog, bail.
-                if ( !is_user_member_of_blog( $user_id ) )
-                    wp_die(__('Cheatin’ uh?'));
-
-                $user = new WP_User( $user_id );
-                $user->set_role( $_REQUEST['new_role'] );
+            if ( isset( $_REQUEST['users'] ) ) {
+                $userids = $_REQUEST['users'];
+                $update = 'promote';
+                foreach ( $userids as $user_id ) {
+                    $user_id = (int) $user_id;
+
+                    // If the user doesn't already belong to the blog, bail.
+                    if ( !is_user_member_of_blog( $user_id ) )
+                        wp_die(__('Cheatin’ uh?'));
+
+                    $user = new WP_User( $user_id );
+                    $user->set_role( $_REQUEST['new_role'] );
+                }
+            } else {
+                $update = 'err_promote';
             }
             break;
@@ -105 +122 @@
     
     restore_current_blog();
-    wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
+    wp_redirect( add_query_arg( 'update', $update, wp_get_referer() ) );
 }
 
@@ -114 +131 @@
 $submenu_file = 'sites.php';
 
-require('../admin-header.php');
-
-?>
+require('../admin-header.php'); ?>
 
 <div class="wrap">
@@ -130 +145 @@
 }
 ?>
-</h3>
+</h3><?php
+
+if ( isset($_GET['update']) ) :
+    switch($_GET['update']) {
+    case 'add':
+        echo '<div id="message" class="updated"><p>' . __( 'User added.' ) . '</p></div>';
+        break;
+    case 'err_add_member':
+        echo '<div id="message" class="error"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+        break;
+    case 'err_add_notfound':
+        echo '<div id="message" class="error"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+        break;
+    case 'promote':
+        echo '<div id="message" class="updated"><p>' . __( 'Changed roles.' ) . '</p></div>';
+        break;
+    case 'err_promote':
+        echo '<div id="message" class="error"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+        break;
+    case 'remove':
+        echo '<div id="message" class="updated fade"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+        break;
+    case 'err_remove':
+        echo '<div id="message" class="error"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+        break;
+    }
+endif; ?>
+
 <form class="search-form" action="" method="get">
 <p class="search-box">