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

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
new file mode 100644 (file)
index 0000000..72b42c2
--- /dev/null
+++ b/actions/confirmaddress.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 (file)
index 72b42c2..0000000
--- a/actions/confirmemail.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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 41ae878c63f9362e094be642c1efa858ed28ab1b..37575d29035bcbb03653becb0ecb7a61fb688766 100644 (file)
--- 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 c1332ab2ba8240b8d7f9cfdfbafc195093e9d6d6..53b360e3c0a64f5745c2ecf6919c19dbb64228c1 100644 (file)
--- 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 833695ba87e667c6b5c1179834a7b5b5157c64e5..49349a72f09873255a023ae7cdcfda7495e8009b 100644 (file)
--- 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: