Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / confirmaddress.php

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index ef4cd7cb0d124862f4437a88b9ee8ceb3ce8cb11..e2e8c1b834100b85a961341fa8c5b9c53dcb1a99 100644 (file)
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -60,31 +60,27 @@ class ConfirmaddressAction extends Action
      *
      * @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();
@@ -92,7 +88,6 @@ class ConfirmaddressAction extends Action
         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');
@@ -101,7 +96,6 @@ class ConfirmaddressAction extends Action
             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;
             }
 
             $orig_user = clone($cur);
@@ -110,18 +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__);
-                // TRANS: Server error displayed when confirming an e-mail address or IM address fails.
-                $this->serverError(_('Could not update user.'));
-                return;
-            }
+            // Throws exception on failure.
+            $cur->updateWithKeys($orig_user);
 
             if ($type == 'email') {
                 $cur->emailChanged();
@@ -136,7 +124,6 @@ class ConfirmaddressAction extends Action
                 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();
@@ -145,7 +132,6 @@ class ConfirmaddressAction extends Action
                     common_log_db_error($user_im_prefs, 'UPDATE', __FILE__);
                     // TRANS: Server error displayed when updating IM preferences fails.
                     $this->serverError(_('Could not update user IM preferences.'));
-                    return;
                 }
             }else{
                 $user_im_prefs = new User_im_prefs();
@@ -158,7 +144,6 @@ class ConfirmaddressAction extends Action
                     common_log_db_error($user_im_prefs, 'INSERT', __FILE__);
                     // TRANS: Server error displayed when adding IM preferences fails.
                     $this->serverError(_('Could not insert user IM preferences.'));
-                    return;
                 }
             }
 
@@ -171,7 +156,6 @@ class ConfirmaddressAction extends Action
             // 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');