Changes - j0ke.net Open Build Service

Changes of Revision 23

[-] [+]	Changed	_service:set_version:ix-inventory-system.spec
@@ -1,7 +1,7 @@ %define pkgname inventory-system Name: ix-inventory-system Release: 0 -Version: 0.0.rev4323 +Version: 0.0.5785 Url: http://www.internetx.com/ License: GPLv2 Group: System 1 @@ -1,7 +1,7 @@ 2 %define pkgname inventory-system 3 Name: ix-inventory-system 4 Release: 0 5 -Version: 0.0.rev4323 6 +Version: 0.0.5785 7 Url: http://www.internetx.com/ 8 License: GPLv2 9 Group: System 10
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.5785.tar.bz2/contrib/inventory.php ^
@@ -33,11 +33,17 @@ $object = spotEntity ('object', $_REQUEST['object_id']); $attrs = getAttrValues ($_REQUEST['object_id']); $fqdn = @$attrs[3]['value']; + $hnarr = explode(".",$fqdn); + if ( $hnarr[0] == "" ) { + $hnarr = explode(".",$object['name']); + } + $hn = $hnarr[0]; $mdbh =& MDB2::singleton($config['inv']['db'], $config['mdb2']['options'] ); $idsql = "SELECT inv_system_id FROM inv_system_properties WHERE (datakey='get_system_hostname' AND value = '" . $object['name'] . "') OR (datakey='get_system_hostname' AND value = '" . $fqdn . "') OR - (datakey='get_system_hostname' AND value = '" . $object['label'] . "' AND '" . $object['label'] . "' != '') + (datakey='get_system_hostname' AND value = '" . $object['label'] . "' AND '" . $object['label'] . "' != '') OR + (datakey='get_system_hostname' AND value = '" . $hn . "') GROUP BY inv_system_id"; $idres = $mdbh->query($idsql); if (PEAR::isError($idres)) {
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.5785.tar.bz2/server/client-status.php ^
@@ -3,8 +3,8 @@ // isdf - inventory system search // Author: Carsten Schoene // -// $LastChangedDate: 2012-11-12 10:39:18 +0100 (Mon, 12 Nov 2012) $ -// $Rev: 4323 $ +// $LastChangedDate: 2013-05-02 20:11:51 +0200 (Thu, 02 May 2013) $ +// $Rev: 5785 $ */ // define our name @@ -103,6 +103,8 @@ foreach ( $mkey as $key => $value ) { if ( $key == "inv_system_id" ) { echo '<tr><td>' . $key . '</td><td>' . $value . '</td><td><input type="hidden" name="inv_system_id" value="' . $value . '"><input type="submit" name="delete" value="Delete from DB"></td></tr>' . "\n"; + } elseif ( $key == "get_system_date" ) { + echo '<tr><td>' . $key . '</td><td>' . $value . " / " . date("Y-m-d H:i:s",$value) . '</td><td> </td></tr>' . "\n"; } else { echo '<tr><td>' . $key . '</td><td>' . $value . '</td><td> </td></tr>' . "\n"; }