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 5617c5339203610d56566f68c48f3c16274b8960..e2e8c1b834100b85a961341fa8c5b9c53dcb1a99 100644 (file)
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -48,7 +48,7 @@ class ConfirmaddressAction extends Action
 {
     /** type of confirmation. */
 
-    var $type = null;
+    var $address;
 
     /**
      * Accept a confirmation code
@@ -60,67 +60,93 @@ 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;
-        if (!in_array($type, array('email', 'jabber', 'sms'))) {
-            // TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-            $this->serverError(sprintf(_('Unrecognized address type %s.'), $type));
-            return;
+        $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));
         }
-        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;
-        }
-
+        $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.
+                $this->clientError(_('That address has already been confirmed.'));
+            }
+
+            $orig_user = clone($cur);
+
+            $cur->$type = $confirm->address;
+
+            if ($type == 'sms') {
+                $cur->carrier  = ($confirm->address_extra)+0;
+                $carrier       = Sms_carrier::getKV($cur->carrier);
+                $cur->smsemail = $carrier->toEmailAddress($cur->sms);
+            }
+
+            // Throws exception on failure.
+            $cur->updateWithKeys($orig_user);
+
+            if ($type == 'email') {
+                $cur->emailChanged();
+            }
+
+        } else {
+
+            $user_im_prefs = new User_im_prefs();
+            $user_im_prefs->transport = $confirm->address_type;
+            $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.'));
+                }
+                $user_im_prefs->screenname = $confirm->address;
+                $result = $user_im_prefs->update();
+
+                if (!$result) {
+                    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.'));
+                }
+            }else{
+                $user_im_prefs = new User_im_prefs();
+                $user_im_prefs->screenname = $confirm->address;
+                $user_im_prefs->transport = $confirm->address_type;
+                $user_im_prefs->user_id = $cur->id;
+                $result = $user_im_prefs->insert();
+
+                if (!$result) {
+                    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.'));
+                }
+            }
 
-        $orig_user = clone($cur);
-
-        $cur->$type = $confirm->address;
-
-        if ($type == 'sms') {
-            $cur->carrier  = ($confirm->address_extra)+0;
-            $carrier       = Sms_carrier::staticGet($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 a user update to the database fails in the contact address confirmation action.
-            $this->serverError(_('Couldn\'t update user.'));
-            return;
-        }
-
-        if ($type == 'email') {
-            $cur->emailChanged();
         }
 
         $result = $confirm->delete();
@@ -130,12 +156,9 @@ 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');
-
-        $this->type = $type;
         $this->showPage();
     }
 
@@ -158,13 +181,12 @@ class ConfirmaddressAction extends Action
     function showContent()
     {
         $cur  = common_current_user();
-        $type = $this->type;
 
         $this->element('p', null,
                        // TRANS: Success message for the contact address confirmation action.
                        // TRANS: %s can be 'email', 'jabber', or 'sms'.
                        sprintf(_('The address "%s" has been '.
                                  'confirmed for your account.'),
-                               $cur->$type));
+                               $this->address));
     }
 }