Magellan Linux

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

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

revision 3276 by niro, Wed Nov 2 13:49:08 2011 UTC revision 3349 by niro, Wed Feb 8 13:05:29 2012 UTC
# Line 37  if($kill==1) Line 37  if($kill==1)
37  $drop = array();  $drop = array();
38  if($alxos >= '0.6.0')  if($alxos >= '0.6.0')
39  {  {
40   $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');   if($alxos >= '0.6.2')
41     {
42     $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'unichrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
43     }
44     else
45     {
46     $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
47     }
48   if($gfxinfo[module] == 'intel')   if($gfxinfo[module] == 'intel')
49   {   {
50   $drop['cfg_graphic_hdmi'] = array('disable', 'enable');   $drop['cfg_graphic_hdmi'] = array('disable', 'enable');
# Line 302  function parsearr($name, $arr, $del=fals Line 309  function parsearr($name, $arr, $del=fals
309   $v='openchrome';   $v='openchrome';
310   }   }
311   }   }
312     if($alxos >= '0.6.2')
313     {
314     if($v == 'via')
315     {
316     echo '<br><font color="#FF0000">Replaced "via" with "unichrome" - Please press SAVE!</font><br>';
317     $v='unichrome';
318     }
319     if($v == 'openchrome')
320     {
321     echo '<br><font color="#FF0000">Replaced "openchrome" with "unichrome" - Please press SAVE!</font><br>';
322     $v='unichrome';
323     }
324     }
325    
326   # tell something about vesa   # tell something about vesa
327   if ($v == 'vesa') echo '<br><font color="#FF0000">Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!</font><br>';   if ($v == 'vesa') echo '<br><font color="#FF0000">Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!</font><br>';
328    
# Line 503  echo '</td><td valign=top>'; Line 523  echo '</td><td valign=top>';
523   echo '<u>IP:</u> '.$conn['ip'].'<br><br>';   echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
524   if($alxos >= '0.6.0')   if($alxos >= '0.6.0')
525   {   {
526   $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}"', $conn['ip']);   $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}"', $conn['ip']);
527   }   }
528   else   else
529   {   {
530   $osver = sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $conn['ip']);   $osver = @sshdo('os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx | cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"', $conn['ip']);
531   }   }
532   $osver = explode(':',$osver[1]);   $osver = explode(':',$osver[1]);
533   if($osver[0] == '') $osver[0]='unkown';   if($osver[0] == '') $osver[0]='unknown';
534   if($osver[1] == '') $osver[1]='unkown';   if($osver[1] == '') $osver[1]='unknown';
535    
536   # update os string in database   # update os string in database
537   if($alxos == '' && $osver[0] >= '0.5.3')   if($alxos == '' && $osver[0] >= '0.5.3')
# Line 525  echo '</td><td valign=top>'; Line 545  echo '</td><td valign=top>';
545   echo '<u>OS:</u> '.$osver[0].'<br>';   echo '<u>OS:</u> '.$osver[0].'<br>';
546   echo '<u>Utils:</u> '.$osver[1].'<br>';   echo '<u>Utils:</u> '.$osver[1].'<br>';
547    
548   if($osver[0] <> 'unkown')   if($osver[0] <> 'unknown')
549   {   {
550   //write them to database   //write them to database
551   }   }
# Line 548  echo '</td><td valign=top>'; Line 568  echo '</td><td valign=top>';
568   echo '<input class="but" type=button value="VGA" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=vga\',\'POST\');">';   echo '<input class="but" type=button value="VGA" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=vga\',\'POST\');">';
569   echo '<br>';   echo '<br>';
570   echo '<input class="but" type=button value="PRN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=printer\',\'POST\');">';   echo '<input class="but" type=button value="PRN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=printer\',\'POST\');">';
571     echo '<input class="but" type=button value="HRDW" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=system\',\'POST\');">';
572   echo '<br><br>';   echo '<br><br>';
573   }   }
574    

Legend:
Removed from v.3276  
changed lines
  Added in v.3349