fooRequestElementBar() functions renamed, adding of request parameters added:

[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 3d497c18d38997f88cee2b8e059ab9c41bcdf637..0c4281e21577ed94e08390c26b35e01167ca890e 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -85,16 +85,16 @@ if (isExtensionActive('country')) {
 }
 
 // Init unset data
-if (!isGetRequestElementSet('letter')) { setGetRequestElement('letter', getMessage('_ALL2')); }
-if (!isGetRequestElementSet('sortby')) { setGetRequestElement('sortby', 'userid');            }
-if (!isGetRequestElementSet('page'))   { setGetRequestElement('page'  , 1);                 }
+if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', getMessage('_ALL2')); }
+if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid');            }
+if (!isGetRequestParameterSet('page'))   { setGetRequestParameter('page'  , 1);                 }
 
 // Set base URL
 $base = '[<a href="{%url=modules.php?module=admin';
 
-if (isGetRequestElementSet('userid')) {
+if (isGetRequestParameterSet('userid')) {
        // Secure the user id
-       $userid = bigintval(getRequestElement('userid'));
+       $userid = bigintval(getRequestParameter('userid'));
 
        // Does the account exists?
        $result_user = SQL_QUERY_ESC("SELECT
@@ -204,24 +204,24 @@ LIMIT 1",
        SQL_FREERESULT($result_user);
 } else {
        $whereStatement = '';
-       if ((getRequestElement('letter') != getMessage('_ALL2')) && (getRequestElement('letter') != getMessage('_OTHERS')) && (isGetRequestElementSet('letter'))) {
+       if ((getRequestParameter('letter') != getMessage('_ALL2')) && (getRequestParameter('letter') != getMessage('_OTHERS')) && (isGetRequestParameterSet('letter'))) {
                // List only persons w
-               $whereStatement = " WHERE `family` LIKE '".getRequestElement('letter') . "%'";
+               $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%'";
        } // END - if
 
        // Parse the status or mode parameter
-       if (isGetRequestElementSet(('status'))) {
+       if (isGetRequestParameterSet(('status'))) {
                // Is a WHERE statement already there?
                if (!empty($whereStatement)) {
                        // Then append the status column
-                       $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
+                       $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status')))));
                } else {
                        // Start a new one
-                       $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
+                       $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status')))));
                }
-       } elseif (isGetRequestElementSet('mode')) {
+       } elseif (isGetRequestParameterSet('mode')) {
                // Choose what we need to list
-               switch (getRequestElement('mode')) {
+               switch (getRequestParameter('mode')) {
                        case 'norefs': // Users w/o refs
                                if (!empty($whereStatement)) {
                                        // Add AND statement
@@ -233,14 +233,14 @@ LIMIT 1",
                                break;
 
                        default: // Invalid list mode
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestElement('mode')));
+                               logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode')));
                                break;
                } // END - switch
        } // END - if
 
        // Generate master query string
        $sql = sprintf("SELECT `userid`, `gender`, `surname`, `family`, `email`, `REMOTE_ADDR`, `refid`, `status`, `emails_sent`, `mails_confirmed`, `emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
-               getRequestElement('sortby')
+               getRequestParameter('sortby')
        );
 
        // Prepare SQL and run it
@@ -255,11 +255,11 @@ LIMIT 1",
        // Activate the extension please!
        $PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
 
-       if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
-       if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getConfig('user_limit'));
+       if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
+       if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('user_limit'));
 
        // Add limitation to SQL string and run him again
-       $sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')).", ".getRequestElement('offset');
+       $sql .= " LIMIT ".(getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')).", ".getRequestParameter('offset');
        $result = SQL_QUERY($sql, __FILE__, __LINE__);
 
        // Count all confirmed users
@@ -272,8 +272,8 @@ LIMIT 1",
                define('__USER_CNT'  , $user_count);
 
                // Sorting links
-               define('__ALPHA_SORT', alpha(getRequestElement('sortby'), $colspan, true));
-               define('__SORT_LINKS', addSortLinks(getRequestElement('letter'), getRequestElement('sortby'), $colspan, true));
+               define('__ALPHA_SORT', alpha(getRequestParameter('sortby'), $colspan, true));
+               define('__SORT_LINKS', addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), $colspan, true));
 
                if ($PAGES > 1) {
                        define('__PAGE_NAV', addPageNavigation($PAGES, getConfig('user_limit'), true, $colspan, true));
@@ -362,12 +362,12 @@ LIMIT 1",
 
                // Init title with "all accounts"
                $content['title'] = getMessage('ADMIN_ALL_ACCOUNTS');
-               if (isGetRequestElementSet(('status'))) {
+               if (isGetRequestParameterSet(('status'))) {
                        // Set title according to the 'status'
-                       $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestElement(('status')))));
-               } elseif (isGetRequestElementSet('mode')) {
+                       $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestParameter(('status')))));
+               } elseif (isGetRequestParameterSet('mode')) {
                        // Set title according to the "mode"
-                       $content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestElement('mode'))));
+                       $content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestParameter('mode'))));
                }
 
                // Load main template