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

[mailer.git] / inc / modules / admin / what-list_unconfirmed.php

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 48d905bc168bfcb5630c3bf5baa1b6a5ccda92ea..897d760274220303bc3f42327274e27f79d7c862 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_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 *
@@ -57,7 +57,7 @@ $sql = '';
 // List confirmation links from normal or bonus mails
 if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
        // SQL query for mail data
-       $sql = sprintf("SELECT
+       $sql = sprintf('SELECT
        `s`.`id`,
        `p`.`sender`,
        `p`.`subject`,
@@ -73,7 +73,7 @@ ON
        `p`.`id`=`s`.`pool_id`
 WHERE
        `s`.`pool_id`=%s
-LIMIT 1",
+LIMIT 1',
                bigintval(getRequestElement('id'))
        );
 
@@ -87,7 +87,7 @@ LIMIT 1",
        $DATA = getRequestElement('id');
 } elseif (((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) && (isExtensionActive('bonus'))) {
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
-       $sql = sprintf("SELECT
+       $sql = sprintf('SELECT
        `id`,
        NULL AS `sender`,
        `subject`,
@@ -99,7 +99,7 @@ FROM
        `{?_MYSQL_PREFIX?}_bonus`
 WHERE
        `id`=%s
-LIMIT 1",
+LIMIT 1',
                bigintval(getRequestElement('id'))
        );
 
@@ -119,12 +119,12 @@ LIMIT 1",
 // Shall I display links or not?
 if (($listed === TRUE) && (!empty($sql))) {
        // Load mail data
-       $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
+       $result_master = sqlQuery($sql, __FILE__, __LINE__);
 
        // Is there an entry?
-       if (SQL_NUMROWS($result_master) == 1) {
+       if (sqlNumRows($result_master) == 1) {
                // Mail order / bonus mail found
-               $poolData = SQL_FETCHARRAY($result_master);
+               $poolData = sqlFetchArray($result_master);
 
                // If there is a pool id and $ID is not set, we take it
                if (($poolData['id'] > 0) && ($ID == '-1')) {
@@ -139,7 +139,7 @@ if (($listed === TRUE) && (!empty($sql))) {
                // Load unconfirmed mail links. Hmmm, this select query is pretty cool
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
-               $result = SQL_QUERY_ESC("SELECT
+               $result = sqlQueryEscaped("SELECT
        `l`.`userid`,
        `u`.`status`,
        `u`.`surname`,
@@ -164,10 +164,10 @@ LIMIT %s",
                        ),__FILE__, __LINE__);
 
                // Are there entries?
-               if (!SQL_HASZERONUMS($result)) {
+               if (!ifSqlHasZeroNumRows($result)) {
                        // At least one link left to confirm
                        $OUT = '';
-                       while ($row = SQL_FETCHARRAY($result)) {
+                       while ($row = sqlFetchArray($result)) {
                                // User data found? We can take any field of u.
                                if (!is_null($row['status'])) {
                                        // Prepare data for the row template
@@ -191,17 +191,17 @@ LIMIT %s",
                        $OUT = loadTemplate('admin_list_unconfirmed_list', TRUE, $OUT);
                } else {
                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
-                       $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', TRUE);
+                       $OUT = returnMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}');
                }
 
                // Prepare content
                $content                = $poolData;
-               $content['unconfirmed'] = SQL_NUMROWS($result);
+               $content['unconfirmed'] = sqlNumRows($result);
                $content['timestamp']   = generateDateTime($poolData['timestamp'], 2);
                $content['rows']        = $OUT;
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
 
                // Load final template
                loadTemplate('admin_list_unconfirmed', FALSE, $content);
@@ -223,7 +223,7 @@ LIMIT %s",
        }
 
        // Free result
-       SQL_FREERESULT($result_master);
+       sqlFreeResult($result_master);
 } // END - if
 
 // [EOF]