/[alx-svn]/alx-src/tags/alx-web-0_7_0_20171218_1/index.php

Diff of /alx-src/tags/alx-web-0_7_0_20171218_1/index.php

Parent Directory | Revision Log | View Patch Patch

-alx-src/branches/alx-web-060/index.php
revision 4895 by niro,
Tue May 28 13:48:36 2013 UTC
+alx-src/branches/alx-web-070/index.php
revision 7996 by niro,
Mon Dec 14 08:24:42 2015 UTC
 Line 4 
 include('include/basesql.php');
  include('include/common-functions.php');
  session_start();
- session_register('alx_sort_krit'); session_register('alx_sort_onfirst'); session_register('alx_sort_loc');
+ //session_register('alx_sort_krit'); session_register('alx_sort_onfirst'); session_register('alx_sort_loc');
+ $_SESSION['alx_sort_krit'] = $alx_sort_krit;
+ $_SESSION['alx_sort_onfirst'] = $alx_sort_onfirst;
+ $_SESSION['alx_sort_loc'] = $alx_sort_loc;
- $locations = sqlarr('SELECT location FROM client_locations', '', 'location');
+ $locations = sqlarr('SELECT location FROM client_locations where enabled="1"', '', 'location');
  $locations[] = '';
  if($_SESSION['alx_sort_krit']==null)
-Line 27 
 if(isset($_GET['s_krit']))
+Line 30 
 if(isset($_GET['s_krit']))
  function check_online($dat, $bla)
  {
  	global $comps;
- 	global $pingcmd;
+ 	global $ssh_port;
+ 	global $mcore_port;
+ 	global $ping_timeout;
  	if(!isset($comps[$dat['serial']])) return false;
- 	//passthru("/bin/ping -I eth0 -c 1 -W 1 -q ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
+ 	// first try mcore, then get ssh
- 	passthru($pingcmd." ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
+ 	$retval = ping_host($dat['ip'],$mcore_port,$ping_timeout);
+ 	if($retval==1) $retval = ping_host($dat['ip'],$ssh_port,$ping_timeout);
  	if($retval==0)
  	{
  		$comps[$dat['serial']]['online'] = true;
-Line 69 
 function checkif($b)
+Line 75 
 function checkif($b)
  $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");
- 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);
  usort($comps, 'sortcomp');
  echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-Line 113 
 echo '</form>';
+Line 119 
 echo '</form>';
  echo '<table border="1" id="mytab">';
- 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>last connected</th>';
  //always enable showversion atm
  $showversion = "on";
  if($showversion=='on') echo '<th colspan=2>version</th>';
-Line 141 
 foreach($comps as $c)
+Line 147 
 foreach($comps as $c)
  	echo '<td><nobr>'.$c['hostname'].'</nobr></td>';
   	echo '<td><nobr>'.$c['ip'].'</nobr></td>';
+  	echo '<td><nobr>'.$c['mac'].'</nobr></td>';
  	if($c['mtime']) { echo '<td><nobr>'.date('Y-m-d, H:i:s',$c['mtime']).'</nobr></td>'; }
  	//if($c['mtime']) { echo '<td><nobr>'.$c['mtime'].'</nobr></td>'; }
  	else echo '<td></td>';
-Line 152 
 foreach($comps as $c)
+Line 159 
 foreach($comps as $c)
  		$alxver = $alxinfo[os];
  		$alxutils = $alxinfo[utils];
- 		if( $alxver == '')
+ //		if( $alxver == '')
- 		{
+ //		{
- 			if($c['online'])
+ //			if($c['online'])
- 			{
+ //			{
- 				//$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']);
- 				//$alxinfo = explode(':',$alxinfo[1]);
+ //				//$alxinfo = explode(':',$alxinfo[1]);
- 				//$alxver = $alxinfo[0];
+ //				//$alxver = $alxinfo[0];
- 				//$alxutils = $alxinfo[1];
+ //				//$alxutils = $alxinfo[1];
- 			}
+ //			}
- 		}
+ //		}
  		if($alxver == '') $alxver='unknown';
  		if($alxutils == '') $alxutils='unknown';
- 	       	echo '<td>'.$alxver.'</td>';
+ 		echo '<td>'.$alxver.'</td>';
- 	       	echo '<td>'.$alxutils.'</td>';
+ 		echo '<td>'.$alxutils.'</td>';
  	}
  	echo '<td>';
-Line 180 
 foreach($comps as $c)
+Line 187 
 foreach($comps as $c)
  	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\')">';
  	echo '</td>';
-  	echo '</tr>';
+ 	echo '</tr>';
  }
  echo '</tbody></table><br>';

 Legend:



Removed from v.4895
 


changed lines


 
Added in v.7996
 Legend:



Removed from v.4895
 


changed lines


 
Added in v.7996
-Removed from v.4895
+Added in v.7996