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

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

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index fed64612ec424b9e2da837248dc37ed349e9c676..f941962989d977ccfea4ddad1274984fbbcef8cd 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.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 *
@@ -52,7 +52,18 @@ if (!isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
 
 // Normal mails ordered by your members
 $sql = "SELECT
-       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `mails_sent`, `cat_id`
+       `id`,
+       `sender`,
+       `subject`,
+       `text`,
+       `receivers`,
+       `payment_id`,
+       `data_type`,
+       `timestamp`,
+       `url`,
+       `target_send`,
+       `mails_sent`,
+       `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -63,28 +74,50 @@ ORDER BY
 $WHO = '';
 $SQL2 = '';
 
-if (isGetRequestElementSet('mid')) {
+if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
        // Only a specific mail shall be displayed
-       $sql = sprintf("SELECT
-       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `mails_sent`, `cat_id`
+       $sql = sprintf('SELECT
+       `id`,
+       `sender`,
+       `subject`,
+       `text`,
+       `receivers`,
+       `payment_id`,
+       `data_type`,
+       `timestamp`,
+       `url`,
+       `target_send`,
+       `mails_sent`,
+       `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
        `id`=%s
-LIMIT 1",
-               bigintval(getRequestElement('mid'))
+LIMIT 1',
+               bigintval(getRequestElement('id'))
        );
-       $WHO = '{--MAIL_ID--}' . ': ' . getRequestElement('mid');
+       $WHO = '{--MAIL_ID--}' . ': ' . getRequestElement('id');
 } elseif (isGetRequestElementSet('userid')) {
        // All mails by a specific member shall be displayed
-       $sql = sprintf("SELECT
-       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `mails_sent`, `cat_id`
+       $sql = sprintf('SELECT
+       `id`,
+       `sender`,
+       `subject`,
+       `text`,
+       `receivers`,
+       `payment_id`,
+       `data_type`,
+       `timestamp`,
+       `url`,
+       `target_send`,
+       `mails_sent`,
+       `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
        `sender`=%s
 ORDER BY
-       `timestamp` DESC",
+       `timestamp` DESC',
                bigintval(getRequestElement('userid'))
        );
        $WHO = '{--USER_ID--}' . ': ' . getRequestElement('userid');
@@ -95,8 +128,20 @@ $result_bonus = FALSE;
 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Check for maximum pages
-       $result_bonus = SQL_QUERY("SELECT
-       `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`,
+       $result_bonus = sqlQuery("SELECT
+       `id`,
+       `subject`,
+       `text`,
+       `receivers`,
+       `points`,
+       `time`,
+       `data_type`,
+       `timestamp`,
+       `url`,
+       `cat_id`,
+       `target_send`,
+       `mails_sent`,
+       `clicks`,
        (`mails_sent` - `clicks`) AS `unconfirmed`
 FROM
        `{?_MYSQL_PREFIX?}_bonus`
@@ -107,7 +152,7 @@ ORDER BY
 } // END - if
 
 // Check for maximum pages
-$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
+$result_normal = sqlQuery($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
 if (!isGetRequestElementSet('page')) setGetRequestElement('page', 1);
@@ -123,7 +168,7 @@ if (!isGetRequestElementSet('offset')) {
 } // END - if
 
 // Add limitation to SQL string
-if (!isGetRequestElementSet('mid')) {
+if (!(isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
        // Create limitation line
        $add = ' LIMIT ' . (bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))) . ', ' . bigintval(getRequestElement('offset'));
 
@@ -135,39 +180,39 @@ if (!isGetRequestElementSet('mid')) {
 } // END - if
 
 // Run SQL query for normal mails
-$result_list = SQL_QUERY($sql, __FILE__, __LINE__);
+$result_list = sqlQuery($sql, __FILE__, __LINE__);
 if ((!empty($SQL2)) && (empty($WHO))) {
-       $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+       $result_bonus = sqlQuery($SQL2, __FILE__, __LINE__);
 } // END - if
 
 // Calculate pages
 $numPages = '0';
 if (isConfigEntrySet('mails_page')) {
-       $numPages = round(SQL_NUMROWS($result_normal) / getMailsPage() + 0.3);
+       $numPages = round(sqlNumRows($result_normal) / getMailsPage() + 0.3);
 } // END - if
 
 // Free result
-SQL_FREERESULT($result_normal);
+sqlFreeResult($result_normal);
 
 $MAIL = FALSE;
-if (!SQL_HASZERONUMS($result_list)) {
+if (!ifSqlHasZeroNumRows($result_list)) {
        // Init rows
        $OUT = '';
 
        // Walk through all entries
-       while ($content = SQL_FETCHARRAY($result_list)) {
+       while ($content = sqlFetchArray($result_list)) {
                // Unconfirmed mails and sent mails
-               $result_uncon = SQL_QUERY_ESC("SELECT (`max_rec` - `clicks`) AS `unconfirmed` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+               $result_uncon = sqlQueryEscaped("SELECT (`max_rec` - `clicks`) AS `unconfirmed` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
                        array(bigintval($content['id'])), __FILE__, __LINE__);
 
                // Load and merge data
-               $content = merge_array($content, SQL_FETCHARRAY($result_uncon));
+               $content = merge_array($content, sqlFetchArray($result_uncon));
 
                // Free result
-               SQL_FREERESULT($result_uncon);
+               sqlFreeResult($result_uncon);
 
                // Unconfirmed mails
-               $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], ($content['unconfirmed']), 'mid');
+               $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], ($content['unconfirmed']), 'normal');
 
                // Prepare content
                $content['timestamp']   = generateDateTime($content['timestamp'], 0);
@@ -177,7 +222,7 @@ if (!SQL_HASZERONUMS($result_list)) {
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result_list);
+       sqlFreeResult($result_list);
 
        // Add navigation (with change box and colspan=3)
        $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);
@@ -192,21 +237,21 @@ if (!SQL_HASZERONUMS($result_list)) {
        $MAIL = TRUE;
        if ((isExtensionActive('bonus')) && (empty($WHO))) {
                // Only check if bonus extension is active
-               if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
+               if (!ifSqlHasZeroNumRows($result_bonus)) outputHtml('<br /><br />');
        } // END - if
 } // END - if
 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Load bonus mails only when extension is active
-       if (!SQL_HASZERONUMS($result_bonus)) {
+       if (!ifSqlHasZeroNumRows($result_bonus)) {
                // Calculate pages
-               $numPages = round(SQL_NUMROWS($result_bonus) / getMailsPage() + 0.5);
+               $numPages = round(sqlNumRows($result_bonus) / getMailsPage() + 0.5);
 
                // List emails
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result_bonus)) {
+               while ($content = sqlFetchArray($result_bonus)) {
                        // Add link to list_unconfirmed what-file
-                       $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed']);
+                       $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed'], 'bonus');
 
                        // Prepare content
                        $content['timestamp']   = generateDateTime($content['timestamp'], 0);