summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--htaccess.sample8
-rw-r--r--lib/util.php14
2 files changed, 22 insertions, 0 deletions
diff --git a/htaccess.sample b/htaccess.sample
index 8c8b2152a..3406554d0 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -85,6 +85,14 @@ RewriteRule ^peopletag/([a-zA-Z0-9]+)$ index.php?action=peopletag&tag=$1 [L,QSA]
RewriteRule ^featured/?$ index.php?action=featured [L,QSA]
RewriteRule ^favorited/?$ index.php?action=favorited [L,QSA]
+RewriteRule ^group/new index.php?action=newgroup [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+) index.php?action=showgroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/edit index.php?action=editgroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/join index.php?action=joingroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/leave index.php?action=leavegroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([0-9]+)/id index.php?action=groupbyid&id=$1 [L,QSA]
+RewriteRule ^group/([0-9]+)/rss index.php?action=grouprss&id=$1 [L,QSA]
+
# Twitter-compatible API rewrites
# XXX: Surely these can be refactored a little -- Zach
RewriteRule ^api/statuses/public_timeline(.*)$ index.php?action=api&apiaction=statuses&method=public_timeline$1 [L,QSA]
diff --git a/lib/util.php b/lib/util.php
index 73c4cdcc8..7b30aeab4 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -915,6 +915,20 @@ function common_fancy_url($action, $args=null)
} else {
return common_path('main/sup');
}
+ case 'newgroup':
+ return common_path('group/new');
+ case 'showgroup':
+ return common_path('group/'.$args['nickname']);
+ case 'editgroup':
+ return common_path('group/'.$args['nickname'].'/edit');
+ case 'joingroup':
+ return common_path('group/'.$args['nickname'].'/join');
+ case 'leavegroup':
+ return common_path('group/'.$args['nickname'].'/leave');
+ case 'groupbyid':
+ return common_path('group/'.$args['id'].'/id');
+ case 'grouprss':
+ return common_path('group/'.$args['nickname'].'/rss');
default:
return common_simple_url($action, $args);
}