Misses this file to merge. I like the comments.

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

diff --git a/actions/smssettings.php b/actions/smssettings.php
index 228c7878d2ada462751a8389d9452e4ac5a011fd..ec8841281d2bf07c544910080002aacd7181e556 100644 (file)
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-
 /**
  * Settings for SMS
  *
@@ -44,7 +42,8 @@ require_once INSTALLDIR.'/lib/connectsettingsaction.php';
  *
  * @see      SettingsAction
  */
-class SmssettingsAction extends ConnectSettingsAction
+
+class SmssettingsAction extends SettingsAction
 {
     /**
      * Title of the page
@@ -121,7 +120,7 @@ class SmssettingsAction extends ConnectSettingsAction
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
-                $carrier = Sms_carrier::staticGet($confirm->address_extra);
+                $carrier = Sms_carrier::getKV($confirm->address_extra);
                 $this->element('p', 'form_unconfirmed',
                                $confirm->address . ' (' . $carrier->name . ')');
                 $this->element('p', 'form_guide',
@@ -247,6 +246,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_('There was a problem with your session token. '.
                               'Try again, please.'));
             return;
@@ -299,7 +299,6 @@ class SmssettingsAction extends ConnectSettingsAction
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error updating SMS preferences.
             $this->serverError(_('Could not update user.'));
-            return;
         }
 
         $user->query('COMMIT');
@@ -363,10 +362,9 @@ class SmssettingsAction extends ConnectSettingsAction
             common_log_db_error($confirm, 'INSERT', __FILE__);
             // TRANS: Server error thrown on database error adding SMS confirmation code.
             $this->serverError(_('Could not insert confirmation code.'));
-            return;
         }
 
-        $carrier = Sms_carrier::staticGet($carrier_id);
+        $carrier = Sms_carrier::getKV($carrier_id);
 
         mail_confirm_sms($confirm->code,
                          $user->nickname,
@@ -410,8 +408,7 @@ class SmssettingsAction extends ConnectSettingsAction
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-            $this->serverError(_('Could not delete email confirmation.'));
-            return;
+            $this->serverError(_('Could not delete SMS confirmation.'));
         }
 
         // TRANS: Message given after successfully canceling SMS phone number confirmation.
@@ -439,22 +436,14 @@ class SmssettingsAction extends ConnectSettingsAction
             return;
         }
 
-        $user->query('BEGIN');
-
         $original = clone($user);
 
         $user->sms      = null;
         $user->carrier  = null;
         $user->smsemail = null;
 
-        $result = $user->updateKeys($original);
-        if (!$result) {
-            common_log_db_error($user, 'UPDATE', __FILE__);
-            // TRANS: Server error thrown on database error removing a registered SMS phone number.
-            $this->serverError(_('Could not update user.'));
-            return;
-        }
-        $user->query('COMMIT');
+        // Throws exception on failure. Also performs it within a transaction.
+        $user->updateWithKeys($original);
 
         // TRANS: Message given after successfully removing a registered SMS phone number.
         $this->showForm(_('The SMS phone number was removed.'), true);
@@ -473,7 +462,7 @@ class SmssettingsAction extends ConnectSettingsAction
     {
         $user = common_current_user();
 
-        $other = User::staticGet('sms', $sms);
+        $other = User::getKV('sms', $sms);
 
         if (!$other) {
             return false;
@@ -560,11 +549,8 @@ class SmssettingsAction extends ConnectSettingsAction
 
         $user->incomingemail = null;
 
-        if (!$user->updateKeys($orig)) {
-            common_log_db_error($user, 'UPDATE', __FILE__);
-            // TRANS: Server error displayed when the user could not be updated in SMS settings.
-            $this->serverError(_('Could not update user record.'));
-        }
+        // Throws exception on failure. Also performs it within a transaction.
+        $user->updateWithKeys($orig);
 
         // TRANS: Confirmation text after updating SMS settings.
         $this->showForm(_('Incoming email address removed.'), true);
@@ -585,11 +571,8 @@ class SmssettingsAction extends ConnectSettingsAction
 
         $user->incomingemail = mail_new_incoming_address();
 
-        if (!$user->updateKeys($orig)) {
-            common_log_db_error($user, 'UPDATE', __FILE__);
-            // TRANS: Server error displayed when the user could not be updated in SMS settings.
-            $this->serverError(_('Could not update user record.'));
-        }
+        // Throws exception on failure. Also performs it within a transaction.
+        $user->updateWithKeys($orig);
 
         // TRANS: Confirmation text after updating SMS settings.
         $this->showForm(_('New incoming email address added.'), true);