Fix access to files with spaces in Apache 2.4.52+

[phorkie.git] / www / .htaccess

diff --git a/www/.htaccess b/www/.htaccess
index 566d27c0ba38def12564fee2d4a2368c9256f85e..c08ec825bd06601d7198cc2e845239f92f152a84 100644 (file)
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -6,17 +6,20 @@ RewriteBase /
 #RewriteCond %{REQUEST_FILENAME} -f
 
 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
+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
-RewriteRule ^([0-9]+)/rev/(.+)$ revision.php?id=$1&rev=$2
-RewriteRule ^([0-9]+)/rev-raw/(.+)/(.+)$ raw.php?id=$1&rev=$2&file=$3
-RewriteRule ^([0-9]+)/tool/([^/]+)/(.+)$ tool.php?id=$1&tool=$2&file=$3
+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
@@ -26,10 +29,10 @@ RewriteRule ^feed/new$ feed-new.php
 RewriteRule ^feed/updated$ feed-updated.php
 
 RewriteRule ^list$ list.php
-RewriteRule ^list/([0-9]+)$ list.php?page=$1
+RewriteRule ^list/([0-9]+)$ list.php?page=$1 [B]
 
 RewriteRule ^search$ search.php
-RewriteRule ^search/([0-9]+)$ search.php?page=$1
+RewriteRule ^search/([0-9]+)$ search.php?page=$1 [B]
 
 RewriteRule ^login$ login.php
 RewriteRule ^setup$ setup.php