/[alx-svn]/alx-src/branches/alx-web-060/show.php

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

Parent Directory | Revision Log | View Patch Patch

-revision 2199 by niro,
Tue Jun  7 18:29:36 2011 UTC
+revision 2591 by niro,
Tue Jul  5 14:54:03 2011 UTC
 Line 1
  <?
  // INCLUDE UND TABELLEN-DEFINITIONEN
  include('include/basesql.php');
+ include('include/common-functions.php');
  // INCLUDE CURRENT-PROBLEMS
  include('include/current-problems.php');
-Line 43 
 $drop['resolution'] = array('640x480', '
+Line 44 
 $drop['resolution'] = array('640x480', '
  $drop['depth'] = array('24', '16', '8');
  $drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
  $drop['keyboard'] = array('PC105');
- $drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211', 'b44', 'bnx2', 'dl2k', 'e1000', 'forcedeth', 'r8169', 'sk98lin', 'tg3', 'via-velocity');
+ if($alxos >= '0.6.0') {
+ 	$drop['cfg_network_module'] = array('3c509', '3c59x', '8139cp', '8139too', '8390', 'amd8111e', 'atl1c', 'atl1e', 'atl1', 'atl2', 'b44', 'bnx2', 'cnic', 'e100', 'e1000', 'e1000e', 'forcedeth', 'igb', 'ipg', 'jme', 'natsemi', 'ne2k-pci', 'ns83820', 'pcnet32', 'qla3xxx', 'r8169', 'sis190', 'sis900', 'skge', 'sky2', 'tg3', 'typhoon', 'via-rhine', 'via-velocity', 'adm8211', 'airo', 'at76c50x-usb', 'ar9170usb', 'ath5k', 'ath9k', 'atmel', 'b43', 'b43legacy', 'hostap_pci', 'hostap_plx', 'ipw2100', 'ipw2200', 'iwl3945', 'usb8xxx', 'libertas_tf', 'libertas_tf_usb', 'mwl8k', 'orinoco', 'orinoco_nortel', 'orinoco_plx', 'orinoco_tmd', 'orinoco_usb', 'p54pci', 'p54usb', 'prism54', 'rndis_wlan', 'rt2400pci', 'rt2500pci', 'rt2500usb', 'rt2800pci', 'rt2800usb', 'rt61pci', 'rt73usb', 'rtl8180', 'rtl8187', 'wl1251', 'wl1271', 'zd1201', 'zd1211rw');
+ } else {
+ 	$drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211', 'b44', 'bnx2', 'dl2k', 'e1000', 'forcedeth', 'r8169', 'sk98lin', 'tg3', 'via-velocity');
+ }
  $drop['networking'] = array('dhcp', 'static');
  $drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
  $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
-Line 88 
 $drop['client_version_utils'] = 'show';
+Line 93 
 $drop['client_version_utils'] = 'show';
  // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
  $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');
- $drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'off');
+ $drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'wpa2', 'off');
  $drop['wireless_key_length'] = array('', '64', '128', '256');
  $drop['wireless_channel'] = array('', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14');
  $drop['wireless_frequency'] = array('', '2.412G', '2.417G', '2.422G', '2.427G', '2.432G', '2.437G', '2.442G',
-Line 386 
 echo '</td><td valign=top>';
+Line 391 
 echo '</td><td valign=top>';
  	if($state=='On')
  	{
  		echo '<u>IP:</u> '.$conn['ip'].'<br><br>';
- 		$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']);
+ 		if($alxos >= '0.6.0') {
+ 			$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']);
+ 		} else {
+ 			$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 = explode(':',$osver[1]);
  		if($osver[0] == '') $osver[0]='unkown';
  		if($osver[1] == '') $osver[1]='unkown';

 Legend:



Removed from v.2199
 


changed lines


 
Added in v.2591
 Legend:



Removed from v.2199
 


changed lines


 
Added in v.2591
-Removed from v.2199
+Added in v.2591