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 911dc01ea085e99279c2efeae41326edfce53a71..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 - 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 *
@@ -48,55 +48,15 @@ if ((isFormSent()) && (!isPostRequestElementSet('id'))) {
 } // END - if
 
 // Form sent or anything else? ;-)
-if ((isFormSent()) && (isPostRequestElementSet('mid'))) {
-       // Make mail editable...
-       $result = SQL_QUERY_ESC('SELECT
-       `id`,
-       `sender` AS `userid`,
-       `subject`,
-       `text`,
-       `url`
-FROM
-       `{?_MYSQL_PREFIX?}_pool`
-WHERE
-       `id`=%s
-LIMIT 1',
-               array(bigintval(postRequestElement('mid'))), __FILE__, __LINE__);
-
-       // Fetch row
-       $content = SQL_FETCHARRAY($result);
-
-       // Free result
-       SQL_FREERESULT($result);
+if ((isFormSent('edit')) && (isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
+       // Get data
+       $content = getPoolDataFromId(postRequestElement('id'));
 
        // Load template
        loadTemplate('admin_edit_email', FALSE, $content);
-} elseif (isGetRequestElementSet('mid')) {
-       // Make also this email editable
-       $result = SQL_QUERY_ESC('SELECT
-       `id`,
-       `sender` AS `userid`,
-       `subject`,
-       `text`,
-       `url`
-FROM
-       `{?_MYSQL_PREFIX?}_pool`
-WHERE
-       `id`=%s
-LIMIT 1',
-               array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
-
-       // Fetch row
-       $content = SQL_FETCHARRAY($result);
-
-       // Free result
-       SQL_FREERESULT($result);
-
-       // Load template
-       loadTemplate('admin_edit_email', FALSE, $content);
-} elseif (isGetRequestElementSet('bid')) {
+} elseif ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) {
                // Make also this email editable
-               $result = SQL_QUERY_ESC('SELECT
+               $result = sqlQueryEscaped('SELECT
        `id`,
        `subject`,
        `text`,
@@ -106,44 +66,29 @@ FROM
 WHERE
        `id`=%s
 LIMIT 1',
-               array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
+               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);
-} elseif (isFormSent('save')) {
+} elseif (isFormSent('do_edit')) {
        // Save changes
-       if (isPostRequestElementSet('mid')) {
+       if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
                // Update pool
-               SQL_QUERY_ESC("UPDATE
-       `{?_MYSQL_PREFIX?}_pool`
-SET
-       `subject`='%s',
-       `text`='%s',
-       `url`='%s'
-WHERE
-       `id`=%s
-LIMIT 1",
-                       array(
-                               postRequestElement('subject'),
-                               postRequestElement('text'),
-                               postRequestElement('url'),
-                               bigintval(postRequestElement('mid')),
-                       ), __FILE__, __LINE__);
-
-               if (!SQL_HASZEROAFFECTED()) {
+               $isUpdated = updatePoolDataById(postRequestElement('id'), NULL, array('subject' => postRequestElement('subject'), 'text' => postRequestElement('text'), 'url' => postRequestElemenet('url')));
+               if ($isUpdated === TRUE) {
                        $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
                } else {
                        $content = '<span class="bad">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
                }
-       } elseif (isPostRequestElementSet('bid')) {
+       } elseif ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) {
                // Update pool
-               SQL_QUERY_ESC("UPDATE
+               sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_bonus`
 SET
        `subject`='%s',
@@ -156,10 +101,10 @@ LIMIT 1",
                                postRequestElement('subject'),
                                postRequestElement('text'),
                                postRequestElement('url'),
-                               bigintval(postRequestElement('bid')),
+                               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>';
@@ -173,28 +118,29 @@ LIMIT 1",
        displayMessage($content);
 } else {
        // Query the pool
-       $result = SQL_QUERY('SELECT
+       $result = sqlQuery('SELECT
        `id`,
-       `sender` AS `userid`,
+       `sender`,
        `subject`,
        `payment_id`,
        `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 ORDER BY
+       `sender` ASC,
        `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);