- removed autoregistration

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

8 files changed, 0 insertions, 167 deletions

diff --git a/frontends/php/include/autoregistration.inc.php b/frontends/php/include/autoregistration.inc.php
deleted file mode 100644
index 364c3e0c..00000000
--- a/frontends/php/include/autoregistration.inc.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
-** ZABBIX
-** Copyright (C) 2000-2005 SIA Zabbix
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**/
-?>
-<?php
-	# Add Autoregistration rule
-
-	function	add_autoregistration($pattern,$priority,$hostid)
-	{
-		$autoregid = get_dbid("autoreg","autoregid");
-
-		$result=DBexecute("insert into autoreg (autoregid,pattern,priority,hostid) ".
-			" values ($autoregid,".zbx_dbstr($pattern).",$priority,$hostid)");
-		if($result)
-		{
-			$host=get_host_by_hostid($hostid);
-			info("Added new autoregistration rule for $pattern");
-			$result = $autoregid;
-		}
-		return $result;
-	}
-
-	# Update Autoregistration rule
-
-	function	update_autoregistration($id,$pattern,$priority,$hostid)
-	{
-		return	DBexecute("update autoreg set pattern=".zbx_dbstr($pattern).",priority=$priority,hostid=$hostid where id=$id");
-	}
-
-	# Delete Autoregistartion rule
-
-	function	delete_autoregistration($id)
-	{
-		return	DBexecute("delete from autoreg where id=$id");
-	}
-
-?>
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 42c093e0..afffc9ff 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2624,66 +2624,6 @@
 		$frmGItem->Show();
 	}
 
-	# Insert autoregistration form
-	function	insert_autoregistration_form()
-	{
-		$frmAutoReg = new CFormTable(S_AUTOREGISTRATION,"config.php");
-		$frmAutoReg->SetHelp("web.autoregistration.php");
-		$frmAutoReg->AddVar("config",$_REQUEST["config"]);
-
-		if(isset($_REQUEST["autoregid"]))
-		{
-			$frmAutoReg->AddVar("autoregid",$_REQUEST["autoregid"]);
-			$result	= DBselect("select * from autoreg  where id=".$_REQUEST["autoregid"]);
-
-			$row	= DBfetch($result);
-			$pattern= $row["pattern"];
-
-			$frmAutoReg->SetTitle(S_AUTOREGISTRATION." \"".$pattern."\"");
-		}
-		
-		if(isset($_REQUEST["autoregid"]) && !isset($_REQUEST["form_refresh"]))
-		{
-			$priority	= $row["priority"];
-			$hostid		= $row["hostid"];
-			$h		= get_host_by_hostid($hostid);
-			$host		= $h["host"];
-		}
-		else
-		{
-			$pattern	= get_request("pattern", "*");
-			$priority	= get_request("priority", 10);
-			$hostid		= get_request("hostid", 0);
-			$host		= get_request("host", "");
-		}
-
-		$col=0;
-
-		$frmAutoReg->AddRow(S_PATTERN,new CTextBox("pattern",$pattern,64));
-		$frmAutoReg->AddRow(S_PRIORITY,new CTextBox("priority",$priority,4));
-		$frmAutoReg->AddRow(S_HOST,array(
-			new CTextBox("host",$host,32,'yes'),
-			new CButton("btn1",S_SELECT,
-				"return PopUp('popup.php?dstfrm=".$frmAutoReg->GetName().
-				"&dstfld1=hostid&dstfld2=host&srctbl=hosts&srcfld1=hostid&srcfld2=host',450,450);",
-				'T')
-			));
-		$frmAutoReg->AddVar("hostid",$hostid);
-		
-		$frmAutoReg->AddItemToBottomRow(new CButton("save",S_SAVE));
-		if(isset($_REQUEST["autoregid"]))
-		{
-			$frmAutoReg->AddItemToBottomRow(SPACE);
-			$frmAutoReg->AddItemToBottomRow(new CButtonDelete(
-				"Delete selected autoregistration rule?",
-				url_param("form").url_param("config").url_param("autoregid").
-				"&pattern=".$pattern));
-		}
-		$frmAutoReg->AddItemToBottomRow(SPACE);
-		$frmAutoReg->AddItemToBottomRow(new CButtonCancel(url_param("config")));
-		$frmAutoReg->Show();
-	}
-
 	function	insert_value_mapping_form()
 	{
 		$frmValmap = new CFormTable(S_VALUE_MAP);
diff --git a/frontends/php/include/locales/cn_zh.inc.php b/frontends/php/include/locales/cn_zh.inc.php
index 50e9e4b6..4edeca1d 100644
--- a/frontends/php/include/locales/cn_zh.inc.php
+++ b/frontends/php/include/locales/cn_zh.inc.php
@@ -192,17 +192,8 @@
 	"S_IMAGE_UPDATED"=>			"Image updated",
 	"S_CANNOT_UPDATE_IMAGE"=>		"Cannot update image",
 	"S_UPDATE_SELECTED_IMAGE"=>		"Update selected image?",
-	"S_AUTOREGISTRATION"=>			"Autoregistration",
-	"S_AUTOREGISTRATION_RULES_BIG"=>	"AUTOREGISTRATION RULES",
 	"S_PRIORITY"=>				"优先级",
 	"S_PATTERN"=>				"Pattern",
-	"S_NO_AUTOREGISTRATION_RULES_DEFINED"=>	"No autoregistration rules defined",
-	"S_AUTOREGISTRATION_ADDED"=>		"Autoregistration added",
-	"S_CANNOT_ADD_AUTOREGISTRATION"=>	"Canot add autoregistration",
-	"S_AUTOREGISTRATION_UPDATED"=>		"Autoregistration updated",
-	"S_AUTOREGISTRATION_WAS_NOT_UPDATED"=>	"Autoregistration was not updated",
-	"S_AUTOREGISTRATION_DELETED"=>		"Autoregistration deleted",
-	"S_AUTOREGISTRATION_WAS_NOT_DELETED"=>	"Autoregistration was not deleted",
 	"S_OTHER"=>				"Other",
 	"S_OTHER_PARAMETERS"=>			"其他参数",
 	"S_REFRESH_UNSUPPORTED_ITEMS"=>		"Refresh unsupported items (in sec)",
diff --git a/frontends/php/include/locales/de_de.inc.php b/frontends/php/include/locales/de_de.inc.php
index c610ffaa..edc4154d 100644
--- a/frontends/php/include/locales/de_de.inc.php
+++ b/frontends/php/include/locales/de_de.inc.php
@@ -199,17 +199,8 @@
 	"S_IMAGE_UPDATED"=>	"Grafik aktualisiert",
 	"S_CANNOT_UPDATE_IMAGE"=>	"Grafik konnte nicht aktualisiert werden",
 	"S_UPDATE_SELECTED_IMAGE"=>	"Ausgew&auml;hlte Grafik aktualisieren?",
-	"S_AUTOREGISTRATION"=>	"Automatische Systemregistrierung",
-	"S_AUTOREGISTRATION_RULES_BIG"=>	"EINSTELLUNGEN ZUR AUTOMATISCHEN SYSTEMREGISTRIERUNG",
 	"S_PRIORITY"=>	"Priorit&auml;t",
 	"S_PATTERN"=>	"Raster",
-	"S_NO_AUTOREGISTRATION_RULES_DEFINED"=>	"Keine Regeln zur automatischen Systemregistrierung definiert",
-	"S_AUTOREGISTRATION_ADDED"=>	"Autoregistration added",
-	"S_CANNOT_ADD_AUTOREGISTRATION"=>	"Automatische Systemregistrierung konnte nicht hinzugef&uml;gt werden",
-	"S_AUTOREGISTRATION_UPDATED"=>	"Automatische Systemregistrierung aktualisiert",
-	"S_AUTOREGISTRATION_WAS_NOT_UPDATED"=>	"Automatische Systemregistrierung konnte nicht aktualisiert werden",
-	"S_AUTOREGISTRATION_DELETED"=>	"Automatische Systemregistrierung gel&ouml;scht",
-	"S_AUTOREGISTRATION_WAS_NOT_DELETED"=>	"Automatische Systemregistrierung konnte nicht gel&ouml;scht werden",
 
 //      Latest values
         "S_LATEST_VALUES"=>	"Aktueller Wert",
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 9f73aed7..3cc394fa 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -433,17 +433,8 @@
 	'S_IMAGE_UPDATED'=>			'Image updated',
 	'S_CANNOT_UPDATE_IMAGE'=>		'Cannot update image',
 	'S_UPDATE_SELECTED_IMAGE'=>		'Update selected image?',
-	'S_AUTOREGISTRATION'=>			'Autoregistration',
-	'S_AUTOREGISTRATION_RULES_BIG'=>	'AUTOREGISTRATION RULES',
 	'S_PRIORITY'=>				'Priority',
 	'S_PATTERN'=>				'Pattern',
-	'S_NO_AUTOREGISTRATION_RULES_DEFINED'=>	'No autoregistration rules defined',
-	'S_AUTOREGISTRATION_ADDED'=>		'Autoregistration added',
-	'S_CANNOT_ADD_AUTOREGISTRATION'=>	'Canot add autoregistration',
-	'S_AUTOREGISTRATION_UPDATED'=>		'Autoregistration updated',
-	'S_AUTOREGISTRATION_WAS_NOT_UPDATED'=>	'Autoregistration was not updated',
-	'S_AUTOREGISTRATION_DELETED'=>		'Autoregistration deleted',
-	'S_AUTOREGISTRATION_WAS_NOT_DELETED'=>	'Autoregistration was not deleted',
 	'S_OTHER'=>				'Other',
 	'S_OTHER_PARAMETERS'=>			'Other parameters',
 	'S_REFRESH_UNSUPPORTED_ITEMS'=>		'Refresh unsupported items (in sec)',
diff --git a/frontends/php/include/locales/ja_jp.inc.php b/frontends/php/include/locales/ja_jp.inc.php
index 0fbf23e6..b8f31b85 100644
--- a/frontends/php/include/locales/ja_jp.inc.php
+++ b/frontends/php/include/locales/ja_jp.inc.php
@@ -208,17 +208,8 @@
 	"S_IMAGE_UPDATED"=>			"Image updated",
 	"S_CANNOT_UPDATE_IMAGE"=>		"Cannot update image",
 	"S_UPDATE_SELECTED_IMAGE"=>		"Update selected image?",
-	"S_AUTOREGISTRATION"=>			"鑷嫊鐧婚尣",
-	"S_AUTOREGISTRATION_RULES_BIG"=>	"鑷嫊鐧婚尣銉兗銉�",
 	"S_PRIORITY"=>				"鍎厛闋嗕綅",
 	"S_PATTERN"=>				"銉戙偪銉笺兂",
-	"S_NO_AUTOREGISTRATION_RULES_DEFINED"=>	"鑷嫊鐧婚尣銉兗銉亴瑷畾銇曘倢銇︺亜銇俱仜銈�",
-	"S_AUTOREGISTRATION_ADDED"=>		"鑷嫊鐧婚尣銉兗銉倰杩藉姞銇椼伨銇椼仧",
-	"S_CANNOT_ADD_AUTOREGISTRATION"=>	"鑷嫊鐧婚尣銉兗銉倰杩藉姞銇с亶銇俱仜銈�",
-	"S_AUTOREGISTRATION_UPDATED"=>		"鑷嫊鐧婚尣銉兗銉倰鏇存柊銇椼伨銇椼仧",
-	"S_AUTOREGISTRATION_WAS_NOT_UPDATED"=>	"鑷嫊鐧婚尣銉兗銉倰鏇存柊銇с亶銇俱仜銈�",
-	"S_AUTOREGISTRATION_DELETED"=>		"鑷嫊鐧婚尣銉兗銉倰鍓婇櫎銇椼伨銇椼仧",
-	"S_AUTOREGISTRATION_WAS_NOT_DELETED"=>	"鑷嫊鐧婚尣銉兗銉倰鍓婇櫎銇с亶銇俱仜銈�",
 
 //	Latest values
 	"S_LATEST_VALUES"=>			"鏈�鏂般儑銉笺偪",
diff --git a/frontends/php/include/locales/nl_nl.inc.php b/frontends/php/include/locales/nl_nl.inc.php
index 2bcddb65..efc215e3 100644
--- a/frontends/php/include/locales/nl_nl.inc.php
+++ b/frontends/php/include/locales/nl_nl.inc.php
@@ -240,17 +240,8 @@
 	"S_IMAGE_UPDATED"=>					"Afbeelding bijgewerkt",
 	"S_CANNOT_UPDATE_IMAGE"=>			"Kan niet afbeelding bijwerken",
 	"S_UPDATE_SELECTED_IMAGE"=>			"Werk bij geselecteerde afbeelding?",
-	"S_AUTOREGISTRATION"=>				"Autoregistratie",
-	"S_AUTOREGISTRATION_RULES_BIG"=>	"AUTOREGISTRATIE REGELS",
 	"S_PRIORITY"=>						"Prioriteit",
 	"S_PATTERN"=>						"Patroon",
-	"S_NO_AUTOREGISTRATION_RULES_DEFINED"=>	"Geen autoregistratie regels gedefineerd",
-	"S_AUTOREGISTRATION_ADDED"=>			"Autoregistratie toegevoegd",
-	"S_CANNOT_ADD_AUTOREGISTRATION"=>		"Kan autoregistratie niet toevoegen",
-	"S_AUTOREGISTRATION_UPDATED"=>			"Autoregistratie bijgewerkt",
-	"S_AUTOREGISTRATION_WAS_NOT_UPDATED"=>	"Autoregistratie was niet bijgewerkt",
-	"S_AUTOREGISTRATION_DELETED"=>			"Autoregistratie verwijderd",
-	"S_AUTOREGISTRATION_WAS_NOT_DELETED"=>	"Autoregistratie was niet verwijderd",
 	"S_OTHER"=>								"Anders",
 	"S_OTHER_PARAMETERS"=>					"Andere parameters",
 	"S_REFRESH_UNSUPPORTED_ITEMS"=>		"Vernieuw niet ondersteunde items (in sec)",
diff --git a/frontends/php/include/locales/sv_se.inc.php b/frontends/php/include/locales/sv_se.inc.php
index 4773d059..18fe7c6e 100644
--- a/frontends/php/include/locales/sv_se.inc.php
+++ b/frontends/php/include/locales/sv_se.inc.php
@@ -246,17 +246,8 @@
 	"S_IMAGE_UPDATED"=>			"Bild uppdaterades",
 	"S_CANNOT_UPDATE_IMAGE"=>		"Kan inte uppdatera bild",
 	"S_UPDATE_SELECTED_IMAGE"=>		"Uppdatera markerad bild?",
-	"S_AUTOREGISTRATION"=>			"Autoregistrering",
-	"S_AUTOREGISTRATION_RULES_BIG"=>	"REGLER F諶 AUTOREGISTRERING",
 	"S_PRIORITY"=>				"Prioritet",
 	"S_PATTERN"=>				"M鰊ster",
-	"S_NO_AUTOREGISTRATION_RULES_DEFINED"=>	"Inga regler f鰎 autoregistrering har definierats",
-	"S_AUTOREGISTRATION_ADDED"=>		"Autoregistrering lades till",
-	"S_CANNOT_ADD_AUTOREGISTRATION"=>	"Kan inte l鋑ga till autoregistrering",
-	"S_AUTOREGISTRATION_UPDATED"=>		"Autoregistrering uppdaterades",
-	"S_AUTOREGISTRATION_WAS_NOT_UPDATED"=>	"Autoregistrering blev inte uppdaterad",
-	"S_AUTOREGISTRATION_DELETED"=>		"Autoregistrering togs bort",
-	"S_AUTOREGISTRATION_WAS_NOT_DELETED"=>	"Autoregistrering blev inte borttagen",
 	"S_OTHER"=>				"講rigt",
 	"S_OTHER_PARAMETERS"=>			"講riga parametrar",
 	"S_REFRESH_UNSUPPORTED_ITEMS"=>		"Uppdatera objekt som inte st鰀s (i sekunder)",