- added default ports for discovery checks (Eugene)

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

4 files changed, 74 insertions, 19 deletions

diff --git a/frontends/php/discoveryconf.php b/frontends/php/discoveryconf.php
index 9a67604c..5cf7e6a0 100644
--- a/frontends/php/discoveryconf.php
+++ b/frontends/php/discoveryconf.php
@@ -54,6 +54,8 @@ include_once "include/page_header.php";
 
 		"new_check_ports"=>	array(T_ZBX_PORTS, O_OPT,  null,	NOT_EMPTY,	'isset({add_check})'),
 
+		"type_changed"=>	array(T_ZBX_INT, O_OPT, null, IN(1), null),
+
 /* actions */
 		"add_check"=>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 		"delete_ckecks"=> 	array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index cde4d5b2..b15b5a32 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -80,7 +80,7 @@
 			$dchecks	= get_request('dchecks',array());
 		}
 		$new_check_type	= get_request('new_check_type', SVC_HTTP);
-		$new_check_ports= get_request('new_check_ports', '80,8080');
+		$new_check_ports= get_request('new_check_ports', '80');
 
 		$form->AddRow(S_NAME, new CTextBox('name', $name, 40));
 		$form->AddRow(S_IP_FIRST, new CTextBox('ipfirst', $ipfirst, 27));
@@ -109,10 +109,28 @@
 			$form->AddRow(S_CHECKS, $dchecks);
 		}
 
-		$cmbChkType = new CComboBox('new_check_type',$new_check_type);
+		$cmbChkType = new CComboBox('new_check_type',$new_check_type,
+			"if(add_variable(this, 'type_changed', 1)) submit()"
+			);
 		foreach(array(SVC_SSH, SVC_LDAP, SVC_SMTP, SVC_FTP, SVC_HTTP, SVC_POP, SVC_NNTP, SVC_IMAP, SVC_TCP) as $type_int)
 			$cmbChkType->AddItem($type_int, discovery_check_type2str($type_int));
 
+		if(isset($_REQUEST['type_changed']))
+		{
+			switch($new_check_type)
+			{
+				case SVC_SSH:	$new_check_ports = 22;	break;
+				case SVC_LDAP:	$new_check_ports = 389;	break;
+				case SVC_SMTP:	$new_check_ports = 25;	break;
+				case SVC_FTP:	$new_check_ports = 21;	break;
+				case SVC_HTTP:	$new_check_ports = 80;	break;
+				case SVC_POP:	$new_check_ports = 110;	break;
+				case SVC_NNTP:	$new_check_ports = 119;	break;
+				case SVC_IMAP:	$new_check_ports = 143;	break;
+				case SVC_TCP:	$new_check_ports = 80;	break;
+			}
+		}
+
 		$form->AddRow(S_NEW_CHECK, array(
 			$cmbChkType, SPACE,
 			S_PORTS_SMALL, SPACE, new CTextBox('new_check_ports', $new_check_ports),
diff --git a/frontends/php/js/common.js b/frontends/php/js/common.js
index 73463ec8..59214a61 100644
--- a/frontends/php/js/common.js
+++ b/frontends/php/js/common.js
@@ -16,6 +16,47 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
+function SDI(msg)
+{
+	alert("DEBUG INFO: " + msg);
+}
+
+function add_variable(o_el, s_name, x_value, s_formname, o_document)
+{
+	var form;
+
+	if(!o_document)	o_document = document;
+
+	if(s_formname)
+	{
+		if( !(form = o_document.forms[s_formname]) )
+			 throw "Missed form with name '"+s_formname+"'.";
+	}
+	else if(o_el)
+	{
+		
+		if( !(form = o_el.form) )
+			throw "Missed form in 'o_el' object";
+	}
+	else
+	{
+		if( !(form = this.form) )
+			throw "Missed form in 'this' object";
+	}
+
+        var o_variable = o_document.createElement('input');
+
+	if( !o_variable )	throw "Can't create element";
+
+        o_variable.type = 'hidden';
+        o_variable.name = s_name;
+        o_variable.value = x_value;
+
+        form.appendChild(o_variable);
+
+        return true;
+}
+
 function get_scroll_pos()
 {
 	var scrOfX = 0, scrOfY = 0;
diff --git a/frontends/php/popup.php b/frontends/php/popup.php
index 7370fde6..f3771059 100644
--- a/frontends/php/popup.php
+++ b/frontends/php/popup.php
@@ -619,27 +619,21 @@ function add_template(formname,id,name)
 
 <script language="JavaScript" type="text/javascript">
 <!--
-function add_variable(formname,value)
+function add_item_variable(s_formname,x_value)
 {
-        var msg = '';
-        var form = window.opener.document.forms[formname];
-        if(!form)
-        {
-                alert('form '+formname+' not exist');
-                window.close();
-        }
+	if(add_variable(null, "itemid[]", x_value, s_formname, window.opener.document))
+	{
+		var o_form;
 
-        new_variable = window.opener.document.createElement('input');
-        new_variable.type = 'hidden';
-        new_variable.name = 'itemid[]';
-        new_variable.value = value;
+		if( !(o_form = window.opener.document.forms[s_formname]) )
+			 throw "Missed form with name '"+s_formname+"'.";
 
-        form.appendChild(new_variable);
+		var element = o_form.elements['itemid'];
+		if(element)     element.name = 'itemid[]';
 
-        var element = form.elements['itemid'];
-        if(element)     element.name = 'itemid[]';
+		o_form.submit();
+	}
 
-        form.submit();
 	window.close();
         return true;
 }
@@ -665,7 +659,7 @@ function add_variable(formname,value)
 		while($db_item = DBfetch($db_items))
 		{
 			$description = new CLink(item_description($db_item["description"],$db_item["key_"]),"#","action");
-			$description->SetAction("return add_variable('".$dstfrm."',".$db_item["itemid"].");");
+			$description->SetAction("return add_item_variable('".$dstfrm."',".$db_item["itemid"].");");
 
 			switch($db_item["status"]){
 				case 0: $status=new CCol(S_ACTIVE,"enabled");		break;