More misc fixes and rewrites (sorry, lame description)

[mailer.git] / inc / gen_mediadata.php

diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index 73a8bce909615b50ceed9fe0ba87d75e326340ce..e060e39fe5729921ca40440dccb7fa64c04fbd58 100644 (file)
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -56,16 +56,12 @@ if (empty($nclicks)) $nclicks = 0;
 SQL_FREERESULT($result_media);
 
 // Count mail orders
-$result_media = SQL_QUERY('SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_stats`', __FILE__, __LINE__);
-list($ncount) = SQL_FETCHROW($result_media);
-SQL_FREERESULT($result_media);
+$ncount = GET_TOTAL_DATA('', 'user_stats', 'id', '', true);
 
 // Check for bonus extension
 if (EXT_IS_ACTIVE('bonus')) {
        // Count bonus mails
-       $result_media = SQL_QUERY('SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_bonus`', __FILE__, __LINE__);
-       list($bcount) = SQL_FETCHROW($result_media);
-       SQL_FREERESULT($result_media);
+       $bcount = GET_TOTAL_DATA('', 'bonus', 'id', '', true);
 
        // Check for bonus mails
        $result_media = SQL_QUERY('SELECT SUM(mails_sent) AS bonus_sent, SUM(clicks) AS bonus_clicks
@@ -76,7 +72,7 @@ FROM `{!_MYSQL_PREFIX!}_bonus`', __FILE__, __LINE__);
 } // END - if
 
 // Load (maybe) missing file
-LOAD_INC_ONCE('inc/libs/mediadata_functions.php');
+loadIncludeOnce('inc/libs/mediadata_functions.php');
 
 // Insert info to database
 MEDIA_UPDATE_ENTRY(array('total_send'  , 'normal_send')  , 'init', $nsent);