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

Move to a generic awstats template directory

Browse Source 
We need this generic directory for future changes in Feature #545.
Some line-ending cleanup included.
This commit is contained in:
Marcus van Dam
2015-06-01 13:09:43 +02:00
parent 30c883c85d
commit 7e8e28fc90
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/functions/froxlor/function.createAWStatsConf.php
View File

@@ -38,7 +38,7 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot
} }
// chown created folder, #258 // chown created folder, #258
makeChownWithNewStats($awstats_params); makeChownWithNewStats($awstats_params);
// weird but could happen... // weird but could happen...
if (!is_dir(Settings::Get('system.awstats_conf'))) { if (!is_dir(Settings::Get('system.awstats_conf'))) {
safe_exec('mkdir -p '.escapeshellarg(Settings::Get('system.awstats_conf'))); safe_exec('mkdir -p '.escapeshellarg(Settings::Get('system.awstats_conf')));
@@ -62,9 +62,9 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot
// File names // File names
$domain_file = makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.' . $siteDomain . '.conf'); $domain_file = makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.' . $siteDomain . '.conf');
$model_file = FROXLOR_INSTALL_DIR.'/templates/misc/awstatsmodel/awstats.froxlor.model.conf'; $model_file = FROXLOR_INSTALL_DIR.'/templates/misc/awstats/awstats.froxlor.model.conf';
$model_file = makeCorrectFile($model_file); $model_file = makeCorrectFile($model_file);
// Test if the file exists // Test if the file exists
if (file_exists($domain_file)) { if (file_exists($domain_file)) {
// Check for the generated header - if this is a manual modification we won't update // Check for the generated header - if this is a manual modification we won't update

0
templates/misc/awstatsmodel/awstats.froxlor.model.conf → templates/misc/awstats/awstats.froxlor.model.conf
View File