Magellan Linux

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

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

revision 7110 by niro, Wed Sep 9 11:20:52 2015 UTC revision 7745 by niro, Tue Nov 3 13:33:12 2015 UTC
# Line 75  function checkif($b) Line 75  function checkif($b)
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 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 158  foreach($comps as $c) Line 158  foreach($comps as $c)
158   $alxver = $alxinfo[os];   $alxver = $alxinfo[os];
159   $alxutils = $alxinfo[utils];   $alxutils = $alxinfo[utils];
160    
161   if( $alxver == '')  // if( $alxver == '')
162   {  // {
163   if($c['online'])  // if($c['online'])
164   {  // {
165   //$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 = @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']);
166   //$alxinfo = explode(':',$alxinfo[1]);  // //$alxinfo = explode(':',$alxinfo[1]);
167   //$alxver = $alxinfo[0];  // //$alxver = $alxinfo[0];
168   //$alxutils = $alxinfo[1];  // //$alxutils = $alxinfo[1];
169   }  // }
170   }  // }
171   if($alxver == '') $alxver='unknown';   if($alxver == '') $alxver='unknown';
172   if($alxutils == '') $alxutils='unknown';   if($alxutils == '') $alxutils='unknown';
173    
174         echo '<td>'.$alxver.'</td>';   echo '<td>'.$alxver.'</td>';
175         echo '<td>'.$alxutils.'</td>';   echo '<td>'.$alxutils.'</td>';
176   }   }
177    
178   echo '<td>';   echo '<td>';
# Line 186  foreach($comps as $c) Line 186  foreach($comps as $c)
186   else echo '<input type=button style="width:100%" value="WOL" onclick="if(confirm(\'WAKE CLIENT #'.$c['serial'].' ?\')) window.open(\'wake_on_lan.php?mac='.$c['mac'].'\', \'WakeWin\', \'width=200,height=100\')">';   else echo '<input type=button style="width:100%" value="WOL" onclick="if(confirm(\'WAKE CLIENT #'.$c['serial'].' ?\')) window.open(\'wake_on_lan.php?mac='.$c['mac'].'\', \'WakeWin\', \'width=200,height=100\')">';
187   echo '</td>';   echo '</td>';
188    
189   echo '</tr>';   echo '</tr>';
190  }  }
191  echo '</tbody></table><br>';  echo '</tbody></table><br>';
192    

Legend:
Removed from v.7110  
changed lines
  Added in v.7745