Parser error fixed + some empty lines added between table rows (tr)

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

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index f367fb9a017e9b13b08f374de965d080375cfad6..d6f42b43a242abc48b543a4725402852587b1088 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -49,7 +49,7 @@ $count = '0';
 if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
        // Load email data
        // @TODO Unused: cat_id
-       $content getPoolDataFromId(getRequestElement('id'));
+       $content = getPoolDataFromId(getRequestElement('id'));
 
        // Delete mail only once
        if (count($content) > 0) {
@@ -64,7 +64,7 @@ if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (post
                sendEmail($content['sender'], '{--MEMBER_ORDER_DELETED--}', $message_user);
 
                // Fetch right stats_id from pool
-               $result_pool = SQL_QUERY_ESC("SELECT
+               $result_pool = sqlQueryEscaped("SELECT
        `s`.`id`
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS `s`
@@ -76,9 +76,9 @@ WHERE
        `s`.`pool_id`=%s
 LIMIT 1",
                        array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result_pool) == 1) {
+               if (sqlNumRows($result_pool) == 1) {
                        // Fetch stats id
-                       list($stats_id) = SQL_FETCHROW($result_pool);
+                       list($stats_id) = sqlFetchRow($result_pool);
 
                        // Get all user links
                        $links = countSumTotalData($stats_id, 'user_links', 'userid', 'stats_id', TRUE);
@@ -119,21 +119,21 @@ LIMIT 1",
                        }
 
                        // Remove links from DB
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
+                       sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
                                array(bigintval($stats_id)), __FILE__, __LINE__);
-                       $count += SQL_AFFECTEDROWS();
+                       $count += sqlAffectedRows();
 
                        // Load template for link
                        displayMessage('<a href="{%url=modules.php?module=admin&amp;what=del_email&amp;pid=' . bigintval(getRequestElement('id')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
                } // END - if
 
                // Free the result
-               SQL_FREERESULT($result_pool);
+               sqlFreeResult($result_pool);
 
                // Delete mail from queue
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+               sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
                        array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
-               $count += SQL_AFFECTEDROWS();
+               $count += sqlAffectedRows();
 
                // Output link for manually removing stats entry
                outputHtml('{%message,ADMIN_DELETED_MAILS_COUNT=' . $count . '%}');
@@ -143,23 +143,23 @@ LIMIT 1",
        }
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 } elseif (isGetRequestElementSet('pid')) {
        // Remove stats entries
-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+       sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
                array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__);
 
        // Output message
        displayMessage('{--ADMIN_USER_STATS_REMOVED--}');
 } elseif (((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) && (isExtensionActive('bonus'))) {
        // Load data from bonus mail
-       $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
 
        // Delete mail only once
-       if (SQL_NUMROWS($result) == 1) {
+       if (sqlNumRows($result) == 1) {
                // Load data
-               $content = SQL_FETCHARRAY($result);
+               $content = sqlFetchArray($result);
 
                // Reset sent mails for recipient(s)
                reduceRecipientReceivedMails('bonus_id', getRequestElement('id'), $content['mails_sent']);
@@ -168,12 +168,12 @@ LIMIT 1",
                $count = '0';
 
                // Delete bonus mail entirely from database
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+               sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                        array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
-               $count += SQL_AFFECTEDROWS();
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
+               $count += sqlAffectedRows();
+               sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
                        array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
-               $count += SQL_AFFECTEDROWS();
+               $count += sqlAffectedRows();
 
                // Prepare data for the template
                $content['timestamp'] = generateDateTime($content['timestamp'], '0');
@@ -187,24 +187,24 @@ LIMIT 1",
        }
 } elseif ((isGetRequestElementSet('nid')) && (isExtensionInstalledAndNewer('bonus', '0.8.7'))) {
        // Load data from bonus mail
-       $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `id`, `subject`, `url`, `timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
 
        // Delete mail only once
-       if (SQL_NUMROWS($result) == 1) {
+       if (sqlNumRows($result) == 1) {
                // Load data
-               $content = SQL_FETCHARRAY($result);
+               $content = sqlFetchArray($result);
 
                // Init counter for deleted mails
                $count = '0';
 
                // Delete bonus mail entirely from database
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+               sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                        array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
-               $count += SQL_AFFECTEDROWS();
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
+               $count += sqlAffectedRows();
+               sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
                        array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
-               $count += SQL_AFFECTEDROWS();
+               $count += sqlAffectedRows();
 
                // Prepare data for the template
                $content['timestamp'] = generateDateTime($content['timestamp'], '0');
@@ -218,7 +218,7 @@ LIMIT 1",
        }
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 } else {
        // No mail orders fond
        displayMessage('{--ADMIN_WRONG_CALL--}');