svn commit: r1449102 - in /vcl/branches/vcl-2.3-bugfixes/web/.ht-inc: requests.php utils.php

[jf...@apache.org]

Author: jfthomps
Date: Fri Feb 22 16:25:26 2013
New Revision: 1449102

URL: http://svn.apache.org/r1449102
Log:
VCL-666
Administrator is always passed as the userid in RDP files for imaging reservations, even if it is for xRDP

requests.php: modified connectRequest - added check for connection method being 'remote desktop' to also include 'RDP'

utils.php: modified sendRDPfile - added check for reservation being 'forimaging' to also check that the OStype is 'windows'

Modified:
    vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/requests.php
    vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/utils.php

Modified: vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/requests.php
URL: http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/requests.php?rev=1449102&r1=1449101&r2=1449102&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/requests.php (original)
+++ vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/requests.php Fri Feb 22 16:25:26 2013
@@ -3396,7 +3396,8 @@ function connectRequest() {
 			             $res['connectIP'], 
 			             $res['connectport']);
 			print preg_replace($froms, $tos, $method['connecttext']);
-			if(preg_match('/remote desktop/i', $method['description'])) {
+			if(preg_match('/remote desktop/i', $method['description']) ||
+			   preg_match('/RDP/i', $method['description'])) {
 				print "<div id=\"counterdiv\" class=\"hidden\"></div>\n";
 				print "<div id=\"connectdiv\">\n";
 				print "<FORM action=\"" . BASEURL . SCRIPT . "\" method=post>\n";

Modified: vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/utils.php
URL: http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/utils.php?rev=1449102&r1=1449101&r2=1449102&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/utils.php (original)
+++ vcl/branches/vcl-2.3-bugfixes/web/.ht-inc/utils.php Fri Feb 22 16:25:26 2013
@@ -8468,7 +8468,7 @@ function sendRDPfile() {
 	print "redirectsmartcards:i:1\r\n";
 	print "displayconnectionbar:i:1\r\n";
 	print "autoreconnection enabled:i:1\r\n";
-	if($request["forimaging"])
+	if($request["forimaging"] && $res['OStype'] == 'windows')
 		print "username:s:Administrator\r\n";
 	else {
 		if(preg_match('/(.*)@(.*)/', $user['unityid'], $matches))