exit(1);
}
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-
/**
* Settings for SMS
*
*
* @see SettingsAction
*/
-class SmssettingsAction extends ConnectSettingsAction
+
+class SmssettingsAction extends SettingsAction
{
/**
* Title of the page
} 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',
$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;
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');
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,
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.
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);
{
$user = common_current_user();
- $other = User::staticGet('sms', $sms);
+ $other = User::getKV('sms', $sms);
if (!$other) {
return false;
$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);
$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);