Bug 18736: (follow-up) Fix missing rounding and bad formatting

[koha.git] / etc / koha-httpd.conf

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 40c2b45..d0f619e 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -111,8 +111,7 @@
      RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
      RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
      RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
-     RewriteRule ^(.*)_[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9].js$ $1.js [L]
-     RewriteRule ^(.*)_[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9].css$ $1.css [L]
+     RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [L]
 
      # REST API configuration
      Alias "/api" "__API_CGI_DIR__"
@@ -124,10 +123,9 @@
 
        RewriteEngine On
        RewriteBase /api/
-       RewriteCond %{REQUEST_FILENAME} !-f
-       RewriteCond %{REQUEST_FILENAME} !-d
-       RewriteCond %{DOCUMENT_ROOT}/../api/$1/app.pl -f
-       RewriteRule ^(.*?)/.* $1/app.pl/api/$0 [L]
+       RewriteCond %{REQUEST_URI} !^/api/v[0-1]+/app.pl
+       RewriteRule ^(v[0-9]+)/(.*)$ /api/$1/app.pl/api/$1/$2 [L]
+
      </Directory>
    </IfModule>
 
@@ -238,8 +236,7 @@
      RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT]
      RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
      RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
-     RewriteRule ^(.*)_[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9].js$ $1.js [L]
-     RewriteRule ^(.*)_[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9].css$ $1.css [L]
+     RewriteRule ^(.*)_[0-9]{2}\.[0-9]{7}\.(js|css)$ $1.$2 [L]
 
 
      # REST API configuration
@@ -252,10 +249,8 @@
 
        RewriteEngine On
        RewriteBase /api/
-       RewriteCond %{REQUEST_FILENAME} !-f
-       RewriteCond %{REQUEST_FILENAME} !-d
-       RewriteCond %{DOCUMENT_ROOT}/../api/$1/app.pl -f
-       RewriteRule ^(.*?)/.* $1/app.pl/api/$0 [L]
+       RewriteCond %{REQUEST_URI} !^/api/v[0-1]+/app.pl
+       RewriteRule ^(v[0-9]+)/(.*)$ /api/$1/app.pl/api/$1/$2 [L]
      </Directory>
    </IfModule>