Changeset 3857

Timestamp:

06/08/06 18:36:05 (3 years ago)

Author:

ryan

Message:

User management improvements from Mark Jaquith and David House. #2793

Files:

• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/menu.php (modified) (2 diffs)
• trunk/wp-admin/profile.php (modified) (1 diff)
• trunk/wp-admin/user-edit.php (modified) (5 diffs)
• trunk/wp-admin/users.php (modified) (16 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -730 +730 @@
-        $short_url =  substr($short_url, 0, 32).'...';
-    $numposts = get_usernumposts($user_object->ID);
-    if (0 < $numposts) $numposts = "<a href='edit.php?author=$user_object->ID' title='" . __('View posts') . "'>$numposts</a>";
-    $r = "<tr id='user-$user_object->ID'$style>
-        <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
@@ -737 +736 @@
-        <td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td>
-        <td><a href='$url' title='website: $url'>$short_url</a></td>";
-
-
+
+
+
+
+
+
+
-    if ( current_user_can('edit_user', $user_object->ID) )
-user-edit.php?user_id=$user_object->ID
+$edit_link
-    $r .= "</td>\n\t</tr>";
-    return $r;

trunk/wp-admin/menu.php

@@ -12 +12 @@
-$menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
-if ( current_user_can('edit_users') )
-read', 'profile
+edit_users', 'users
-else
-    $menu[35] = array(__('Profile'), 'read', 'profile.php');
@@ -35 +35 @@
-$submenu['link-manager.php'][20] = array(__('Import Bookmarks'), 'manage_links', 'link-import.php');
-
-
-
+
+
+
+
+
+
-
-$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');

trunk/wp-admin/profile.php

@@ -4 +4 @@
-$title = __('Profile');
-
-
+
+
+
+
-include_once('admin-header.php');
-$profileuser = new WP_User($user_ID);

trunk/wp-admin/user-edit.php

@@ -3 +3 @@
-
-$title = __('Edit User');
-
+
+
+
+
-$submenu_file = 'users.php';
-
-
+, 'wp_http_referer'
-for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-    $wpvar = $wpvarstoreset[$i];
@@ -22 +25 @@
-}
-
+$wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer));
+
-switch ($action) {
-case 'switchposts':
@@ -41 +46 @@
-
-if( !is_wp_error( $errors ) ) {
-
+
+
+
-    exit;
-}
@@ -58 +65 @@
-<div id="message" class="updated fade">
-    <p><strong><?php _e('User updated.') ?></strong></p>
+    <?php if ( $wp_http_referer ) : ?>
+    <p><a href="<?php echo wp_specialchars($wp_http_referer); ?>"><?php _e('&laquo; Back to Authors and Users'); ?></a></p>
+    <?php endif; ?>
-</div>
-<?php endif; ?>
@@ -76 +86 @@
-<form name="profile" id="your-profile" action="user-edit.php" method="post">
-<?php wp_nonce_field('update-user_' . $user_id) ?>
+<?php if ( $wp_http_referer ) : ?>
+    <input type="hidden" name="wp_http_referer" value="<?php echo wp_specialchars($wp_http_referer); ?>" />
+<?php endif; ?>
-<p>
-<input type="hidden" name="from" value="profile" />

trunk/wp-admin/users.php

@@ -4 +4 @@
-
-$title = __('Users');
-
+
+
+
+
-
-$action = $_REQUEST['action'];
-$update = '';
-
+if ( empty($_POST) ) {
+    $referer = '<input type="hidden" name="wp_http_referer" value="'. wp_specialchars(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
+} elseif ( isset($_POST['wp_http_referer']) ) {
+    $redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), urlencode(stripslashes($_POST['wp_http_referer'])));
+    $referer = '<input type="hidden" name="wp_http_referer" value="' . wp_specialchars($redirect) . '" />';
+} else {
+    $redirect = 'users.php';
+}
+
-switch ($action) {
-
@@ -15 +27 @@
-
-    if (empty($_POST['users'])) {
-users.php'
+' . $redirect
-    }
-
@@ -21 +33 @@
-        die(__('You can&#8217;t edit users.'));
-
- 
+
-    $update = 'promote';
- 
- 
- 
+
+
+
-        // The new role of the current user must also have edit_users caps
-        if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
@@ -32 +44 @@
-        }
-
- 
- 
- 
-
-users.php?update=' . $update
+
+
+
+
+' . add_query_arg('update', $update, $redirect)
-
-break;
@@ -45 +57 @@
-
-    if ( empty($_POST['users']) ) {
-users.php'
+' . $redirect
-    }
-
@@ -52 +64 @@
-
-    $userids = $_POST['users'];
-
-    $update = 'del';
-
-
-
-
+
+
+
+
+
+
-        if($id == $current_user->id) {
-            $update = 'err_admin_del';
-            continue;
-        }
- 
+
-        case 'delete':
-            wp_delete_user($id);
@@ -70 +83 @@
-            break;
-        }
-
-
-
+
+
+
+
+
+
-
-break;
@@ -80 +96 @@
-    check_admin_referer('bulk-users');
-
-
-
-
+
+
-
-    if ( !current_user_can('delete_users') )
-
+s
-
-    $userids = $_POST['users'];
@@ -93 +108 @@
-<form action="" method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('delete-users') ?>
+<?php echo $referer; ?>
-<div class="wrap">
-<h2><?php _e('Delete Users'); ?></h2>
@@ -99 +115 @@
-<?php
-    $go_delete = false;
-   foreach ($userids as $id
- 
-$id == $current_user->id
+   foreach ( (array) $userids as $id 
+
+ $id == $current_user->id 
-            echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
-        } else {
@@ -107 +123 @@
-            $go_delete = true;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    <ul style="list-style:none;">
-        <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
@@ -144 +158 @@
-
-    $user_id = add_user();
+    $update = 'add';
-    if ( is_wp_error( $user_id ) )
-
+add_user_
-    else {
-
+
+
+
-        die();
-    }
-
-default:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $tmp_user = new WP_User($userid);
-        $roles = $tmp_user->roles;
@@ -165 +231 @@
-    }
-
-
-
-
-
+
-        switch($_GET['update']) {
-        case 'del':
-
-
+
+
+
+
-        <?php
-            break;
@@ -198 +263 @@
-            break;
-        }
-
-
+
+
+
-    <div class="error">
-        <ul>
-        <?php
-            foreach ( $errors->get_error_messages() as $message )
- 
+
-        ?>
-        </ul>
-    </div>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-<form action="" method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('bulk-users') ?>
-<div class="wrap">
-
+
+
+
+
+
+
+
+
+
+
-<table class="widefat">
-<?php
@@ -223 +314 @@
-
-<tr>
-8
+7
-</tr>
-
-
+
-    <th style="text-align: left"><?php _e('ID') ?></th>
-    <th style="text-align: left"><?php _e('Username') ?></th>
@@ -232 +322 @@
-    <th style="text-align: left"><?php _e('E-mail') ?></th>
-    <th style="text-align: left"><?php _e('Website') ?></th>
-
-
+
-</tr>
-</thead>
-<tbody id="role-<?php echo $role; ?>"><?php
-$style = '';
-
-
-
-
-
-
-
-
-
+
+
+
-}
-?>
+
+</tbody>
+<?php } ?>
-</table>
-
+<?php if ( $paging_text ) : ?>
+    <div class="user-paging-text"><?php echo $paging_text; ?></div>
+<?php endif; ?>
-
-    <h2><?php _e('Update Users'); ?></h2>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-</div>
-</form>
-
+<?php endif; // if users were returned ?>
+
+<?php
+    if ( is_wp_error($add_user_errors) ) {
+        foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
+            $var = 'new_' . $var;
+            $$var = wp_specialchars(stripslashes($_POST[$formpost]));
+        }
+        unset($name);
+    }
+?>
+
-<div class="wrap">
-
+ id="add-new-user"
-<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_settings('siteurl').'/wp-register.php').'</p>'; ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<div id="ajax-response"></div>
-</div>
-
-
+
+
-break;
-
+
+
-
-include('admin-footer.php');

trunk/wp-admin/wp-admin.css

@@ -53 +53 @@
-}
-
-
+, .thead
-    background: #dfdfdf
-}

trunk/wp-includes/functions.php

@@ -810 +810 @@
-    $ret = '';
-    if ( is_array(func_get_arg(0)) ) {
-
+|| '' == @func_get_arg(1) 
-            $uri = $_SERVER['REQUEST_URI'];
-        else
-            $uri = @func_get_arg(1);
-    } else {
-
+|| '' == @func_get_arg(2) 
-            $uri = $_SERVER['REQUEST_URI'];
-        else
-            $uri = @func_get_arg(2);
+    }
+
+    if ( preg_match('|^https?://|i', $uri, $matches) ) {
+        $protocol = $matches[0];
+        $uri = substr($uri, strlen($protocol));
+    } else {
+        $protocol = '';
-    }
-
@@ -830 +837 @@
-            $query = $parts[1];
-        }
-
-
+
-        $base = $uri . '?';
-        $query = '';
@@ -854 +860 @@
-        }
-    }
-
+
+
+
-    return trim($ret, '?');
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return add_query_arg($key, '', $query);
-}