summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-20 02:48:24 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-20 02:48:24 -0400
commitf72329a13d7061e891e8b778abe76408166346a9 (patch)
treebb347bf1c93626073e1caa8d455efb2c3b5556da
parent940b14952aca8490d7ad854f3356554edfc3a58c (diff)
whitespace and debugging changes
darcs-hash:20080620064824-84dde-1d349cf2add75fbffa7cc763fb5ac8776cce4d03.gz
-rw-r--r--actions/confirmemail.php93
-rw-r--r--lib/mail.php6
2 files changed, 50 insertions, 49 deletions
diff --git a/actions/confirmemail.php b/actions/confirmemail.php
index 82e3a5537..8052452ae 100644
--- a/actions/confirmemail.php
+++ b/actions/confirmemail.php
@@ -21,50 +21,51 @@ 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->update($orig_user);
- if (!$result) {
- $this->server_error(_t('Error setting email address.'));
- return;
- }
- $result = $confirm_email->delete();
- if (!$result) {
- $this->server_error(_t('Error deleting code.'));
- 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'));
- }
+ 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;
+ common_debug('cur email = "' . $cur->email . '"', __FILE__);
+ $result = $cur->update($orig_user);
+ if (!$result) {
+ $this->server_error(_t('Error setting email address.'));
+ return;
+ }
+ $result = $confirm_email->delete();
+ if (!$result) {
+ $this->server_error(_t('Error deleting code.'));
+ 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/lib/mail.php b/lib/mail.php
index 23fd24b25..c1332ab2b 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -22,8 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once('Mail.php');
function mail_backend() {
- static $backend = NULL;
-
+ static $backend = NULL;
+
if (!$backend) {
global $config;
$backend = Mail::factory($config['mail']['backend'],
@@ -78,6 +78,6 @@ function mail_confirm_address($code, $nickname, $address) {
$body .= "\n";
$body .= common_config('site', 'name');
$body .= "\n";
-
+
mail_send($recipients, $headers, $body);
}