Add a browsing prefix for rewrite rules (#8524)

diff --git a/chora/.htaccess b/chora/.htaccess
index b49e18d..dc66fa7 100644 (file)
--- a/chora/.htaccess
+++ b/chora/.htaccess
@@ -1,7 +1,9 @@
+Allow from all
 <IfModule mod_rewrite.c>
        RewriteEngine On
        RewriteRule   ^([a-z]+).php/(.*)$ $1.php?f=$2 [QSA,L]
        RewriteCond   %{REQUEST_FILENAME}  !-d
        RewriteCond   %{REQUEST_FILENAME}  !-f
+       RewriteRule   ^browse/(.*)$ browsedir.php?f=$1 [QSA]
        RewriteRule   ^(.*)$ browsedir.php?f=$1 [QSA]
 </IfModule>

diff --git a/chora/lib/Chora.php b/chora/lib/Chora.php
index aaa72d8..fb0ef02 100644 (file)
--- a/chora/lib/Chora.php
+++ b/chora/lib/Chora.php
@@ -113,9 +113,10 @@ class Chora
 
         if ($GLOBALS['conf']['options']['urls'] == 'rewrite') {
             if (in_array($script, array('browse.php', 'browsedir.php'))) {
-                $script = $uri;
-                if (substr($script, 0, 1) == '/') {
-                    $script = substr($script, 1);
+                if (substr($uri, 0, 1) == '/') {
+                    $script = "browse$uri";
+                } else {
+                    $script = "browse/$uri";
                 }
             } else {
                 $script .= '/' . $uri;