X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fstats-functions.php;h=3b0a794d96a9dea1c49f8fe1a5e645e5ed9773c7;hp=e38e6114b7414ca749adc51428de4cfe25cea69c;hb=e3934352dffa6eb9da59a137ae1a9414e5b4d80b;hpb=d52beaaad0b8388fec7f9f3cece88ef98a833751

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index e38e6114b7..3b0a794d96 100644
--- a/inc/stats-functions.php
+++ b/inc/stats-functions.php
@@ -14,11 +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                           *
- * 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 *
@@ -44,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Init stats system
 function initStatsSystem () {
 	// Is stats cache loaded?
-	if ((!isset($GLOBALS['stats_loaded'])) && (getConfig('STATS_ENABLED') == 'Y')) {
+	if ((!isset($GLOBALS['stats_loaded'])) && (ifStatsAreEnabled())) {
 		// Init statistics array
 		$GLOBALS['stats'] = array();
 
@@ -65,7 +64,7 @@ function isStatsEntrySet ($entry) {
 // Increments a statistics entry
 function incrementStatsEntry ($entry, $amount=1) {
 	// Do we have stats enabled?
-	if (getConfig('STATS_ENABLED') != 'Y') return;
+	if (!ifStatsAreEnabled()) return;
 
 	// Is it there?
 	if (isStatsEntrySet($entry)) {
@@ -110,7 +109,9 @@ function loadStatsTable () {
 
 	// Load it from database
 	$result = SQL_QUERY_ESC("SELECT `stats_entry`,`stats_value` FROM `{?_MYSQL_PREFIX?}_stats_%s` ORDER BY `stats_entry` ASC",
-		array(date('Ymd', time())), __FUNCTION__, __LINE__);
+		array(
+			generateDateTime(time(), '6')
+		), __FUNCTION__, __LINE__);
 
 	// Read all rows
 	while ($row = SQL_FETCHARRAY($result)) {
@@ -128,7 +129,7 @@ function isStatsTableCreated () {
 
 	// Ask for it
 	$result = SQL_QUERY_ESC("SHOW TABLES LIKE '{?_MYSQL_PREFIX?}_stats_%s'",
-		array(date('Ymd', time())), __FUNCTION__, __LINE__);
+		array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__);
 
 	// Do we have a row?
 	return SQL_NUMROWS($result);
@@ -140,12 +141,12 @@ 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'",
-		array(date('Ymd', time())), __FUNCTION__, __LINE__);
+) ENGINE = HEAP COMMENT = 'Temporary statistics table'",
+		array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__);
 }
 
 // Write all entries to the table
@@ -155,11 +156,11 @@ function writeStatsTable () {
 
 	// Empty the table first
 	SQL_QUERY_ESC("TRUNCATE `{?_MYSQL_PREFIX?}_stats_%s`",
-		array(date('Ymd', time())), __FUNCTION__, __LINE__);
+		array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__);
 
 	// Begin the SQL command
 	$sql = sprintf("REPLACE INTO `{?_MYSQL_PREFIX?}_stats_%s` (`stats_entry`,`stats_value`) VALUES ",
-		date('Ymd', time()));
+		generateDateTime(time(), '6'));
 
 	// Add all entries to the final query
 	foreach ($GLOBALS['stats'] as $entry => $value) {
@@ -173,7 +174,7 @@ function writeStatsTable () {
 // Filter for flushing statistics
 function FILTER_FLUSH_STATS () {
 	// Now do we have stats?
-	if ((isset($GLOBALS['stats'])) && (getConfig('STATS_ENABLED') == 'Y')) {
+	if ((isset($GLOBALS['stats'])) && (!isInstallationPhase()) && (ifStatsAreEnabled())) {
 		// Write statistics to temporary table
 		writeStatsTable();
 	} // END - if