Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alx-web-060/index.php

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

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

    revision 2947 by niro, Wed Jun 15 14:22:53 2011 UTC revision 2948 by niro, Wed Sep 7 08:54:25 2011 UTC
    # Line 68  function checkif($b) Line 68  function checkif($b)
    68  }  }
    69    
    70  $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 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");
    71    
    72  sqlforeach('SELECT serial, ip, hostname, mac FROM state_connected', 'check_online', null);  sqlforeach('SELECT serial, ip, hostname, mac FROM state_connected', 'check_online', null);
    73  usort($comps, 'sortcomp');  usort($comps, 'sortcomp');
    74  echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    # Line 143  foreach($comps as $c) Line 143  foreach($comps as $c)
    143   //if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }   //if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }
    144   else echo '<td></td>';   else echo '<td></td>';
    145    
    146   if($c['online'])   if($showversion=='on')
    147   {   {
    148   if($showversion=='on')   // get alx version info for
    149     $alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$c['serial']);
    150     $alxver = $alxinfo[os];
    151     $alxutils = $alxinfo[utils];
    152    
    153     if( $alxver == '')
    154   {   {
    155   $osver = 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']);   if($c['online'])
    156   $osver = explode(':',$osver[1]);   {
    157   if($osver[0] == '') $osver[0]='unkown';   //$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']);
    158   if($osver[1] == '') $osver[1]='unkown';   //$alxinfo = explode(':',$alxinfo[1]);
    159           echo '<td>'.$osver[0].'</td>';   //$alxver = $alxinfo[0];
    160           echo '<td>'.$osver[1].'</td>';   //$alxutils = $alxinfo[1];
    161          }   }
    162     }
    163     if($alxver == '') $alxver='unkown';
    164     if($alxutils == '') $alxutils='unkown';
    165    
    166           echo '<td>'.$alxver.'</td>';
    167           echo '<td>'.$alxutils.'</td>';
    168   }   }
    169    
    170   echo '<td>';   echo '<td>';
    Legend:
    Removed from v.2947  
    changed lines
      Added in v.2948