Revize 4af4d58c

Re #7577 zprovoznění routování aplikace pro původní části

.htaccess

@@ +1 @@
+<IfModule mod_autoindex.c>
+	Options -Indexes
+</IfModule>
+
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+
+    # old-nobtc
+    RewriteCond %{REQUEST_URI} ^/old-nobtc(.*)$
+    RewriteRule ^old-nobtc(.*)$ /old/html/$1
+
+    # obrázky pro old-nobtc
+    RewriteCond %{REQUEST_URI} ^/img(.*)$
+    RewriteRule ^img(.*)$ /old/html/img/$1
+
+    # nobtc
+    RewriteCond %{REQUEST_URI} ^/nobtc(.*)$
+    RewriteRule ^nobtc(.*)$ /old/html/nobtc/app/$1
+
+    # multidic
+    RewriteCond %{REQUEST_URI} ^/multidic(.*)$
+    RewriteRule ^multidic(.*)$ /old/html/multidic/app/$1
+
+    # utf
+    RewriteCond %{REQUEST_URI} ^/utf(.*)$
+    RewriteRule ^utf/(.*)$ /old/html/utf/$1
+
+    # zakázání přesměrování horních pravidel + přesměrování ze složky www/ na root
+    RewriteCond %{REQUEST_URI} !^/old(.*)$
+    RewriteCond %{REQUEST_URI} !^/old-nobtc(.*)$
+    RewriteCond %{REQUEST_URI} !^/img(.*)$
+    RewriteCond %{REQUEST_URI} !^/nobtc(.*)$
+    RewriteCond %{REQUEST_URI} !^/multidic(.*)$
+    RewriteCond %{REQUEST_URI} !^/utf(.*)$
+    RewriteRule ^(.*)$ /www/$1
+
+</IfModule>

docker/conf.d/apache/000-default.conf

@@ -9 +9 @@
 	
 	ServerName klinopis.local
 	ServerAdmin [e-mail] 
-	DocumentRoot /var/www/html/www
+	DocumentRoot /var/www/html
 
-	<Directory "/var/www/html/www">
+	<Directory "/var/www/html">
 	  Order allow,deny
 	  Allow from all
 	  AllowOverride All

docker/conf.d/apache/apache2.conf

@@ -57 +57 @@
 
 ServerName klinopis.local
 ServerAdmin [e-mail]
-DocumentRoot "/var/www/html/www"
+DocumentRoot "/var/www/html"
 
 #
 # ServerRoot: The top of the directory tree under which the server's

old/html/index.php

@@ -347 +347 @@
   <br>
   <span class=span01>
     The Old Babylonian Text Corpus (OBTC) comprises a large text database of the Old Babylonian Akkadian Language (currently <?php
-  include_once('functions-help.php');
+  include_once('inc/functions-help.php');
   echo get_count_lines();
   ?> text lines, letters, documents, legal texts, royal inscriptions, omina, mathematical texts etc.).
   </span>