From a464e1f42fd73ae080df752c6a1c1a57d73deb43 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 3 Oct 2012 09:49:21 +0000
Subject: [PATCH] Fixed: FS#2417 - Custom awstats_index.php.master
---
server/cron_daily.php | 10 ++++++++--
server/plugins-available/apache2_plugin.inc.php | 6 +++++-
server/plugins-available/nginx_plugin.inc.php | 6 +++++-
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 7c91a465d9..9420a051dc 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -39,7 +39,7 @@ $conf['server_id'] = intval($conf['server_id']);
// Load required base-classes
-$app->uses('ini_parser,file,services,getconf');
+$app->uses('ini_parser,file,services,getconf,system');
#######################################################################################################
@@ -238,7 +238,13 @@ HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';
exec($command);
if(is_file($rec['document_root'].'/'.$web_folder.'/stats/index.html')) unlink($rec['document_root'].'/'.$web_folder.'/stats/index.html');
rename($rec['document_root'].'/'.$web_folder.'/stats/awstats.'.$domain.'.html',$rec['document_root'].'/'.$web_folder.'/stats/awsindex.html');
- if(!is_file($rec['document_root']."/".$web_folder."/stats/index.php")) copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+ if(!is_file($rec['document_root']."/".$web_folder."/stats/index.php")) {
+ if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
+ copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+ } else {
+ copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+ }
+ }
$app->log('Created awstats statistics with command: '.$command,LOGLEVEL_DEBUG);
} else {
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 45134fe8a5..ae5ce803ef 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -2271,7 +2271,11 @@ class apache2_plugin {
}
if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");
- $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+ if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
+ $app->system->copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+ } else {
+ $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+ }
}
//* Delete the awstats configuration file
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index ef376e0f39..2e76d4c247 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1792,7 +1792,11 @@ class nginx_plugin {
}
if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");
- $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+ if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
+ $app->system->copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+ } else {
+ $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+ }
}
//* Delete the awstats configuration file
--
GitLab