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

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

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index b9edf20f42b769b9e8cdc0952930cdb639c1deea..f3f41f68ab9fc545004a2486f10b138fd315c05b 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.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 *
@@ -56,7 +56,7 @@ if ((isFormSent('edit')) && (isPostRequestElementSet('id')) && (isGetRequestElem
        loadTemplate('admin_edit_email', FALSE, $content);
 } elseif ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) {
                // Make also this email editable
-               $result = SQL_QUERY_ESC('SELECT
+               $result = sqlQueryEscaped('SELECT
        `id`,
        `subject`,
        `text`,
@@ -69,10 +69,10 @@ LIMIT 1',
                array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
 
        // Fetch row
-       $content = SQL_FETCHARRAY($result);
+       $content = sqlFetchArray($result);
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Load template
        loadTemplate('admin_edit_bonus_email', FALSE, $content);
@@ -88,7 +88,7 @@ LIMIT 1',
                }
        } elseif ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) {
                // Update pool
-               SQL_QUERY_ESC("UPDATE
+               sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_bonus`
 SET
        `subject`='%s',
@@ -104,7 +104,7 @@ LIMIT 1",
                                bigintval(postRequestElement('id')),
                        ), __FILE__, __LINE__);
 
-               if (!SQL_HASZEROAFFECTED()) {
+               if (!ifSqlHasZeroAffectedRows()) {
                        $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
                } else {
                        $content = '<span class="bad">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
@@ -118,7 +118,7 @@ LIMIT 1",
        displayMessage($content);
 } else {
        // Query the pool
-       $result = SQL_QUERY('SELECT
+       $result = sqlQuery('SELECT
        `id`,
        `sender`,
        `subject`,
@@ -131,16 +131,16 @@ ORDER BY
        `timestamp` ASC', __FILE__, __LINE__);
 
        // Entries found?
-       if (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // There are mail orders available
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_edit_email_row', TRUE, $content);
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
 
                // Load email template
                loadTemplate('admin_edit_email_select', FALSE, $OUT);