Make the OpenID settings work with new framework

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

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 3cffda8710b59c15efa87ca347c22e087df3e073..53410fbe63b9d07d06dba501eb4b7ef70def49c7 100644 (file)
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -19,9 +19,11 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ConfirmaddressAction extends Action {
+class ConfirmaddressAction extends Action
+{
 
-    function handle($args) {
+    function handle($args)
+    {
         parent::handle($args);
         if (!common_logged_in()) {
             common_set_returnto($this->self_url());
@@ -30,61 +32,65 @@ class ConfirmaddressAction extends Action {
         }
         $code = $this->trimmed('code');
         if (!$code) {
-            $this->client_error(_('No confirmation code.'));
+            $this->clientError(_('No confirmation code.'));
             return;
         }
         $confirm = Confirm_address::staticGet('code', $code);
         if (!$confirm) {
-            $this->client_error(_('Confirmation code not found.'));
+            $this->clientError(_('Confirmation code not found.'));
             return;
         }
         $cur = common_current_user();
         if ($cur->id != $confirm->user_id) {
-            $this->client_error(_('That confirmation code is not for you!'));
+            $this->clientError(_('That confirmation code is not for you!'));
+            return;
+        }
+        $type = $confirm->address_type;
+        if (!in_array($type, array('email', 'jabber', 'sms'))) {
+            $this->serverError(sprintf(_('Unrecognized address type %s'), $type));
             return;
         }
-               $type = $confirm->address_type;
-               if (!in_array($type, array('email', 'jabber', 'sms'))) {
-                       $this->server_error(sprintf(_('Unrecognized address type %s'), $type));
-                       return;
-               }
         if ($cur->$type == $confirm->address) {
-            $this->client_error(_('That address has already been confirmed.'));
-                       return;
-               }
+            $this->clientError(_('That address has already been confirmed.'));
+            return;
+        }
 
         $cur->query('BEGIN');
 
         $orig_user = clone($cur);
 
-               $cur->$type = $confirm->address;
+        $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);
-               }
+        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);
+        $result = $cur->updateKeys($orig_user);
 
         if (!$result) {
-                       common_log_db_error($cur, 'UPDATE', __FILE__);
-            $this->server_error(_('Couldn\'t update user.'));
+            common_log_db_error($cur, 'UPDATE', __FILE__);
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
 
+        if ($type == 'email') {
+            $cur->emailChanged();
+        }
+
         $result = $confirm->delete();
 
         if (!$result) {
-                       common_log_db_error($confirm, 'DELETE', __FILE__);
-            $this->server_error(_('Couldn\'t delete email confirmation.'));
+            common_log_db_error($confirm, 'DELETE', __FILE__);
+            $this->serverError(_('Couldn\'t delete email confirmation.'));
             return;
         }
 
         $cur->query('COMMIT');
 
         common_show_header(_('Confirm Address'));
-        common_element('p', NULL,
+        $this->element('p', null,
                        sprintf(_('The address "%s" has been confirmed for your account.'), $cur->$type));
         common_show_footer();
     }