Rewrites to use filters instead of mass if() blocks

[mailer.git] / inc / gen_mediadata.php

diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index 0f72be55323825c1bec8c27b2f1033383604945e..6821e945faddbc9c213251e95b2fce320458057f 100644 (file)
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -55,6 +55,8 @@ $result_media = SQL_QUERY('SELECT
        SUM(`clicks`) AS `normal_clicks`
 FROM
        `{?_MYSQL_PREFIX?}_user_stats`', __FILE__, __LINE__);
+
+// Merge data together
 $content = merge_array($content, SQL_FETCHARRAY($result_media));
 
 // Free memory
@@ -63,14 +65,17 @@ SQL_FREERESULT($result_media);
 // Check for bonus extension
 if (isExtensionActive('bonus')) {
        // Count bonus mails
-       $bcount = countSumTotalData('', 'bonus', 'id', '', true);
+       $bcount = countSumTotalData('', 'bonus', 'id', '', TRUE);
 
        // Check for bonus mails
        $result_media = SQL_QUERY('SELECT
        SUM(`mails_send`) AS `bonus_send`,
        SUM(`clicks`) AS `bonus_clicks`
 FROM
-       `{?_MYSQL_PREFIX?}_bonus`', __FILE__, __LINE__);
+       `{?_MYSQL_PREFIX?}_bonus`
+LIMIT 1', __FILE__, __LINE__);
+
+       // Merge data together
        $content = merge_array($content, SQL_FETCHARRAY($result_media));
 
        // Free memory
@@ -83,7 +88,7 @@ loadIncludeOnce('inc/libs/mediadata_functions.php');
 // Insert info to database
 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_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);