From 3da206a823e436f3a3ad5d44aa6daa7929bb6d6a Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 24 Jun 2009 22:34:05 -0400
Subject: Minor log fixes.  Fix a couple bugs with multiple hostnames.

---
 config/apache_mod_security/apache_mod_security.inc           | 4 ++--
 config/apache_mod_security/apache_mod_security_view_logs.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index 7a2193c0..15550dd3 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -247,8 +247,6 @@ EOF;
 				$local_ip_port = "{$ams['ipaddress']}:{$ams['port']}";
 			else 
 				$local_ip_port = $global_listen;
-			// Begin VirtualHost
-			$mod_proxy .= "\n<VirtualHost {$local_ip_port}>\n";
 			// Is this item a load balancer
 			if(count($ams['row'])>1) {
 				$balancer = true;
@@ -259,6 +257,8 @@ EOF;
 				$backend_sites = " balancer://{$sitename}\n";
 				$sitename = "";			// we are not using sitename in this case
 			}
+			// Begin VirtualHost
+			$mod_proxy .= "\n<VirtualHost {$local_ip_port}>\n";
 			if($additionalsitehostnames)
 				$mod_proxy .= "  ServerAlias $additionalsitehostnames\n";
 			if($serveradmin)
diff --git a/config/apache_mod_security/apache_mod_security_view_logs.php b/config/apache_mod_security/apache_mod_security_view_logs.php
index 94561504..8289ac1e 100644
--- a/config/apache_mod_security/apache_mod_security_view_logs.php
+++ b/config/apache_mod_security/apache_mod_security_view_logs.php
@@ -119,7 +119,7 @@ pre {
 </td>
 </div>
 <?php
-	if($_REQUEST['logtype'] == "error") {
+	if($_REQUEST['logtype'] = "error") {
 		echo "<br/>View <a href='apache_mod_security_view_logs.php?logtype=error'>error</a> logs";
 	} else {
 		echo "<br/>View <a href='apache_mod_security_view_logs.php'>access</a> logs";
-- 
cgit v1.2.3