- BUGFIX: getidbyname() did not pass parameters to MySQL correctly.

- Restructured sysContact and sysLocation "not set" code.
- Do not display "SNMP Location" when empty or unset.


git-svn-id: http://www.observium.org/svn/observer/trunk@2299 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Geert Hauwaerts
2011-05-13 12:28:57 +00:00
parent bc0cdd2415
commit ad1ca375e2
4 changed files with 12 additions and 16 deletions

View File

@@ -15,20 +15,6 @@ $data = snmp_get_multi($device, "VMWARE-SYSTEM-MIB::vmwProdName.0 VMWARE-SYSTE
$version = preg_replace("/^VMware /", "", $data[0]["vmwProdName"]) . " " . $data[0]["vmwProdVersion"];
$features = "build-" . $data[0]["vmwProdBuild"];
/*
* VMware ESXi returns "not set" instead of a NULL value.
*/
if ($sysLocation == "not set")
{
$sysLocation = "";
}
if ($sysContact == "not set")
{
$sysContact = "";
}
/*
* CONSOLE: Start the VMware discovery process.
*/