function handle($args) {
parent::handle($args);
if (!common_logged_in()) {
- common_user_error(_t('Not logged in.'));
+ common_user_error(_('Not logged in.'));
} else {
$this->try_login();
}
$response = $consumer->complete(common_local_url('finishaddopenid'));
if ($response->status == Auth_OpenID_CANCEL) {
- $this->message(_t('OpenID authentication cancelled.'));
+ $this->message(_('OpenID authentication cancelled.'));
return;
} else if ($response->status == Auth_OpenID_FAILURE) {
// Authentication failed; display the error message.
- $this->message(_t('OpenID authentication failed: ') . $response->message);
+ $this->message(sprintf(_('OpenID authentication failed: %s'), $response->message));
} else if ($response->status == Auth_OpenID_SUCCESS) {
-
+
$display = $response->getDisplayIdentifier();
$canonical = ($response->endpoint && $response->endpoint->canonicalID) ?
$response->endpoint->canonicalID : $display;
}
$cur =& common_current_user();
- $other = $this->get_user($canonical);
-
+ $other = oid_get_user($canonical);
+
if ($other) {
if ($other->id == $cur->id) {
- $this->message(_t('You already have this OpenID!'));
+ $this->message(_('You already have this OpenID!'));
} else {
- $this->message(_t('Someone else already has this OpenID.'));
+ $this->message(_('Someone else already has this OpenID.'));
}
return;
}
# start a transaction
-
+
$cur->query('BEGIN');
-
- $result = oid_link_user($cur->id, $display, $canonical);
-
+
+ $result = oid_link_user($cur->id, $canonical, $display);
+
if (!$result) {
- $this->message(_t('Error connecting user.'));
+ $this->message(_('Error connecting user.'));
return;
}
if ($sreg) {
- if (!$this->update_user($cur, $sreg)) {
- $this->message(_t('Error updating profile'));
+ if (!oid_update_user($cur, $sreg)) {
+ $this->message(_('Error updating profile'));
return;
}
}
-
+
# success!
-
+
$cur->query('COMMIT');
-
+
+ oid_set_last($display);
+
common_redirect(common_local_url('openidsettings'));
}
}
function message($msg) {
- common_show_header(_t('OpenID Login'));
+ common_show_header(_('OpenID Login'));
common_element('p', NULL, $msg);
common_show_footer();
}
-
- function get_user($canonical) {
- $user = NULL;
- $oid = User_openid::staticGet('canonical', $canonical);
- if ($oid) {
- $user = User::staticGet('id', $oid->user_id);
- }
- return $user;
- }
-
- function update_user(&$user, $sreg) {
-
- $profile =& $user->getProfile();
-
- $orig_profile = clone($profile);
-
- if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
- $profile->fullname = $sreg['fullname'];
- }
-
- if ($sreg['country']) {
- if ($sreg['postcode']) {
- # XXX: use postcode to get city and region
- # XXX: also, store postcode somewhere -- it's valuable!
- $profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
- } else {
- $profile->location = $sreg['country'];
- }
- }
-
- # XXX save language if it's passed
- # XXX save timezone if it's passed
-
- if (!$profile->update($orig_profile)) {
- common_server_error(_t('Error saving the profile.'));
- return false;
- }
-
- $orig_user = clone($user);
-
- if ($sreg['email'] && Validate::email($sreg['email'], true)) {
- $user->email = $sreg['email'];
- }
-
- if (!$user->update($orig_user)) {
- common_server_error(_t('Error saving the user.'));
- return false;
- }
-
- return true;
- }
}