/[alx-svn]/alx-src/branches/alx-web-070/index.php

Diff of /alx-src/branches/alx-web-070/index.php

Parent Directory | Revision Log | View Patch Patch

-revision 8004 by niro,
Wed Dec 16 15:17:38 2015 UTC
+revision 8527 by niro,
Mon Feb  8 10:03:43 2016 UTC
 Line 30 
 if(isset($_GET['s_krit']))
  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;
-Line 73 
 function checkif($b)
+Line 70 
 function checkif($b)
  	else return '';
  }
- $comps = sqlarr("select client_serials.serial, 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");
+ $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 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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+ 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
  echo '<head>';
  	echo '<title>ALX Config - Index</title>';
  	echo '<script language="JavaScript">';
-Line 91 
 echo '<script type="text/javascript" src
+Line 88 
 echo '<script type="text/javascript" src
  if($reload!='off') echo '<body onload="window.setTimeout(\'location.reload()\',60000)">';
- /*
- echo '<img src="logo.jpg" align=middle>';
- echo '<a href="index.php" style="padding-left:170px; color:#000000;text-decoration:none; font-weight:bold">[REFRESH]</a><br>';
- echo '<form action="index.php" method="get" style="margin-top:0px"><b>SORT BY</b> <input onclick="this.form.submit()" type="radio" name="s_krit" value="serial"'.checkif($_SESSION['alx_sort_krit']=='serial').'>serial <input onclick="this.form.submit()" type="radio" name="s_krit" value="hostname"'.checkif($_SESSION['alx_sort_krit']=='hostname').'>hostname';
- echo '<input onclick="this.form.submit()" style="margin-left:125px" name="s_on" type="checkbox" value="1"'.checkif($_SESSION['alx_sort_onfirst']).'>online clients on top</form><br>';
- */
  echo '<form action="index.php" method="get" style="margin:0px">';
  echo '<table width=480><tr>';
  echo '<td><img src="pics/logo.jpg"></td>';
-Line 119 
 echo '</form>';
+Line 108 
 echo '</form>';
  echo '<table border="1" id="mytab">';
- echo '<thead><tr style="font-weight:bold;background-color:#d5e5ff"><th>edit</th><th colspan=3>serial</th><th width=170>hostname</th><th width=100>ip</th><th width=100>mac</th><th width=100>boot</th><th width=100>last connected</th>';
+ echo '<thead><tr style="font-weight:bold;background-color:#d5e5ff"><th>edit</th><th colspan=3>serial</th><th width=170>hostname</th><th width=100>ip</th><th width=100>mac</th><th width=100>last connected</th>';
- //always enable showversion atm
+ echo '<th colspan=2>version</th>';
- $showversion = "on";
+ echo '<th width=100>boot</th>';
- if($showversion=='on') echo '<th colspan=2>version</th>';
  echo '<th width=150>up/down</th></tr></thead><tbody>';
  foreach($comps as $c)
  {
  	if(!$_SESSION['alx_sort_loc'][$c['location']]) Continue;
- 	if($c['serial']<0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;
+ 	if($c['enabled']==0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;
  	if($c['online']) $pic='online';
  	else $pic='offline';
- 	if($c['serial']<0)
+ 	if($c['enabled']==0)
  	{
  		echo '<tr style="text-decoration:line-through; color:#aaaaaa">';
  		$pic = 'deact';
-Line 146 
 foreach($comps as $c)
+Line 134 
 foreach($comps as $c)
  	echo '<td width=40><b>#'.$c['serial'].'</b></td>';
  	echo '<td><nobr>'.$c['hostname'].'</nobr></td>';
-  	echo '<td><nobr>'.$c['ip'].'</nobr></td>';
+ 	echo '<td><nobr>'.$c['ip'].'</nobr></td>';
-  	echo '<td><nobr>'.$c['mac'].'</nobr></td>';
+ 	echo '<td><nobr>'.$c['mac'].'</nobr></td>';
-  	echo '<td><nobr>'.$c['netboot'].'</nobr></td>';
  	if($c['mtime']) { echo '<td><nobr>'.date('Y-m-d, H:i:s',$c['mtime']).'</nobr></td>'; }
- 	//if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }
  	else echo '<td></td>';
  	if($showversion=='on')
-Line 160 
 foreach($comps as $c)
+Line 146 
 foreach($comps as $c)
  		$alxver = $alxinfo[os];
  		$alxutils = $alxinfo[utils];
- //		if( $alxver == '')
- //		{
- //			if($c['online'])
- //			{
- //				//$alxinfo = @sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $c['ip']);
- //				//$alxinfo = explode(':',$alxinfo[1]);
- //				//$alxver = $alxinfo[0];
- //				//$alxutils = $alxinfo[1];
- //			}
- //		}
  		if($alxver == '') $alxver='unknown';
  		if($alxutils == '') $alxutils='unknown';
-Line 177 
 foreach($comps as $c)
+Line 153 
 foreach($comps as $c)
  		echo '<td>'.$alxutils.'</td>';
  	}
+ 	//netboot state
+ 	if($c['netboot'] == 1) echo '<td>Netboot (PXE)</td>';
+ 	else echo '<td>Local Disk</td>';
  	echo '<td>';
  	if($c['online'])
  	{

 Legend:



Removed from v.8004
 


changed lines


 
Added in v.8527
 Legend:



Removed from v.8004
 


changed lines


 
Added in v.8527
-Removed from v.8004
+Added in v.8527