fancy url for remote subscribe

darcs-hash:20080701164058-84dde-9e3864ddd1174b771d0830bb77db7889c4e3def1.gz

diff --git a/htaccess.sample b/htaccess.sample
index 915ace4b63653c4b0884a9acb8a202651da8a651..2179c58006d4123aa7a0499ac94d9103f632c8ad 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -15,6 +15,7 @@ RewriteRule ^main/login$ index.php?action=login [L,QSA]
 RewriteRule ^main/logout$ index.php?action=logout [L,QSA]
 RewriteRule ^main/register$ index.php?action=register [L,QSA]
 RewriteRule ^main/openid$ index.php?action=openidlogin [L,QSA]
+RewriteRule ^main/remote$ index.php?action=remotesubscribe [L,QSA]
 
 RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA]
 RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]

diff --git a/lib/util.php b/lib/util.php
index 9e1b1a8c9ac41b512f07a8ec5a84ed519456e838..8bd99c816c6840b36cb4102883ef18abdb8a8e43 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -656,6 +656,12 @@ function common_fancy_url($action, $args=NULL) {
         case 'subscribe':
         case 'unsubscribe':
                return common_path('main/'.$action);
+        case 'remotesubscribe':
+               if ($args && $args['nickname']) {
+                       return common_path('main/remote?nickname=' . $args['nickname']);
+               } else {
+                       return common_path('main/remote');
+               }
         case 'openidlogin':
                return common_path('main/openid');
         case 'avatar':