From 20e7cebf11796ad7452207b3f94a74501437704d Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 20 Jun 2009 19:58:20 -0400
Subject: Use rowhelper

---
 config/apache_mod_security/apache_mod_security.inc       |  5 +++--
 .../apache_mod_security/apache_mod_security_settings.xml | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index a6a34943..b1b84040 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -19,8 +19,9 @@ function apache_mod_security_resync() {
 function generate_apache_configuration() {
 	// Generate mod_proxy specific configuration
 	$mod_proxy = "ProxyRequests on\n";
-	if($config['installedpackages']['apache_mod_security']) {
-		foreach($config['installedpackages']['apache_mod_security']['config'] as $ams) {
+	
+	if($config['installedpackages']['apachemodsecurity']) {
+		foreach($config['installedpackages']['apachemodsecurity']['config'] as $ams) {
 			$sitename = str_replace(" ", "", $ams['sitename']);
 			$mod_proxy .= "ProxyPass /{$sitename}/ {$sitename} \n";
 			$mod_proxy .= "ProxyHTMLURLMap {$ams['siteurl']} /{$sitename} \n";
diff --git a/config/apache_mod_security/apache_mod_security_settings.xml b/config/apache_mod_security/apache_mod_security_settings.xml
index d070502c..3f2764c6 100644
--- a/config/apache_mod_security/apache_mod_security_settings.xml
+++ b/config/apache_mod_security/apache_mod_security_settings.xml
@@ -75,13 +75,25 @@
 		<field>
 			<fielddescr>Bind to IP Address</fielddescr>
 			<fieldname>globalbindtoipaddr</fieldname>
-			<description>This is the IP address the Proxy Server will listen on. </description>
+			<description>
+				<![CDATA[
+					This is the IP address the Proxy Server will listen on. 
+					<br/>
+					NOTE: Leave blank to bind to *
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Bind to port</fielddescr>
 			<fieldname>globalbindtoport</fieldname>
-			<description>This is the port the Proxy Server will listen on. </description>
+			<description>
+				<![CDATA[
+					This is the port the Proxy Server will listen on. 
+					<br/>
+					NOTE: Leave blank to bind to *
+				]]>					
+			</description>
 			<type>input</type>
 		</field>
 	</fields>
-- 
cgit v1.2.3