+ _('Enter the code you received on your phone.'));
+ common_submit('confirm', _('Confirm'));
} else {
common_input('sms', _('SMS Phone number'),
($this->arg('sms')) ? $this->arg('sms') : NULL,
} else {
common_input('sms', _('SMS Phone number'),
($this->arg('sms')) ? $this->arg('sms') : NULL,
@@ -90,7+94,7 @@ class SmssettingsAction extends EmailsettingsAction {
common_element('h2', NULL, _('Preferences'));
common_checkbox('smsnotify',
common_element('h2', NULL, _('Preferences'));
common_checkbox('smsnotify',
- _('Send me notices through SMS; I understand I may incur charges from my carrier.'),
+ _('Send me notices through SMS; I understand I may incur exorbitant charges from my carrier.'),
$user->smsnotify);
common_submit('save', _('Save'));
$user->smsnotify);
common_submit('save', _('Save'));
@@ -125,6+129,8 @@ class SmssettingsAction extends EmailsettingsAction {
$this->remove_incoming();
} else if ($this->arg('newincoming')) {
$this->new_incoming();
$this->remove_incoming();
} else if ($this->arg('newincoming')) {
$this->new_incoming();
+ } else if ($this->arg('confirm')) {
+ $this->confirm_code();
} else {
$this->show_form(_('Unexpected form submission.'));
}
} else {
$this->show_form(_('Unexpected form submission.'));
}
@@ -132,7+138,7 @@ class SmssettingsAction extends EmailsettingsAction {
function save_preferences() {
function save_preferences() {
- $smsnotify = $this->boolean('emailpost');
+ $smsnotify = $this->boolean('smsnotify');
$user = common_current_user();
$user = common_current_user();
@@ -191,7+197,7 @@ class SmssettingsAction extends EmailsettingsAction {
$confirm->address_extra = $carrier_id;
$confirm->address_type = 'sms';
$confirm->user_id = $user->id;
$confirm->address_extra = $carrier_id;
$confirm->address_type = 'sms';
$confirm->user_id = $user->id;
- $confirm->code = common_confirmation_code(64);
+ $confirm->code = common_confirmation_code(40);
$result = $confirm->insert();
$result = $confirm->insert();
@@ -203,9+209,9 @@ class SmssettingsAction extends EmailsettingsAction {
$carrier = Sms_carrier::staticGet($carrier_id);
$carrier = Sms_carrier::staticGet($carrier_id);
- mail_confirm_address($confirm->code,
- $user->nickname,
- $carrier->toEmailAddress($sms));
+ mail_confirm_sms($confirm->code,
+ $user->nickname,
+ $carrier->toEmailAddress($sms));
$msg = _('A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');
$msg = _('A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');
@@ -223,8+229,8 @@ class SmssettingsAction extends EmailsettingsAction {
$this->show_form(_('No pending confirmation to cancel.'));
return;
}
$this->show_form(_('No pending confirmation to cancel.'));
return;
}
- if ($confirm->address != $sms || $confirm->address_extra != $carrier) {
- $this->show_form(_('That is the wrong IM address.'));
+ if ($confirm->address != $sms) {
+ $this->show_form(_('That is the wrong confirmation number.'));
return;
}
return;
}
@@ -256,6+262,7 @@ class SmssettingsAction extends EmailsettingsAction {
$original = clone($user);
$user->sms = NULL;
$user->carrier = NULL;
$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__);
$result = $user->updateKeys($original);
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
@@ -300,4+307,17 @@ class SmssettingsAction extends EmailsettingsAction {