From b5a0dc34a3bebd221fe8a564595d4c644122e11d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Dec 2010 22:21:13 +0000
Subject: [PATCH] Merged revisions 2144-2150 from stable branch.

---
 install/autoupdate.php                                 | 2 +-
 interface/lib/classes/tform.inc.php                    | 8 +++-----
 server/cron_daily.php                                  | 2 +-
 server/mods-available/monitor_core_module.inc.php      | 6 ++++--
 server/mods-available/remoteaction_core_module.inc.php | 6 +++++-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/install/autoupdate.php b/install/autoupdate.php
index 1629d6ac1..7a5798580 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -281,7 +281,7 @@ $inst->install_crontab();
 
 //** Restart services:
 swriteln('Restarting services ...');
-if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))					system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))					system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' reload');
 if($conf['services']['mail']) {
 	if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))				system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
 	if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))			system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 4f9b8a985..3a5e1897b 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -143,9 +143,9 @@ class tform {
 					if(!file_exists($lng_file)) $lng_file = "../$module/lib/lang/en_".$this->formDef["name"].".lng";
 					include($lng_file);
                 }
-				
+
 				if(is_array($wb_global)) {
-					$wb = array_merge($wb_global,$wb);
+					$wb = $wb_global + $wb;
 				}
 				if(isset($wb_global)) unset($wb_global);
 				
@@ -495,9 +495,7 @@ class tform {
                                                 $out = '';
                                                 foreach($field['value'] as $k => $v) {
                                                     $selected = ($k == $field["default"])?' SELECTED':'';
-													if(!empty($this->wordbook[$v]))
-                                                                    $v = $this->wordbook[$v];
-                                                    $out .= "<option value='$k'$selected>$v</option>\r\n";
+                                                    $out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
                                                 }
                                         }
                                         if(isset($out)) $new_record[$key] = $out;
diff --git a/server/cron_daily.php b/server/cron_daily.php
index e3fc5be33..c511178c4 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -185,7 +185,7 @@ HostAliases="www.'.$domain.' localhost 127.0.0.1"';
 	if(!@is_dir($statsdir)) mkdir($statsdir);
 	
 	// awstats_buildstaticpages.pl -update -config=mydomain.com -lang=en -dir=/var/www/domain.com/web/stats -awstatsprog=/path/to/awstats.pl
-	$command = "$awstats_buildstaticpages_pl -update -config='$domain' -lang=en -dir='$statsdir' -awstatsprog='$awstats_pl'";
+	$command = "$awstats_buildstaticpages_pl -update -LogFile='$logfile' -config='$domain' -lang=en -dir='$statsdir' -awstatsprog='$awstats_pl'";
 	
 	if($awstats_pl != '' && $awstats_buildstaticpages_pl != '' && fileowner($awstats_pl) == 0 && fileowner($awstats_buildstaticpages_pl) == 0) {
 		exec($command);
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 43928121e..4d9bfc34c 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -203,8 +203,10 @@ class monitor_core_module {
 		$this->monitorMemUsage();
 		$this->monitorCpu();
 		$this->monitorServices();
-		$this->monitorOpenVzHost();
-		$this->monitorOpenVzUserBeancounter();
+		if(@file_exists('/proc/user_beancounters')) {
+			$this->monitorOpenVzHost();
+			$this->monitorOpenVzUserBeancounter();
+		}
 		$this->monitorMailLog();
 		$this->monitorMailWarnLog();
 		$this->monitorMailErrLog();
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index fa51db146..4416bd8af 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -150,6 +150,10 @@ class remoteaction_core_module {
 	}
 
 	private function _doIspCUpdate($action) {
+		
+		// Ensure that this code is not executed twice as this would cause a loop in case of a failure
+		$this->_actionDone($action['action_id'], 'ok');
+		
 		/*
 		 * Get the version-number of the newest version 
 		 */
@@ -195,7 +199,7 @@ class remoteaction_core_module {
 		/*
 		 * All well done!
 		 */
-		$this->_actionDone($action['action_id'], 'ok');
+		//$this->_actionDone($action['action_id'], 'ok');
 	}
 }
 ?>
\ No newline at end of file
-- 
GitLab