X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstats-functions.php;h=61392cbfff3c4e8e29ca7fc359d671bbafebd274;hb=0b3c067e92787167d135981d4fe6f3a039bad0af;hp=79cc70549b335fac7581673e44d509583efabf57;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git diff --git a/inc/stats-functions.php b/inc/stats-functions.php index 79cc70549b..61392cbfff 100644 --- a/inc/stats-functions.php +++ b/inc/stats-functions.php @@ -14,11 +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, 2010 by Mailer Developer Team * + * 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 * @@ -45,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(); @@ -66,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,8 +108,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)) { @@ -129,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); @@ -145,8 +145,8 @@ function createStatsTable () { `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__); +) TYPE = HEAP COMMENT = 'Temporary statistics table'", + array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__); } // Write all entries to the table @@ -156,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) { @@ -174,7 +174,7 @@ function writeStatsTable () { // Filter for flushing statistics function FILTER_FLUSH_STATS () { // Now do we have stats? - if ((isset($GLOBALS['stats'])) && (!isInstallationPhase()) && (getConfig('STATS_ENABLED') == 'Y')) { + if ((isset($GLOBALS['stats'])) && (!isInstallationPhase()) && (ifStatsAreEnabled())) { // Write statistics to temporary table writeStatsTable(); } // END - if