$_SESSION['openid_sreg'] = $sreg;
}
- function get_saved_values($display, $canonical, $sreg) {
- common_ensure_session();
+ function get_saved_values() {
return array($_SESSION['openid_display'],
$_SESSION['openid_canonical'],
$_SESSION['openid_sreg']);
$profile->delete();
}
- $oid = new User_openid();
- $oid->display = $display;
- $oid->canonical = $canonical;
- $oid->user_id = $id;
- $oid->created = DB_DataObject_Cast::dateTime();
+ $result = oid_link_user($user->id, $canonical, $display);
- $result = $oid->insert();
-
if (!$result) {
# Try to clean up...
$user->delete();
$profile->delete();
}
- common_redirect(common_local_url('profilesettings'));
+ common_set_user($user->nickname);
+ common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)));
}
function connect_user() {
return;
}
- $oid = new User_openid();
- $oid->display = $display;
- $oid->canonical = $canonical;
- $oid->user_id = $user->id;
- $oid->created = DB_DataObject_Cast::dateTime();
+ $result = oid_link_user($user->id, $canonical, $display);
- if (!$oid->insert()) {
- common_server_error(_t('Error connecting OpenID.'));
+ if (!$result) {
+ common_server_error(_t('Error connecting user to OpenID.'));
return;
}
function best_new_nickname($display, $sreg) {
# Try the passed-in nickname
-
- if ($sreg['nickname'] && $this->is_new_nickname($sreg['nickname'])) {
- return $sreg['nickname'];
+
+
+ if ($sreg['nickname']) {
+ $nickname = $this->nicknamize($sreg['nickname']);
+ if ($this->is_new_nickname($nickname)) {
+ return $nickname;
+ }
}
# Try the full name