More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

[mailer.git] / inc / modules / admin / what-cache_stats.php

diff --git a/inc/modules/admin/what-cache_stats.php b/inc/modules/admin/what-cache_stats.php
index b22172c7deb8479267cd487f7144ac6071c7b4d1..ee2f431796d17bb0712488357a9339f915b6e650 100644 (file)
--- a/inc/modules/admin/what-cache_stats.php
+++ b/inc/modules/admin/what-cache_stats.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
-{
+if ((!defined('__SECURITY')) || (!is_admin())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -41,12 +40,14 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
+// Calculate total hits
+$totalHits = ($_CONFIG['db_hits'] + $_CONFIG['cache_hits']);
+
 // Prepare data for the template
-define('__DB_HITS'   , $_CONFIG['db_hits']);
-$HITS = str_repeat(" ", abs(strlen($_CONFIG['db_hits']) - strlen($_CONFIG['cache_hits']))).$_CONFIG['cache_hits'];
-define('__CACHE_HITS', $HITS);
-define('__TOTAL_HITS', ($_CONFIG['db_hits'] + $_CONFIG['cache_hits']));
-define('__CACHE_PERC', TRANSLATE_COMMA(($_CONFIG['cache_hits'] / __TOTAL_HITS  * 100)));
+define('__DB_HITS'   , TRANSLATE_COMMA($_CONFIG['db_hits']));
+define('__CACHE_HITS', TRANSLATE_COMMA($_CONFIG['cache_hits']));
+define('__TOTAL_HITS', TRANSLATE_COMMA($totalHits));
+define('__CACHE_PERC', TRANSLATE_COMMA(($_CONFIG['cache_hits'] / $totalHits * 100)));
 
 // Load template
 LOAD_TEMPLATE("admin_cache_stats");