- $msg = _('A confirmation code was sent to the email address 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 email address you added. '.
+ 'Check your inbox (and spam box!) for the code and instructions '.
+ 'on how to use it.');
- $this->show_form($msg, true);
+ $this->showForm($msg, true);
}
}
- function cancel_confirmation()
+ /**
+ * Handle a request to cancel email confirmation
+ *
+ * @return void
+ */
+
+ function cancelConfirmation()
{
$email = $this->arg('email');
{
$email = $this->arg('email');
- $confirm = $this->get_confirmation();
+
+ $confirm = $this->getConfirmation();
+
if (!$confirm) {
if (!$confirm) {
- $this->show_form(_('No pending confirmation to cancel.'));
+ $this->showForm(_('No pending confirmation to cancel.'));
return;
}
if ($confirm->address != $email) {
return;
}
if ($confirm->address != $email) {
- $this->show_form(_('That is the wrong IM address.'));
+ $this->showForm(_('That is the wrong IM address.'));
return;
}
return;
}
@@ -260,79+379,115 @@ class EmailsettingsAction extends SettingsAction