Fixes for cache getPaymentsData(), renamed variable 'pid' to 'paymentsId'

[mailer.git] / inc / stats-functions.php

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index 5b6e48c0be55b11d01848f3fa668e69fa5b2586b..a965d71c155d583598a8b2fb052e26ba1bfdd02c 100644 (file)
--- a/inc/stats-functions.php
+++ b/inc/stats-functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Init stats system
 function initStatsSystem () {
        // Is stats cache loaded?
-       if ((!isset($GLOBALS['stats_loaded'])) && (ifStatsAreEnabled())) {
+       if ((!isset($GLOBALS['stats_loaded'])) && (ifInternalStatsEnabled())) {
                // Init statistics array
                $GLOBALS['stats'] = array();
 
@@ -64,7 +64,10 @@ function isStatsEntrySet ($entry) {
 // Increments a statistics entry
 function incrementStatsEntry ($entry, $amount=1) {
        // Do we have stats enabled?
-       if (!ifStatsAreEnabled()) return;
+       if ((!ifInternalStatsEnabled()) && ($entry != 'db_hits')) {
+               // Abort here
+               return;
+       } // END - if
 
        // Is it there?
        if (isStatsEntrySet($entry)) {
@@ -72,7 +75,7 @@ function incrementStatsEntry ($entry, $amount=1) {
                $GLOBALS['stats'][$entry] += $amount;
        } else {
                // Write it
-               $GLOBALS['stats'][$entry] = $amount;
+               setStatsEntry($entry, $amount);
        }
 }
 
@@ -108,7 +111,7 @@ function loadStatsTable () {
        } // END - if
 
        // Load it from database
-       $result = SQL_QUERY_ESC("SELECT `stats_entry`, `stats_value` FROM `{?_MYSQL_PREFIX?}_stats_%s` ORDER BY `stats_entry` ASC",
+       $result = SQL_QUERY_ESC("SELECT `stats_entry`,`stats_value` FROM `{?_MYSQL_PREFIX?}_stats_%s` ORDER BY `stats_entry` ASC",
                array(
                        generateDateTime(time(), '6')
                ), __FUNCTION__, __LINE__);
@@ -174,9 +177,21 @@ function writeStatsTable () {
 // Filter for flushing statistics
 function FILTER_FLUSH_STATS () {
        // Now do we have stats?
-       if ((isset($GLOBALS['stats'])) && (!isInstallationPhase()) && (ifStatsAreEnabled())) {
+       if ((isset($GLOBALS['stats'])) && (!isInstallationPhase()) && (ifInternalStatsEnabled())) {
                // Write statistics to temporary table
                writeStatsTable();
+
+               // Count db/cache hits in database
+               updateConfiguration(
+                       array(
+                               'db_hits',
+                               'cache_hits'
+                       ), array(
+                               getStatsEntry('db_hits'),
+                               getStatsEntry('cache_hits')
+                       ),
+                       '+'
+               );
        } // END - if
 }