wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whitespace and debugging changes

Browse Source 
darcs-hash:20080620064824-84dde-1d349cf2add75fbffa7cc763fb5ac8776cce4d03.gz
This commit is contained in:
Evan Prodromou 2008-06-20 02:48:24 -04:00
parent 940b14952a
commit f72329a13d
2 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
actions/confirmemail.php
View File

@ -21,50 +21,51 @@ if (!defined('LACONICA')) { exit(1); }
class ConfirmemailAction extends Action { class ConfirmemailAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
if (!common_logged_in()) { if (!common_logged_in()) {
common_set_returnto($this->self_url()); common_set_returnto($this->self_url());
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'));
return; return;
} }
$code = $this->trimmed('code'); $code = $this->trimmed('code');
if (!$code) { if (!$code) {
$this->client_error(_t('No confirmation code.')); $this->client_error(_t('No confirmation code.'));
return; return;
} }
$confirm_email = Confirm_email::staticGet('code', $code); $confirm_email = Confirm_email::staticGet('code', $code);
if (!$confirm_email) { if (!$confirm_email) {
$this->client_error(_t('Confirmation code not found.')); $this->client_error(_t('Confirmation code not found.'));
return; return;
} }
$cur = common_current_user(); $cur = common_current_user();
if ($cur->id != $confirm_email->user_id) { if ($cur->id != $confirm_email->user_id) {
$this->client_error(_t('That confirmation code is not for you!')); $this->client_error(_t('That confirmation code is not for you!'));
return; return;
} }
if ($cur->email == $confirm_email->email) { if ($cur->email == $confirm_email->email) {
$this->client_error(_t('That email address is already confirmed.')); $this->client_error(_t('That email address is already confirmed.'));
return; return;
} }
$cur->query('BEGIN'); $cur->query('BEGIN');
$orig_user = clone($cur); $orig_user = clone($cur);
$cur->email = $confirm_email->email; $cur->email = $confirm_email->email;
$result = $cur->update($orig_user); common_debug('cur email = "' . $cur->email . '"', __FILE__);
if (!$result) { $result = $cur->update($orig_user);
$this->server_error(_t('Error setting email address.')); if (!$result) {
return; $this->server_error(_t('Error setting email address.'));
} return;
$result = $confirm_email->delete(); }
if (!$result) { $result = $confirm_email->delete();
$this->server_error(_t('Error deleting code.')); if (!$result) {
return; $this->server_error(_t('Error deleting code.'));
} return;
$cur->query('COMMIT'); }
common_show_header(_t('Confirm E-mail Address')); $cur->query('COMMIT');
common_element('p', NULL, common_show_header(_t('Confirm E-mail Address'));
_t('The email address "') . $cur->email . common_element('p', NULL,
_t('" has been confirmed for your account.')); _t('The email address "') . $cur->email .
common_show_footer(_t('Confirm E-mail Address')); _t('" has been confirmed for your account.'));
} common_show_footer(_t('Confirm E-mail Address'));
}
} }

6
lib/mail.php
View File

@ -22,8 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
require_once('Mail.php'); require_once('Mail.php');
function mail_backend() { function mail_backend() {
static $backend = NULL; static $backend = NULL;
if (!$backend) { if (!$backend) {
global $config; global $config;
$backend = Mail::factory($config['mail']['backend'], $backend = Mail::factory($config['mail']['backend'],
@ -78,6 +78,6 @@ function mail_confirm_address($code, $nickname, $address) {
$body .= "\n"; $body .= "\n";
$body .= common_config('site', 'name'); $body .= common_config('site', 'name');
$body .= "\n"; $body .= "\n";
mail_send($recipients, $headers, $body); mail_send($recipients, $headers, $body);
} }