A lot more nice improvements!

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index faa279ca7d988c97fbbe148e18c1e22d655f6872..f00c096841e82d32954662a3293af96aef08a770 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -42,7 +42,7 @@ function alpha($sortby, $colspan, $return=false)
 {
        global $_CONFIG;
        if (empty($_GET['offset'])) $_GET['offset'] = 0;
-       $ADD = "&page=".$_GET['page']."&offset=".$_GET['offset'];
+       $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);
        if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
 
        /* Creates the list of letters and makes them a link. */
@@ -93,8 +93,14 @@ function SortLinks($letter, $sortby, $colspan, $return=false)
 {
        $OUT = "";
        if (empty($_GET['offset'])) $_GET['offset'] = 0;
-       $ADD = "&page=".$_GET['page']."&offset=".$_GET['offset'];
-       if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
+       if (empty($_GET['page']))   $_GET['page'] = 0;
+
+       // Add page and offset
+       $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);
+
+       // Add status or mode
+       if (!empty($_GET['status'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['status']);
+        elseif (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
 
        // Makes order by links..
        if ($letter == "front") $letter = _ALL2;
@@ -138,41 +144,39 @@ function SortLinks($letter, $sortby, $colspan, $return=false)
 // Add page navigation
 function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false)
 {
-       if (!$show_form)
-       {
+       if (!$show_form) {
                // Empty row
                define('__FORM_HEADER', "<TR><TD colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</TD></TR>");
-       }
-        else
-       {
+       } else {
                // Load form for changing number of lines
                define('__FORM_HEADER', LOAD_TEMPLATE("admin_list_user_sort_form", true));
        }
-       if (!$show_form)
-       {
+
+       if (!$show_form) {
                // Add line with bottom border
                define('__FORM_FOOTER', "<TR><TD colspan=\"".__COLSPAN2."\" class=\"seperator bottom2\">&nbsp;</TD></TR>");
-       }
-        else
-       {
+       } else {
                // Add line without bottom border
                define('__FORM_FOOTER', "<TR><TD colspan=\"".__COLSPAN2."\" class=\"seperator bottom2\">&nbsp;</TD></TR>");
        }
 
        $OUT = "";
-       for ($page = 1; $page <= $PAGES; $page++)
-       {
-               if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1")))
-               {
+       for ($page = 1; $page <= $PAGES; $page++) {
+               if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
                        $OUT .= "<STRONG>-";
-               }
-                else
-               {
+               } else {
                        if (empty($_GET['letter'])) $_GET['letter'] = _ALL2;
                        if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
+
+                       // Base link
                        $OUT .= "<A href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
-                       if (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
-                       $OUT .= "&amp;letter=".$_GET['letter']."&amp;sortby=".$_GET['sortby']."&amp;page=".$page."&amp;offset=".$offset."\">";
+
+                       // 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']);
+
+                        // Letter and so on
+                       $OUT .= "&amp;letter=".SQL_ESCAPE($_GET['letter'])."&amp;sortby=".SQL_ESCAPE($_GET['sortby'])."&amp;page=".$page."&amp;offset=".$offset."\">";
                }
                $OUT .= $page;
                if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1")))