[evolvis-commits] r7182: [#608] use getArrayFromRequest, getIntFromRequest, getStringFromRequest?==?UTF-8?Q?↵

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Jan 26 15:02:10 CET 2011


Author: mirabilos
Date: 2011-01-26 15:02:10 +0100 (Wed, 26 Jan 2011)
New Revision: 7182

Modified:
   trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
Log:
[#608] use getArrayFromRequest, getIntFromRequest, getStringFromRequest


Modified: trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php	2011-01-26 14:02:09 UTC (rev 7181)
+++ trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php	2011-01-26 14:02:10 UTC (rev 7182)
@@ -106,28 +106,21 @@
 $_extra_fields = array() ;
 $aux_extra_fields = array() ;
 
+$tmp_extra_fields = getArrayFromRequest('extra_fields');
 foreach ($arrObjAth as $ath) {
-
 	if ($set == 'custom') {
-
-		//
-		//may be past in next/prev url
-		//
-		if (isset($_GET['extra_fields'][$ath->getCustomStatusField()])) {
-
-			$_extra_fields[$ath->getCustomStatusField()] = $_GET['extra_fields'][$ath->getCustomStatusField()];
-		} elseif (isset($_POST['extra_fields'][$ath->getCustomStatusField()])) {
-
-			$_extra_fields[$ath->getCustomStatusField()] = $_POST['extra_fields'][$ath->getCustomStatusField()];
-		} else {
-			#This line would maybe be interessting for exception handling in future implementations.
-		}
+		/* may be past in next/prev url */
+		$i = $ath->getCustomStatusField();
+		if (isset($tmp_extra_fields[$i]))
+			$_extra_fields[$i] = $tmp_extra_fields[$i];
 	}
 }
 
+/*XXX huh? it’s always set, see above… */
 if (is_array($_extra_fields)){
 	$keys=array_keys($_extra_fields);
 	foreach ($keys as $key) {
+		/* WTH… */
 		if ($_extra_fields[$key] != 'Array') {
 			$aux_extra_fields[$key] = $_extra_fields[$key];
 		}
@@ -339,80 +332,24 @@
 </form>
 ';
 
-	if ($artaf_arr[0] && ($art_cnt = count($artaf_arr[0])) > 0) {
-		$focus = getIntFromRequest('focus');
+if ($artaf_arr[0] && ($art_cnt = count($artaf_arr[0])) > 0) {
+	$focus = getIntFromRequest('focus');
 
-	} else {
-		$art_cnt = 0;
-		$start = 0;
-		$focus = 0;
-	}
+} else {
+	$art_cnt = 0;
+	$start = 0;
+	$focus = 0;
+}
 
-	if (!isset($_GET['start'])) {
+$start = getIntFromRequest('start', 0);
+$prevNextStart = getStringFromRequest('pNS', '');
+$prevNextTracker = getStringFromRequest('pNT', '');
+$total = getIntFromRequest('total', 0);
+$page_count = getIntFromRequest('page_count', 1);
+$tracker_count = getIntFromRequest('tracker', 0);
 
-		if (!isset($_POST['start'])) {
-			$start=0;
-		} else {
-			$start = getIntFromRequest('start');
-		}
-	} else {
-		$start = getIntFromRequest('start');
-	}
+$resetStartOnce = getIntFromRequest('resetStartOnce');
 
-	if (!isset($_GET['pNS'])) {
-
-		if (!isset($_POST['pNS'])) {
-			$prevNextStart = '';
-		} else {
-			$prevNextStart = getStringFromRequest('pNS');
-		}
-	} else {
-		$prevNextStart = getStringFromRequest('pNS');
-	}
-
-	if (!isset($_GET['pNT'])) {
-
-		if (!isset($_POST['pNT'])) {
-			$prevNextTracker = '';
-		} else {
-			$prevNextTracker = getStringFromRequest('pNT');
-		}
-	} else {
-		$prevNextTracker = getStringFromRequest('pNT');
-	}
-
-	if (!isset($_GET['total'])) {
-		if (!isset($_POST['total'])) {
-			$total = 0;
-		} else {
-			$total = getIntFromRequest('total');
-		}
-	} else {
-		$total = getIntFromRequest('total');
-	}
-
-	if (!isset($_GET['page_count'])) {
-		if (!isset($_POST['page_count'])) {
-			$page_count = 1;
-		} else {
-			$page_count = getIntFromRequest('page_count');
-		}
-	} else {
-		$page_count = getIntFromRequest('page_count');
-	}
-
-	if (!isset($_GET['tracker'])) {
-		if (!isset($_POST['tracker'])) {
-			$tracker_count = 0;
-		} else {
-			$tracker_count = getIntFromRequest('tracker');
-		}
-	} else {
-		$tracker_count = getIntFromRequest('tracker');
-	}
-
-	$resetStartOnce = getIntFromRequest('resetStartOnce');
-
 $paging = 0;
 if (session_loggedin()) {
 	/* logged in users get configurable paging */



More information about the evolvis-commits mailing list