Magellan Linux

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

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

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

    revision 7070 by niro, Mon Sep 7 10:50:48 2015 UTC revision 7122 by niro, Fri Sep 11 15:24:49 2015 UTC
    # Line 4  include('include/basesql.php'); Line 4  include('include/basesql.php');
    4  include('include/common-functions.php');  include('include/common-functions.php');
    5    
    6  session_start();  session_start();
    7  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');
    8    $_SESSION['alx_sort_krit'] = $alx_sort_krit;
    9    $_SESSION['alx_sort_onfirst'] = $alx_sort_onfirst;
    10    $_SESSION['alx_sort_loc'] = $alx_sort_loc;
    11    
    12  $locations = sqlarr('SELECT location FROM client_locations', '', 'location');  $locations = sqlarr('SELECT location FROM client_locations', '', 'location');
    13  $locations[] = '';  $locations[] = '';
    # Line 27  if(isset($_GET['s_krit'])) Line 30  if(isset($_GET['s_krit']))
    30  function check_online($dat, $bla)  function check_online($dat, $bla)
    31  {  {
    32   global $comps;   global $comps;
    33   global $pingcmd;   global $ssh_port;
    34     global $mcore_port;
    35     global $ping_timeout;
    36   if(!isset($comps[$dat['serial']])) return false;   if(!isset($comps[$dat['serial']])) return false;
    37    
    38   //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
    39   passthru($pingcmd." ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);   $retval = ping_host($dat['ip'],$mcore_port,$ping_timeout);
    40     if($retval==1) $retval = ping_host($dat['ip'],$ssh_port,$ping_timeout);
    41   if($retval==0)   if($retval==0)
    42   {   {
    43   $comps[$dat['serial']]['online'] = true;   $comps[$dat['serial']]['online'] = true;
    # Line 152  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    
    Legend:
    Removed from v.7070  
    changed lines
      Added in v.7122