From 97115c846e139bb101bf0b100a0708dd6532f509 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 22 Jun 2008 11:52:50 -0400 Subject: move confirmemail to confirmaddress Rename the confirmemail to more general confirmaddress so we can use it for Jabber, SMS, or whatever. darcs-hash:20080622155250-34904-0cbc2895c01769dfb5e7393e6534355b6f5c2ac3.gz --- actions/confirmaddress.php | 80 ++++++++++++++++++++++++++++++++++++++++++++++ actions/confirmemail.php | 80 ---------------------------------------------- htaccess.sample | 4 +-- lib/mail.php | 2 +- lib/util.php | 4 +-- 5 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 actions/confirmaddress.php delete mode 100644 actions/confirmemail.php diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php new file mode 100644 index 000000000..72b42c2a7 --- /dev/null +++ b/actions/confirmaddress.php @@ -0,0 +1,80 @@ +. + */ + +if (!defined('LACONICA')) { exit(1); } + +class ConfirmemailAction extends Action { + + function handle($args) { + parent::handle($args); + if (!common_logged_in()) { + common_set_returnto($this->self_url()); + common_redirect(common_local_url('login')); + return; + } + $code = $this->trimmed('code'); + if (!$code) { + $this->client_error(_t('No confirmation code.')); + return; + } + $confirm_email = Confirm_email::staticGet('code', $code); + if (!$confirm_email) { + $this->client_error(_t('Confirmation code not found.')); + return; + } + $cur = common_current_user(); + if ($cur->id != $confirm_email->user_id) { + $this->client_error(_t('That confirmation code is not for you!')); + return; + } + if ($cur->email == $confirm_email->email) { + $this->client_error(_t('That email address is already confirmed.')); + return; + } + + $cur->query('BEGIN'); + + $orig_user = clone($cur); + + $cur->email = $confirm_email->email; + $result = $cur->updateKeys($orig_user); + + if (!$result) { + common_log_db_error($cur, 'UPDATE', __FILE__); + $this->server_error(_t('Couldn\'t update user.')); + return; + } + + $result = $confirm_email->delete(); + + if (!$result) { + common_log_db_error($confirm_email, 'DELETE', __FILE__); + $this->server_error(_t('Couldn\'t delete email confirmation.')); + return; + } + + $cur->query('COMMIT'); + + common_show_header(_t('Confirm E-mail Address')); + common_element('p', NULL, + _t('The email address "') . $cur->email . + _t('" has been confirmed for your account.')); + common_show_footer(_t('Confirm E-mail Address')); + } +} diff --git a/actions/confirmemail.php b/actions/confirmemail.php deleted file mode 100644 index 72b42c2a7..000000000 --- a/actions/confirmemail.php +++ /dev/null @@ -1,80 +0,0 @@ -. - */ - -if (!defined('LACONICA')) { exit(1); } - -class ConfirmemailAction extends Action { - - function handle($args) { - parent::handle($args); - if (!common_logged_in()) { - common_set_returnto($this->self_url()); - common_redirect(common_local_url('login')); - return; - } - $code = $this->trimmed('code'); - if (!$code) { - $this->client_error(_t('No confirmation code.')); - return; - } - $confirm_email = Confirm_email::staticGet('code', $code); - if (!$confirm_email) { - $this->client_error(_t('Confirmation code not found.')); - return; - } - $cur = common_current_user(); - if ($cur->id != $confirm_email->user_id) { - $this->client_error(_t('That confirmation code is not for you!')); - return; - } - if ($cur->email == $confirm_email->email) { - $this->client_error(_t('That email address is already confirmed.')); - return; - } - - $cur->query('BEGIN'); - - $orig_user = clone($cur); - - $cur->email = $confirm_email->email; - $result = $cur->updateKeys($orig_user); - - if (!$result) { - common_log_db_error($cur, 'UPDATE', __FILE__); - $this->server_error(_t('Couldn\'t update user.')); - return; - } - - $result = $confirm_email->delete(); - - if (!$result) { - common_log_db_error($confirm_email, 'DELETE', __FILE__); - $this->server_error(_t('Couldn\'t delete email confirmation.')); - return; - } - - $cur->query('COMMIT'); - - common_show_header(_t('Confirm E-mail Address')); - common_element('p', NULL, - _t('The email address "') . $cur->email . - _t('" has been confirmed for your account.')); - common_show_footer(_t('Confirm E-mail Address')); - } -} diff --git a/htaccess.sample b/htaccess.sample index 41ae878c6..37575d290 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -16,8 +16,8 @@ RewriteRule ^main/openid$ index.php?action=openidlogin [L,QSA] RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA] RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA] -RewriteRule ^main/confirmemail$ index.php?action=confirmemail [L,QSA] -RewriteRule ^main/confirmemail/(.*)$ index.php?action=confirmemail&code=$1 [L,QSA] +RewriteRule ^main/confirmaddress$ index.php?action=confirmaddress [L,QSA] +RewriteRule ^main/confirmaddress/(.*)$ index.php?action=confirmaddress&code=$1 [L,QSA] RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA] RewriteRule ^settings/password$ index.php?action=password [L,QSA] diff --git a/lib/mail.php b/lib/mail.php index c1332ab2b..53b360e3c 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -69,7 +69,7 @@ function mail_confirm_address($code, $nickname, $address) { $body .= "\n\n"; $body .= 'If it was you, and you want to confirm your entry, use the URL below:'; $body .= "\n\n"; - $body .= "\t".common_local_url('confirmemail', + $body .= "\t".common_local_url('confirmaddress', array('code' => $code)); $body .= "\n\n"; $body .= 'If not, just ignore this message.'; diff --git a/lib/util.php b/lib/util.php index 833695ba8..49349a72f 100644 --- a/lib/util.php +++ b/lib/util.php @@ -570,8 +570,8 @@ function common_fancy_url($action, $args=NULL) { } else { return common_path($args['nickname']); } - case 'confirmemail': - return common_path('main/confirmemail/'.$args['code']); + case 'confirmaddress': + return common_path('main/confirmaddress/'.$args['code']); case 'userbyid': return common_path('user/'.$args['id']); default: -- cgit v1.2.3-54-g00ecf