url for confirmation email is better, fancy url

darcs-hash:20080624220335-34904-2c4089bf6d1b37b6f613ce89c6fad104727e7487.gz

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 8bcfa9755cd8ea85470a732922a111eea46e950e..4d1dd6f44b55cc5c108f4ef02e5fe8c792cf90b5 100644 (file)
--- 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 37575d29035bcbb03653becb0ecb7a61fb688766..a5d2cd4e0a7400d166ed6d1905710332a50c6e08 100644 (file)
--- 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 88a71273dd28609f1384fad7663f22d2fe390fd5..e2c9c67a1ef73f91ae5158c49420d47ad17944a9 100644 (file)
--- 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);
        }