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

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

Parent Directory | Revision Log | View Patch Patch

-alx-src/branches/alx-web-060/show.php
revision 2444 by niro,
Mon Jun 27 11:47:42 2011 UTC
+alx-src/branches/alx-web-070/show.php
revision 7140 by niro,
Tue Sep 15 08:33:39 2015 UTC
 Line 1
  <?
- <?
  // INCLUDE UND TABELLEN-DEFINITIONEN
  include('include/basesql.php');
  include('include/common-functions.php');
-Line 7 
 include('include/common-functions.php');
+Line 6 
 include('include/common-functions.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');
+ $tabs = array('cfg_graphic', 'cfg_network', 'cfg_input', 'client_auth', 'cfg_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions_citrix', 'cfg_sessions_storefront', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version');
- $multi= array(    0,		 0,		0,		0,		0,		0,		1,		1,		1,		1,		1,		0,	0);
+ $multi= array(	0,		 0,		0,		0,		1,		0,		1,		1,		1,		1,		1,		1,		0,	0);
  $data = array();
  // get alx version info for
  $alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$id);
  $alxos = $alxinfo[os];
  $alxutils = $alxinfo[utils];
+ // get gfxdriver
+ $gfxinfo = sqlfirst('SELECT * FROM cfg_graphic WHERE serial='.$id);
  if($kill==1)
  {
  	foreach($tabs as $t)	mysql_query('UPDATE '.$t.' SET serial=-serial WHERE serial='.$id);
-Line 33 
 if($kill==1)
+Line 34 
 if($kill==1)
  // FELD-DEFINITIONEN  (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID)
  $drop = array();
- if($alxos >= '0.5.3')
+ $drop['cfg_graphic_module'] = sqlarr('SELECT value FROM values_graphic_module where enabled=1', '', 'value');
+ if($gfxinfo[module] == 'intel')
  {
- 	$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng');
+ 	$drop['cfg_graphic_hdmi'] = array('disable', 'enable');
  }
  else
  {
- 	$drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i810', 'i710', 'nv', 'mga', 'r128', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'via');
+ 	$drop['cfg_graphic_hdmi'] = 'ignore';
  }
- $drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x960', '1280x1024', '1360x768', '1366x768', '1400x1050', '1440x900', '1600x1200', '1680x1050', '1280x720', '1920x1080');
+ $drop['resolution'] = sqlarr('SELECT value FROM values_graphic_resolution where enabled=1', '', 'value');
- $drop['depth'] = array('24', '16', '8');
+ $drop['depth'] = sqlarr('SELECT value FROM values_graphic_depth where enabled=1', '', 'value');
- $drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
+ //$drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
- $drop['keyboard'] = array('PC105');
+ //$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');
+ $drop['keymap'] = sqlarr('SELECT value FROM values_input_keymap where enabled=1', '', 'value');
+ $drop['cfg_network_module'] = sqlarr('SELECT value FROM values_network_module where enabled=1', '', 'value');
  $drop['networking'] = array('dhcp', 'static');
- $drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
+ $drop['port'] = sqlarr('SELECT value FROM values_printers_port where enabled=1', '', 'value');
- $drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
+ //for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
+ $drop['share'] = 'ignore';
+ $drop['location'] = sqlarr('SELECT location FROM client_locations where enabled=1', '', 'location');
  $drop['id'] = 'hidden';
  $drop['flg_modified'] = '1';
  $drop['serial'] = 'ignore';
- if($alxos>='0.5.3')
+ $drop['monitorid'] = 'ignore';
- {
+ $drop['refresh_rate'] = sqlarr('SELECT value FROM values_graphic_refresh_rate where enabled=1', '', 'value');
- 	$drop['monitorid'] = 'ignore';
- 	$drop['refresh_rate'] = array('','60','75','85','100');
- }
- else
- {
- 	$drop['monitorid'] = 'monitorid';
- 	$drop['refresh_rate'] = 'ignore';
- }
  $drop['hostname'] = 'bold';
  $drop['session'] = 'bold';
- $drop['cfg_autostart_session'] = 'filename';
+ $drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions_citrix where serial='.$id, '', 'filename');
+ array_unshift($drop['cfg_autostart_session'], "");
  $drop['mtime'] = 'showtime';
  $drop['mac'] = 'show';
  $drop['client_serials_serial'] = 'show';
- $drop['password'] = 'password';
+ //$drop['password'] = 'password';
- $drop['shell'] = 'password';
+ //$drop['shell'] = 'password';
+ $drop['client_auth_user'] = 'password';
+ $drop['root'] = 'password';
  $drop['vnc'] = 'password';
  $drop['samba'] = 'password';
  $drop['station'] = 'password';
  $drop['txt'] = 'txt';
- $drop['screensaver'] = array('','blank', 'random', 'ant', 'ant3d', 'apollonian', 'ball', 'bat', 'blot', 'bomb', 'bouboule',
+ $drop['screensaver'] = sqlarr('SELECT value FROM values_screensaver_screensaver where enabled=1', '', 'value');
- 		'bounce', 'braid', 'bubble', 'bug', 'clock', 'coral', 'crystal', 'daisy', 'dclock', 'decay', 'deco',
+ //$drop['iface'] = array('eth0', 'wlan0');
- 		'demon', 'dilemma', 'discrete', 'dragon', 'drift', 'euler2d', 'eyes', 'fadeplot', 'fiberlamp', 'flag',
- 		'flame', 'flow', 'forest', 'galaxy', 'goop', 'grav', 'helix', 'hop', 'hyper', 'ico', 'ifs', 'image',
- 		'juggle', 'julia', 'kaleid', 'kumppa', 'laser', 'life', 'life1d', 'life3d', 'lightning', 'lisa', 'lissie',
- 		'loop', 'lyapunov', 'mandelbrot', 'marquee', 'matrix', 'maze', 'mountain', 'munch', 'nose', 'pacman',
- 		'penrose', 'petal', 'petri', 'polyominoes', 'puzzle',  'pyro', 'qix', 'roll',  'rotor', 'scooter', 'shape',
- 		'sierpinski', 'slip', 'solitare', 'space', 'sphere', 'spiral', 'spline', 'star', 'starfish', 'strange',
- 		'swarm', 'swirl', 't3d', 'tetris', 'thornbird', 'tik_tak', 'toneclock', 'triangle', 'tube', 'turtle',
- 		'vines', 'voters', 'wator', 'wire', 'world', 'worm', 'xcl', 'xjack');
- $drop['iface'] = array('eth0', 'wlan0');
  $drop['client_version_os'] = 'show';
  $drop['client_version_utils'] = 'show';
+ $drop['hwdetected'] = 'ignore';
- // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
+ // 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', 'wpa2', 'off');
  $drop['wireless_key_length'] = array('', '64', '128', '256');
-Line 98 
 $drop['wireless_frequency'] = array('',
+Line 90 
 $drop['wireless_frequency'] = array('',
  $drop['wireless_key'] = 'password';
  $drop['wireless_key_ascii'] = 'password';
- // GGF. NEUEN DATENSATZ EINFÜGEN
+ // get current citrix apps
+ $citrix_apps = sqlarr('SELECT session FROM values_citrix_session where enabled=1', '', 'session');
+ // add an empty value add the first position of the array as session-default
+ array_unshift($citrix_apps, "");
+ // hackish, fix me
+ for ($i=0; $i<999; $i++) { $drop['cfg_sessions_citrix_'.$i.'_session'] = $citrix_apps; }
+ // get current storefront apps
+ $storefront_apps = sqlarr('SELECT session FROM values_storefront_session where enabled=1', '', 'session');
+ // add an empty value add the first position of the array as session-default
+ array_unshift($storefront_apps, "");
+ // hackish, fix me
+ for ($i=0; $i<999; $i++) { $drop['cfg_sessions_storefront_'.$i.'_session'] = $storefront_apps; }
+ // GGF. NEUEN DATENSATZ EINFÃœGEN
  if(isset($_POST['do_add']))
  {
  	list($bla,$what) = explode(' ',$_POST['do_add']);
  	if($what=='COMMENT')		sqladd('cfg_comments', array('serial'=>$id));
  	else if($what=='PRINTER')	sqladd('cfg_printers', array('serial'=>$id));
  	else if($what=='MODULE')	sqladd('cfg_modules', array('serial'=>$id));
- 	else if($what=='SESSION')	sqladd('cfg_sessions', array('domain'=>'DOM_AKA_NT', 'browseradrs'=>'128.20.50.50;128.20.50.66;128.20.50.71;128.20.50.46;128.20.100.31;128.20.100.32', 'serial'=>$id));
+ 	else if($what=='SESSION-CITRIX')	sqladd('cfg_sessions_citrix', array('domain'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id));
+ 	else if($what=='SESSION-STOREFRONT')	sqladd('cfg_sessions_storefront', array('domain'=>$storefront_domain_name, 'store'=>$storefront_store, 'serial'=>$id));
  	else if($what=='MENUITEM')	sqladd('cfg_other_menuitems', array('serial'=>$id));
+ 	else if($what=='AUTOSTART')	sqladd('cfg_autostart', array('serial'=>$id));
  }
-Line 142 
 if($_POST['do_upl'])
+Line 150 
 if($_POST['do_upl'])
  			}
  		}
  	}
- }
+ 	// reload site
+ 	header("location: show.php?id=".$id);
+ }
  // EINLESEN DER DATEN AUS SQL-TABELLEN
  foreach($tabs as $k=>$t)
-Line 159 
 function openabs($heading, $helpfile='')
+Line 169 
 function openabs($heading, $helpfile='')
  {
  	global $absnames;
  	$absnames[] = $heading;
  	// <AufZuLink> <Bild/> <Heading/> </AufZuLink><BR/> <Absatz>
  	if( $_SESSION['openclose'][$heading] )
  	{
  		echo '<a href="JavaScript:openclose(\''.$heading.'\',1);"><img border="0" src="pics/minus.gif" title="CLOSE" id="sch_bild_'.$heading.'"> <b>['.$heading.']</b></a>';
  		if($helpfile!='')	echo ' <a href="JavaScript:showhelp(\''.$helpfile.'\')" title="HELP">[?]</a>';
  		echo '<br><div id="sch_absatz_'.$heading.'" style="top:0px; visibility:visible">';
  	}
  	else
  	{
-Line 179 
 function openabs($heading, $helpfile='')
+Line 189 
 function openabs($heading, $helpfile='')
  function closeabs()
  {
  	// </Absatz> <BR/>
  	echo '</div><br>';
  }
+ // ANZEIGEN
- // ANZEIGEN
  function parsearr($name, $arr, $del=false, $wireless=false)
  {
-Line 199 
 function parsearr($name, $arr, $del=fals
+Line 207 
 function parsearr($name, $arr, $del=fals
  	foreach($arr as $k=>$v)
  	{
  		if( (substr($k,0,9)=='wireless_') xor $wireless )	Continue;
  		$d = $drop[$name.'_'.$k]; if($d==null) $d = $drop[$k];
  		$k = str_replace('wireless_', '', $k);
  		$k2 = $k;
- 		//replace some drivers on 0.5.3 or higher
- 		if($alxos >= '0.5.3')
- 		{
- 			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 1024x786x16@60hz!</font><br>';
  		if(is_array($d))
  		{
  			echo '<tr><td class="key">'.$k2.'</td><td>= <select style="width:144px" name="'.$name.'_'.$k.'">';
-Line 244 
 function parsearr($name, $arr, $del=fals
+Line 230 
 function parsearr($name, $arr, $del=fals
  		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=='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')			echo '<tr><td class="key">'.$k2.'</td><td>= <input type=password style="width:144px" name="'.$name.'_'.$k.'" value="KEEPPASS"></td></tr>';
- 		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>';
  		else if($d!='ignore')			echo '<tr><td class="key">'.$k2.'</td><td>= <input style="width:144px" name="'.$name.'_'.$k.'" value="'.$v.'"></td></tr>';
  	}
-Line 254 
 function parsearr($name, $arr, $del=fals
+Line 240 
 function parsearr($name, $arr, $del=fals
  	if($name=='cfg_network' && !$wireless)	parsearr($name.'_wireless', $arr, $del, true);
  }
  function parsearrs($name, $arr)
  {
  	foreach($arr as $k=>$a)
-Line 269 
 function parsearrs($name, $arr)
+Line 256 
 function parsearrs($name, $arr)
  	.keytab, input, textarea, select, option { font-size:8pt; font-family:Tahoma }
  	.but { font-size:10pt; font-family:Tahoma; height:23px }
  </style>
+ <script type="text/javascript" src="js/jquery-1.2.6.min.js"></script>
  <script language="JavaScript" src="openclose_ajax.js"></script>
  <script language="JavaScript">
+ 	// opens an url and shows retval in a javascript-alert on current site
+ 	function urlopen(url,typ) {
+ 		var $url = url.split("?");
+ 		$.ajax({type:""+typ+"",url:$url[0],data:$url[1],cache:false,success:function(data){ alert(data); }});
+ 	}
+ /* ignore this atm, not always working, sometime open does not work
+ 	function openclose(nummer, act)
+ 	{
+ 		var bild = document.images['sch_bild_'+nummer];
+ 		var absatz = document.all['sch_absatz_'+nummer].style;
+ 		var senden = false;
+ 		$("#sch_absatz_"+nummer).toggle(0, function(){
+ 			if($(this).css("display")=="none"){$("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'});}else{$("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'});}
+ 		});
+ 		if(act<=1){ $("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'}); }else{ $("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'}); };
+ 	}
+ */
  	function openclose(nummer, act)
  	{
  		var bild = document.images['sch_bild_'+nummer];
  		var absatz = document.all['sch_absatz_'+nummer].style;
  		var senden = false;
-Line 302 
 function parsearrs($name, $arr)
+Line 309 
 function parsearrs($name, $arr)
  				act = 2;
  			}
  		}
  		if(senden)	sendopenclose(nummer,act);
  	}
  	function showhelp(name)
  	{ window.open(name, 'HelpWin', 'width=620,height=500,scrollbars=yes'); }
-Line 314 
 function parsearrs($name, $arr)
+Line 320 
 function parsearrs($name, $arr)
  <body><?
- //echo '<body style="background-image:URL(logo.jpg);background-repeat:no-repeat; background-position:0px 0px; margin-top:25px">';
+ echo '<form action="show.php" method="post" onreset="return confirm(\'UNDO CHANGES?\')">';
- echo '<form action="show.php" method=post onreset="return confirm(\'UNDO CHANGES?\')">';
  echo '<input type=hidden name="do_upl" value="1">';
  echo '<input type=hidden name="id" value="'.$id.'">';
-Line 350 
 echo '</td><td valign=top>';
+Line 355 
 echo '</td><td valign=top>';
  	$state = 'Off';
  	if(count($conn)>0)
  	{
- // 			passthru($pingcmd." ".$conn['ip']." &> /dev/null && exit 0 || exit 1",$retval);
+ 		if($retval==0)
- 		if($retval==0)	$state = 'On';
+ 		{
+ 			// first try mcore, then get ssh
+ 			$ping_retval = ping_host($conn['ip'],$mcore_port,$ping_timeout);
+ 			if($ping_retval==1) $ping_retval = ping_host($dat['ip'],$ssh_port,$ping_timeout);
+ 			if($ping_retval==0)
+ 			{
+ 				$state = 'On';
+ 			}
+ 		}
  	}
  	echo '<img src="pics/logo2.jpg"><br><br>';
  	echo '<input class="but" type=submit value="SAVE" style="width:150px"><br><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD COMMENT" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD COMMENT" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD PRINTER" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD PRINTER" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD SESSION" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD SESSION-CITRIX" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MODULE" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD SESSION-STOREFRONT" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MENUITEM" style="width:150px"><br><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD MODULE" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD MENUITEM" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD AUTOSTART" style="width:150px"><br>';
+ 	echo '<br>';
  	if($id>0) $KILLCAP='DEACTIVATE'; else $KILLCAP='ACTIVATE';
  	echo '<input class="but" type=button value="'.$KILLCAP.'" style="width:150px" onclick="if(confirm(\''.$KILLCAP.' CLIENT #'.abs($id).' ?\')) { window.open(\'show.php?id='.$id.'&kill=1\', \'DeactWin\', \'width=200,height=100\'); location.href=\'index.php\'; }"><br>';
-Line 379 
 echo '</td><td valign=top>';
+Line 393 
 echo '</td><td valign=top>';
  	echo '<input class="but" type=button '.$disdanach.' value=">" style="width:30px" onclick="location.href=\'show.php?id='.($id+1).'\'">';
  	echo '<br><input class="but" type=button value="INDEX" style="width:150px; font-weight:bold" onclick="location.href=\'index.php\'"><br><br>';
- 	echo '<br><br>';
+ 	echo '<br>';
  	echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff"><b>';
  	if($id<0)	echo '<b>DEACTIVATED!</b><br><br>';
  	echo '<u>Serial:</u>&nbsp;&nbsp;#'.$id.'<br>';
-Line 388 
 echo '</td><td valign=top>';
+Line 402 
 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']);
+ 		echo '<u>OS:</u> '.$alxos.'<br>';
- 		$osver = explode(':',$osver[1]);
+ 		echo '<u>Utils:</u> '.$alxutils.'<br>';
- 		if($osver[0] == '') $osver[0]='unkown';
- 		if($osver[1] == '') $osver[1]='unkown';
- 		# 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')
- 		{
- 			//write them to database
- 		}
  	}
  	echo '</b></div>';
- 	//echo '<br><br>';
  	if($state=='On')
  	{
-Line 420 
 echo '</td><td valign=top>';
+Line 414 
 echo '</td><td valign=top>';
  		echo '<input class="but" type=button value="SHUTDOWN" style="width:150px" onclick="if(confirm(\'SHUTDOWN CLIENT #'.$id.' ?\')) window.open(\'reboot.php?client='.$id.'&ip='.$conn['ip'].'&op=halt\', \'ShutdownWin\', \'width=200,height=100\')"><br>';
  		echo '<br>';
  		echo '<div style="border:solid black 1px; padding:5px; background-color:#d5e5ff" align="center"><b>';
- 		echo 'Remote Shadow:</b></div>';
+ 		echo 'Hardware Detection:</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="LAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=lan\',\'POST\');">';
- 		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 '<input class="but" type=button value="WLAN" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=wlan\',\'POST\');">';
+ 		echo '<input class="but" type=button value="VGA" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=vga\',\'POST\');">';
  		echo '<br>';
+ 		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="HRDW" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=system\',\'POST\');">';
+ 		echo '<input class="but" type=button value="FS" style="width:50px" onclick="javascript:urlopen(\'include/hwinfo.php?ip='.$conn['ip'].'&cmd=rootfs\',\'POST\');">';
+ 		echo '<br><br>';
+ 		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:75px" onclick="window.open(\'vncviewer.php?ip='.$conn['ip'].'\', \'VncViewer\', \'width=200,height=100\')">';
+ 		echo '<input class="but" type=button value="SSH" style="width:75px" onclick="window.open(\'mindterm.php?ip='.$conn['ip'].'\', \'MindTerm\', \'width=200,height=100\')">';
+ 		echo '<br><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>';

 Legend:



Removed from v.2444
 


changed lines


 
Added in v.7140
 Legend:



Removed from v.2444
 


changed lines


 
Added in v.7140
-Removed from v.2444
+Added in v.7140