- developed group permission system (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@3371 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 35 insertions, 14 deletions

diff --git a/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php
index 9a4f593a..385675f1 100644
--- a/frontends/php/include/html.inc.php
+++ b/frontends/php/include/html.inc.php
@@ -85,22 +85,45 @@
 		}
 	}
 
-	function url_param($parameter)
+	function	prepare_url(&$var, $varname)
+	{
+		$result = "";
+
+		if(is_array($var))
+		{
+			foreach($var as $id => $par)
+				$result .= prepare_url($par,$varname."[".$id."]");
+		}
+		else
+		{
+			$result = "&".$varname."=".$var;
+		}
+		return $result;
+	}
+
+	function url_param($parameter,$request=true,$name=null)
 	{
-		global $_REQUEST;
 	
 		$result = "";
-		if(isset($_REQUEST[$parameter]))
+
+		if(!isset($name)) $name = $parameter;
+		
+		if($request)
 		{
-			if(is_array($_REQUEST[$parameter]))
-			{
-				foreach($_REQUEST[$parameter] as $par)
-					$result .= "&".$parameter."[]=".$par;
-			}
-			else
-			{
-				$result = "&".$parameter."=".$_REQUEST[$parameter];
-			}
+			global $_REQUEST;
+			
+			$var =& $_REQUEST[$parameter];
+		}
+		else
+		{
+			global $$parameter;
+			
+			$var =& $$parameter;
+		}
+		
+		if(isset($var))
+		{
+			$result = prepare_url($var,$name);
 		}
 		return $result;
 	}
@@ -160,7 +183,6 @@
 
 	function table_nodata($text="...")
 	{
-		cr();
 		echo "<TABLE BORDER=0 align=center WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
 		echo "<TR BGCOLOR=\"#DDDDDD\">";
 		echo "<TD ALIGN=CENTER>";
@@ -168,6 +190,5 @@
 		echo "</TD>";
 		echo "</TR>";
 		echo "</TABLE>";
-		cr();
 	}
 ?>