--- alx-src/branches/alx-web-050/show.php	2010/12/02 23:02:19	1610
+++ alx-src/branches/alx-web-050/show.php	2011/03/16 11:07:08	1726
@@ -1,6 +1,10 @@
 <?
 	// INCLUDE UND TABELLEN-DEFINITIONEN
 	include('include/basesql.php');
+
+	// INCLUDE CURRENT-PROBLEMS
+	include('include/current-problems.php');
+
 	$tabs = array('cfg_graphic', 'cfg_network', 'cfg_input', 'client_auth', 'cfg_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version');
 	$multi= array(    0,		 0,		0,		0,		0,		0,		1,		1,		1,		1,		1,		0,	0);
 	$data = array();
@@ -29,7 +33,7 @@
 	$drop = array();
 	if($alxos >= '0.5.3')
 	{
-		$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mga', 'r128', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'via');
+		$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng');
 	}
 	else
 	{
@@ -38,6 +42,7 @@
  	$drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x960', '1280x1024', '1360x768', '1366x768', '1400x1050', '1440x900', '1600x1200', '1680x1050');
 	$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', 'r8169', 'sk98lin', 'tg3', 'via-velocity');
 	$drop['networking'] = array('dhcp', 'static');
 	$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
@@ -197,12 +202,30 @@
 			$k = str_replace('wireless_', '', $k);
 			$k2 = $k;
 
-			//replace i810 with intel on 0.5.3 or higher
-			if($alxos >= '0.5.3' && $v == 'i810')
+			//replace some drivers on 0.5.3 or higher
+			if($alxos >= '0.5.3')
 			{
-				echo '<br><font color="#FF0000">Replaced "i810" with "intel" - Please press SAVE!</font><br>';
-				$v='intel';
+				if($v == 'i810')
+				{
+					echo '<br><font color="#FF0000">Replaced "i810" with "intel" - Please press SAVE!</font><br>';
+					$v='intel';
+				}
+				if($v == 'r128')
+				{
+					echo '<br><font color="#FF0000">Replaced "r128" with "vesa" - Please press SAVE!</font><br>';
+					$v='vesa';
+				}
+
+				if($v == 'via')
+				{
+					echo '<br><font color="#FF0000">Replaced "via" with "openchrome" - Please press SAVE!</font><br>';
+					$v='openchrome';
+				}
 			}
+			
+			# tell something about vesa
+			if ($v == 'vesa') echo '<br><font color="#FF0000">Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1020x786x16@60hz!</font><br>';
+
 
 			if(is_array($d))
 			{
@@ -377,8 +400,18 @@
 			}
 			if($osver[0] == '') $osver[0]='unkown';
 			if($osver[1] == '') $osver[1]='unkown';
-                	echo '<u>OS:</u> '.$osver[0].'<br>';
-                	echo '<u>Utils:</u> '.$osver[1].'<br>';
+			
+			# update os string in database
+			if($alxos == '' && $osver[0] >= '0.5.3')
+			{
+				mysql_query('insert into client_version(serial,os,utils) values("'.$id.'","'.$osver[0].'","'.$osver[1].'")
+								on duplicate key update os="'.$osver[0].'", utils="'.$osver[1].'"');
+				# reload the site
+				echo '<script type="text/javascript">setTimeout(\'window.location.reload()\',0);</script>';
+			}
+
+			echo '<u>OS:</u> '.$osver[0].'<br>';
+			echo '<u>Utils:</u> '.$osver[1].'<br>';
 
 			if($osver[0] <> 'unkown')
 			{
@@ -397,12 +430,13 @@
                 	echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
         	        echo 'Remote Shadow:</b></div>';
 			echo '<input class="but" type=button value="VNC" style="width:150px" onclick="window.open(\'vncviewer.php?ip='.$conn['ip'].'\', \'VncViewer\', \'width=200,height=100\')"><br>';
+			echo '<input class="but" type=button value="SSH" style="width:150px" onclick="window.open(\'mindterm.php?ip='.$conn['ip'].'\', \'MindTerm\', \'width=200,height=100\')"><br>';
 			echo '<br>';
                 	echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
         	        echo 'Client Update:</b></div>';
 			echo '<input class="but" type=button value="UPDATE MAGE DB" style="width:150px" onclick="if(confirm(\'UPDATE DB ON CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=update\', \'ShutdownWin\', \'width=800,height=600\')"><br>';
 			echo '<input class="but" type=button value="CALC DEPS" style="width:150px" onclick="if(confirm(\'CALC DEPS FOR CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=calc\', \'ShutdownWin\', \'width=800,height=600\')"><br>';
-			echo '<input class="but" type=button value="UPGRADE CLIENT" style="width:150px" onclick="if(confirm(\'UPGRADE ALL PACKAGES ON CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=upgrade\', \'ShutdownWin\', \'width=800,height=600\')"><br>';	                       	                
+			echo '<input class="but" type=button value="UPGRADE CLIENT" style="width:150px" onclick="if(confirm(\'UPGRADE ALL PACKAGES ON CLIENT #'.$id.' ?\')) window.open(\'mageupgrade.php?client='.$id.'&ip='.$conn['ip'].'&op=upgrade\', \'ShutdownWin\', \'width=800,height=600\');setTimeout(\'window.location.reload()\',0);"><br>'; 
 		}
 		else
 			echo '<input class="but" type=button value="WAKE ON LAN" style="width:150px" onclick="if(confirm(\'WAKE CLIENT #'.$id.' ?\')) window.open(\'wake_on_lan.php?mac='.$data['client_serials']['mac'].'\', \'WakeWin\', \'width=200,height=100\')"><br>';