From 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 04:54:19 -0500
Subject: [PATCH] Merged revisions 2812-2883 from staböe branch.
---
server/conf/awstats_index.php.master | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/server/conf/awstats_index.php.master b/server/conf/awstats_index.php.master
index e0f185e..f3867d3 100644
--- a/server/conf/awstats_index.php.master
+++ b/server/conf/awstats_index.php.master
@@ -5,29 +5,36 @@
if ($handle = opendir('.'))
{
- while(false !== ($file = readdir($handle)))
- {
- if (substr($file,0,1) != "." && is_dir($file))
- {
- $orderkey = substr($file,0,4).substr($file,5,2);
- if (substr($file,5,2) < 10 ) $orderkey = substr($file,0,4)."0".substr($file,5,2);
- $awprev[$orderkey] = $file;
- }
- }
- $month = date("n");
- $year = date("Y");
- if (date("d") == 1)
- {
- $month = date("m")-1;
- if (date("m") == 1)
- {
- $year = date("Y")-1;
- $month = "12";
- }
- }
- $current = $year.$month;
- $awprev[$current] = $year."-".$month;
- closedir($handle);
+ while(false !== ($file = readdir($handle)))
+ {
+ if (substr($file,0,1) != "." && is_dir($file))
+ {
+ $orderkey = substr($file,0,4).substr($file,5,2);
+ if (substr($file,5,2) < 10 )
+ {
+ $orderkey = substr($file,0,4)."0".substr($file,5,2);
+ }
+ $awprev[$orderkey] = $file;
+ }
+ }
+
+ $month = date("n");
+ $year = date("Y");
+
+ if (date("d") == 1)
+ {
+ $month = date("m")-1;
+ if (date("m") == 1)
+ {
+ $year = date("Y")-1;
+ $month = "12";
+ }
+ }
+
+ $current = $year.$month;
+ $awprev[$current] = $year."-".$month;
+
+ closedir($handle);
}
arsort($awprev);
--
Gitblit v1.9.1