- cgi, ssi and sueexec could not be disabled in vhosts

- logfile directory was not deleted when a site was deleted.

Author: tbrehm

server/conf/vhost.conf.master

@@ -16,18 +16,18 @@
 <tmpl_if name='alias'>
     ServerAlias <tmpl_var name='alias'>
 </tmpl_if>
-<tmpl_if name='cgi'>
+<tmpl_if name='cgi' op='==' value='y'>
     # cgi enabled
     ScriptAlias  /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
     AddHandler cgi-script .cgi
     AddHandler cgi-script .pl
 </tmpl_if>
-<tmpl_if name='ssi'>
+<tmpl_if name='ssi' op='==' value='y'>
     # ssi enabled
     AddType text/html .shtml
     AddOutputFilter INCLUDES .shtml
 </tmpl_if>
-<tmpl_if name='suexec'>
+<tmpl_if name='suexec' op='==' value='y'>
     # suexec enabled
     SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
 </tmpl_if>

server/plugins-available/apache2_plugin.inc.php

@@ -447,6 +447,11 @@ function delete($event_name,$data) {
 		}
 		// end removing symlinks
 
+		// Delete the log file directory
+		$vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);
+		if($data["old"]["domain"] != '' && !stristr($vhost_logfile_dir,'..')) exec("rm -rf $vhost_logfile_dir");
+		$app->log("Removing website logfile directory: $vhost_logfile_dir",LOGLEVEL_DEBUG);
+		
 	}
 
 	//* This function is called when a IP on the server is inserted, updated or deleted