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 91e79b44cd959bbb7cd37c4329fd2b5062c46d25..9c62bc4fd2338fc2f8bd23a4df2b26620afa8b0f 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * 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 *
@@ -49,7 +49,7 @@ addYouAreHereLink('member', __FILE__);
 $main_content = array();
 
 // Load waiting/pending orders
-$result = SQL_QUERY_ESC("SELECT
+$result = sqlQueryEscaped("SELECT
        `id`,
        `cat_id`,
        `payment_id`,
@@ -69,10 +69,10 @@ 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');
 
@@ -84,14 +84,14 @@ if (!SQL_HASZERONUMS($result)) {
        $main_content['pool'] = loadTemplate('member_pool_table', TRUE, $OUT);
 } else {
        // No mails in pool!
-       $main_content['pool'] = displayMessage('{--MEMBER_NO_MAILS_IN_POOL--}', TRUE);
+       $main_content['pool'] = returnMessage('{--MEMBER_NO_MAILS_IN_POOL--}');
 }
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // Load sent orders
-$result = SQL_QUERY_ESC('SELECT
+$result = sqlQueryEscaped('SELECT
        `id`,
        `cat_id`,
        `payment_id`,
@@ -109,21 +109,16 @@ ORDER BY
        `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');
 
                // Click rate
-               $content['click_rate'] = '0';
-
-               // Better protection against 'divison-by-zero'
-               if ($content['max_rec'] > 0) {
-                       $content['click_rate'] = ($content['clicks'] / $content['max_rec'] * 100);
-               } // END - if
+               $content['click_rate'] = calculatePercentageRate($content['clicks'], $content['max_rec']);
 
                // Load row template and switch colors
                $OUT .= loadTemplate('member_stats_row', TRUE, $content);
@@ -133,11 +128,11 @@ if (!SQL_HASZERONUMS($result)) {
        $main_content['stats'] = loadTemplate('member_stats_table', TRUE, $OUT);
 } else {
        // No mail orders fond
-       $main_content['stats'] = displayMessage('{--MEMBER_NO_MAILS_IN_STATS--}', TRUE);
+       $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);