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

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

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 34515878f862b59cbd8472f2f3639432aff8da15..b1ef76e919167274f062d112ddd6daede52349cb 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 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 *
@@ -54,7 +54,7 @@ if (!isExtensionActive('mailid')) {
 // Shall we display a mail?
 if ((isGetRequestElementSet('bonusid')) && (isExtensionActive('bonus'))) {
        // Display bonus mail by loading it's full data
-       $result_data = SQL_QUERY_ESC('SELECT
+       $result_data = sqlQueryEscaped('SELECT
        `id`,
        `subject`,
        `timestamp`,
@@ -73,7 +73,7 @@ LIMIT 1',
                array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
 
        // Load data
-       $content = SQL_FETCHARRAY($result_data);
+       $content = sqlFetchArray($result_data);
 
        // Translate some data
        $content['timestamp'] = generateDateTime($content['timestamp'], '2');
@@ -99,34 +99,28 @@ LIMIT 1',
        loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), FALSE, $content);
 
        // Free result
-       SQL_FREERESULT($result_data);
+       sqlFreeResult($result_data);
 } elseif (isGetRequestElementSet('mailid')) {
        // Display regular member mail by loading its full data
-       $result_data = SQL_QUERY_ESC("SELECT
-       `s`.`id`,
-       `s`.`subject`,
-       `p`.`text`,
-       `s`.`timestamp_ordered` AS `timestamp`,
-       `s`.`cat_id`,
-       `p`.`payment_id`,
-       `p`.`sender`,
-       `p`.`data_type`
+       $result_data = sqlQueryEscaped("SELECT
+       `id` AS `stats_id`,
+       `pool_id`,
+       `subject`,
+       `timestamp_ordered`,
+       `cat_id`,
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS `s`
-LEFT JOIN
-       `{?_MYSQL_PREFIX?}_pool` AS `p`
-ON
-       s.pool_id=p.id
 WHERE
-       `s`.`id`=%s
+       `id`=%s
 LIMIT 1",
                array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
 
        // Load data
-       $content = SQL_FETCHARRAY($result_data);
+       $content = sqlFetchArray($result_data);
+       $content = merge_array($content, getPoolDataFromId($content['pool_id']));
 
        // Translate some data
-       $content['timestamp'] = generateDateTime($content['timestamp'], '2');
+       $content['timestamp_ordered'] = generateDateTime($content['timestamp_ordered'], '2');
        // @TODO This call cannot be saved as EL code cannot be "framed" in other EL code
        $content['userid'] = getMemberId();
        $content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
@@ -150,21 +144,21 @@ LIMIT 1",
        loadTemplate('member_mail_normal_' . strtolower($content['data_type']), FALSE, $content);
 
        // Free result
-       SQL_FREERESULT($result_data);
+       sqlFreeResult($result_data);
 }
 
 if (isExtensionActive('bonus')) {
        // Load bonus id
-       $result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC",
+       $result = sqlQueryEscaped("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC",
                array(getMemberId()), __FILE__, __LINE__);
 } else {
        // Don't load bonus id if ext-bonus is not installed
-       $result = SQL_QUERY_ESC("SELECT `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
+       $result = sqlQueryEscaped("SELECT `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
                array(getMemberId()), __FILE__, __LINE__);
 }
 
 // Mails left for confirmation?
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNumRows($result)) {
        // Please confirm these mails!
        $sum = '0'; $OUT = '';
 
@@ -172,7 +166,7 @@ if (!SQL_HASZERONUMS($result)) {
        $content = array();
 
        // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-       while ($row = SQL_FETCHARRAY($result)) {
+       while ($row = sqlFetchArray($result)) {
                // Load data from stats table...
                $cat = '';
                $result_data = FALSE;
@@ -180,7 +174,7 @@ if (!SQL_HASZERONUMS($result)) {
                $data = $row['stats_id'] . '/' . $row['bonus_id'] . '/' . $row['link_type'];
                switch ($row['link_type']) {
                        case 'NORMAL':
-                               $result_data = SQL_QUERY_ESC("SELECT
+                               $result_data = sqlQueryEscaped("SELECT
        `s`.`subject`,
        `s`.`timestamp_ordered` AS `timestamp`,
        `s`.`cat_id`,
@@ -202,7 +196,7 @@ LIMIT 1",
                                break;
 
                        case 'BONUS':
-                               $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id`, `points`, NULL FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                               $result_data = sqlQueryEscaped("SELECT `subject`, `timestamp`, `cat_id`, `points`, NULL FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                        array(bigintval($row['bonus_id'])), __FILE__, __LINE__);
                                $row['link_type'] = 'bonusid';
                                $data = $row['bonus_id'];
@@ -215,9 +209,9 @@ LIMIT 1",
                } // END - switch
 
                // Data found to this mail?
-               if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
+               if ((sqlNumRows($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
                        // Mail was found
-                       $rowData = SQL_FETCHARRAY($result_data);
+                       $rowData = sqlFetchArray($result_data);
 
                        // Subject line found?
                        if (empty($rowData['subject'])) {
@@ -275,11 +269,11 @@ LIMIT 1",
                }
 
                // Free result
-               SQL_FREERESULT($result_data);
+               sqlFreeResult($result_data);
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Remember total points
        $content['total_points'] = $sum;