- developed group permission system (Eugene)

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

1 files changed, 16 insertions, 6 deletions

diff --git a/frontends/php/include/classes/cbutton.inc.php b/frontends/php/include/classes/cbutton.inc.php
index 22104147..ce63f5ce 100644
--- a/frontends/php/include/classes/cbutton.inc.php
+++ b/frontends/php/include/classes/cbutton.inc.php
@@ -27,7 +27,7 @@
 			parent::CTag('input','no');
 			$this->tag_body_start = '';
 			$this->options['type'] = 'submit';
-			$this->options['value'] = $caption;
+			$this->AddOption('value', $caption);
 //			$this->options["type"] = "button";
 			$this->options['class'] = 'button';
 			$this->SetName($name);
@@ -36,11 +36,11 @@
 		}
 		function SetAction($value='submit()', $event='onClick')
 		{
-			$this->options[$event] = $value;
+			$this->AddOption($event, $value);
 		}
 		function SetTitle($value='button title')
 		{
-			$this->options['title'] = $value;
+			$this->AddOption('title', $value);
 		}
 		function SetAccessKey($value='B')
 		{
@@ -48,7 +48,7 @@
 				if(!isset($this->options['title']))
 					$this->SetTitle($this->options['value'].' [Alt+'.$value.']');
 
-			return $this->options['accessKey'] = $value;
+			return $this->AddOption('accessKey', $value);
 		}
 	}
 
@@ -82,12 +82,14 @@
 		var $vars;
 		var $msg;
 		var $name;
+		var $do_redirect;
 
-		function CButtonQMessage($name, $caption, $msg=NULL, $vars=NULL){
+		function CButtonQMessage($name, $caption, $msg=NULL, $vars=NULL, $do_redirect=true){
 			$this->name = $name;
 			parent::CButton($name,$caption);
 			$this->SetMessage($msg);
 			$this->SetVars($vars);
+			$this->do_redirect = $do_redirect;
 		}
 		function SetVars($value=NULL){
 			if(!is_string($value) && !is_null($value)){
@@ -113,7 +115,15 @@
 			global $page;
 
 			$confirmation = "Confirm('".$this->msg."')";
-			$redirect = "Redirect('".$page["file"]."?".$this->name."=1".$this->vars."')";
+			
+			if($this->do_redirect)
+			{
+				$redirect = "Redirect('".$page["file"]."?".$this->name."=1".$this->vars."')";
+			}
+			else
+			{
+				$redirect = 'true';
+			}
 			
 			return parent::SetAction("if(".$confirmation.") return ".$redirect."; else return false;");
 		}