summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlezvous.ca>2008-06-22 11:52:50 -0400
committerEvan Prodromou <evan@controlezvous.ca>2008-06-22 11:52:50 -0400
commit97115c846e139bb101bf0b100a0708dd6532f509 (patch)
tree8c5f6691a2364b1ea4f18d7eafc69b518eba7c0d
parentb19c86bd0065ee3a13ced9be3244d8dc007d2ee6 (diff)
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
-rw-r--r--actions/confirmaddress.php (renamed from actions/confirmemail.php)0
-rw-r--r--htaccess.sample4
-rw-r--r--lib/mail.php2
-rw-r--r--lib/util.php4
4 files changed, 5 insertions, 5 deletions
diff --git a/actions/confirmemail.php b/actions/confirmaddress.php
index 72b42c2a7..72b42c2a7 100644
--- a/actions/confirmemail.php
+++ b/actions/confirmaddress.php
diff --git a/htaccess.sample b/htaccess.sample
index 41ae878c6..37575d290 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -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]
diff --git a/lib/mail.php b/lib/mail.php
index c1332ab2b..53b360e3c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -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.';
diff --git a/lib/util.php b/lib/util.php
index 833695ba8..49349a72f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -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: