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

diff --git a/inc/stats-functions.php b/inc/stats-functions.php
index baa0b130b1..5d8c441f48 100644
--- 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 *
@@ -44,7 +45,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 +66,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 (getConfig('stats_enabled') != 'Y') return;
 
 	// 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
@@ -106,8 +110,10 @@ 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",
-		array(date('Ymd', time())), __FUNCTION__, __LINE__);
+	$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__);
 
 	// Read all rows
 	while ($row = SQL_FETCHARRAY($result)) {
@@ -120,9 +126,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 +139,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("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
 
@@ -161,11 +176,25 @@ 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
 }
 
+// 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]
 ?>