From 9dff94f1c8e19e9697e2e97324ecbdea8aed5731 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 24 Mar 2010 11:22:53 +0000 Subject: [PATCH] - corrected awstats-statsfile-parsing and traffic-calculation, refs #58 --- scripts/jobs/cron_traffic.inc.functions.php | 24 +++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/jobs/cron_traffic.inc.functions.php b/scripts/jobs/cron_traffic.inc.functions.php index 8592d011..7d43cfe6 100644 --- a/scripts/jobs/cron_traffic.inc.functions.php +++ b/scripts/jobs/cron_traffic.inc.functions.php @@ -77,26 +77,28 @@ function awstatsDoSingleDomain($domain, $outputdir) $count_bdw = false; foreach($content_array as $line) { - if(trim($line) == '') { + if(trim($line) == '' // skip empty lines + || substr(trim($line), 0, 1) == '#' // skip comments + ) { continue; } $parts = explode(' ', $line); - if(isset($line[0]) - && strtoupper($line[0]) == 'BEGIN_DOMAIN' + if(isset($parts[0]) + && strtoupper($parts[0]) == 'BEGIN_DOMAIN' ) { $count_bdw = true; } - elseif(isset($line[0]) - && strtoupper($line[0]) == 'END_DOMAIN' - ) { - $count_bdw = false; - } - + if ($count_bdw) { - if (isset($line[3])) { - $returnval += floatval($line[3]); + if(isset($parts[0]) + && strtoupper($parts[0]) == 'END_DOMAIN' + ) { + $count_bdw = false; + break; + } elseif (isset($parts[3])) { + $returnval += floatval($parts[3]); } } }