X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fconfirmaddress.php;h=9ac6848d7a09f55ceaefb7dd8b05d0a2d423de98;hb=d2e6519bad041e50b4ae7df441e43fd2cfed46fc;hp=fd04c313075dcbdb67c4ae34e8e94d5c90b313c5;hpb=bf59eaf602c8319d5ae99d9809b4d4867cb632cd;p=quix0rs-gnu-social.git diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index fd04c31307..9ac6848d7a 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -27,9 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * Confirm an address @@ -44,64 +42,60 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class ConfirmaddressAction extends Action +class ConfirmaddressAction extends ManagedAction { /** type of confirmation. */ - var $address; + protected $address; - /** - * Accept a confirmation code - * - * Checks the code and confirms the address in the - * user record - * - * @param args $args $_REQUEST array - * - * @return void - */ - function handle($args) + protected function doPreparation() { - 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; + throw new ClientException(_('No confirmation code.')); } - $confirm = Confirm_address::staticGet('code', $code); - if (!$confirm) { + $confirm = Confirm_address::getKV('code', $code); + if (!$confirm instanceof Confirm_address) { // TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action. - $this->clientError(_('Confirmation code not found.')); - return; + throw new ClientException(_('Confirmation code not found.'), 404); + } + + try { + $profile = Profile::getByID($confirm->user_id); + } catch (NoResultException $e) { + common_log(LOG_INFO, 'Tried to confirm the email for a deleted profile: '._ve(['id'=>$confirm->user_id, 'email'=>$confirm->address])); + $confirm->delete(); + throw $e; } - $cur = common_current_user(); - if ($cur->id != $confirm->user_id) { + if (!$profile->sameAs($this->scoped)) { // 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; + throw new AuthorizationException(_('That confirmation code is not for you!')); } + $type = $confirm->address_type; $transports = array(); Event::handle('GetImTransports', array(&$transports)); 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; + throw new ServerException(sprintf(_('Unrecognized address type %s'), $type)); } $this->address = $confirm->address; + + $cur = $this->scoped->getUser(); + $cur->query('BEGIN'); - if (in_array($type, array('email', 'sms'))) - { + if (in_array($type, array('email', 'sms'))) { + common_debug("Confirming {$type} address for user {$this->scoped->getID()}"); if ($cur->$type == $confirm->address) { - // TRANS: Client error for an already confirmed email/jabber/sms address. - $this->clientError(_('That address has already been confirmed.')); - return; + // Already verified, so delete the confirm_address entry + $confirm->delete(); + // TRANS: Client error for an already confirmed email/jabber/sms address. + throw new AlreadyFulfilledException(_('That address has already been confirmed.')); } $orig_user = clone($cur); @@ -110,17 +104,12 @@ class ConfirmaddressAction extends Action 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); } - $result = $cur->updateKeys($orig_user); - - if (!$result) { - common_log_db_error($cur, 'UPDATE', __FILE__); - $this->serverError(_('Couldn\'t update user.')); - return; - } + // Throws exception on failure. + $cur->updateWithKeys($orig_user); if ($type == 'email') { $cur->emailChanged(); @@ -133,16 +122,18 @@ class ConfirmaddressAction extends Action $user_im_prefs->user_id = $cur->id; if ($user_im_prefs->find() && $user_im_prefs->fetch()) { if($user_im_prefs->screenname == $confirm->address){ - $this->clientError(_('That address has already been confirmed.')); - return; + // Already verified, so delete the confirm_address entry + $confirm->delete(); + // TRANS: Client error for an already confirmed IM address. + throw new AlreadyFulfilledException(_('That address has already been confirmed.')); } $user_im_prefs->screenname = $confirm->address; $result = $user_im_prefs->update(); - if (!$result) { + if ($result === false) { 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. + throw new ServerException(_('Could not update user IM preferences.')); } }else{ $user_im_prefs = new User_im_prefs(); @@ -151,27 +142,18 @@ class ConfirmaddressAction extends Action $user_im_prefs->user_id = $cur->id; $result = $user_im_prefs->insert(); - if (!$result) { + if ($result === false) { 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. + throw new ServerException(_('Could not insert user IM preferences.')); } } } - $result = $confirm->delete(); - - if (!$result) { - common_log_db_error($confirm, 'DELETE', __FILE__); - // 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; - } + $confirm->delete(); $cur->query('COMMIT'); - $this->showPage(); } /** @@ -192,8 +174,6 @@ class ConfirmaddressAction extends Action */ function showContent() { - $cur = common_current_user(); - $this->element('p', null, // TRANS: Success message for the contact address confirmation action. // TRANS: %s can be 'email', 'jabber', or 'sms'.