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();
}
}
-
+
function try_login() {
$consumer =& oid_consumer();
$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 = 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 (!oid_update_user($cur, $sreg)) {
- $this->message(_t('Error updating profile'));
+ $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();
}