From 077e3bc34b94a8f0cb0c09d7034ab9c09a22dfbe Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 23 Jun 2009 19:39:34 -0400
Subject: Ensure that we append a / if it does not exist.

---
 config/apache_mod_security/apache_mod_security.inc | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'config/apache_mod_security/apache_mod_security.inc')

diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index cf39e467..2f533b0d 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -116,8 +116,13 @@ EOF;
 			foreach($ams['row'] as $row)
 				$additionalsitehostnames .= "{$row['additionalsitehostnames']} ";
 			$backend_sites = "";
-			foreach($ams['row'] as $row)
-				$backend_sites .= "{$row['webserveripaddr']} ";
+			foreach($ams['row'] as $row) {
+				$backend_sites .= "{$row['webserveripaddr']}";
+				if(substr($row['webserveripaddr'],count($row['webserveripaddr']),1) != "/")
+					$backend_sites .= "/ ";
+				else 
+					$backend_sites .= " ";
+			}
 			// Set general items
 			if($ams['siteemail'])
 				$serveradmin = $ams['siteemail'];
@@ -160,8 +165,11 @@ EOF;
 		}
 	}
 
+	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['modsecuritycustom'])  
+		$mod_security_custom = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['modsecuritycustom'];
+
 	// Mod_security enabled?
-	if($config['installedpackages']['apachemodsecuritysettings']['config']['enablemodsecurity'])  {
+	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['enablemodsecurity'])  {
 		$enable_mod_security = true;
 		$mod_security = <<< EOF
 <IfModule mod_security.c>
@@ -286,9 +294,12 @@ EOF;
     #phpMyAdmin path vln
     SecFilterSelective REQUEST_URI "/css/phpmyadmin\.css\.php\?GLOBALS\[cfg\]\[ThemePath\]=/etc"
 
+	{$mod_security_custom}
+
 </IfModule>
 
 EOF;
+
 		
 }
 	$apache_config = <<<EOF
-- 
cgit v1.2.3