Magellan Linux

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

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

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

    revision 3285 by niro, Wed Nov 2 14:43:33 2011 UTC revision 4896 by niro, Tue May 28 13:52:08 2013 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 169  if($alxos>='0.6.0') Line 176  if($alxos>='0.6.0')
    176   array_unshift($citrix_public_applications, "");   array_unshift($citrix_public_applications, "");
    177   for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }   for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }
    178   }   }
    179   else if($retval = 126) echo "pnabrowser-wrapper has no execute permission! please run chmod +x on ".$wwwroot."/pnabrowser-wrapper.";   else
    180   else echo "pnabrowse-wrapper does not run successfully! retval->'".$retval."'<br>";   {
    181     if($retval = 126) echo "pnabrowser-wrapper has no execute permission! please run chmod +x on ".$wwwroot."/pnabrowser-wrapper.";
    182     else echo "pnabrowse-wrapper does not run successfully! retval->'".$retval."'<br>";
    183     }
    184  }  }
    185    
    186  // GGF. NEUEN DATENSATZ EINFÜGEN  // GGF. NEUEN DATENSATZ EINFÜGEN
    # Line 302  function parsearr($name, $arr, $del=fals Line 312  function parsearr($name, $arr, $del=fals
    312   $v='openchrome';   $v='openchrome';
    313   }   }
    314   }   }
    315     if($alxos >= '0.6.2')
    316     {
    317     if($v == 'via')
    318     {
    319     echo '<br><font color="#FF0000">Replaced "via" with "unichrome" - Please press SAVE!</font><br>';
    320     $v='unichrome';
    321     }
    322     if($v == 'openchrome')
    323     {
    324     echo '<br><font color="#FF0000">Replaced "openchrome" with "unichrome" - Please press SAVE!</font><br>';
    325     $v='unichrome';
    326     }
    327     }
    328    
    329   # tell something about vesa   # tell something about vesa
    330   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>';
    331    
    # Line 503  echo '</td><td valign=top>'; Line 526  echo '</td><td valign=top>';
    526   echo '<u>IP:</u> '.$conn['ip'].'<br><br>';   echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
    527   if($alxos >= '0.6.0')   if($alxos >= '0.6.0')
    528   {   {
    529   $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']);
    530   }   }
    531   else   else
    532   {   {
    533   $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']);
    534   }   }
    535   $osver = explode(':',$osver[1]);   $osver = explode(':',$osver[1]);
    536   if($osver[0] == '') $osver[0]='unkown';   if($osver[0] == '') $osver[0]='unknown';
    537   if($osver[1] == '') $osver[1]='unkown';   if($osver[1] == '') $osver[1]='unknown';
    538    
    539   # update os string in database   # update os string in database
    540   if($alxos == '' && $osver[0] >= '0.5.3')   if($alxos == '' && $osver[0] >= '0.5.3')
    # Line 525  echo '</td><td valign=top>'; Line 548  echo '</td><td valign=top>';
    548   echo '<u>OS:</u> '.$osver[0].'<br>';   echo '<u>OS:</u> '.$osver[0].'<br>';
    549   echo '<u>Utils:</u> '.$osver[1].'<br>';   echo '<u>Utils:</u> '.$osver[1].'<br>';
    550    
    551   if($osver[0] <> 'unkown')   if($osver[0] <> 'unknown')
    552   {   {
    553   //write them to database   //write them to database
    554   }   }
    Legend:
    Removed from v.3285  
    changed lines
      Added in v.4896