- fixed missing action setting on merged plugin class

Author: Marius Burkard

server/lib/classes/plugin_webserver_base.inc.php

@@ -30,6 +30,8 @@
 
 class plugin_webserver_base {
 
+	private $action = '';
+	
 	public function registerEvents($server_type = 'apache') {
 		global $app;
 
@@ -522,10 +524,12 @@ public function awstats_delete ($data, $web_config) {
 			$app->log('Removed AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['old']['domain'].'.conf', LOGLEVEL_DEBUG);
 		}
 	}
-
-	public function eventUpdate($event_name, $data, $server_type = 'apache') {
+	
+	public function eventUpdate($event_name, $data, $action, $server_type = 'apache') {
 		global $app, $conf;
 
+		$this->action = $action;
+		
 		if($server_type === 'nginx') {
 			//* Check if the apache plugin is enabled
 			if(@is_link('/usr/local/ispconfig/server/plugins-enabled/apache2_plugin.inc.php')) {

server/plugins-available/apache2_plugin.inc.php

@@ -98,7 +98,7 @@ function update($event_name, $data) {
 
 		if($this->action != 'insert') $this->action = 'update';
 
-		$app->plugin_webserver_base->eventUpdate($event_name, $data, 'apache');
+		$app->plugin_webserver_base->eventUpdate($event_name, $data, $this->action, 'apache');
 
 		//* Unset action to clean it for next processed vhost.
 		$this->action = '';