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 66d5a4d8f0c2486726006840d2c89c014f2a79d7..e060e39fe5729921ca40440dccb7fa64c04fbd58 100644 (file)
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Prueft bestehende Mailbuchungen                  *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,13 +38,16 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        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__);
+$result_media = SQL_QUERY('SELECT SUM(max_rec) AS max_rec, SUM(clicks) AS clicks
+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,52 +56,44 @@ 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);
-$result_media = SQL_QUERY("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_bonus", __FILE__, __LINE__);
-list($bcount) = 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"))
-{
+if (EXT_IS_ACTIVE('bonus')) {
+       // Count bonus mails
+       $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
-FROM "._MYSQL_PREFIX."_bonus", __FILE__, __LINE__);
+       $result_media = SQL_QUERY('SELECT SUM(mails_sent) AS bonus_sent, SUM(clicks) AS bonus_clicks
+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");
+loadIncludeOnce('inc/libs/mediadata_functions.php');
 
 // Insert info to database
-MEDIA_UPDATE_ENTRY(array("total_send"  , "normal_send")  , "init", $nsent);
-MEDIA_UPDATE_ENTRY(array("total_clicks", "normal_clicks"), "init", $nclicks);
-MEDIA_UPDATE_ENTRY(array("total_orders", "normal_orders"), "init", $ncount);
-MEDIA_UPDATE_ENTRY(array("total_send"  , "bonus_send" )  , "init", $bsent);
-MEDIA_UPDATE_ENTRY(array("total_clicks", "bonus_clicks") , "init", $bclicks);
-MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders") , "init", $bcount);
+MEDIA_UPDATE_ENTRY(array('total_send'  , 'normal_send')  , 'init', $nsent);
+MEDIA_UPDATE_ENTRY(array('total_clicks', 'normal_clicks'), 'init', $nclicks);
+MEDIA_UPDATE_ENTRY(array('total_orders', 'normal_orders'), 'init', $ncount);
+MEDIA_UPDATE_ENTRY(array('total_send'  , 'bonus_send' )  , 'init', $bsent);
+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);
 
 // Update database
-MEDIA_UPDATE_ENTRY(array("total_points"), "init", ($points - $used));
+MEDIA_UPDATE_ENTRY(array('total_points'), 'init', ($points - $used));
 
 //
 ?>