A lot has been rewritten, ext-teams added, ext-forced continued:

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

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index f22bc6300e373dc1b0c7087c065903fbecd6eb29..6d9b8eed9d392b79ae5d031eed1fcf98aeda192a 100644 (file)
--- a/inc/stats-functions.php
+++ b/inc/stats-functions.php
@@ -14,10 +14,9 @@
  * $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 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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,14 +156,14 @@ 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) {
+       foreach ($GLOBALS['stats'] as $entry => $value) {
                $sql .= sprintf("('%s', %s),", $entry, bigintval($value));
        } // END - foreach
 
@@ -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