svn commit: r1636434 - in /vcl/trunk/web: .ht-inc/requests.php .ht-inc/utils.php js/requests.js

[jf...@apache.org]

Author: jfthomps
Date: Mon Nov  3 20:33:58 2014
New Revision: 1636434

URL: http://svn.apache.org/r1636434
Log:
minor changes

utils.php:
-modified abort: if $errcode == 8 (login problem) replace the password argument with *******
-modified getDojoHTML: added "?v=$v" to end of custom dojo file script include (was having problems with users using an older cached version of the file after doing an upgrade)

requests.php and requests.js: fixed typo (newReservationHTML and selectResType) changed indefinteend to indefiniteend

Modified:
    vcl/trunk/web/.ht-inc/requests.php
    vcl/trunk/web/.ht-inc/utils.php
    vcl/trunk/web/js/requests.js

Modified: vcl/trunk/web/.ht-inc/requests.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1636434&r1=1636433&r2=1636434&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Mon Nov  3 20:33:58 2014
@@ -1632,7 +1632,7 @@ function newReservationHTML() {
 	$h .= "<br></span>\n";
 
 	# ending is indefinite
-	$h .= "<span id=\"indefinteend\" class=\"hidden\">\n";
+	$h .= "<span id=\"indefiniteend\" class=\"hidden\">\n";
 	if($serveraccess) {
 		$h .= "&nbsp;&nbsp;&nbsp;";
 		$h .= "<input type=\"radio\" id=\"endindef\" name=\"deployend\" ";

Modified: vcl/trunk/web/.ht-inc/utils.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1636434&r1=1636433&r2=1636434&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Mon Nov  3 20:33:58 2014
@@ -916,6 +916,8 @@ function abort($errcode, $query="") {
 			}
 		}
 		$message .= getBacktraceString(FALSE);
+		if($errcode == 8)
+			$message = preg_replace("/Argument#: 3 => .*\n/", "Argument#: 3 => *********\n", $message);
 		$mailParams = "-f" . ENVELOPESENDER;
 		error_log($message);
 		mail(ERROREMAIL, "Error with VCL pages ($errcode)", $message, '', $mailParams);
@@ -12924,11 +12926,11 @@ function getDojoHTML($refresh) {
 	if(empty($dojoRequires))
 		return '';
 	$customfile = '';
+	$v = $VCLversion;
 	if(! empty($filename))
-		$customfile = sprintf("<script type=\"text/javascript\" src=\"dojo/dojo/%s\"></script>\n", $filename);
+		$customfile = sprintf("<script type=\"text/javascript\" src=\"dojo/dojo/%s?v=$v\"></script>\n", $filename);
 	$rt = '';
 	$jslocale = strtolower(str_replace('_', '-', $locale));
-	$v = $VCLversion;
 	switch($mode) {
 
 		case "viewRequests":

Modified: vcl/trunk/web/js/requests.js
URL: http://svn.apache.org/viewvc/vcl/trunk/web/js/requests.js?rev=1636434&r1=1636433&r2=1636434&view=diff
==============================================================================
--- vcl/trunk/web/js/requests.js (original)
+++ vcl/trunk/web/js/requests.js Mon Nov  3 20:33:58 2014
@@ -152,7 +152,7 @@ function selectResType() {
 		if(dijit.byId('nousercheck'))
 			dojo.removeClass('nousercheckspan', 'hidden');
 		dojo.addClass('anystart', 'hidden');
-		dojo.addClass('indefinteend', 'hidden');
+		dojo.addClass('indefiniteend', 'hidden');
 		//hideDijitButton('newResDlgShowConfigBtn'); // finishconfigs
 		if(dojo.byId('openend').value == 1) {
 			dojo.removeClass('endlbl', 'hidden');
@@ -221,7 +221,7 @@ function selectResType() {
 		//dojo.removeClass('nrmonitoredspan', 'hidden');
 		dojo.removeClass('nrfixedipdiv2', 'hidden');
 		dojo.removeClass('anystart', 'hidden');
-		dojo.removeClass('indefinteend', 'hidden');
+		dojo.removeClass('indefiniteend', 'hidden');
 		dojo.removeClass('endlbl', 'hidden');
 		dojo.removeClass('specifyend', 'hidden');
 		//showDijitButton('newResDlgShowConfigBtn'); // finishconfigs