if (is_null($user)) {
return false;
} else {
- return (0 == strcmp(common_munge_password($password, $user->id),
- $user->password));
+ if (0 == strcmp(common_munge_password($password, $user->id),
+ $user->password)) {
+ return $user;
+ } else {
+ return false;
+ }
}
}
}
}
-function common_set_user($nickname) {
- if (is_null($nickname) && common_have_session()) {
+# Three kinds of arguments:
+# 1) a user object
+# 2) a nickname
+# 3) NULL to clear
+
+function common_set_user($user) {
+ if (is_null($user) && common_have_session()) {
unset($_SESSION['userid']);
return true;
- } else {
+ } else if (is_string($user)) {
+ $nickname = $user;
$user = User::staticGet('nickname', $nickname);
- if ($user) {
- common_ensure_session();
- $_SESSION['userid'] = $user->id;
- return true;
- } else {
- return false;
- }
+ } else if (!($user instanceof User)) {
+ return false;
+ }
+
+ if ($user) {
+ common_ensure_session();
+ $_SESSION['userid'] = $user->id;
+ return $user;
}
return false;
}
define('REMEMBERME', 'rememberme');
define('REMEMBERME_EXPIRY', 30 * 24 * 60 * 60);
-function common_rememberme() {
- $user = common_current_user();
+function common_rememberme($user=NULL) {
if (!$user) {
- common_debug('No current user to remember', __FILE__);
- return false;
+ $user = common_current_user();
+ if (!$user) {
+ common_debug('No current user to remember', __FILE__);
+ return false;
+ }
}
$rm = new Remember_me();
$rm->code = common_good_rand(16);
common_real_login(false);
# We issue a new cookie, so they can log in
# automatically again after this session
- common_rememberme();
+ common_rememberme($user);
}
}
}
case 'openidsettings':
return common_path('settings/openid');
case 'newnotice':
- return common_path('notice/new');
+ if ($args && $args['replyto']) {
+ return common_path('notice/new?replyto='.$args['replyto']);
+ } else {
+ return common_path('notice/new');
+ }
case 'shownotice':
return common_path('notice/'.$args['notice']);
case 'xrds':