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 8007 by niro, Wed Dec 16 16:06:40 2015 UTC
# Line 73  function checkif($b) Line 73  function checkif($b)
73   else return '';   else return '';
74  }  }
75    
76  $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");
77    
78  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);
79  usort($comps, 'sortcomp');  usort($comps, 'sortcomp');
# Line 122  echo '<table border="1" id="mytab">'; Line 122  echo '<table border="1" id="mytab">';
122  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>';
123  //always enable showversion atm  //always enable showversion atm
124  $showversion = "on";  $showversion = "on";
125  if($showversion=='on') echo '<th colspan=3>version</th>';  if($showversion=='on') echo '<th colspan=2>version</th>';
126    echo '<th width=100>boot</th>';
127  echo '<th width=150>up/down</th></tr></thead><tbody>';  echo '<th width=150>up/down</th></tr></thead><tbody>';
128    
129  foreach($comps as $c)  foreach($comps as $c)
130  {  {
131   if(!$_SESSION['alx_sort_loc'][$c['location']]) Continue;   if(!$_SESSION['alx_sort_loc'][$c['location']]) Continue;
132   if($c['serial']<0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;   if($c['enabled']==0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;
133    
134   if($c['online']) $pic='online';   if($c['online']) $pic='online';
135   else $pic='offline';   else $pic='offline';
136    
137   if($c['serial']<0)   if($c['enabled']==0)
138   {   {
139   echo '<tr style="text-decoration:line-through; color:#aaaaaa">';   echo '<tr style="text-decoration:line-through; color:#aaaaaa">';
140   $pic = 'deact';   $pic = 'deact';
# Line 159  foreach($comps as $c) Line 160  foreach($comps as $c)
160   $alxver = $alxinfo[os];   $alxver = $alxinfo[os];
161   $alxutils = $alxinfo[utils];   $alxutils = $alxinfo[utils];
162    
  //netboot state  
  if($c['netboot'] == 1) $bootmethod = 'Netboot (PXE)';  
  else $bootmethod = 'Local Disk';  
   
163  // if( $alxver == '')  // if( $alxver == '')
164  // {  // {
165  // if($c['online'])  // if($c['online'])
# Line 176  foreach($comps as $c) Line 173  foreach($comps as $c)
173   if($alxver == '') $alxver='unknown';   if($alxver == '') $alxver='unknown';
174   if($alxutils == '') $alxutils='unknown';   if($alxutils == '') $alxutils='unknown';
175    
  echo '<td>'.$bootmethod.'</td>';  
176   echo '<td>'.$alxver.'</td>';   echo '<td>'.$alxver.'</td>';
177   echo '<td>'.$alxutils.'</td>';   echo '<td>'.$alxutils.'</td>';
178   }   }
179    
180     //netboot state
181     if($c['netboot'] == 1) echo '<td>Netboot (PXE)</td>';
182     else echo '<td>Local Disk</td>';
183    
184   echo '<td>';   echo '<td>';
185   if($c['online'])   if($c['online'])
186   {   {

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