All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

[mailer.git] / inc / gen_mediadata.php

diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index 66d5a4d8f0c2486726006840d2c89c014f2a79d7..a7bd796574616cec67391fb8a7519a40fb5c3a16 100644 (file)
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -37,9 +37,12 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
+// Init variables
+$bsent = 0; $bclicks = 0; $bcount = 0;
+
 // Check for normal mails
 $result_media = SQL_QUERY("SELECT SUM(max_rec) AS max_rec, SUM(clicks) AS clicks
-FROM "._MYSQL_PREFIX."_user_stats", __FILE__, __LINE__);
+FROM `{!MYSQL_PREFIX!}_user_stats`", __FILE__, __LINE__);
 list($nsent, $nclicks) = SQL_FETCHROW($result_media);
 if (empty($nsent))   $nsent   = 0;
 if (empty($nclicks)) $nclicks = 0;
@@ -48,28 +51,24 @@ 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__);
+$result_media = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_user_stats`", __FILE__, __LINE__);
 list($ncount) = SQL_FETCHROW($result_media);
 SQL_FREERESULT($result_media);
-$result_media = SQL_QUERY("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_bonus", __FILE__, __LINE__);
-list($bcount) = SQL_FETCHROW($result_media);
-SQL_FREERESULT($result_media);
 
 // Check for bonus extension
-if (EXT_IS_ACTIVE("bonus"))
-{
+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);
+
        // Check for bonus mails
        $result_media = SQL_QUERY("SELECT SUM(mails_sent) AS bonus_sent, SUM(clicks) AS bonus_clicks
-FROM "._MYSQL_PREFIX."_bonus", __FILE__, __LINE__);
+FROM `{!MYSQL_PREFIX!}_bonus`", __FILE__, __LINE__);
        list($bsent, $bclicks) = SQL_FETCHROW($result_media);
        if (empty($bsent))   $bsent   = 0;
        if (empty($bclicks)) $bclicks = 0;
-}
- else
-{
-       // Not found!
-       $bsent = 0; $bclicks = 0;
-}
+} // END - if
 
 // Load (maybe) missing file
 require_once(PATH."inc/libs/mediadata_functions.php");
@@ -83,12 +82,12 @@ MEDIA_UPDATE_ENTRY(array("total_clicks", "bonus_clicks") , "init", $bclicks);
 MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders") , "init", $bcount);
 
 // Aquire total used points
-$result = SQL_QUERY("SELECT SUM(used_points) AS used_points FROM "._MYSQL_PREFIX."_user_data", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT SUM(used_points) AS used_points FROM `{!MYSQL_PREFIX!}_user_data`", __FILE__, __LINE__);
 list($used) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // ... and total points
-$result = SQL_QUERY("SELECT SUM(points) AS points FROM "._MYSQL_PREFIX."_user_points", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT SUM(points) AS points FROM `{!MYSQL_PREFIX!}_user_points`", __FILE__, __LINE__);
 list($points) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);