From 97115c846e139bb101bf0b100a0708dd6532f509 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlezvous.ca>
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 ----------------------------------------------
 2 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 actions/confirmaddress.php
 delete mode 100644 actions/confirmemail.php

(limited to 'actions')

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 @@
+<?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
index 72b42c2a7..000000000
--- 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'));
-    }
-}
-- 
cgit v1.2.3-54-g00ecf