Magellan Linux

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

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

revision 3284 by niro, Wed Nov 2 14:41:24 2011 UTC revision 4908 by niro, Wed May 29 06:44:21 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', 'nouveau', '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 145  if($alxos>='0.6.0') Line 152  if($alxos>='0.6.0')
152   for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'pluginconfig'; }   for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'pluginconfig'; }
153   for ($i=0; $i<999; $i++)   for ($i=0; $i<999; $i++)
154   {   {
155   $drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin');   if($alxos>'0.6.5')
156     $drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin');
157     else
158     $drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins where plugin<>"citrix_spe"', '', 'plugin');
159   array_unshift($drop['cfg_plugins_'.$i.'_plugin_array'], "");   array_unshift($drop['cfg_plugins_'.$i.'_plugin_array'], "");
160   }   }
161  }  }
# Line 169  if($alxos>='0.6.0') Line 179  if($alxos>='0.6.0')
179   array_unshift($citrix_public_applications, "");   array_unshift($citrix_public_applications, "");
180   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; }
181   }   }
182   else if($retval = 126) echo "pnabrowser-wrapper has no execute permission! please run chmod +x on ".$wwwroot."/pnabrowser-wrapper.";   else
183   else echo "pnabrowse-wrapper does not run successfully! retval->'".$retval."'<br>";   {
184     if($retval = 126) echo "pnabrowser-wrapper has no execute permission! please run chmod +x on ".$wwwroot."/pnabrowser-wrapper.";
185     else echo "pnabrowse-wrapper does not run successfully! retval->'".$retval."'<br>";
186     }
187  }  }
188    
189  // GGF. NEUEN DATENSATZ EINFÜGEN  // GGF. NEUEN DATENSATZ EINFÜGEN
# Line 302  function parsearr($name, $arr, $del=fals Line 315  function parsearr($name, $arr, $del=fals
315   $v='openchrome';   $v='openchrome';
316   }   }
317   }   }
318     if($alxos >= '0.6.2')
319     {
320     if($v == 'via')
321     {
322     echo '<br><font color="#FF0000">Replaced "via" with "unichrome" - Please press SAVE!</font><br>';
323     $v='unichrome';
324     }
325     if($v == 'openchrome')
326     {
327     echo '<br><font color="#FF0000">Replaced "openchrome" with "unichrome" - Please press SAVE!</font><br>';
328     $v='unichrome';
329     }
330     }
331    
332   # tell something about vesa   # tell something about vesa
333   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>';
334    
# Line 335  function parsearr($name, $arr, $del=fals Line 361  function parsearr($name, $arr, $del=fals
361   else if($d=='showtime') echo '<tr><td class="key">'.$k2.'</td><td>= <b>'.date('d.m.y - H:i:s', $v).'</b></td></tr>';   else if($d=='showtime') echo '<tr><td class="key">'.$k2.'</td><td>= <b>'.date('d.m.y - H:i:s', $v).'</b></td></tr>';
362   else if($d=='password' && $v=='') echo '<tr><td class="key">'.$k2.'</td><td>= <input type=password style="width:144px" name="'.$name.'_'.$k.'" value=""></td></tr>';   else if($d=='password' && $v=='') echo '<tr><td class="key">'.$k2.'</td><td>= <input type=password style="width:144px" name="'.$name.'_'.$k.'" value=""></td></tr>';
363   else if($d=='password') echo '<tr><td class="key">'.$k2.'</td><td>= <input type=password style="width:144px" name="'.$name.'_'.$k.'" value="KEEPPASS"></td></tr>';   else if($d=='password') echo '<tr><td class="key">'.$k2.'</td><td>= <input type=password style="width:144px" name="'.$name.'_'.$k.'" value="KEEPPASS"></td></tr>';
364   else if($d=='txt') echo '<tr><td colspan=2><textarea style="width:240px; background-color:#d5e5ff" rows=4 name="'.$name.'_'.$k.'">'.$v.'</textarea></td></tr>';   else if($d=='txt') echo '<tr><td colspan=2><textarea style="width:240px; background-color:#d5e5ff" rows=6 name="'.$name.'_'.$k.'">'.$v.'</textarea></td></tr>';
365   else if($d!='ignore') echo '<tr><td class="key">'.$k2.'</td><td>= <input style="width:144px" name="'.$name.'_'.$k.'" value="'.$v.'"></td></tr>';   else if($d!='ignore') echo '<tr><td class="key">'.$k2.'</td><td>= <input style="width:144px" name="'.$name.'_'.$k.'" value="'.$v.'"></td></tr>';
366   }   }
367    
# Line 503  echo '</td><td valign=top>'; Line 529  echo '</td><td valign=top>';
529   echo '<u>IP:</u> '.$conn['ip'].'<br><br>';   echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
530   if($alxos >= '0.6.0')   if($alxos >= '0.6.0')
531   {   {
532   $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']);
533   }   }
534   else   else
535   {   {
536   $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']);
537   }   }
538   $osver = explode(':',$osver[1]);   $osver = explode(':',$osver[1]);
539   if($osver[0] == '') $osver[0]='unkown';   if($osver[0] == '') $osver[0]='unknown';
540   if($osver[1] == '') $osver[1]='unkown';   if($osver[1] == '') $osver[1]='unknown';
541    
542   # update os string in database   # update os string in database
543   if($alxos == '' && $osver[0] >= '0.5.3')   if($alxos == '' && $osver[0] >= '0.5.3')
# Line 525  echo '</td><td valign=top>'; Line 551  echo '</td><td valign=top>';
551   echo '<u>OS:</u> '.$osver[0].'<br>';   echo '<u>OS:</u> '.$osver[0].'<br>';
552   echo '<u>Utils:</u> '.$osver[1].'<br>';   echo '<u>Utils:</u> '.$osver[1].'<br>';
553    
554   if($osver[0] <> 'unkown')   if($osver[0] <> 'unknown')
555   {   {
556   //write them to database   //write them to database
557   }   }
# Line 548  echo '</td><td valign=top>'; Line 574  echo '</td><td valign=top>';
574   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\');">';
575   echo '<br>';   echo '<br>';
576   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\');">';
577   if($alxutils >= '0.6.3')   echo '<input class="but" type=button value="HRDW" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=system\',\'POST\');">';
  {  
  echo '<input class="but" type=button value="HRDW" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=system\',\'POST\');">';  
  }  
578   echo '<br><br>';   echo '<br><br>';
579   }   }
580    

Legend:
Removed from v.3284  
changed lines
  Added in v.4908