Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 8005 by niro, Wed Dec 16 15:21:22 2015 UTC revision 8525 by niro, Mon Feb 8 09:59:56 2016 UTC
# Line 30  if(isset($_GET['s_krit'])) Line 30  if(isset($_GET['s_krit']))
30  function check_online($dat, $bla)  function check_online($dat, $bla)
31  {  {
32   global $comps;   global $comps;
  global $ssh_port;  
33   global $mcore_port;   global $mcore_port;
34   global $ping_timeout;   global $ping_timeout;
35   if(!isset($comps[$dat['serial']])) return false;   if(!isset($comps[$dat['serial']])) return false;
36    
  // first try mcore, then get ssh  
37   $retval = ping_host($dat['ip'],$mcore_port,$ping_timeout);   $retval = ping_host($dat['ip'],$mcore_port,$ping_timeout);
  if($retval==1) $retval = ping_host($dat['ip'],$ssh_port,$ping_timeout);  
38   if($retval==0)   if($retval==0)
39   {   {
40   $comps[$dat['serial']]['online'] = true;   $comps[$dat['serial']]['online'] = true;
# Line 73  function checkif($b) Line 70  function checkif($b)
70   else return '';   else return '';
71  }  }
72    
73  $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");
74    
75  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);  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);
76  usort($comps, 'sortcomp');  usort($comps, 'sortcomp');
# Line 122  echo '<table border="1" id="mytab">'; Line 119  echo '<table border="1" id="mytab">';
119  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>';  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>';
120  //always enable showversion atm  //always enable showversion atm
121  $showversion = "on";  $showversion = "on";
122  if($showversion=='on') echo '<th colspan=3>version</th>';  if($showversion=='on') echo '<th colspan=2>version</th>';
123    echo '<th width=100>boot</th>';
124  echo '<th width=150>up/down</th></tr></thead><tbody>';  echo '<th width=150>up/down</th></tr></thead><tbody>';
125    
126  foreach($comps as $c)  foreach($comps as $c)
127  {  {
128   if(!$_SESSION['alx_sort_loc'][$c['location']]) Continue;   if(!$_SESSION['alx_sort_loc'][$c['location']]) Continue;
129   if($c['serial']<0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;   if($c['enabled']==0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;
130    
131   if($c['online']) $pic='online';   if($c['online']) $pic='online';
132   else $pic='offline';   else $pic='offline';
133    
134   if($c['serial']<0)   if($c['enabled']==0)
135   {   {
136   echo '<tr style="text-decoration:line-through; color:#aaaaaa">';   echo '<tr style="text-decoration:line-through; color:#aaaaaa">';
137   $pic = 'deact';   $pic = 'deact';
# Line 159  foreach($comps as $c) Line 157  foreach($comps as $c)
157   $alxver = $alxinfo[os];   $alxver = $alxinfo[os];
158   $alxutils = $alxinfo[utils];   $alxutils = $alxinfo[utils];
159    
  //netboot state  
  if($c['netboot'] == 1) $bootmethod = 'Netboot (PXE)';  
  else $bootmethod = 'Local Disk';  
   
160  // if( $alxver == '')  // if( $alxver == '')
161  // {  // {
162  // if($c['online'])  // if($c['online'])
# Line 176  foreach($comps as $c) Line 170  foreach($comps as $c)
170   if($alxver == '') $alxver='unknown';   if($alxver == '') $alxver='unknown';
171   if($alxutils == '') $alxutils='unknown';   if($alxutils == '') $alxutils='unknown';
172    
  echo '<td>'.$bootmethod.'</td>';  
173   echo '<td>'.$alxver.'</td>';   echo '<td>'.$alxver.'</td>';
174   echo '<td>'.$alxutils.'</td>';   echo '<td>'.$alxutils.'</td>';
175   }   }
176    
177     //netboot state
178     if($c['netboot'] == 1) echo '<td>Netboot (PXE)</td>';
179     else echo '<td>Local Disk</td>';
180    
181   echo '<td>';   echo '<td>';
182   if($c['online'])   if($c['online'])
183   {   {

Legend:
Removed from v.8005  
changed lines
  Added in v.8525