summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlezvous.ca>2008-06-24 18:03:35 -0400
committerEvan Prodromou <evan@controlezvous.ca>2008-06-24 18:03:35 -0400
commitbb3c796c25f989b529af0e985faa857689e0b25f (patch)
treed8fb5160d7a858197f0dcfca43cd1a09356f013b
parent589a6c05f7dda6e365298fb0854700a94853bb1a (diff)
url for confirmation email is better, fancy url
darcs-hash:20080624220335-34904-2c4089bf6d1b37b6f613ce89c6fad104727e7487.gz
-rw-r--r--actions/recoverpassword.php4
-rw-r--r--htaccess.sample2
-rw-r--r--lib/util.php4
3 files changed, 8 insertions, 2 deletions
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 8bcfa9755..4d1dd6f44 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -175,7 +175,7 @@ class RecoverpasswordAction extends Action {
$body .= "\n\n";
$body .= 'If it was you, and you want to confirm, use the URL below:';
$body .= "\n\n";
- $body .= "\t".common_local_url('confirmaddress',
+ $body .= "\t".common_local_url('recoverpassword',
array('code' => $confirm->code));
$body .= "\n\n";
$body .= 'If not, just ignore this message.';
@@ -190,7 +190,7 @@ class RecoverpasswordAction extends Action {
common_show_header(_('Password recovery requested'));
common_element('p', NULL,
_t('Instructions for recovering your password ' .
- 'have been sent to the email registered to your ' .
+ 'have been sent to the email address registered to your ' .
'account.'));
common_show_footer();
}
diff --git a/htaccess.sample b/htaccess.sample
index 37575d290..a5d2cd4e0 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -18,6 +18,8 @@ RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA]
RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
RewriteRule ^main/confirmaddress$ index.php?action=confirmaddress [L,QSA]
RewriteRule ^main/confirmaddress/(.*)$ index.php?action=confirmaddress&code=$1 [L,QSA]
+RewriteRule ^main/recoverpassword$ index.php?action=recoverpassword [L,QSA]
+RewriteRule ^main/recoverpassword/(.*)$ index.php?action=recoverpassword&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/util.php b/lib/util.php
index 88a71273d..e2c9c67a1 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -684,6 +684,10 @@ function common_fancy_url($action, $args=NULL) {
return common_path('main/confirmaddress/'.$args['code']);
case 'userbyid':
return common_path('user/'.$args['id']);
+ case 'recoverpassword':
+ return common_path('main/recoverpassword' .
+ ($args['code']) ? ('/' . $args['code']) :
+ '');
default:
return common_simple_url($action, $args);
}