- added frontend-side support of external checks. (Eugene)

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

4 files changed, 12 insertions, 18 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 9f107a31..a1c14ea5 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -158,6 +158,7 @@
 	define('ITEM_TYPE_ZABBIX_ACTIVE',7);
 	define('ITEM_TYPE_AGGREGATE',8);
 	define('ITEM_TYPE_HTTPTEST',9);
+	define('ITEM_TYPE_EXTERNAL',10);
 
 	define('ITEM_VALUE_TYPE_FLOAT',0);
 	define('ITEM_VALUE_TYPE_STR',1);
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 55b86d61..cf5ee929 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1457,15 +1457,10 @@
 		else
 		{
 			$cmbType = new CComboBox("type",$type,"submit()");
-			$cmbType->AddItem(ITEM_TYPE_ZABBIX,S_ZABBIX_AGENT);
-			$cmbType->AddItem(ITEM_TYPE_ZABBIX_ACTIVE,S_ZABBIX_AGENT_ACTIVE);
-			$cmbType->AddItem(ITEM_TYPE_SIMPLE,S_SIMPLE_CHECK);
-			$cmbType->AddItem(ITEM_TYPE_SNMPV1,S_SNMPV1_AGENT);
-			$cmbType->AddItem(ITEM_TYPE_SNMPV2C,S_SNMPV2_AGENT);
-			$cmbType->AddItem(ITEM_TYPE_SNMPV3,S_SNMPV3_AGENT);
-			$cmbType->AddItem(ITEM_TYPE_TRAPPER,S_ZABBIX_TRAPPER);
-			$cmbType->AddItem(ITEM_TYPE_INTERNAL,S_ZABBIX_INTERNAL);
-			$cmbType->AddItem(ITEM_TYPE_AGGREGATE,S_ZABBIX_AGGREGATE);
+			foreach(array(ITEM_TYPE_ZABBIX,ITEM_TYPE_ZABBIX_ACTIVE,ITEM_TYPE_SIMPLE,
+				ITEM_TYPE_SNMPV1,ITEM_TYPE_SNMPV2C,ITEM_TYPE_SNMPV3,ITEM_TYPE_TRAPPER,
+				ITEM_TYPE_INTERNAL,ITEM_TYPE_AGGREGATE,ITEM_TYPE_EXTERNAL) as $it)
+					$cmbType->AddItem($it,item_type2str($it));
 			$frmItem->AddRow(S_TYPE, $cmbType);
 		}
 
@@ -1831,15 +1826,11 @@
 		if(count($applications)==0)  array_push($applications,0);
 
 		$cmbType = new CComboBox('type',$type);
-		$cmbType->AddItem(ITEM_TYPE_ZABBIX,S_ZABBIX_AGENT);
-		$cmbType->AddItem(ITEM_TYPE_ZABBIX_ACTIVE,S_ZABBIX_AGENT_ACTIVE);
-		$cmbType->AddItem(ITEM_TYPE_SIMPLE,S_SIMPLE_CHECK);
-		$cmbType->AddItem(ITEM_TYPE_SNMPV1,S_SNMPV1_AGENT);
-		$cmbType->AddItem(ITEM_TYPE_SNMPV2C,S_SNMPV2_AGENT);
-		$cmbType->AddItem(ITEM_TYPE_SNMPV3,S_SNMPV3_AGENT);
-		$cmbType->AddItem(ITEM_TYPE_TRAPPER,S_ZABBIX_TRAPPER);
-		$cmbType->AddItem(ITEM_TYPE_INTERNAL,S_ZABBIX_INTERNAL);
-		$cmbType->AddItem(ITEM_TYPE_AGGREGATE,S_ZABBIX_AGGREGATE);
+		foreach(array(ITEM_TYPE_ZABBIX,ITEM_TYPE_ZABBIX_ACTIVE,ITEM_TYPE_SIMPLE,ITEM_TYPE_SNMPV1,
+			ITEM_TYPE_SNMPV2C,ITEM_TYPE_SNMPV3,ITEM_TYPE_TRAPPER,ITEM_TYPE_INTERNAL,
+			ITEM_TYPE_AGGREGATE,ITEM_TYPE_AGGREGATE,ITEM_TYPE_EXTERNAL) as $it)
+				$cmbType->AddItem($it, item_type2str($it));
+
 		$frmItem->AddRow(array( new CVisibilityBox('type_visible', get_request('type_visible'), 'type', S_ORIGINAL),
 			S_TYPE), $cmbType);
 
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index ad150b20..89063143 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -33,6 +33,7 @@
 			case ITEM_TYPE_ZABBIX_ACTIVE:	$type = S_ZABBIX_AGENT_ACTIVE;		break;
 			case ITEM_TYPE_AGGREGATE:	$type = S_ZABBIX_AGGREGATE;		break;
 			case ITEM_TYPE_HTTPTEST:	$type = S_WEB_MONITORING;		break;
+			case ITEM_TYPE_EXTERNAL:	$type = S_EXTERNAL_CHECK;		break;
 			default:$type = S_UNKNOWN;			break;
 		}
 		return $type;
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 56329b2e..483b27c8 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -711,6 +711,7 @@
 	'S_SNMPV3_AGENT'=>			'SNMPv3 agent',
 	'S_ZABBIX_INTERNAL'=>			'ZABBIX internal',
 	'S_ZABBIX_AGGREGATE'=>			'ZABBIX aggregate',
+	'S_EXTERNAL_CHECK'=>			'External check',
 	'S_WEB_MONITORING'=>			'Web monitoring',
 	'S_ZABBIX_UNKNOWN'=>			'Unknown',
 	'S_ACTIVE'=>				'Active',