X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstats-functions.php;h=343a7c510c7284794fb4176ccb5230a0a2a7abc9;hb=262c3e87d0a80ec8a4435b2564d4b666fd329bf6;hp=5d8c441f48a860fed2ca0838cc7b5ac0cec9d25d;hpb=ac293991d427918ec28531221ed2b34cbb03caef;p=mailer.git

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index 5d8c441f48..343a7c510c 100644
--- a/inc/stats-functions.php
+++ b/inc/stats-functions.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 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 *
@@ -45,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();
 
@@ -66,7 +64,9 @@ function isStatsEntrySet ($entry) {
 // Increments a statistics entry
 function incrementStatsEntry ($entry, $amount=1) {
 	// Do we have stats enabled?
-	if (getConfig('stats_enabled') != 'Y') return;
+	if (!ifInternalStatsEnabled()) {
+		return;
+	} // END - if
 
 	// Is it there?
 	if (isStatsEntrySet($entry)) {
@@ -110,7 +110,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__);
@@ -143,11 +143,11 @@ function createStatsTable () {
 	if (!SQL_IS_LINK_UP()) return false;
 
 	// Create it here
-	$result = SQL_QUERY_ESC("CREATE TABLE IF NOT EXISTS `{?_MYSQL_PREFIX?}_stats_%s` (
+	$result = SQL_QUERY_ESC("CREATE TEMPORARY TABLE IF NOT EXISTS `{?_MYSQL_PREFIX?}_stats_%s` (
 `stats_entry` VARCHAR(100) NOT NULL DEFAULT '',
 `stats_value` BIGINT(20) NOT NULL DEFAULT 0,
 PRIMARY KEY (`stats_entry`)
-) TYPE=HEAP COMMENT='Temporary statistics table'",
+) ENGINE = HEAP COMMENT = 'Temporary statistics table'",
 		array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__);
 }
 
@@ -176,25 +176,11 @@ 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();
 	} // END - if
 }
 
-// Check wether stats are enabled
-function ifStatsAreEnabled () {
-	logDebugMessage(__FUNCTION__, __LINE__, 'CALLED!');
-
-	// Do we have cache?
-	if (!isset($GLOBALS['stats_enabled'])) {
-		// Then determine it
-		$GLOBALS['stats_enabled'] = (getConfig('stats_enabled') == 'Y');
-	} // END - if
-
-	// Return cached value
-	return $GLOBALS['stats_enabled'];
-}
-
 // [EOF]
 ?>