*
* @return void
*/
- function handle($args)
+ function handle(array $args=array())
{
parent::handle($args);
if (!common_logged_in()) {
common_set_returnto($this->selfUrl());
common_redirect(common_local_url('login'));
- return;
}
$code = $this->trimmed('code');
if (!$code) {
// TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
$this->clientError(_('No confirmation code.'));
- return;
}
- $confirm = Confirm_address::staticGet('code', $code);
+ $confirm = Confirm_address::getKV('code', $code);
if (!$confirm) {
// TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
$this->clientError(_('Confirmation code not found.'));
- return;
}
$cur = common_current_user();
if ($cur->id != $confirm->user_id) {
// TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
$this->clientError(_('That confirmation code is not for you!'));
- return;
}
$type = $confirm->address_type;
$transports = array();
if (!in_array($type, array('email', 'sms')) && !in_array($type, array_keys($transports))) {
// TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
$this->serverError(sprintf(_('Unrecognized address type %s'), $type));
- return;
}
$this->address = $confirm->address;
$cur->query('BEGIN');
if (in_array($type, array('email', 'sms')))
{
if ($cur->$type == $confirm->address) {
- // TRANS: Client error for an already confirmed email/jabber/sms address.
+ // TRANS: Client error for an already confirmed email/jabber/sms address.
$this->clientError(_('That address has already been confirmed.'));
- return;
}
$orig_user = clone($cur);
if ($type == 'sms') {
$cur->carrier = ($confirm->address_extra)+0;
- $carrier = Sms_carrier::staticGet($cur->carrier);
+ $carrier = Sms_carrier::getKV($cur->carrier);
$cur->smsemail = $carrier->toEmailAddress($cur->sms);
}
if (!$result) {
common_log_db_error($cur, 'UPDATE', __FILE__);
- $this->serverError(_('Couldn\'t update user.'));
- return;
+ // TRANS: Server error displayed when confirming an e-mail address or IM address fails.
+ $this->serverError(_('Could not update user.'));
}
if ($type == 'email') {
$user_im_prefs->user_id = $cur->id;
if ($user_im_prefs->find() && $user_im_prefs->fetch()) {
if($user_im_prefs->screenname == $confirm->address){
+ // TRANS: Client error for an already confirmed IM address.
$this->clientError(_('That address has already been confirmed.'));
- return;
}
$user_im_prefs->screenname = $confirm->address;
$result = $user_im_prefs->update();
if (!$result) {
common_log_db_error($user_im_prefs, 'UPDATE', __FILE__);
- $this->serverError(_('Couldn\'t update user im preferences.'));
- return;
+ // TRANS: Server error displayed when updating IM preferences fails.
+ $this->serverError(_('Could not update user IM preferences.'));
}
}else{
$user_im_prefs = new User_im_prefs();
if (!$result) {
common_log_db_error($user_im_prefs, 'INSERT', __FILE__);
- $this->serverError(_('Couldn\'t insert user im preferences.'));
- return;
+ // TRANS: Server error displayed when adding IM preferences fails.
+ $this->serverError(_('Could not insert user IM preferences.'));
}
}
// TRANS: Server error displayed when an address confirmation code deletion from the
// TRANS: database fails in the contact address confirmation action.
$this->serverError(_('Could not delete address confirmation.'));
- return;
}
$cur->query('COMMIT');