--- alx-src/branches/alx-web-070/index.php 2015/09/11 15:25:31 7123
+++ alx-src/branches/alx-web-070/index.php 2016/02/08 14:05:46 8553
@@ -9,7 +9,7 @@
$_SESSION['alx_sort_onfirst'] = $alx_sort_onfirst;
$_SESSION['alx_sort_loc'] = $alx_sort_loc;
-$locations = sqlarr('SELECT location FROM client_locations', '', 'location');
+$locations = sqlarr('SELECT location FROM client_locations where enabled="1"', '', 'location');
$locations[] = '';
if($_SESSION['alx_sort_krit']==null)
@@ -30,14 +30,11 @@
function check_online($dat, $bla)
{
global $comps;
- global $ssh_port;
global $mcore_port;
global $ping_timeout;
if(!isset($comps[$dat['serial']])) return false;
- // first try mcore, then get ssh
$retval = ping_host($dat['ip'],$mcore_port,$ping_timeout);
- if($retval==1) $retval = ping_host($dat['ip'],$ssh_port,$ping_timeout);
if($retval==0)
{
$comps[$dat['serial']]['online'] = true;
@@ -73,12 +70,12 @@
else return '';
}
-$comps = sqlarr("select client_serials.serial, client_serials.location, client_serials.mac, cfg_network.hostname, state_connected.mtime from client_serials left join cfg_network on client_serials.serial=cfg_network.serial left join state_connected on client_serials.serial=state_connected.serial", "serial");
+$comps = sqlarr("select client_serials.serial, client_serials.enabled, client_serials.location, client_serials.mac, cfg_network.hostname, state_connected.mtime, state_connected.netboot from client_serials left join cfg_network on client_serials.serial=cfg_network.serial left join state_connected on client_serials.serial=state_connected.serial", "serial");
-sqlforeach('SELECT serial, ip, hostname, mac FROM state_connected', 'check_online', null);
+sqlforeach('SELECT state_connected.serial, state_connected.ip, cfg_network.hostname, state_connected.mac FROM state_connected left join cfg_network on cfg_network.serial=state_connected.serial', 'check_online', null);
usort($comps, 'sortcomp');
echo '';
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
echo '';
echo 'ALX Config - Index';
echo '