Changes - j0ke.net Open Build Service

Changes of Revision 87

[-] [+]	Changed	_service:set_version:inventory-system.spec
@@ -1,7 +1,7 @@ %define pkgname inventory-system Name: inventory-system Release: 0 -Version: 0.0.rev4245 +Version: 0.0.rev4263 Url: http://www.linux-administrator.com/ License: GPLv2 Group: System 1 @@ -1,7 +1,7 @@ 2 %define pkgname inventory-system 3 Name: inventory-system 4 Release: 0 5 -Version: 0.0.rev4245 6 +Version: 0.0.rev4263 7 Url: http://www.linux-administrator.com/ 8 License: GPLv2 9 Group: System 10
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev4263.tar.bz2/client/inventory-system.sh ^
@@ -1,8 +1,8 @@ #!/bin/bash # Inventory System # Author: Carsten Schoene -# $LastChangedDate: 2012-11-01 21:23:16 +0100 (Thu, 01 Nov 2012) $ -# $Rev: 4204 $ +# $LastChangedDate: 2012-11-07 17:54:40 +0100 (Wed, 07 Nov 2012) $ +# $Rev: 4263 $ # # Default options (can be changed by inventory-system.conf) DEBUG="yes" @@ -406,6 +406,18 @@ echo ${SYSMANUF} } +# get express service code for dell systems +function get_system_dell_express_service_code { + [ "`is_disabled $FUNCNAME`" == "1" ] && return + if [ -n "`get_system_manufacturer \| grep -i dell`" ] ; then + ST=`get_system_serial` + if [ -n "${ST}" ] ; then + EC=$((36#${ST})) + debug "SYSTEM-DELL-EXPRESS-SERVICE-CODE: ${EC}" + echo "${EC}" + fi + fi +} # get system bios version function get_system_biosversion { [ "`is_disabled $FUNCNAME`" == "1" ] && return @@ -617,6 +629,7 @@ get_system_cpu \ get_system_memory \ get_system_manufacturer \ + get_system_dell_express_service_code \ get_system_productname \ get_system_biosversion \ get_system_net_info \
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev4263.tar.bz2/server/config.inc.php ^
@@ -1,6 +1,6 @@ <?php -$config["isdf"]["postvars"] = array("get_system_uuid","get_system_serial","get_system_cpu","get_system_memory","get_system_manufacturer","get_system_productname","get_system_biosversion","get_system_net_info","get_system_default_ip","get_system_ipv4","get_system_ipv6","get_system_hostname","get_system_mgmt_mac","get_system_mgmt_ip","get_system_type","get_system_kernelversion","get_system_arch","get_system_os","get_system_software","get_system_date","get_system_disk_size_bootdev","get_system_disk_sizes"); +$config["isdf"]["postvars"] = array("get_system_uuid","get_system_serial","get_system_cpu","get_system_memory","get_system_manufacturer","get_system_productname","get_system_biosversion","get_system_net_info","get_system_default_ip","get_system_ipv4","get_system_ipv6","get_system_hostname","get_system_mgmt_mac","get_system_mgmt_ip","get_system_type","get_system_kernelversion","get_system_arch","get_system_os","get_system_software","get_system_date","get_system_disk_size_bootdev","get_system_disk_sizes","get_system_dell_express_service_code"); $config["isdf"]["dhcp"]["macblacklist"] = array("00:00:00:00:00:00","ff:ff:ff:ff:ff:ff"); $config["isdf"]["dhcp"]["intblacklist"] = array("virbr0");
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev4263.tar.bz2/server/search.php ^
@@ -72,9 +72,9 @@ $search = $dbh->escape($_GET['search']); $output = $_GET['output']; if ( $systemid == "all" ) { - $idsql = "SELECT inv_system_id FROM inv_system_properties WHERE value LIKE '%$search%'"; + $idsql = "SELECT inv_system_id FROM inv_system_properties WHERE value LIKE '%$search%' GROUP BY inv_system_id"; } else { - $idsql = "SELECT inv_system_id FROM inv_system_properties WHERE datakey = '$systemid' AND value LIKE '%$search%'"; + $idsql = "SELECT inv_system_id FROM inv_system_properties WHERE datakey = '$systemid' AND value LIKE '%$search%' GROUP BY inv_system_id"; } $idres = $dbh->query($idsql);