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
This commit is contained in:
parent
b19c86bd00
commit
97115c846e
|
@ -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]
|
||||
|
|
|
@ -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.';
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue
Block a user