From 36ac901c2e3ea78a0e58d1eea4b3d9d55dfaccd2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 12 Jul 2011 14:34:20 +0000
Subject: [PATCH] Rewrites for a little easier adding of additional parameters

---
 inc/libs/user_functions.php | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 827ee9c2c6..73bb07cf49 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -42,9 +42,15 @@ if (!defined('__SECURITY')) {
 
 // Add links for selecting some users
 function alpha ($sortby, $colspan, $return=false) {
-	if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
+	if (!isGetRequestParameterSet('offset')) {
+		setGetRequestParameter('offset', 0);
+	} // END - if
 	$add = '&amp;page=' . getRequestParameter('page').'&amp;offset=' . getRequestParameter('offset');
-	if (isGetRequestParameterSet('mode')) $add .= '&amp;mode=' . getRequestParameter('mode');
+	foreach (array('mode','status') as $param) {
+		if (isGetRequestParameterSet($param)) {
+			$add .= '&amp;' . $param . '=' . getRequestParameter($param);
+		} // END - if
+	} // END - foreach
 
 	/* Creates the list of letters and makes them a link. */
 	$alphabet = explode(',', '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,');
@@ -57,7 +63,11 @@ function alpha ($sortby, $colspan, $return=false) {
 		} else {
 			// Output link to letter
 			$OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
-			if (isGetRequestParameterSet('mode')) $OUT .= '&amp;mode=' . getRequestParameter('mode');
+			foreach (array('mode','status') as $param) {
+				if (isGetRequestParameterSet($param)) {
+					$OUT .= '&amp;' . $param . '=' . getRequestParameter($param);
+				} // END - if
+			} // END - foreach
 			$OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '%}">' . $ltr . '</a>';
 		}
 
@@ -94,9 +104,12 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 	// Add page and offset
 	$add = '&amp;page=' . getRequestParameter('page') . '&amp;offset=' . getRequestParameter('offset');
 
-	// Add status or mode
-	if (isGetRequestParameterSet('status'))   $add .= '&amp;mode=' . getRequestParameter('status');
-	elseif (isGetRequestParameterSet('mode')) $add .= '&amp;mode=' . getRequestParameter('mode');
+	// Add status/ mode
+	foreach (array('mode','status') as $param) {
+		if (isGetRequestParameterSet($param)) {
+			$add .= '&amp;' . $param . '=' . getRequestParameter($param);
+		} // END - if
+	} // END - foreach
 
 	// Makes order by links..
 	if ($letter == 'front') {
@@ -165,9 +178,12 @@ function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=fal
 			// Base link
 			$OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
-			// Add status or mode
-			if (isGetRequestParameterSet('status'))    $OUT .= '&amp;mode=' . getRequestParameter('status');
-			 elseif (isGetRequestParameterSet('mode')) $OUT .= '&amp;mode=' . getRequestParameter('mode');
+			// Add status/mode
+			foreach (array('mode','status') as $param) {
+				if (isGetRequestParameterSet($param)) {
+					$OUT .= '&amp;' . $param . '=' . getRequestParameter($param);
+				} // END - if
+			} // END - foreach
 
 			// Letter and so on
 			$OUT .= '&amp;letter=' . getRequestParameter('letter') . '&amp;sortby=' . getRequestParameter('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
-- 
2.39.5