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

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

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 1b024ace196fc6e2c152c9256ffeaba00bd40c5c..b0b5309e31be1d841e47d399626315a526407ecf 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.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 *
@@ -61,22 +61,22 @@ if (isGetRequestElementSet('userid')) {
                } // END - if
 
                // Load user links data
-               $result = SQL_QUERY_ESC("SELECT `userid`, `stats_id`, `%s`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+               $result = sqlQueryEscaped("SELECT `userid`, `stats_id`, `%s`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
                        array(
                                $linkDataName,
                                bigintval(getRequestElement('userid'))
                        ), __FILE__, __LINE__);
 
                // Are there some entries?
-               if (!SQL_HASZERONUMS($result)) {
+               if (!ifSqlHasZeroNumRows($result)) {
                        // Some unconfirmed mails left
                        if (getRequestElement('delete') == 'all') {
                                // Delete all unconfirmed mails by this user
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s LIMIT %s",
-                                       array(bigintval(getRequestElement('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
+                               sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s LIMIT %s",
+                                       array(bigintval(getRequestElement('userid')), sqlNumRows($result)), __FILE__, __LINE__);
 
                                // Prepare mail and send it away
-                               $message = loadEmailTemplate('member_delete_links', SQL_NUMROWS($result), bigintval(getRequestElement('userid')));
+                               $message = loadEmailTemplate('member_delete_links', sqlNumRows($result), bigintval(getRequestElement('userid')));
                                sendEmail(getUserData('userid'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
 
                                // Display message
@@ -86,17 +86,17 @@ if (isGetRequestElementSet('userid')) {
                                $OUT = '';
 
                                // List all unconfirmed mails
-                               while ($linkData = SQL_FETCHARRAY($result)) {
+                               while ($linkData = sqlFetchArray($result)) {
                                        // Initializes all other elements
                                        $linkData['mail_id'] = '';
                                        $linkData['problem'] = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
-                                       $result_data = false;
+                                       $result_data = FALSE;
 
                                        // Load data from stats table...
                                        // @TODO Rewrite this to includes/filter
                                        switch ($linkData['link_type']) {
                                                case 'NORMAL':
-                                                       $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+                                                       $result_data = sqlQueryEscaped("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($linkData['stats_id'])), __FILE__, __LINE__);
                                                        $linkData['link_type'] = 'mailid';
                                                        $linkData['mail_id']   = $linkData['stats_id'];
@@ -104,7 +104,7 @@ if (isGetRequestElementSet('userid')) {
                                                        break;
 
                                                case 'BONUS':
-                                                       $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                                                       $result_data = sqlQueryEscaped("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($linkData['bonus_id'])), __FILE__, __LINE__);
                                                        $linkData['link_type'] = 'bonusid';
                                                        $linkData['mail_id']   = $linkData['bonus_id'];
@@ -112,48 +112,48 @@ if (isGetRequestElementSet('userid')) {
                                                        break;
 
                                                default: // Problem in application detected!
-                                                       reportBug(__FILE__, __LINE__, sprintf("Invalid email type %s detected.", $linkData['link_type']));
+                                                       reportBug(__FILE__, __LINE__, sprintf('Invalid email type %s detected.', $linkData['link_type']));
                                                        break;
                                        } // END - switch
 
                                        // Is there an entry?
-                                       if (SQL_NUMROWS($result_data) == 1) {
+                                       if (sqlNumRows($result_data) == 1) {
                                                // Mail was found
-                                               $mailData = merge_array($linkData, SQL_FETCHARRAY($result_data));
+                                               $mailData = merge_array($linkData, sqlFetchArray($result_data));
 
                                                // Fix empty subject
                                                if (empty($mailData['subject'])) {
                                                        // The subject line is empty so we use the default
-                                                       $mailData['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
+                                                       $mailData['subject'] = '{--DEFAULT_SUBJECT--}';
                                                } // END - if
 
                                                // Prepare data for the row template
                                                $mailData['timestamp'] = generateDateTime($mailData['timestamp'], 0);
 
                                                // Load row template
-                                               $OUT .= loadTemplate('admin_list_links_row', true, $mailData);
+                                               $OUT .= loadTemplate('admin_list_links_row', TRUE, $mailData);
                                        } else {
                                                // Load template for error
-                                               $OUT .= loadTemplate('admin_list_links_problem', true, $linkData);
+                                               $OUT .= loadTemplate('admin_list_links_problem', TRUE, $linkData);
                                        }
 
                                        // Free result
-                                       SQL_FREERESULT($result_data);
+                                       sqlFreeResult($result_data);
                                } // END - while
 
                                // Remember list in constant for the template
                                $content = array(
                                        'email'   => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . getUserData('email') . '</a>',
                                        'rows'    => $OUT,
-                                       'nums'    => SQL_NUMROWS($result),
+                                       'nums'    => sqlNumRows($result),
                                        'userid'  => bigintval(getRequestElement('userid')),
                                );
 
                                // Free memory
-                               SQL_FREERESULT($result);
+                               sqlFreeResult($result);
 
                                // Load final template
-                               loadTemplate('admin_list_links', false, $content);
+                               loadTemplate('admin_list_links', FALSE, $content);
                        }
                } else {
                        // No mails left to confirm