X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_mediadata.php;h=6821e945faddbc9c213251e95b2fce320458057f;hb=6ab597cf6eeb82241f57ca7d13871338dbb9bcaa;hp=9e16179b21603d9c65b130085dea5d6f99392b35;hpb=c25e794a61b597f90bff599307ae4d766a2d3479;p=mailer.git diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php index 9e16179b21..6821e945fa 100644 --- 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 - 2011 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,7 +65,7 @@ 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 @@ -72,6 +74,8 @@ if (isExtensionActive('bonus')) { FROM `{?_MYSQL_PREFIX?}_bonus` LIMIT 1', __FILE__, __LINE__); + + // Merge data together $content = merge_array($content, SQL_FETCHARRAY($result_media)); // Free memory @@ -84,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);