Author: jfthomps
Date: Wed Aug 19 19:38:09 2015
New Revision: 1696655
URL: http://svn.apache.org/r1696655
Log:
VCL-901 - Cannot enter preferred name under user preferences if have
reservation and custom RDP port set
userpreferences.php: modified processUserPrefsInput: if preferredname or
newpassword are submitted, set rdpport to user's current value so that the
checks for it are not performed (cannot submit rdp port at the same time as
submitting preferred name or password)
Modified:
vcl/trunk/web/.ht-inc/userpreferences.php
Modified: vcl/trunk/web/.ht-inc/userpreferences.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/userpreferences.php?rev=1696655&r1=1696654&r2=1696655&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/userpreferences.php (original)
+++ vcl/trunk/web/.ht-inc/userpreferences.php Wed Aug 19 19:38:09 2015
@@ -638,6 +638,10 @@ function processUserPrefsInput($checks=1
$submitErrMsg[LOCALPASSWORDERR] = i("Passwords do not
match");
}
}
+ if(array_key_exists('preferredname', $_POST) ||
+ array_key_exists('newpassword', $_POST))
+ $return['rdpport'] = $user['rdpport'];
+
if($return['rdpport'] != $user['rdpport']) {
$requests = getUserRequests('all');
$nochange = 0;
