Merge branch 'master' of http://goukihq.org/misc/git/laconica-locales

[quix0rs-gnu-social.git] / htaccess.sample

diff --git a/htaccess.sample b/htaccess.sample
index 58b060b6c3b4687bda44ab2be3492c3ab78e2e63..bd29d318f52fa1e22768ab321e7a4abf3bbdf074 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -7,6 +7,8 @@ RewriteBase /mublog/
 RewriteRule ^$ index.php?action=public [L,QSA]
 RewriteRule ^rss$ index.php?action=publicrss [L,QSA]
 RewriteRule ^xrds$ index.php?action=publicxrds [L,QSA]
+RewriteRule ^featuredrss$ index.php?action=featuredrss [L,QSA]
+RewriteRule ^favoritedrss$ index.php?action=favoritedrss [L,QSA]
 RewriteRule ^opensearch/people$ index.php?action=opensearch&type=people [L,QSA]
 RewriteRule ^opensearch/notice$ index.php?action=opensearch&type=notice [L,QSA]
 
@@ -20,6 +22,12 @@ RewriteRule ^doc/openmublog$ index.php?action=doc&title=openmublog [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 ^facebook/$ index.php?action=facebookhome [L,QSA]
+RewriteRule ^facebook/index.php$ index.php?action=facebookhome [L,QSA]
+RewriteRule ^facebook/settings.php$ index.php?action=facebooksettings [L,QSA]
+RewriteRule ^facebook/invite.php$ index.php?action=facebookinvite [L,QSA]
+RewriteRule ^facebook/remove$ index.php?action=facebookremove [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&code=$1 [L,QSA]
@@ -40,12 +48,18 @@ RewriteRule ^main/disfavor$ index.php?action=disfavor [L,QSA]
 
 RewriteRule ^main/sup$ index.php?action=sup [L,QSA]
 
+RewriteRule ^main/tagother$ index.php?action=tagother [L,QSA]
+
+RewriteRule ^main/block$ index.php?action=block [L,QSA]
+
+RewriteRule ^settings/delete$ index.php?action=deleteprofile [L,QSA]
 RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
 RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
 RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]
 RewriteRule ^settings/email$ index.php?action=emailsettings [L,QSA]
 RewriteRule ^settings/sms$ index.php?action=smssettings [L,QSA]
 RewriteRule ^settings/twitter$ index.php?action=twittersettings [L,QSA]
+RewriteRule ^settings/other$ index.php?action=othersettings [L,QSA]
 
 RewriteRule ^search/people$ index.php?action=peoplesearch [L,QSA]
 RewriteRule ^search/notice$ index.php?action=noticesearch [L,QSA]
@@ -62,10 +76,19 @@ RewriteRule ^message/(\d+)$ index.php?action=showmessage&message=$1 [L,QSA]
 RewriteRule ^user/(\d+)$ index.php?action=userbyid&id=$1 [L,QSA]
 
 RewriteRule ^tags/?$ index.php?action=tag [L,QSA]
+RewriteRule ^tag/([a-zA-Z0-9]+)/rss$ index.php?action=tagrss&tag=$1 [L,QSA]
 RewriteRule ^tag(/(.*))?$ index.php?action=tag&tag=$2 [L,QSA]
 
+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 ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/subscriptions/([a-zA-Z0-9]+)$ index.php?action=subscriptions&nickname=$1&tag=$2 [L,QSA]
+RewriteRule ^(\w+)/subscribers/([a-zA-Z0-9]+)$ index.php?action=subscribers&nickname=$1&tag=$2 [L,QSA]
 RewriteRule ^(\w+)/subscribers$ index.php?action=subscribers&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/nudge$ index.php?action=nudge&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]
@@ -78,6 +101,7 @@ RewriteRule ^(\w+)/favorites$ index.php?action=showfavorites&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/favorites/rss$ index.php?action=favoritesrss&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/inbox$ index.php?action=inbox&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/outbox$ index.php?action=outbox&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/microsummary$ index.php?action=microsummary&nickname=$1 [L,QSA]
 
 RewriteRule ^(\w+)$ index.php?action=showstream&nickname=$1 [L,QSA]