Theme renamed, missing dash added (minor fixes)

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

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index 1e4b5dac22d7634abdd1ca86203bf1db3209ce2f..338f3b833adab7d1920438ea6c89e070d8c4b6a3 100644 (file)
--- a/inc/stats-functions.php
+++ b/inc/stats-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/25/2009 *
- * ===============                              Last change: 10/25/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 10/25/2009 *
+ * ===================                          Last change: 10/25/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : stats-functions.php                              *
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -80,7 +81,7 @@ function incrementStatsEntry ($entry, $amount=1) {
 // Getter for stats
 function getStatsEntry ($entry) {
        // Default is zero
-       $stats = 0;
+       $stats = '0';
 
        // Is it there?
        if (isStatsEntrySet($entry)) {
@@ -99,6 +100,9 @@ function setStatsEntry ($entry, $value) {
 
 // Loads stats table
 function loadStatsTable () {
+       // Check if the link is up
+       if (!SQL_IS_LINK_UP()) return false;
+
        // Do we have it there for today?
        if (!isStatsTableCreated()) {
                // Then create a default one
@@ -107,7 +111,7 @@ 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)) {
@@ -120,9 +124,12 @@ function loadStatsTable () {
 
 // Checks if the the statistics table is created
 function isStatsTableCreated () {
+       // Check if the link is up
+       if (!SQL_IS_LINK_UP()) return false;
+
        // 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);
@@ -130,27 +137,33 @@ function isStatsTableCreated () {
 
 // Create the dummy table
 function createStatsTable () {
+       // Check if the link is up
+       if (!SQL_IS_LINK_UP()) return false;
+
        // Create it here
        $result = SQL_QUERY_ESC("CREATE 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__);
+               array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__);
 }
 
 // Write all entries to the table
 function writeStatsTable () {
+       // Check if the link is up
+       if (!SQL_IS_LINK_UP()) return false;
+
        // 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("INSERT INTO `{?_MYSQL_PREFIX?}_stats_%s` (`stats_entry`,`stats_value`) VALUES ",
-               date('Ymd', time()));
+       $sql = sprintf("REPLACE INTO `{?_MYSQL_PREFIX?}_stats_%s` (`stats_entry`,`stats_value`) VALUES ",
+               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
 
@@ -161,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()) && (getConfig('STATS_ENABLED') == 'Y')) {
                // Write statistics to temporary table
                writeStatsTable();
        } // END - if