fancy url for confirmation of email

darcs-hash:20080620062847-84dde-e7dd5ea325b1cbbf3cb5e3668851750497242e64.gz

diff --git a/htaccess.sample b/htaccess.sample
index 090857e4abc3805be8e0516d39d253bcb8abf153..cd8ba10038b6fc9a46cd1f1a5d0cdf80dcbeed67 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -16,6 +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 ^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 42c9a1a0bc7521e03e33919738601b2dd6132adc..646d93c3b75d34326ff72d8f0b014c42cd21d203 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -573,6 +573,8 @@ function common_fancy_url($action, $args=NULL) {
                } else {
                        return common_path($args['nickname']);
                }
+        case 'confirmemail':
+               return common_path('main/confirmemail/'.$args['code']);
         default:
                return common_simple_url($action, $args);
        }