X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_mediadata.php;h=7f9ff7c38856f677f4f20aa33fd3d1f063b3e8d5;hp=7f4246a5083b89c8d576e23d0e4007ad6cb218c3;hb=35fd597b272983427fd88f541ea55642e0b42c9e;hpb=4f089d36fcc801992932f3a1f47ab139b573a38d

diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index 7f4246a508..7f9ff7c388 100644
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 *
@@ -42,58 +40,64 @@ 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
+$result_media = sqlQuery('SELECT
+	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';
 
-// Free memory
-SQL_FREERESULT($result_media);
+// Merge data together
+$content = merge_array($content, sqlFetchArray($result_media));
 
-// Count mail orders
-$ncount = countSumTotalData('', 'user_stats', 'id', '', true);
+// Free memory
+sqlFreeResult($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_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 = sqlQuery('SELECT
+	SUM(`mails_send`) AS `bonus_send`,
+	SUM(`clicks`) AS `bonus_clicks`
+FROM
+	`{?_MYSQL_PREFIX?}_bonus`
+LIMIT 1', __FILE__, __LINE__);
+
+	// Merge data together
+	$content = merge_array($content, sqlFetchArray($result_media));
+
+	// Free memory
+	sqlFreeResult($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
-$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);
+$used = countSumTotalData('', 'user_data', 'used_points', '');
 
 // ... and total points
-$result = SQL_QUERY('SELECT SUM(`points`) AS points FROM `{?_MYSQL_PREFIX?}_user_points`', __FILE__, __LINE__);
-list($points) = SQL_FETCHROW($result);
-SQL_FREERESULT($result);
+$points = countSumTotalData('', 'user_points', 'points', '');
 
 // Update database
 updateMediadataEntry(array('total_points'), 'init', ($points - $used));