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

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

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index c16f1787ec1a0ae8cfc838636496138170170784..295b8144062ad50bd112d7035216d732c4b57d0d 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.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 *
@@ -71,7 +71,7 @@ if (isGetRequestElementSet('userid')) {
        $userid = bigintval(getRequestElement('userid'));
 
        // Does the account exists?
-       $result_user = SQL_QUERY_ESC('SELECT
+       $result_user = sqlQueryEscaped('SELECT
        `userid`,
        `country`,
        `email`,
@@ -96,9 +96,9 @@ LIMIT 1',
                array($userid), __FILE__, __LINE__);
 
        // User found?
-       if (SQL_NUMROWS($result_user) == 1) {
+       if (sqlNumRows($result_user) == 1) {
                // Account found
-               $content  = SQL_FETCHARRAY($result_user);
+               $content  = sqlFetchArray($result_user);
 
                // Get count/sum of refs, selected categories, unconfirmed mails
                // @TODO Refacture these old link generation to functions
@@ -114,7 +114,7 @@ LIMIT 1',
                        $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
                } // END - if
                if ($content['cats']  > 0) {
-                       $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
+                       $content['cats']  = $base . '&amp;what=list_user_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
                } // END - if
 
                // Calculate timestamp for birthday
@@ -157,10 +157,7 @@ LIMIT 1',
                } // END - if
 
                // Clickrate
-               $content['click_rate'] = '0';
-               if ($content['emails_received'] > 0) {
-                       $content['click_rate'] = ($content['mails_confirmed'] / $content['emails_received'] * 100);
-               } // END - if
+               $content['click_rate'] = calculatePercentageRate($content['mails_confirmed'], $content['emails_received']);
 
                // Is the extension 'country' installed?
                if (isExtensionActive('country')) {
@@ -182,7 +179,7 @@ LIMIT 1',
        }
 
        // Free the result
-       SQL_FREERESULT($result_user);
+       sqlFreeResult($result_user);
 } else {
        $whereStatement = '';
        if (isGetRequestElementSet('letter')) {
@@ -195,14 +192,14 @@ LIMIT 1',
                // Is a WHERE statement already there?
                if (!empty($whereStatement)) {
                        // Then append the status column
-                       $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(strtoupper(getRequestElement('status'))));
+                       $whereStatement .= sprintf(" AND `status`='%s'", sqlEscapeString(strtoupper(getRequestElement('status'))));
                } else {
                        // Start a new one
-                       $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(strtoupper(getRequestElement('status'))));
+                       $whereStatement = sprintf(" WHERE `status`='%s'", sqlEscapeString(strtoupper(getRequestElement('status'))));
                }
 
                // Exclude other users
-               $whereStatement = runFilterChain('user_exclusion_sql', $whereStatement);
+               $whereStatement = runFilterChain('user_exclusion_sql', ' ' . $whereStatement);
        } elseif (isGetRequestElementSet('do')) {
                // Choose what we need to list
                switch (getRequestElement('do')) {
@@ -232,14 +229,14 @@ LIMIT 1',
                                break;
 
                        default: // Invalid list mode
-                               reportBug(__FILE__, __LINE__, sprintf('Invalid do %s detected.', SQL_ESCAPE(getRequestElement('do'))));
+                               reportBug(__FILE__, __LINE__, sprintf('Invalid do %s detected.', sqlEscapeString(getRequestElement('do'))));
                                break;
                } // END - switch
 
                // If it is not 'testers', add exclusion SQL
                if (getRequestElement('do') != 'testers') {
                        // Exclude tester users
-                       $whereStatement = runFilterChain('user_exclusion_sql', $whereStatement);
+                       $whereStatement = runFilterChain('user_exclusion_sql', ' ' . $whereStatement);
                } // END - if
        } // END - if
 
@@ -260,7 +257,7 @@ ORDER BY
        );
 
        // Prepare SQL and run it
-       $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
+       $result_master = sqlQuery($sql, __FILE__, __LINE__);
 
        // Is the user limit zero?
        if (getUserLimit() == '0') {
@@ -272,17 +269,17 @@ ORDER BY
        } // END - if
 
        // Calculate page count (0.5 fixes a bug with page count)
-       $numPages = round(SQL_NUMROWS($result_master) / getUserLimit() + 0.5);
+       $numPages = round(sqlNumRows($result_master) / getUserLimit() + 0.5);
 
        if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
        if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getUserLimit());
 
        // Add limitation to SQL string and run him again
        $sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
-       $result = SQL_QUERY($sql, __FILE__, __LINE__);
+       $result = sqlQuery($sql, __FILE__, __LINE__);
 
        // Are there some entries?
-       if (!SQL_HASZERONUMS($result_master)) {
+       if (!ifSqlHasZeroNumRows($result_master)) {
                // Sorting links and number of pages
                $templateContent['sort_links'] = addSortLinks(getRequestElement('letter'), getRequestElement('sortby'));
                $templateContent['num_pages'] = $numPages;
@@ -297,7 +294,7 @@ ORDER BY
 
                // Load all users
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        // Merge more data in
                        $content = merge_array($content, $templateContent);
 
@@ -313,10 +310,7 @@ ORDER BY
                        } // END - if
 
                        // Click rate
-                       $content['click_rate'] = '0';
-                       if ($content['emails_received'] > 0) {
-                               $content['click_rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100;
-                       } // END - if
+                       $content['click_rate'] = calculatePercentageRate($content['mails_confirmed'], $content['emails_received']);
 
                        // Transfer data to array
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
@@ -367,10 +361,10 @@ ORDER BY
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
 
                // Free some memory
-               SQL_FREERESULT($result_master);
+               sqlFreeResult($result_master);
 
                // Remember all rows
                $content['rows'] = $OUT;
@@ -386,7 +380,7 @@ ORDER BY
        }
 
        // Free memory
-       SQL_FREERESULT($result_master);
+       sqlFreeResult($result_master);
 }
 
 // [EOF]