X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/cdaa5e28290fe0e9e73ca3a0557ee021a7ab404b..HEAD:/www/.htaccess

diff --git a/www/.htaccess b/www/.htaccess
index 32701be..8afcbf7 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -1,13 +1,39 @@
+# http://serverfault.com/questions/57243/apache-mod-rewrite-fails-when-file-by-same-name-exists
+Options -MultiViews
+
 RewriteEngine On
 RewriteBase /
 #RewriteCond %{REQUEST_FILENAME} -f
 
-RewriteRule ^([0-9]+)$ /display.php?id=$1
-RewriteRule ^([0-9]+)/delete$ /delete.php?id=$1
-RewriteRule ^([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1
-RewriteRule ^([0-9]+)/edit$ /edit.php?id=$1
-RewriteRule ^([0-9]+)/fork$ /fork.php?id=$1
-RewriteRule ^([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2
+RewriteRule ^([0-9]+)$ display.php?id=$1
+RewriteRule ^([0-9]+)/$ $1 [R]
+RewriteRule ^([0-9]+)/delete$ delete.php?id=$1
+RewriteRule ^([0-9]+)/delete/confirm$ delete.php?id=$1&confirm=1
+RewriteRule ^([0-9]+)/doap$ doap.php?id=$1
+RewriteRule ^([0-9]+)/edit$ edit.php?id=$1
+RewriteRule ^([0-9]+)/edit/(.+)$ edit.php?id=$1&file=$2 [B]
+RewriteRule ^([0-9]+)/embed$ embed.php?id=$1
+RewriteRule ^([0-9]+)/embed/(.+)$ embed-file.php?id=$1&file=$2 [B]
+RewriteRule ^([0-9]+)/fork$ fork.php?id=$1
+RewriteRule ^([0-9]+)/linkback$ linkback.php?id=$1
+RewriteRule ^([0-9]+)/raw/(.+)$ raw.php?id=$1&file=$2 [B]
+RewriteRule ^([0-9]+)/rev/(.+)$ revision.php?id=$1&rev=$2 [B]
+RewriteRule ^([0-9]+)/rev-raw/([^/]+)/(.+)$ raw.php?id=$1&rev=$2&file=$3 [B]
+RewriteRule ^([0-9]+)/tool/([^/]+)/(.+)$ tool.php?id=$1&tool=$2&file=$3 [B]
+
+RewriteRule ^fork-remote$ fork-remote.php
+RewriteRule ^help$ help.php
+RewriteRule ^new$ new.php
+
+RewriteRule ^feed/new$ feed-new.php
+RewriteRule ^feed/updated$ feed-updated.php
+
+RewriteRule ^list$ list.php
+RewriteRule ^list/([0-9]+)$ list.php?page=$1 [B]
+
+RewriteRule ^search$ search.php
+RewriteRule ^search/([0-9]+)$ search.php?page=$1 [B]
 
-RewriteRule ^list$ /list.php
-RewriteRule ^list/([0-9]+)$ /list.php?page=$1
+RewriteRule ^login$ login.php
+RewriteRule ^setup$ setup.php
+RewriteRule ^user$ user.php