X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fconfirmaddress.php;h=44280e08a7543cf15dc373244042c5a489b63ec0;hb=485247e9011e08a6ff0b9a2ff3d7a60bad515a26;hp=76f79da05c23a8cccb59c28eddd28263c71c52dd;hpb=4fd1f6246ddc272192b293a5e5d5cb9dbd3e1cdf;p=quix0rs-gnu-social.git

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 76f79da05c..44280e08a7 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ConfirmemailAction extends Action {
+class ConfirmaddressAction extends Action {
 
     function handle($args) {
         parent::handle($args);
@@ -30,61 +30,66 @@ class ConfirmemailAction extends Action {
         }
         $code = $this->trimmed('code');
         if (!$code) {
-            $this->client_error(_t('No confirmation code.'));
+            $this->client_error(_('No confirmation code.'));
             return;
         }
         $confirm = Confirm_address::staticGet('code', $code);
         if (!$confirm) {
-            $this->client_error(_t('Confirmation code not found.'));
+            $this->client_error(_('Confirmation code not found.'));
             return;
         }
         $cur = common_current_user();
         if ($cur->id != $confirm->user_id) {
-            $this->client_error(_t('That confirmation code is not for you!'));
+            $this->client_error(_('That confirmation code is not for you!'));
             return;
         }
 		$type = $confirm->address_type;
 		if (!in_array($type, array('email', 'jabber', 'sms'))) {
-			$this->server_error(_t('Unrecognized address type ') . $type);
+			$this->server_error(sprintf(_('Unrecognized address type %s'), $type));
 			return;
 		}
         if ($cur->$type == $confirm->address) {
-            $this->client_error(_t('That address has already been confirmed.'));
+            $this->client_error(_('That address has already been confirmed.'));
 			return;
 		}
-		
+
         $cur->query('BEGIN');
-		
+
         $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->server_error(_t('Couldn\'t update user.'));
+            $this->server_error(_('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(_t('Couldn\'t delete email confirmation.'));
+            $this->server_error(_('Couldn\'t delete email confirmation.'));
             return;
         }
-		
+
         $cur->query('COMMIT');
 
-        common_show_header(_t('Confirm Address'));
+        common_show_header(_('Confirm Address'));
         common_element('p', NULL,
-                       _t('The address "') . $cur->email . 
-                       _t('" has been confirmed for your account.'));
+                       sprintf(_('The address "%s" has been confirmed for your account.'), $cur->$type));
         common_show_footer();
     }
 }