1 files changed, 68 insertions, 34 deletions

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 8bf8c8c4d..f92db3ec4 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -49,7 +49,7 @@ class ConfirmaddressAction extends Action
 {
     /** type of confirmation. */
 
-    var $type = null;
+    var $address;
 
     /**
      * Accept a confirmation code
@@ -86,39 +86,76 @@ class ConfirmaddressAction extends Action
             return;
         }
         $type = $confirm->address_type;
-        if (!in_array($type, array('email', 'jabber', 'sms'))) {
-            // TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-            $this->serverError(sprintf(_('Unrecognized address type %s.'), $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;
         }
-        if ($cur->$type == $confirm->address) {
-            // TRANS: Client error for an already confirmed email/jabbel/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) {
+                $this->clientError(_('That address has already been confirmed.'));
+                return;
+            }
+
+            $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__);
+                $this->serverError(_('Couldn\'t update user.'));
+                return;
+            }
+
+            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){
+                    $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;
+                }
+            }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__);
+                    $this->serverError(_('Couldn\'t insert user im preferences.'));
+                    return;
+                }
+            }
 
-        $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__);
-            $this->serverError(_('Couldn\'t update user.'));
-            return;
-        }
-
-        if ($type == 'email') {
-            $cur->emailChanged();
         }
 
         $result = $confirm->delete();
@@ -130,8 +167,6 @@ class ConfirmaddressAction extends Action
         }
 
         $cur->query('COMMIT');
-
-        $this->type = $type;
         $this->showPage();
     }
 
@@ -155,11 +190,10 @@ class ConfirmaddressAction extends Action
     function showContent()
     {
         $cur  = common_current_user();
-        $type = $this->type;
 
         $this->element('p', null,
                        sprintf(_('The address "%s" has been '.
                                  'confirmed for your account.'),
-                               $cur->$type));
+                               $this->address));
     }
 }