Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 05d43f9a84d1d829cf554a258301afbd762e6b9b..2d40f4520a7a9be846c747f8fac90cb711c82b26 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -39,22 +39,22 @@ if (!defined('__SECURITY')) {
 
 // Add links for selecting some users
 function alpha ($sortby, $colspan, $return=false) {
-       if (empty($_GET['offset'])) $_GET['offset'] = 0;
-       $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);
-       if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
+       if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0);
+       $ADD = "&page=".SQL_ESCAPE(REQUEST_GET('page'))."&offset=".SQL_ESCAPE(REQUEST_GET('offset'));
+       if (REQUEST_ISSET_GET(('mode'))) $ADD .= "&mode=".SQL_ESCAPE(REQUEST_GET('mode'));
 
        /* Creates the list of letters and makes them a link. */
        $alphabet = array(_ALL2,"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",_OTHERS);
        $num = count($alphabet) - 1;
        $OUT = "";
        while (list($counter, $ltr) = each($alphabet)) {
-               if ($_GET['letter'] == $ltr) {
+               if (REQUEST_GET('letter') == $ltr) {
                        // Current letter is letter from URL
                        $OUT .= "<strong>".$ltr."</strong>";
                } else {
                        // Output link to letter
                        $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what'];
-                       if (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
+                       if (REQUEST_ISSET_GET(('mode'))) $OUT .= "&amp;mode=".SQL_ESCAPE(REQUEST_GET('mode'));
                        $OUT .= "&amp;letter=".$ltr."&amp;sortby=".$sortby.$ADD."\">".$ltr."</a>";
                }
 
@@ -81,15 +81,15 @@ function alpha ($sortby, $colspan, $return=false) {
 // Add links for sorting
 function SortLinks($letter, $sortby, $colspan, $return=false) {
        $OUT = "";
-       if (empty($_GET['offset'])) $_GET['offset'] = 0;
-       if (empty($_GET['page']))   $_GET['page'] = 0;
+       if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0);
+       if (!REQUEST_ISSET_GET(('page')))   REQUEST_SET_GET('page'  , 0);
 
        // Add page and offset
-       $ADD = "&amp;page=".SQL_ESCAPE($_GET['page'])."&amp;offset=".SQL_ESCAPE($_GET['offset']);
+       $ADD = "&amp;page=".SQL_ESCAPE(REQUEST_GET('page'))."&amp;offset=".SQL_ESCAPE(REQUEST_GET('offset'));
 
        // Add status or mode
-       if (!empty($_GET['status'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['status']);
-        elseif (!empty($_GET['mode'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
+       if (REQUEST_ISSET_GET(('status'))) $ADD .= "&amp;mode=".SQL_ESCAPE(REQUEST_GET('status'));
+        elseif (REQUEST_ISSET_GET(('mode'))) $ADD .= "&amp;mode=".SQL_ESCAPE(REQUEST_GET('mode'));
 
        // Makes order by links..
        if ($letter == "front") $letter = _ALL2;
@@ -148,26 +148,26 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
 
        $OUT = "";
        for ($page = 1; $page <= $PAGES; $page++) {
-               if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
+               if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
                        $OUT .= "<strong>-";
                } else {
-                       if (empty($_GET['letter'])) $_GET['letter'] = _ALL2;
-                       if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
+                       if (!REQUEST_ISSET_GET(('letter'))) REQUEST_SET_GET('letter', getMessage('_ALL2'));
+                       if (!REQUEST_ISSET_GET(('sortby'))) REQUEST_SET_GET('sortby', "userid");
 
                        // Base link
                        $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what'];
 
                        // Add status or mode
-                       if (!empty($_GET['status'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['status']);
-                        elseif (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
+                       if (REQUEST_ISSET_GET(('status'))) $OUT .= "&amp;mode=".SQL_ESCAPE(REQUEST_GET('status'));
+                        elseif (REQUEST_ISSET_GET(('mode'))) $OUT .= "&amp;mode=".SQL_ESCAPE(REQUEST_GET('mode'));
 
                         // Letter and so on
-                       $OUT .= "&amp;letter=".SQL_ESCAPE($_GET['letter'])."&amp;sortby=".SQL_ESCAPE($_GET['sortby'])."&amp;page=".$page."&amp;offset=".$offset."\">";
+                       $OUT .= "&amp;letter=".SQL_ESCAPE(REQUEST_GET('letter'))."&amp;sortby=".SQL_ESCAPE(REQUEST_GET('sortby'))."&amp;page=".$page."&amp;offset=".$offset."\">";
                }
 
                $OUT .= $page;
 
-               if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
+               if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
                        $OUT .= "-</strong>";
                } else  {
                        $OUT .= "</a>";
@@ -206,7 +206,7 @@ WHERE email='%s'".$locked." LIMIT 1",
                list($uid) = SQL_FETCHROW($result);
 
                // Rewrite email address to contact link
-               $email = "{!URL!}/modules.php?module=".$mod."&amp;what=user_contct&amp;u_id=".bigintval($uid);
+               $email = "{!URL!}/modules.php?module=".$mod."&amp;what=user_contct&amp;uid=".bigintval($uid);
        } // END - if
 
        // Free memory