Magellan Linux

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

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

revision 7123 by niro, Fri Sep 11 15:25:31 2015 UTC revision 8004 by niro, Wed Dec 16 15:17:38 2015 UTC
# Line 9  $_SESSION['alx_sort_krit'] = $alx_sort_k Line 9  $_SESSION['alx_sort_krit'] = $alx_sort_k
9  $_SESSION['alx_sort_onfirst'] = $alx_sort_onfirst;  $_SESSION['alx_sort_onfirst'] = $alx_sort_onfirst;
10  $_SESSION['alx_sort_loc'] = $alx_sort_loc;  $_SESSION['alx_sort_loc'] = $alx_sort_loc;
11    
12  $locations = sqlarr('SELECT location FROM client_locations', '', 'location');  $locations = sqlarr('SELECT location FROM client_locations where enabled="1"', '', 'location');
13  $locations[] = '';  $locations[] = '';
14    
15  if($_SESSION['alx_sort_krit']==null)  if($_SESSION['alx_sort_krit']==null)
# 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 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.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 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);
79  usort($comps, 'sortcomp');  usort($comps, 'sortcomp');
80  echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
81      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
# Line 119  echo '</form>'; Line 119  echo '</form>';
119    
120    
121  echo '<table border="1" id="mytab">';  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>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>boot</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=2>version</th>';  if($showversion=='on') echo '<th colspan=2>version</th>';
# Line 147  foreach($comps as $c) Line 147  foreach($comps as $c)
147   echo '<td><nobr>'.$c['hostname'].'</nobr></td>';   echo '<td><nobr>'.$c['hostname'].'</nobr></td>';
148    
149   echo '<td><nobr>'.$c['ip'].'</nobr></td>';   echo '<td><nobr>'.$c['ip'].'</nobr></td>';
150     echo '<td><nobr>'.$c['mac'].'</nobr></td>';
151     echo '<td><nobr>'.$c['netboot'].'</nobr></td>';
152   if($c['mtime']) { echo '<td><nobr>'.date('Y-m-d, H:i:s',$c['mtime']).'</nobr></td>'; }   if($c['mtime']) { echo '<td><nobr>'.date('Y-m-d, H:i:s',$c['mtime']).'</nobr></td>'; }
153   //if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }   //if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }
154   else echo '<td></td>';   else echo '<td></td>';

Legend:
Removed from v.7123  
changed lines
  Added in v.8004