From 174a24db8ae7a25929910471d4579e459266a3ce Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 25 Aug 2010 00:23:56 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7649
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/admin/admin.admin.view.php | 10 +++++++---
 modules/admin/tpl/index.html       |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 9028ae497..68c867441 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -170,18 +170,22 @@
             $args->start_date = $start_date;
             $args->end_date = $end_date;
             $output = executeQueryArray('admin.getVisitors', $args);
-            $status->week_max = 0;
             if(count($output->data)) {
                 foreach($output->data as $key => $val) {
                     $visitors[$val->regdate] = $val->unique_visitor;
-                    if($val->unique_visitor>$status->week_max) $status->week_max = $val->unique_visitor;
                 }
             }
             $output = executeQueryArray('admin.getSiteVisitors', $args);
             if(count($output->data)) {
                 foreach($output->data as $key => $val) {
                     $visitors[$val->regdate] += $val->unique_visitor;
-                    if($val->unique_visitor>$status->week_max) $status->week_max = $val->unique_visitor;
+                }
+            }
+
+            $status->week_max = 0;
+            if(count($visitors)) {
+                foreach($visitors as $key => $val) {
+                    if($val>$status->week_max) $status->week_max = $val;
                 }
             }
 
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index 351a3b5a4..481f6085e 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -146,8 +146,8 @@
 				<!--@foreach($status->week as $key => $val)-->
 				<dl>
 					<dt><!--@if($key==date("Ymd"))--><strong>{$key}</strong><!--@else-->{$key}<!--@end--></dt>
-					<dd class="past" style="height:{$val->last/$status->week_max * 70}%" title="{$lang->last_week}:{number_format($val->last)}"><span>{$lang->last_week}:{number_format($val->last)}</span></dd>
-					<dd class="today" style="height:{$val->this/$status->week_max * 70}%" title="{$lang->this_week}:{number_format($val->this)}"><span>{$lang->this_week}:{number_format($val->this)}</span></dd>
+					<dd class="past" style="height:{$val->last/$status->week_max * 100}%" title="{$lang->last_week}:{number_format($val->last)}"><span>{$lang->last_week}:{number_format($val->last)}</span></dd>
+					<dd class="today" style="height:{$val->this/$status->week_max * 100}%" title="{$lang->this_week}:{number_format($val->this)}"><span>{$lang->this_week}:{number_format($val->this)}</span></dd>
 
 				</dl>
 				<!--@end-->