X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/a66f9e26487c560245ef9cd17d7e87c0cbb650af..refs/tags/wordpress-2.5.1:/wp-includes/user.php
diff --git a/wp-includes/user.php b/wp-includes/user.php
index c1efcb6e..c861be03 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -1,5 +1,58 @@
add('empty_username', __('ERROR: The username field is empty.'));
+ if ( empty($credentials['user_password']) )
+ $error->add('empty_password', __('ERROR: The password field is empty.'));
+ return $error;
+ }
+
+ $user = wp_authenticate($credentials['user_login'], $credentials['user_password']);
+ if ( is_wp_error($user) )
+ return $user;
+
+ wp_set_auth_cookie($user->ID, $credentials['remember']);
+ do_action('wp_login', $credentials['user_login']);
+ return $user;
+}
+
function get_profile($field, $user = false) {
global $wpdb;
if ( !$user )
@@ -15,13 +68,11 @@ function get_usernumposts($userid) {
// TODO: xmlrpc only. Maybe move to xmlrpc.php.
function user_pass_ok($user_login,$user_pass) {
- global $cache_userdata;
- if ( empty($cache_userdata[$user_login]) ) {
- $userdata = get_userdatabylogin($user_login);
- } else {
- $userdata = $cache_userdata[$user_login];
- }
- return (md5($user_pass) == $userdata->user_pass);
+ $user = wp_authenticate($user_login, $user_pass);
+ if ( is_wp_error($user) )
+ return false;
+
+ return true;
}
//
@@ -31,17 +82,20 @@ function user_pass_ok($user_login,$user_pass) {
function get_user_option( $option, $user = 0 ) {
global $wpdb;
+ $option = preg_replace('|[^a-z0-9_]|i', '', $option);
if ( empty($user) )
$user = wp_get_current_user();
else
$user = get_userdata($user);
if ( isset( $user->{$wpdb->prefix . $option} ) ) // Blog specific
- return $user->{$wpdb->prefix . $option};
+ $result = $user->{$wpdb->prefix . $option};
elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
- return $user->{$option};
+ $result = $user->{$option};
else // Blog global
- return get_option( $option );
+ $result = get_option( $option );
+
+ return apply_filters("get_user_option_{$option}", $result, $option, $user);
}
function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
@@ -80,9 +134,7 @@ function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
else
$wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
- $user = get_userdata($user_id);
wp_cache_delete($user_id, 'users');
- wp_cache_delete($user->user_login, 'userlogins');
return true;
}
@@ -96,9 +148,14 @@ function get_usermeta( $user_id, $meta_key = '') {
if ( !empty($meta_key) ) {
$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
- $metas = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
+ $user = wp_cache_get($user_id, 'users');
+ // Check the cached user object
+ if ( false !== $user && isset($user->$meta_key) )
+ $metas = array($user->$meta_key);
+ else
+ $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
} else {
- $metas = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'");
+ $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
}
if ( empty($metas) ) {
@@ -108,13 +165,12 @@ function get_usermeta( $user_id, $meta_key = '') {
return '';
}
- foreach ($metas as $meta)
- $values[] = maybe_unserialize($meta->meta_value);
+ $metas = array_map('maybe_unserialize', $metas);
- if ( count($values) == 1 )
- return $values[0];
+ if ( count($metas) == 1 )
+ return $metas[0];
else
- return $values;
+ return $metas;
}
function update_usermeta( $user_id, $meta_key, $meta_value ) {
@@ -144,9 +200,7 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) {
return false;
}
- $user = get_userdata($user_id);
wp_cache_delete($user_id, 'users');
- wp_cache_delete($user->user_login, 'userlogins');
return true;
}
@@ -169,7 +223,7 @@ function setup_userdata($user_id = '') {
$userdata = $user->data;
$user_login = $user->user_login;
- $user_level = (int) $user->user_level;
+ $user_level = (int) isset($user->user_level) ? $user->user_level : 0;
$user_ID = (int) $user->ID;
$user_email = $user->user_email;
$user_url = $user->user_url;
@@ -242,4 +296,35 @@ function wp_dropdown_users( $args = '' ) {
return $output;
}
+function _fill_user( &$user ) {
+ global $wpdb;
+
+ $show = $wpdb->hide_errors();
+ $metavalues = $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user->ID));
+ $wpdb->show_errors($show);
+
+ if ( $metavalues ) {
+ foreach ( $metavalues as $meta ) {
+ $value = maybe_unserialize($meta->meta_value);
+ $user->{$meta->meta_key} = $value;
+ }
+ }
+
+ $level = $wpdb->prefix . 'user_level';
+ if ( isset( $user->{$level} ) )
+ $user->user_level = $user->{$level};
+
+ // For backwards compat.
+ if ( isset($user->first_name) )
+ $user->user_firstname = $user->first_name;
+ if ( isset($user->last_name) )
+ $user->user_lastname = $user->last_name;
+ if ( isset($user->description) )
+ $user->user_description = $user->description;
+
+ wp_cache_add($user->ID, $user, 'users');
+ wp_cache_add($user->user_login, $user->ID, 'userlogins');
+ wp_cache_add($user->user_email, $user->ID, 'useremail');
+}
+
?>