golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up user-edit.php, add password strength meter to Add User and Edit User 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-05-16 06:29:10 +00:00
parent a5e73d3b9b
commit d271668438
3 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
wp-admin/user-edit.php
View File

@ -9,18 +9,14 @@
/** WordPress Administration Bootstrap */ /** WordPress Administration Bootstrap */
require_once('admin.php'); require_once('admin.php');
if ( defined('IS_PROFILE_PAGE') && IS_PROFILE_PAGE ) if ( !defined('IS_PROFILE_PAGE') )
$is_profile_page = true; define('IS_PROFILE_PAGE', false);
else
$is_profile_page = false;
if ( $is_profile_page ) { wp_enqueue_script('user-profile');
wp_enqueue_script('user-profile'); wp_enqueue_script('password-strength-meter');
wp_enqueue_script('password-strength-meter');
}
$title = $is_profile_page? __('Profile') : __('Edit User'); $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
if ( current_user_can('edit_users') && !$is_profile_page ) if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
$submenu_file = 'users.php'; $submenu_file = 'users.php';
else else
$submenu_file = 'profile.php'; $submenu_file = 'profile.php';
@ -33,7 +29,7 @@ $wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashe
$user_id = (int) $user_id; $user_id = (int) $user_id;
if ( !$user_id ) { if ( !$user_id ) {
if ( $is_profile_page ) { if ( IS_PROFILE_PAGE ) {
$current_user = wp_get_current_user(); $current_user = wp_get_current_user();
$user_id = $current_user->ID; $user_id = $current_user->ID;
} else { } else {
@ -75,7 +71,7 @@ check_admin_referer('update-user_' . $user_id);
if ( !current_user_can('edit_user', $user_id) ) if ( !current_user_can('edit_user', $user_id) )
wp_die(__('You do not have permission to edit this user.')); wp_die(__('You do not have permission to edit this user.'));
if ($is_profile_page) if ( IS_PROFILE_PAGE )
do_action('personal_options_update', $user_id); do_action('personal_options_update', $user_id);
else else
do_action('edit_user_profile_update', $user_id); do_action('edit_user_profile_update', $user_id);
@ -83,7 +79,7 @@ else
$errors = edit_user($user_id); $errors = edit_user($user_id);
if ( !is_wp_error( $errors ) ) { if ( !is_wp_error( $errors ) ) {
$redirect = ($is_profile_page? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true"; $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true";
$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect); $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
wp_redirect($redirect); wp_redirect($redirect);
exit; exit;
@ -101,7 +97,7 @@ include ('admin-header.php');
<?php if ( isset($_GET['updated']) ) : ?> <?php if ( isset($_GET['updated']) ) : ?>
<div id="message" class="updated fade"> <div id="message" class="updated fade">
<p><strong><?php _e('User updated.') ?></strong></p> <p><strong><?php _e('User updated.') ?></strong></p>
<?php if ( $wp_http_referer && !$is_profile_page ) : ?> <?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?>
<p><a href="users.php"><?php _e('&larr; Back to Authors and Users'); ?></a></p> <p><a href="users.php"><?php _e('&larr; Back to Authors and Users'); ?></a></p>
<?php endif; ?> <?php endif; ?>
</div> </div>
@ -173,7 +169,7 @@ do_action('personal_options', $profileuser);
?> ?>
</table> </table>
<?php <?php
if ( $is_profile_page ) if ( IS_PROFILE_PAGE )
do_action('profile_personal_options', $profileuser); do_action('profile_personal_options', $profileuser);
?> ?>
@ -185,7 +181,7 @@ do_action('personal_options', $profileuser);
<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Your username cannot be changed.'); ?></span></td> <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Your username cannot be changed.'); ?></span></td>
</tr> </tr>
<?php if ( !$is_profile_page ): ?> <?php if ( !IS_PROFILE_PAGE ): ?>
<tr><th><label for="role"><?php _e('Role:') ?></label></th> <tr><th><label for="role"><?php _e('Role:') ?></label></th>
<td><select name="role" id="role"> <td><select name="role" id="role">
<?php <?php
@ -204,7 +200,7 @@ else
echo '<option value="" selected="selected">' . __('&mdash; No role for this blog &mdash;') . '</option>'; echo '<option value="" selected="selected">' . __('&mdash; No role for this blog &mdash;') . '</option>';
?> ?>
</select></td></tr> </select></td></tr>
<?php endif; //!$is_profile_page ?> <?php endif; //!IS_PROFILE_PAGE ?>
<tr> <tr>
<th><label for="first_name"><?php _e('First name') ?></label></th> <th><label for="first_name"><?php _e('First name') ?></label></th>
@ -280,7 +276,7 @@ else
</tr> </tr>
</table> </table>
<h3><?php $is_profile_page? _e('About Yourself') : _e('About the user'); ?></h3> <h3><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h3>
<table class="form-table"> <table class="form-table">
<tr> <tr>
@ -297,16 +293,15 @@ if ( $show_password_fields ) :
<th><label for="pass1"><?php _e('New Password'); ?></label></th> <th><label for="pass1"><?php _e('New Password'); ?></label></th>
<td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br /> <td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br />
<input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br /> <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br />
<?php if ( $is_profile_page ): ?>
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div> <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p class="description indicator-hint"><?php _e('Hint: Your password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p> <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
<?php endif; ?></td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
</table> </table>
<?php <?php
if ( $is_profile_page ) { if ( IS_PROFILE_PAGE ) {
do_action('show_user_profile', $profileuser); do_action('show_user_profile', $profileuser);
} else { } else {
do_action('edit_user_profile', $profileuser); do_action('edit_user_profile', $profileuser);
@ -335,7 +330,7 @@ if ( $show_password_fields ) :
<p class="submit"> <p class="submit">
<input type="hidden" name="action" value="update" /> <input type="hidden" name="action" value="update" />
<input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" /> <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
<input type="submit" class="button-primary" value="<?php $is_profile_page? esc_attr_e('Update Profile') : esc_attr_e('Update User') ?>" name="submit" /> <input type="submit" class="button-primary" value="<?php IS_PROFILE_PAGE ? esc_attr_e('Update Profile') : esc_attr_e('Update User') ?>" name="submit" />
</p> </p>
</form> </form>
</div> </div>

7
wp-admin/user-new.php
View File

@ -37,6 +37,8 @@ $title = __('Add New User');
$parent_file = 'users.php'; $parent_file = 'users.php';
wp_enqueue_script('wp-ajax-response'); wp_enqueue_script('wp-ajax-response');
wp_enqueue_script('user-profile');
wp_enqueue_script('password-strength-meter');
require_once ('admin-header.php'); require_once ('admin-header.php');
@ -117,7 +119,10 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']);
<th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php _e('(twice, required)'); ?></span></label></th> <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php _e('(twice, required)'); ?></span></label></th>
<td><input name="pass1" type="password" id="pass1" autocomplete="off" /> <td><input name="pass1" type="password" id="pass1" autocomplete="off" />
<br /> <br />
<input name="pass2" type="password" id="pass2" autocomplete="off"/></td> <input name="pass2" type="password" id="pass2" autocomplete="off"/>
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
</td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="send_password"><?php _e('Send Password?') ?></label></th> <th scope="row"><label for="send_password"><?php _e('Send Password?') ?></label></th>

9
wp-admin/wp-admin.css
View File

@ -1304,8 +1304,9 @@ textarea.large-text {
width: 99%; width: 99%;
} }
.form-table input.regular-text { .form-table input.regular-text,
width: 325px; #adduser .form-field input {
width: 25em;
} }
.form-table input.small-text { .form-table input.small-text {
@ -1317,10 +1318,6 @@ textarea.large-text {
margin-bottom: 6px; margin-bottom: 6px;
} }
#profile-page .form-table input[type=text] {
width: 300px;
}
#profile-page .form-table #rich_editing { #profile-page .form-table #rich_editing {
margin-right: 5px margin-right: 5px
} }