From e6bb4e823a6fb353fb802b6a7bfb8d7ed1cc424a Mon Sep 17 00:00:00 2001
From: quentusrex <quentusrex@ispconfig3>
Date: Thu, 06 Nov 2008 12:35:24 -0500
Subject: [PATCH] Oops. Don't ever disable auth.  Bug FS#267 - mail filter not hidden for client 

---
 server/plugins-available/apache2_plugin.inc.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7b46615..8c20234 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -107,7 +107,7 @@
         O                      = ".$data['new']['ssl_organisation']."
         OU                     = ".$data['new']['ssl_organisation_unit']."
         CN                     = $domain
-        emailAddress           = webmatser@".$data['new']['domain']."
+        emailAddress           = webmaster@".$data['new']['domain']."
 
         [ req_attributes ]
         challengePassword              = A challenge password";
@@ -191,6 +191,7 @@
 			$tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$parent_domain_id." AND active = 'y'");
 			$data["new"] = $tmp;
 			$data["old"] = $tmp;
+			$this->action = 'update';
 		}
 		
 		
@@ -336,6 +337,7 @@
 		
 		$vhost_data = $data["new"];
 		$vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";
+		$vhost_data["web_document_root_www"] = "/var/www/".$data["new"]["domain"]."/web";
 		
 		// Check if a SSL cert exists
 		$ssl_dir = $data["new"]["document_root"]."/ssl";
@@ -432,6 +434,7 @@
 
 			$tpl->setVar('fastcgi_alias',$fastcgi_config["fastcgi_alias"]);
 			$tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
+			$tpl->setVar('fastcgi_starter_script',$fastcgi_config["fastcgi_starter_script"]);
 			
 		}
 		

--
Gitblit v1.9.1