X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=htaccess.sample;h=c0ba80f5d1cd6045de972a293eaad0545c8884ba;hb=38b215805e17e3df93c4b93c323ed7e72b927820;hp=604326fe888aa38c73ba08151e9a93cb39e558ea;hpb=e013c06346fd6ad95e7b00a3833a66e6b47d8f44;p=quix0rs-gnu-social.git

diff --git a/htaccess.sample b/htaccess.sample
index 604326fe88..c0ba80f5d1 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,33 +1,56 @@
 RewriteEngine On
 
-RewriteRule ^$ index.php?action=public [L]
-RewriteRule ^rss$ index.php?action=publicrss [L]
+RewriteRule ^$ index.php?action=public [L,QSA]
+RewriteRule ^rss$ index.php?action=publicrss [L,QSA]
+RewriteRule ^xrds$ index.php?action=publicxrds [L,QSA]
 
 RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
+RewriteRule ^doc/contact$ index.php?action=doc&title=contact [L,QSA]
+RewriteRule ^doc/faq$ index.php?action=doc&title=faq [L,QSA]
 RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]
+RewriteRule ^doc/im$ index.php?action=doc&title=im [L,QSA]
+RewriteRule ^doc/openid$ index.php?action=doc&title=openid [L,QSA]
+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 ^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]
+RewriteRule ^main/confirmaddress$ index.php?action=confirmaddress [L,QSA]
+RewriteRule ^main/confirmaddress/(.*)$ index.php?action=confirmaddress&code=$1 [L,QSA]
+RewriteRule ^main/recoverpassword$ index.php?action=recoverpassword [L,QSA]
+RewriteRule ^main/recoverpassword/(.*)$ index.php?action=recoverpassword&code=$1 [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 ^settings/openid$ index.php?action=openidsettings [L,QSA]
+RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]
+
+RewriteRule ^search/people$ index.php?action=peoplesearch [L,QSA]
+RewriteRule ^search/notice$ index.php?action=noticesearch [L,QSA]
+RewriteRule ^search/notice/rss$ index.php?action=noticesearchrss [L,QSA]
 
 RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
 RewriteRule ^notice/(\d+)$ index.php?action=shownotice&notice=$1 [L,QSA]
 
+RewriteRule ^user/(\d+)$ index.php?action=userbyid&id=$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+)/subscribers$ index.php?action=subscribers&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+)/foaf$ index.php?action=foaf&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/replies$ index.php?action=replies&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/replies/rss$ index.php?action=repliesrss&nickname=$1 [L,QSA]
+RewriteRule ^(\w+)/avatar/(original|96|48|24)$ index.php?action=avatarbynickname&nickname=$1&size=$2 [L,QSA]
 
 RewriteRule ^(\w+)$ index.php?action=showstream&nickname=$1 [L,QSA]