use mod_rewrite to have prettier urls

darcs-hash:20080606195136-84dde-c1839e332e9b7e1e36f693c1a0968535a8f2702f.gz

diff --git a/doc/URLS.txt b/doc/URLS.txt
index 6d8c483494ac3b20020b51389a3829e5cad962b5..4b1e4aba4e57e780800eb2d7ee9e4a9bbdeb88a5 100644 (file)
--- a/doc/URLS.txt
+++ b/doc/URLS.txt
@@ -1,5 +1,4 @@
 /                              main page
-/public                                public stream
 
 /<username>                    profile and update feed
 /<username>?page=2             profile and update feed

diff --git a/htaccess.sample b/htaccess.sample
index 5583beae2e6e7bed8521d07eed4dc86f4fcaec7e..39e16f2390436d806c5b1c6849a213104a866579 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,3 +1,40 @@
 RewriteEngine On
 
-RewriteRule ^/notice/(.*)$ index.php?action=shownotice&notice=$1 [L,QSA]
+RewriteRule ^$ index.php?action=public [L]
+RewriteRule ^rss$ index.php?action=publicrss [L]
+
+RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
+RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]
+RewriteRule ^doc/privacy$ index.php?action=doc&title=privacy [L,QSA]
+RewriteRule ^doc/source$ index.php?action=doc&title=source [L,QSA]
+
+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/subscribe$ index.php?action=subscribe [L,QSA]
+RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
+
+RewriteRule ^omb/accesstoken$ index.php?action=accesstoken [L,QSA]
+RewriteRule ^omb/requesttoken$ index.php?action=requesttoken [L,QSA]
+RewriteRule ^omb/postnotice$ index.php?action=postnotice [L,QSA]
+RewriteRule ^omb/subscribe$ index.php?action=remotesubscribe [L,QSA]
+RewriteRule ^omb/finish$ index.php?action=finishremotesubscribe [L,QSA]
+RewriteRule ^omb/updateprofile$ index.php?action=updateprofile [L,QSA]
+RewriteRule ^omb/userauthorization$ index.php?action=userauthorization [L,QSA]
+
+RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA]
+RewriteRule ^settings/password$ index.php?action=password [L,QSA]
+RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
+
+RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
+RewriteRule ^notice/(\d+)$ index.php?action=shownotice&notice=$1 [L,QSA]
+
+RewriteRule ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/subscribed$ index.php?action=subscribed&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/xrds$ index.php?action=xrds&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/rss$ index.php?action=userrss&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/all$ index.php?action=all&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/all/rss$ index.php?action=allrss&nickname=$1 [L,QSA]
+
+RewriteRule ^(\w+)$ index.php?action=showstream&nickname=$1 [L,QSA]