Renamed function so it might be more understandable

[mailer.git] / inc / gen_mediadata.php

diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index 8922660483b0431a3120658c7ed2384c646ee926..0f72be55323825c1bec8c27b2f1033383604945e 100644 (file)
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -42,47 +40,52 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
-// Init variables
-$bsent = '0'; $bclicks = '0'; $bcount = '0';
+// Init array/varriable
+$bcount = '0';
+$content = array(
+       'normal_send'   => 0,
+       'normal_clicks' => 0,
+       'bonus_send'    => 0,
+       'bonus_clicks'  => 0
+);
 
 // Check for normal mails
 $result_media = SQL_QUERY('SELECT
-       SUM(`max_rec`) AS max_rec,
-       SUM(`clicks`) AS clicks
+       SUM(`max_rec`) AS `normal_send`,
+       SUM(`clicks`) AS `normal_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';
+$content = merge_array($content, SQL_FETCHARRAY($result_media));
 
 // Free memory
 SQL_FREERESULT($result_media);
 
-// Count mail orders
-$ncount = countSumTotalData('', 'user_stats', 'id', '', true);
-
 // Check for bonus extension
 if (isExtensionActive('bonus')) {
        // Count bonus mails
        $bcount = countSumTotalData('', '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__);
-       list($bsent, $bclicks) = SQL_FETCHROW($result_media);
-       if (empty($bsent))   $bsent   = '0';
-       if (empty($bclicks)) $bclicks = '0';
+       $result_media = SQL_QUERY('SELECT
+       SUM(`mails_send`) AS `bonus_send`,
+       SUM(`clicks`) AS `bonus_clicks`
+FROM
+       `{?_MYSQL_PREFIX?}_bonus`', __FILE__, __LINE__);
+       $content = merge_array($content, SQL_FETCHARRAY($result_media));
+
+       // Free memory
+       SQL_FREERESULT($result_media);
 } // END - if
 
 // Load (maybe) missing file
 loadIncludeOnce('inc/libs/mediadata_functions.php');
 
 // Insert info to database
-updateMediadataEntry(array('total_send'  , 'normal_send')  , 'init', $nsent);
-updateMediadataEntry(array('total_clicks', 'normal_clicks'), 'init', $nclicks);
-updateMediadataEntry(array('total_orders', 'normal_orders'), 'init', $ncount);
-updateMediadataEntry(array('total_send'  , 'bonus_send' )  , 'init', $bsent);
-updateMediadataEntry(array('total_clicks', 'bonus_clicks') , 'init', $bclicks);
+updateMediadataEntry(array('total_send'  , 'normal_send')  , 'init', $content['normal_send']);
+updateMediadataEntry(array('total_clicks', 'normal_clicks'), 'init', $content['normal_clicks']);
+updateMediadataEntry(array('total_orders', 'normal_orders'), 'init', countSumTotalData('', 'user_stats', 'id', '', true));
+updateMediadataEntry(array('total_send'  , 'bonus_send' )  , 'init', $content['bonus_send']);
+updateMediadataEntry(array('total_clicks', 'bonus_clicks') , 'init', $content['bonus_clicks']);
 updateMediadataEntry(array('total_orders', 'bonus_orders') , 'init', $bcount);
 
 // Aquire total used points