Changeset 2632

Timestamp:

06/12/2005 11:14:52 PM (20 years ago)

Author:

matt

Message:

More user updates

Location:

trunk

Files:

• wp-admin/install.php (modified) (1 diff)
• wp-admin/profile.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/functions-formatting.php (modified) (1 diff)
• wp-includes/pluggable-functions.php (modified) (1 diff)
• wp-includes/template-functions-author.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• wp-register.php (modified) (3 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/install.php

@@ -165 +165 @@
 
 // Default comment
-$wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".addslashes(__('Mr WordPress'))."', '', 'http://wordpress.org', '127.0.0.1', '$now', '$now_gmt', '".addslashes(__('Hi, this is a comment.<br />To delete a comment, just log in, and view the posts\' comments, there you will have the option to edit or delete them.'))."')");
+$wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".addslashes(__('Mr WordPress'))."', '', 'http://wordpress.org', '$now', '$now_gmt', '".addslashes(__('Hi, this is a comment.<br />To delete a comment, just log in, and view the posts\' comments, there you will have the option to edit or delete them.'))."')");
 
 // Set up admin user
 $random_password = substr(md5(uniqid(microtime())), 0, 6);
-$wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_nickname, user_email, user_level, user_idmode, user_registered) VALUES ( '1', 'admin', MD5('$random_password'), '".addslashes(__('Administrator'))."', '$admin_email', '10', 'nickname', NOW() )");
+$wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_email, user_level, user_registered) VALUES ( '1', 'admin', MD5('$random_password'), '$admin_email', '10', NOW() )");
 
 $message_headers = 'From: ' . stripslashes($_POST['weblog_title']) . ' <wordpress@' . $_SERVER['SERVER_NAME'] . '>';

trunk/wp-admin/profile.php

@@ -85 +85 @@
     $user_description = $_POST['user_description'];
 
-    $result = $wpdb->query("UPDATE $wpdb->users SET user_firstname='$newuser_firstname', $updatepassword user_lastname='$newuser_lastname', user_nickname='$newuser_nickname', user_icq='$newuser_icq', user_email='$newuser_email', user_url='$newuser_url', user_aim='$newuser_aim', user_msn='$newuser_msn', user_yim='$newuser_yim', user_idmode='$newuser_idmode', user_description = '$user_description', user_nicename = '$newuser_nicename' WHERE ID = $user_ID");
+    $result = $wpdb->query("UPDATE $wpdb->users SET $updatepassword user_email='$newuser_email', user_url='$newuser_url', user_nicename = '$newuser_nicename' WHERE ID = $user_ID");
+
+    update_user_meta( $user_ID, 'first_name', $newuser_firstname );
+    update_user_meta( $user_ID, 'last_name', $newuser_lastname );
+    update_user_meta( $user_ID, 'nickname', $newuser_nickname );
+    update_user_meta( $user_ID, 'description', $user_description );
+    update_user_meta( $user_ID, 'icq', $newuser_icq );
+    update_user_meta( $user_ID, 'aim', $newuser_aim );
+    update_user_meta( $user_ID, 'msn', $newuser_msn );
+    update_user_meta( $user_ID, 'yim', $newuser_yim );
 
     do_action('profile_update', $user_ID);

trunk/wp-admin/user-edit.php

@@ -67 +67 @@
 $new_description = $_POST['new_description'];
 
-$result = $wpdb->query("UPDATE $wpdb->users SET user_login = '$new_user_login', user_firstname = '$new_firstname', $updatepassword user_lastname='$new_lastname', user_nickname='$new_nickname', user_icq='$new_icq', user_email='$new_email', user_url='$new_url', user_aim='$new_aim', user_msn='$new_msn', user_yim='$new_yim', user_idmode='$new_idmode', user_description = '$new_description', user_nicename = '$new_nicename' WHERE ID = $user_id");
+$result = $wpdb->query("UPDATE $wpdb->users SET user_login = '$new_user_login', $updatepassword user_email='$new_email', user_url='$new_url', user_nicename = '$new_nicename' WHERE ID = '$user_id'");
+
+update_user_meta( $user_ID, 'first_name', $new_firstname );
+update_user_meta( $user_ID, 'last_name', $new_lastname );
+update_user_meta( $user_ID, 'nickname', $new_nickname );
+update_user_meta( $user_ID, 'description', $new_description );
+update_user_meta( $user_ID, 'icq', $new_icq );
+update_user_meta( $user_ID, 'aim', $new_aim );
+update_user_meta( $user_ID, 'msn', $new_msn );
+update_user_meta( $user_ID, 'yim', $new_yim );
 
 header("Location: user-edit.php?user_id=$user_id&updated=true");

trunk/wp-admin/users.php

@@ -70 +70 @@
 
     $result = $wpdb->query("INSERT INTO $wpdb->users 
-        (user_login, user_pass, user_nickname, user_email, user_ip, user_domain, user_browser, user_registered, user_level, user_idmode, user_firstname, user_lastname, user_nicename, user_url)
+        (user_login, user_pass, user_email, user_registered, user_level, user_nicename, user_url)
     VALUES 
-        ('$user_login', MD5('$pass1'), '$user_nickname', '$user_email', '$user_ip', '$user_domain', '$user_browser', '$now', '$new_users_can_blog', 'nickname', '$user_firstname', '$user_lastname', '$user_nicename', '$user_uri')");
+        ('$user_login', MD5('$pass1'), '$user_email', '$now', '$new_users_can_blog', '$user_nicename', '$user_uri')");
     
     if ($result == false)

trunk/wp-includes/functions-formatting.php

@@ -264 +264 @@
 
     return $string;
+}
+
+function sanitize_user( $username ) {
+    return preg_replace('|a-z0-9 _.-|i', '', $username);
 }
 

trunk/wp-includes/pluggable-functions.php

@@ -59 +59 @@
 function get_userdatabylogin($user_login) {
     global $cache_userdata, $wpdb;
-    $user_login = addslashes( $user_login );
+    $user_login = sanitize_user( $user_login );
     if ( empty( $user_login ) )
         return false;

trunk/wp-includes/template-functions-author.php

@@ -157 +157 @@
     global $wpdb;
 
-    $query = "SELECT ID, user_nickname, user_firstname, user_lastname, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY user_nickname";
+    $query = "SELECT ID, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY display_name";
     $authors = $wpdb->get_results($query);
 
     foreach($authors as $author) {
+        $author = get_userdata( $author->ID );
         $posts = get_usernumposts($author->ID);
         $name = $author->user_nickname;

trunk/wp-login.php

@@ -122 +122 @@
 
     // Generate something random for a password... md5'ing current time with a rand salt
-    $key = $_GET['key'];
+    $key = preg_replace('/a-z0-9/i', '', $_GET['key']);
     if ( empty($key) )
         die( __('Sorry, that key does not appear to be valid.') );

trunk/wp-register.php

@@ -27 +27 @@
 case 'register':
 
-    $user_login = $_POST['user_login'];
+    $user_login = sanitize_user( $_POST['user_login'] );
     $user_email = $_POST['user_email'];
         
-    /* checking that username has been typed */
-    if ($user_login == '') {
+    if ( $user_login == '' )
         die (__('<strong>ERROR</strong>: Please enter a username.'));
-    }
 
     /* checking e-mail address */
@@ -42 +40 @@
     }
 
-    /* checking the username isn't already used by another user */
-    $result = $wpdb->get_results("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'");
-    if (count($result) >= 1) {
+    if ( $result = $wpdb->get_row("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'") )
         die (__('<strong>ERROR</strong>: This username is already registered, please choose another one.'));
-    }
 
     $user_ip = $_SERVER['REMOTE_ADDR'] ;
@@ -52 +47 @@
     $user_browser = $wpdb->escape($_SERVER['HTTP_USER_AGENT']);
 
-    $user_login = $wpdb->escape( preg_replace('|a-z0-9 _.-|i', '', $user_login) );
+    $user_login = $wpdb->escape( sanitize_user($user_login) ) );
     $user_nickname = $user_login;
-   $user_nicename = sanitize_title($user_nickname);
+    $user_nicename = sanitize_title($user_nickname);
     $now = gmdate('Y-m-d H:i:s');
     $user_level = get_settings('new_users_can_blog');

trunk/wp-settings.php

@@ -53 +53 @@
 if ( defined('CUSTOM_USER_TABLE') )
     $wpdb->users = CUSTOM_USER_TABLE;
+if ( defined('CUSTOM_USER_META_TABLE') )
+    $wpdb->usermeta = CUSTOM_USER_META_TABLE;
 
 // We're going to need to keep this around for a few months even though we're not using it internally