From 39bc773476e0ec48110d375aa412bf1d9b16d7ab Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Sep 2011 10:17:57 -0400
Subject: [PATCH] Fixed: FS#1690 - Awstats shows only the last month.
---
server/cron_daily.php | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index e21520c..571a02b 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -200,12 +200,44 @@
if(is_link('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log')) unlink('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log');
symlink($logfile,'/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log');
+ $awmonth = date("m");
+ if (date("d") == 1) {
+ $awmonth = date("m")-1;
+ }
+
+ $awyear = date("Y");
+ if (date("m") == 1) {
+ $awyear = date("Y")-1;
+ $awmonth = "12";
+ }
+
// 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=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
+ // $command = "$awstats_buildstaticpages_pl -update -config='$domain' -lang=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
+
+ $command = "$awstats_buildstaticpages_pl -month='$awmonth' -year='$awyear' -update -config='$domain' -lang=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
+
+ if (date("d") == 2) {
+ $awmonth = date("m")-1;
+ if (date("m") == 1) {
+ $awyear = date("Y")-1;
+ $awmonth = "12";
+ }
+
+ $statsdirold = $statsdir."/".$awyear."-".$awmonth."/";
+ mkdir($statsdirold);
+ $files = scandir($statsdir);
+ foreach ($files as $file) {
+ if (substr($file,0,1) != "." && !is_dir($file) && substr($file,0,1) != "w" && substr($file,0,1) != "i") copy("$statsdir"."/"."$file","$statsdirold"."$file");
+ }
+ }
+
if($awstats_pl != '' && $awstats_buildstaticpages_pl != '' && fileowner($awstats_pl) == 0 && fileowner($awstats_buildstaticpages_pl) == 0) {
exec($command);
- rename($rec['document_root'].'/web/stats/awstats.'.$domain.'.html',$rec['document_root'].'/web/stats/index.html');
+ if(is_file($rec['document_root'].'/web/stats/index.html')) unlink($rec['document_root'].'/web/stats/index.html');
+ rename($rec['document_root'].'/web/stats/awstats.'.$domain.'.html',$rec['document_root'].'/web/stats/awsindex.html');
+ if(!is_file($rec['document_root']."/web/stats/index.php")) copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/web/stats/index.php");
+
$app->log('Created awstats statistics with command: '.$command,LOGLEVEL_DEBUG);
} else {
$app->log("No awstats statistics created. Either $awstats_pl or $awstats_buildstaticpages_pl is not owned by root user.",LOGLEVEL_WARN);
--
Gitblit v1.9.1