X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_mediadata.php;h=7f9ff7c38856f677f4f20aa33fd3d1f063b3e8d5;hb=ec3907de5b6c1ca85da82232707c85d22e197c11;hp=cd3fdb2ec2dead7b9d1b6a3f4ebff033317c2692;hpb=879d21c8fbaf8868194aeb456a77ab95b0dc43b0;p=mailer.git diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php index cd3fdb2ec2..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 * @@ -52,31 +50,36 @@ $content = array( ); // Check for normal mails -$result_media = SQL_QUERY('SELECT +$result_media = sqlQuery('SELECT SUM(`max_rec`) AS `normal_send`, SUM(`clicks`) AS `normal_clicks` FROM `{?_MYSQL_PREFIX?}_user_stats`', __FILE__, __LINE__); -$content = merge_array($content, SQL_FETCHARRAY($result_media)); + +// Merge data together +$content = merge_array($content, sqlFetchArray($result_media)); // Free memory -SQL_FREERESULT($result_media); +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 + $result_media = sqlQuery('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)); + `{?_MYSQL_PREFIX?}_bonus` +LIMIT 1', __FILE__, __LINE__); + + // Merge data together + $content = merge_array($content, sqlFetchArray($result_media)); // Free memory - SQL_FREERESULT($result_media); + sqlFreeResult($result_media); } // END - if // Load (maybe) missing file @@ -85,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);