Merged V3.1 to HEAD

14031: Fix for ETHREEOH-1910
   14044: Fix for ETHREEOH-1805 and ETHREEOH-1907 - SURF now uses POST for Alfresco Login and does not toString() CredentailVault impls

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-04-22 13:00:36 +00:00
parent 874110d096
commit 30ce335c4c

View File

@@ -376,20 +376,19 @@ public class PageTag extends TagSupport
CCProperties ccProps = (CCProperties)FacesHelper.getManagedBean(fc, "CCProperties"); CCProperties ccProps = (CCProperties)FacesHelper.getManagedBean(fc, "CCProperties");
if (ccProps.getWebdavUrl() != null || ccProps.getCifsPath() != null) if (ccProps.getWebdavUrl() != null || ccProps.getCifsPath() != null)
{ {
out.write("window.onload=onloadFunc('"); out.write("window.onload=onloadFunc(\"");
if (ccProps.getWebdavUrl() != null) if (ccProps.getWebdavUrl() != null)
{ {
out.write(ccProps.getWebdavUrl()); out.write(ccProps.getWebdavUrl());
} }
out.write("','"); out.write("\",\"");
if (ccProps.getCifsPath() != null) if (ccProps.getCifsPath() != null)
{ {
String val = ccProps.getCifsPath(); String val = ccProps.getCifsPath();
val = Utils.replace(val, "\\", "\\\\"); // encode escape character val = Utils.replace(val, "\\", "\\\\"); // encode escape character
val = Utils.replace(val, "'", "\\'"); // encode single quote as we wrap string with that
out.write(val); out.write(val);
} }
out.write("');"); out.write("\");");
// reset session bean state // reset session bean state
ccProps.setCifsPath(null); ccProps.setCifsPath(null);