Cleanups and all "base scripts" fixed:

[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 91f225c556313a4dc4f285f8dc757120764c8ff4..feabe013ac560fd0fe361374202e5f2fd315cd4d 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -55,23 +55,23 @@ if (isExtensionInstalledAndNewer('user', '0.3.5')) {
 // Is the extension 'country' installed?
 if (isExtensionActive('country')) {
        // Add country code
-       $MORE .= ', `country_code`';
+       $MORE .= ',`country_code`';
 } else {
        // Add direct value
-       $MORE .= ', `country`';
+       $MORE .= ',`country`';
 }
 
 // Init unset data
-if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', '');       }
-if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid'); }
-if (!isGetRequestParameterSet('page'))   { setGetRequestParameter('page'  , 1);        }
+if (!isGetRequestElementSet('letter')) { setGetRequestElement('letter', '');       }
+if (!isGetRequestElementSet('sortby')) { setGetRequestElement('sortby', 'userid'); }
+if (!isGetRequestElementSet('page'))   { setGetRequestElement('page'  , 1);        }
 
 // Set base URL
 $base = '[<a href="{%url=modules.php?module=admin';
 
-if (isGetRequestParameterSet('userid')) {
+if (isGetRequestElementSet('userid')) {
        // Secure the user id
-       $userid = bigintval(getRequestParameter('userid'));
+       $userid = bigintval(getRequestElement('userid'));
 
        // Does the account exists?
        $result_user = SQL_QUERY_ESC("SELECT
@@ -166,24 +166,24 @@ LIMIT 1",
        SQL_FREERESULT($result_user);
 } else {
        $whereStatement = '';
-       if (isGetRequestParameterSet('letter')) {
+       if (isGetRequestElementSet('letter')) {
                // List only persons w
-               $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%%'";
+               $whereStatement = " WHERE `family` LIKE '".getRequestElement('letter') . "%%'";
        } // END - if
 
        // Parse the status or mode parameter
-       if (isGetRequestParameterSet('status')) {
+       if (isGetRequestElementSet('status')) {
                // Is a WHERE statement already there?
                if (!empty($whereStatement)) {
                        // Then append the status column
-                       $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status')))));
+                       $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
                } else {
                        // Start a new one
-                       $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status')))));
+                       $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
                }
-       } elseif (isGetRequestParameterSet('mode')) {
+       } elseif (isGetRequestElementSet('mode')) {
                // Choose what we need to list
-               switch (getRequestParameter('mode')) {
+               switch (getRequestElement('mode')) {
                        case 'norefs': // Users w/o refs
                                if (!empty($whereStatement)) {
                                        // Add AND statement
@@ -194,7 +194,7 @@ LIMIT 1",
                                }
                                break;
 
-                       case 'random_refid': // Users available for random referal id
+                       case 'random_refid': // Users available for random referral id
                                if (!empty($whereStatement)) {
                                        // Add AND statement
                                        $whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}';
@@ -205,14 +205,14 @@ LIMIT 1",
                                break;
 
                        default: // Invalid list mode
-                               debug_report_bug(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode')));
+                               debug_report_bug(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestElement('mode')));
                                break;
                } // END - switch
        } // END - if
 
        // Generate master query string
        $sql = sprintf("SELECT `userid`,`email`,`emails_sent`,`mails_confirmed`,`emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
-               getRequestParameter('sortby')
+               getRequestElement('sortby')
        );
 
        // Prepare SQL and run it
@@ -227,11 +227,11 @@ LIMIT 1",
        // Activate the extension please!
        $numPages = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
 
-       if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
-       if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('user_limit'));
+       if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
+       if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getConfig('user_limit'));
 
        // Add limitation to SQL string and run him again
-       $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
+       $sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
        $result = SQL_QUERY($sql, __FILE__, __LINE__);
 
        // Are there some entries?
@@ -240,7 +240,7 @@ LIMIT 1",
                $templateContent['user_count'] = getTotalConfirmedUser();
 
                // Sorting links and number of pages
-               $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'));
+               $templateContent['sort_links'] = addSortLinks(getRequestElement('letter'), getRequestElement('sortby'));
                $templateContent['num_pages'] = $numPages;
 
                // Column with nickname when nickname extension is present
@@ -281,7 +281,7 @@ LIMIT 1",
                        $content['own_points']     = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points');
                        $content['locked_points']  = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');
 
-                       // If we have at least one referal, make it clickable to referal list
+                       // If we have at least one referral, make it clickable to referral list
                        if ($content['refs'] > 0) {
                                $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
                        } // END - if