maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fixing php-notice in cron while setting awstats - permissions, fixes #960, fixes #970, thx d4f

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-11-12 09:19:50 +01:00
parent 2b0cfea888
commit 0deb4404d2
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -667,12 +667,8 @@ class apache
// After inserting the AWStats information, // After inserting the AWStats information,
// be sure to build the awstats conf file as well // be sure to build the awstats conf file as well
// and chown it using $awstats_params, #258 // and chown it using $awstats_params, #258
$awstats_params = array( // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations
'loginname' => $domain['loginname'], createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain);
'guid' => $domain['guid'],
'documentroot' => $domain['documentroot']
);
createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params);
} }
} }

8
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -618,12 +618,8 @@ class lighttpd
// After inserting the AWStats information, // After inserting the AWStats information,
// be sure to build the awstats conf file as well // be sure to build the awstats conf file as well
// and chown it using $awstats_params, #258 // and chown it using $awstats_params, #258
$awstats_params = array( // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations
'loginname' => $domain['loginname'], createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain);
'guid' => $domain['guid'],
'documentroot' => $domain['documentroot']
);
createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params);
} }
} }

8
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -855,12 +855,8 @@ class nginx
// After inserting the AWStats information, // After inserting the AWStats information,
// be sure to build the awstats conf file as well // be sure to build the awstats conf file as well
// and chown it using $awstats_params, #258 // and chown it using $awstats_params, #258
$awstats_params = array( // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations
'loginname' => $domain['loginname'], createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain);
'guid' => $domain['guid'],
'documentroot' => $domain['documentroot']
);
createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params);
} }
} }