From 272bacae9564fcb4ce65d70766bc4609ac69b17d Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 7 Mar 2013 16:03:10 +0100
Subject: [PATCH] escape parts of template

---
 .../src/de/hsadmin/mods/dom/httpd-vhost.vm    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
index 6474617..05f88c6 100644
--- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
@@ -51,15 +51,15 @@
 
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
-    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs/${tolower:%1} -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs/${tolower:%1}$1 [last]     
+    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
+    RewriteCond /home/doms/${dom.name}/subs/#[[ ${tolower:%1} ]]# -d
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[ ${tolower:%1}$1 ]]# [last]     
     
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
 	RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
-    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?\$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs/\$\{tolower:%1\} !-d
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
+    RewriteCond /home/doms/${dom.name}/subs/#[[ ${tolower:%1} ]]# !-d
     RewriteRule ^(.*) - [redirect=404,last]
 #end
 
@@ -125,15 +125,15 @@
     
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
-    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs-ssl/${tolower:%1} -d
-    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/${tolower:%1}$1 [last]    
+    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
+    RewriteCond /home/doms/${dom.name}/subs-ssl/#[[ ${tolower:%1} ]]# -d
+    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[ ${tolower:%1}$1 ]]# [last]    
     
 #if( !${htdocsfallback} )
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
 	RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
-    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?\$ [novary]
-    RewriteCond /home/doms/${dom.name}/subs-ssl/${tolower:%1} !-d
+    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?$ [novary]
+    RewriteCond /home/doms/${dom.name}/subs-ssl/#[[ ${tolower:%1} ]]# !-d
     RewriteRule ^(.*) - [redirect=404,last]
 #end