From 7e8e28fc9050ada9ab33daa76670e1f71e9d90a5 Mon Sep 17 00:00:00 2001 From: Marcus van Dam Date: Mon, 1 Jun 2015 13:09:43 +0200 Subject: [PATCH] Move to a generic awstats template directory We need this generic directory for future changes in Feature #545. Some line-ending cleanup included. --- lib/functions/froxlor/function.createAWStatsConf.php | 6 +++--- .../{awstatsmodel => awstats}/awstats.froxlor.model.conf | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename templates/misc/{awstatsmodel => awstats}/awstats.froxlor.model.conf (100%) diff --git a/lib/functions/froxlor/function.createAWStatsConf.php b/lib/functions/froxlor/function.createAWStatsConf.php index cc848f8b..4132b99a 100644 --- a/lib/functions/froxlor/function.createAWStatsConf.php +++ b/lib/functions/froxlor/function.createAWStatsConf.php @@ -38,7 +38,7 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot } // chown created folder, #258 makeChownWithNewStats($awstats_params); - + // weird but could happen... if (!is_dir(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 $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); - + // Test if the file exists if (file_exists($domain_file)) { // Check for the generated header - if this is a manual modification we won't update diff --git a/templates/misc/awstatsmodel/awstats.froxlor.model.conf b/templates/misc/awstats/awstats.froxlor.model.conf similarity index 100% rename from templates/misc/awstatsmodel/awstats.froxlor.model.conf rename to templates/misc/awstats/awstats.froxlor.model.conf