- improved JS supporting for IE

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

5 files changed, 29 insertions, 31 deletions

diff --git a/frontends/php/include/classes/cbutton.inc.php b/frontends/php/include/classes/cbutton.inc.php
index 42c31afa..50b5a126 100644
--- a/frontends/php/include/classes/cbutton.inc.php
+++ b/frontends/php/include/classes/cbutton.inc.php
@@ -28,15 +28,14 @@
 			$this->tag_body_start = '';
 			$this->options['type'] = 'submit';
 			$this->AddOption('value', $caption);
-//			$this->options["type"] = "button";
 			$this->options['class'] = 'button';
 			$this->SetName($name);
 			$this->SetAction($action);
 			$this->SetAccessKey($accesskey);
 		}
-		function SetAction($value='submit()', $event='onClick')
+		function SetAction($value=null)
 		{
-			$this->AddOption($event, $value);
+			$this->AddAction('onClick', $value);
 		}
 		function SetTitle($value='button title')
 		{
@@ -54,19 +53,21 @@
 
 	class CButtonCancel extends CButton
 	{
-		function CButtonCancel($vars=NULL){
+		function CButtonCancel($vars=NULL,$action=NULL){
 			parent::CButton('cancel',S_CANCEL);
+			$this->options['type'] = 'button';
 			$this->SetVars($vars);
+			$this->SetAction($action);
 		}
 		function SetVars($value=NULL){
 			global $page;
 
-			$url = $page["file"]."?cancel=1";
+			$url = "?cancel=1";
 
 			if(!is_null($value))
 				$url = $url.$value;
 
-			return $this->SetAction("return Redirect('$url')");
+			return parent::SetAction("return Redirect('$url')");
 		}
 	}
 
@@ -82,19 +83,18 @@
 		/*
 		var $vars;
 		var $msg;
-		var $name;
-		var $do_redirect;*/
+		var $name;*/
 
-		function CButtonQMessage($name, $caption, $msg=NULL, $vars=NULL, $do_redirect=true){
+		function CButtonQMessage($name, $caption, $msg=NULL, $vars=NULL){
 			$this->vars = null;
 			$this->msg = null;
 			$this->name = $name;
-			$this->do_redirect = $do_redirect;
 			
 			parent::CButton($name,$caption);
 
 			$this->SetMessage($msg);
 			$this->SetVars($vars);
+			$this->SetAction(NULL);
 		}
 		function SetVars($value=NULL){
 			if(!is_string($value) && !is_null($value)){
@@ -113,7 +113,7 @@
 			$this->msg = $value;
 			$this->SetAction(NULL);
 		}
-		function SetAction($value=null, $event='onClick'){
+		function SetAction($value=null){
 			if(!is_null($value))
 				return parent::SetAction($value);
 
@@ -121,7 +121,7 @@
 
 			$confirmation = "Confirm('".$this->msg."')";
 			
-			if($this->do_redirect)
+			if(isset($this->vars))
 			{
 				$redirect = "Redirect('".$page["file"]."?".$this->name."=1".$this->vars."')";
 			}
diff --git a/frontends/php/include/classes/ccheckbox.inc.php b/frontends/php/include/classes/ccheckbox.inc.php
index 526ceedf..2d616da8 100644
--- a/frontends/php/include/classes/ccheckbox.inc.php
+++ b/frontends/php/include/classes/ccheckbox.inc.php
@@ -29,7 +29,7 @@
 			$this->options['type'] = 'checkbox';
 			$this->options['value'] = $value;
 			$this->options['name'] = $name;
-			$this->options['onClick'] = $action;
+			$this->SetAction($action);
 			$this->SetChecked($checked);
 		}
 		function SetEnabled($value='yes')
@@ -49,7 +49,7 @@
 		}
 		function SetAction($value='submit()', $event='onClick')
 		{
-			$this->options[$event] = $value;
+			$this->AddAction('onClick', $value);
 		}
 	}
 
diff --git a/frontends/php/include/classes/clink.inc.php b/frontends/php/include/classes/clink.inc.php
index 374453ca..eb785941 100644
--- a/frontends/php/include/classes/clink.inc.php
+++ b/frontends/php/include/classes/clink.inc.php
@@ -40,7 +40,7 @@
 			if(is_null($value))
 				return $this->options['action'] = $page['file'];
 
-			return $this->options['onClick'] = htmlspecialchars($value);
+			return parent::AddAction('onClick', $value);
 		}
 		function SetUrl($value)
 		{
diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php
index 70decbfc..93671c81 100644
--- a/frontends/php/include/classes/ctag.inc.php
+++ b/frontends/php/include/classes/ctag.inc.php
@@ -218,7 +218,7 @@
 		{
 			insert_showhint_javascript();
 
-			$text = addslashes(htmlspecialchars(unpack_object($text)));
+			$text = unpack_object($text);
 			if($width != '' || $class!= '')
 			{
 				$code = "show_hint_ext(this,event,'".$text."','".$width."','".$class."');";
@@ -239,10 +239,8 @@
 
 		function AddAction($name, $value)
 		{
-			if(isset($value))
-				$this->options[$name] = str_replace("\n", '', strval($value)); 
-			else
-				unset($this->options[$name]);
+			if(!empty($value))
+				$this->options[$name] = htmlentities(str_replace("\n", '', strval($value)),ENT_COMPAT); 
 		}
 
 		function AddOption($name, $value)
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index b15b5a32..5816ce6d 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -181,7 +181,7 @@
 		
 		$form->AddItemToBottomRow(new CButton("save", isset($sid) ? S_SAVE : S_ADD));
 
-		$form->AddItemToBottomRow(new CButton('cancel',S_CANCEL,'window.close();'));
+		$form->AddItemToBottomRow(new CButtonCancel('close_window();'));
 
 		$form->show();
 	}
@@ -494,7 +494,7 @@
 		$frmMsg->AddRow(S_MESSAGE, new CTextArea("message","",80,6));
 
 		$frmMsg->AddItemToBottomRow(new CButton("save",$btn_txt));
-		$frmMsg->AddItemToBottomRow(new CButton("cancel",S_CANCEL));
+		$frmMsg->AddItemToBottomRow(new CButtonCancel(url_param('"eventid')));
 
 		$frmMsg->Show(false);
 
@@ -654,8 +654,8 @@
 					$lstGroups, 
 					BR, 
 					new CButton('add_group',S_ADD,
-						"return PopUp('popup_usrgrp.php?dstfrm=".$frmUser->GetName().
-						"&list_name=user_groups_to_del[]&var_name=user_groups',450, 450);"),
+						'return PopUp("popup_usrgrp.php?dstfrm='.$frmUser->GetName().
+						'&list_name=user_groups_to_del[]&var_name=user_groups",450, 450);'),
 					SPACE,
 					(count($user_groups) > 0) ? new CButton('del_user_group',S_DELETE_SELECTED) : null
 				));
@@ -1286,7 +1286,7 @@
 
 		$form->AddItemToBottomRow(array(
 			new CButton('select',S_SEARCH),
-			new CButton('cancel',S_CANCEL)));
+			new CButtonCancel('&external_filter=1')));
 
 		$form->Show();
 	}
@@ -1532,7 +1532,7 @@
 		{
 			$btnSelect = new CButton('btn1',S_SELECT,
 				"return PopUp('popup.php?dstfrm=".$frmItem->GetName().
-				"&dstfld1=key&srctbl=help_items&srcfld1=key_');");
+				"&dstfld1=key&srctbl=help_items&srcfld1=key_&itemtype=".$type."');");
 			$btnSelect->SetAccessKey('T');
 		}
 		
@@ -1974,7 +1974,7 @@
 		$cmbCopyType->AddItem(1,S_HOST_GROUPS);
 		$frmCopy->AddRow(S_TARGET_TYPE, $cmbCopyType);
 
-		$target_sql = 'select distinct g.groupid target_id, g.name target_name'.
+		$target_sql = 'select distinct g.groupid as target_id, g.name as target_name'.
 			' from groups g, hosts_groups hg'.
 			' where hg.groupid=g.groupid';
 
@@ -1989,7 +1989,7 @@
 			}
 			$frmCopy->AddRow('Group', $cmbGroup);
 
-			$target_sql = 'select h.hostid target_id, h.host target_name from hosts h';
+			$target_sql = 'select h.hostid as target_id, h.host as target_name from hosts h';
 			if($filter_groupid > 0)
 			{
 				$target_sql .= ', hosts_groups hg where hg.hostid=h.hostid and hg.groupid='.$filter_groupid;
@@ -2181,7 +2181,7 @@
 		$frmComent->AddVar("triggerid",$triggerid);
 		$frmComent->AddRow(S_COMMENTS,new CTextArea("comments",stripslashes($trigger["comments"]),100,25));
 		$frmComent->AddItemToBottomRow(new CButton("save",S_SAVE));
-		$frmComent->AddItemToBottomRow(new CButton("cancel",S_CANCEL));
+		$frmComent->AddItemToBottomRow(new CButtonCancel('&triggerid='.$triggerid));
 
 		$frmComent->Show();
 	}
@@ -2493,7 +2493,7 @@
 
 		$frmGItem->AddItemToBottomRow(new CButton("save", isset($gid) ? S_SAVE : S_ADD));
 
-		$frmGItem->AddItemToBottomRow(new CButton('cancel',S_CANCEL,'window.close();'));
+		$frmGItem->AddItemToBottomRow(new CButtonCancel('close_window();'));
 		$frmGItem->Show();
 	}
 
@@ -3485,7 +3485,7 @@
 	
 		$frmMedia->AddItemToBottomRow(new CButton("add", S_ADD));
 		$frmMedia->AddItemToBottomRow(SPACE);
-		$frmMedia->AddItemToBottomRow(new CButton('cancel',S_CANCEL,'window.close();'));
+		$frmMedia->AddItemToBottomRow(new CButtonCancel(null, 'close_window();'));
 		$frmMedia->Show();
 	}