GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

move confirmemail to confirmaddress

Browse Source 
Rename the confirmemail to more general confirmaddress so we can use
it for Jabber, SMS, or whatever.

darcs-hash:20080622155250-34904-0cbc2895c01769dfb5e7393e6534355b6f5c2ac3.gz
This commit is contained in:
Evan Prodromou 2008-06-22 11:52:50 -04:00
parent b19c86bd00
commit 97115c846e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
actions/confirmemail.php → actions/confirmaddress.php
View File

4
htaccess.sample
View File

@ -16,8 +16,8 @@ RewriteRule ^main/openid$ index.php?action=openidlogin [L,QSA]
RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA] RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA]
RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA] RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
RewriteRule ^main/confirmemail$ index.php?action=confirmemail [L,QSA] RewriteRule ^main/confirmaddress$ index.php?action=confirmaddress [L,QSA]
RewriteRule ^main/confirmemail/(.*)$ index.php?action=confirmemail&code=$1 [L,QSA] RewriteRule ^main/confirmaddress/(.*)$ index.php?action=confirmaddress&code=$1 [L,QSA]
RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA] RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA]
RewriteRule ^settings/password$ index.php?action=password [L,QSA] RewriteRule ^settings/password$ index.php?action=password [L,QSA]

2
lib/mail.php
View File

@ -69,7 +69,7 @@ function mail_confirm_address($code, $nickname, $address) {
$body .= "\n\n"; $body .= "\n\n";
$body .= 'If it was you, and you want to confirm your entry, use the URL below:'; $body .= 'If it was you, and you want to confirm your entry, use the URL below:';
$body .= "\n\n"; $body .= "\n\n";
$body .= "\t".common_local_url('confirmemail', $body .= "\t".common_local_url('confirmaddress',
array('code' => $code)); array('code' => $code));
$body .= "\n\n"; $body .= "\n\n";
$body .= 'If not, just ignore this message.'; $body .= 'If not, just ignore this message.';

4
lib/util.php
View File

@ -570,8 +570,8 @@ function common_fancy_url($action, $args=NULL) {
} else { } else {
return common_path($args['nickname']); return common_path($args['nickname']);
} }
case 'confirmemail': case 'confirmaddress':
return common_path('main/confirmemail/'.$args['code']); return common_path('main/confirmaddress/'.$args['code']);
case 'userbyid': case 'userbyid':
return common_path('user/'.$args['id']); return common_path('user/'.$args['id']);
default: default: