Author: jfthomps
Date: Mon Aug 23 20:43:03 2010
New Revision: 988306
URL: http://svn.apache.org/viewvc?rev=988306&view=rev
Log:
VCL-347
cluster connect page rdp file
utils.php: modified sendRDPfile - now expect resid to be passed in through the
continuation; use this key to get the correct ip and pwd
requests.php: modified connectRequest - added resid to each continuation for
sendRDPfile
Modified:
incubator/vcl/trunk/web/.ht-inc/requests.php
incubator/vcl/trunk/web/.ht-inc/utils.php
Modified: incubator/vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/requests.php?rev=988306&r1=988305&r2=988306&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Mon Aug 23 20:43:03 2010
@@ -2208,7 +2208,8 @@ function connectRequest() {
print " <TR>\n";
print " <TD>\n";
print " <FORM action=\"" . BASEURL . SCRIPT . "\"
method=post>\n";
- $cdata = array('requestid' => $requestid);
+ $cdata = array('requestid' => $requestid,
+ 'resid' =>
$requestData['reservations'][0]['reservationid']);
$expire = datetimeToUnix($requestData['end']) -
datetimeToUnix($requestData['start']) + 1800;
# reservation time plus 30 min
$cont = addContinuationsEntry('sendRDPfile', $cdata,
$expire);
@@ -2298,6 +2299,7 @@ function connectRequest() {
print "Automatic connection using an RDP
file:<br>\n";
print "<FORM action=\"" . BASEURL . SCRIPT .
"\" method=post>\n";
$cdata = array('requestid' => $requestid,
+ 'resid' => $res['reservationid'],
'reservedIP' =>
$res['reservedIP']);
$expire = datetimeToUnix($requestData['end']) -
datetimeToUnix($requestData['start'])
+ 1800; # reservation time plus 30 min
Modified: incubator/vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/utils.php?rev=988306&r1=988305&r2=988306&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/utils.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/utils.php Mon Aug 23 20:43:03 2010
@@ -6850,9 +6850,10 @@ function sendRDPfile() {
# for more info on this file, see
# http://dev.remotenetworktechnology.com/ts/rdpfile.htm
$requestid = getContinuationVar("requestid");
+ $resid = getContinuationVar("resid");
$request = getRequestInfo("$requestid");
foreach($request["reservations"] as $res) {
- if($res["forcheckout"]) {
+ if($res['reservationid'] == $resid) {
$ipaddress = $res["reservedIP"];
$passwd = $res["password"];
break;
