Commit b5a0dc34 authored by tbrehm's avatar tbrehm

Merged revisions 2144-2150 from stable branch.

parent 6ae502f2
......@@ -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');
......
......@@ -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;
......
......@@ -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);
......
......@@ -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();
......
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment