Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / modules / member / what-stats.php

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index b10dd0a11811093b5bbf0d5edf26de0e569f2198..9c62bc4fd2338fc2f8bd23a4df2b26620afa8b0f 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.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 - 2015 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 *
@@ -39,20 +37,28 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 // Init output
 $main_content = array();
 
 // Load waiting/pending orders
-$result = SQL_QUERY_ESC("SELECT
-       `id`, `cat_id`, `payment_id`, `subject`, `url`, `timestamp`, `target_send`, `data_type`, `zip`
+$result = sqlQueryEscaped("SELECT
+       `id`,
+       `cat_id`,
+       `payment_id`,
+       `subject`,
+       `url`,
+       `timestamp`,
+       `target_send`,
+       `data_type`,
+       `zip`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -63,63 +69,73 @@ ORDER BY
        array(getMemberId()), __FILE__, __LINE__);
 
 // Are there mails left in pool?
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNumRows($result)) {
        // Load all orders
        $OUT = '';
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Prepare content for output
-               $content['timestamp'] = generateDateTime($content['timestamp'], 2);
+               $content['timestamp'] = generateDateTime($content['timestamp'], '2');
 
                // Load template
-               $OUT .= loadTemplate('member_pool_row', true, $content);
+               $OUT .= loadTemplate('member_pool_row', TRUE, $content);
        } // END - if
 
        // Load main template
-       $main_content['pool'] = loadTemplate('member_pool_table', true, $OUT);
+       $main_content['pool'] = loadTemplate('member_pool_table', TRUE, $OUT);
 } else {
        // No mails in pool!
-       $main_content['pool'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_MAILS_IN_POOL--}');
+       $main_content['pool'] = returnMessage('{--MEMBER_NO_MAILS_IN_POOL--}');
 }
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // Load sent orders
-$result = SQL_QUERY_ESC("SELECT
-       `id`, `cat_id`, `payment_id`, `subject`, `url`, `timestamp_ordered`, `max_rec`, `timestamp_send`, `clicks`
+$result = sqlQueryEscaped('SELECT
+       `id`,
+       `cat_id`,
+       `payment_id`,
+       `subject`,
+       `url`,
+       `timestamp_ordered`,
+       `max_rec`,
+       `timestamp_send`,
+       `clicks`
 FROM
        `{?_MYSQL_PREFIX?}_user_stats`
 WHERE
        `userid`=%s
 ORDER BY
-       `timestamp_ordered` DESC",
+       `timestamp_ordered` DESC',
        array(getMemberId()), __FILE__, __LINE__);
 
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNumRows($result)) {
        // Mail orders are in pool so we can display them
        $OUT = '';
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Prepare data for the template
-               $content['timestamp_ordered'] = generateDateTime($content['timestamp_ordered'], 2);
-               $content['timestamp_sent']    = generateDateTime($content['timestamp_send'], 2);
-               $content['percents']          = ($content['clicks'] / $content['max_rec'] * 100);
+               $content['timestamp_ordered'] = generateDateTime($content['timestamp_ordered'], '2');
+               $content['timestamp_sent']    = generateDateTime($content['timestamp_send'], '2');
+
+               // Click rate
+               $content['click_rate'] = calculatePercentageRate($content['clicks'], $content['max_rec']);
 
                // Load row template and switch colors
-               $OUT .= loadTemplate('member_stats_row', true, $content);
+               $OUT .= loadTemplate('member_stats_row', TRUE, $content);
        } // END - while
 
        // Load main template
-       $main_content['stats'] = loadTemplate('member_stats_table', true, $OUT);
+       $main_content['stats'] = loadTemplate('member_stats_table', TRUE, $OUT);
 } else {
        // No mail orders fond
-       $main_content['stats'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_MAILS_IN_STATS--}');
+       $main_content['stats'] = returnMessage('{--MEMBER_NO_MAILS_IN_STATS--}');
 }
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // Load main template
-loadTemplate('member_stats_pool', false, $main_content);
+loadTemplate('member_stats_pool', FALSE, $main_content);
 
 // [EOF]
 ?>