inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
13304: Final part of I18N fixes for Share. TinyMCE editor lang packs: fr, de, jp, es. Added Spanish (es) to web-client TinyMCE integration also which was missing it.
   13316: Liferay Portal 4.3.X fixes for JSF Client portlet:
           - Tested deployment instructions for Alfresco and Liferay 4.3.X - still work as per wiki page http://wiki.alfresco.com/wiki/Deploying_2.1WAR_Liferay4.3
           - Upload is working (tested from Add Content, Upload New Version and Update)
           - Fixed bug raised in ETHREEOH-1170
          NOTE: there are still issues with the other Ajax Mootools powered portlets...
   13333: Fix for ETHREEOH-1410, ETHREEOH-1402, ETHREEOH-1396, ETHREEOH-1393, ETHREEOH-1380, ETHREEOH-1274, ETHREEOH-1266, ETHREEOH-1257 - Paging control submit box now correctly handles enter key press without submitting parent form.
   13348: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes.
          So they are not accidently given full permissions to that folder or the ability to rename it later.
   13349: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes [missed files]
   13350: Fix for ETHREEOH-971. CIFS and WebDav online edit modes fixed to work in IE as best as possible in FF.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-12 11:19:13 +00:00
parent 2bc702e125
commit b906c50cdf
27 changed files with 995 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/web/ui/common/Utils.java
View File

@@ -269,7 +269,10 @@ public final class Utils extends StringUtils
buf.append("']['");
buf.append(name);
buf.append("'].value='");
buf.append(replace(params.get(name), "'", "\\'"));
String val = params.get(name);
val = replace(val, "\\", "\\\\"); // encode escape character
val = replace(val, "'", "\\'"); // encode single quote as we wrap string with that
buf.append(val);
buf.append("';");
// weak, but this seems to be the way Sun RI do it...
@@ -390,24 +393,25 @@ public final class Utils extends StringUtils
if (nodeService != null && navBean != null && cifsServer != null)
{
// Resolve CIFS network folder location for this node
FilesystemsConfigSection filesysConfig = (FilesystemsConfigSection) cifsServer.getConfiguration().getConfigSection(FilesystemsConfigSection.SectionName);
DiskSharedDevice diskShare = null;
SharedDeviceList shares = filesysConfig.getShares();
Enumeration<SharedDevice> shareEnum = shares.enumerateShares();
while ( shareEnum.hasMoreElements() && diskShare == null) {
SharedDevice curShare = shareEnum.nextElement();
if ( curShare.getContext() instanceof ContentContext)
diskShare = (DiskSharedDevice) curShare;
}
// Resolve CIFS network folder location for this node
FilesystemsConfigSection filesysConfig = (FilesystemsConfigSection)cifsServer.getConfiguration().getConfigSection(FilesystemsConfigSection.SectionName);
DiskSharedDevice diskShare = null;
SharedDeviceList shares = filesysConfig.getShares();
Enumeration<SharedDevice> shareEnum = shares.enumerateShares();
while (shareEnum.hasMoreElements() && diskShare == null)
{
SharedDevice curShare = shareEnum.nextElement();
if (curShare.getContext() instanceof ContentContext)
{
diskShare = (DiskSharedDevice)curShare;
}
}
if (diskShare != null)
{
ContentContext contentCtx = (ContentContext) diskShare.getContext();
ContentContext contentCtx = (ContentContext)diskShare.getContext();
NodeRef rootNode = contentCtx.getRootNode();
try
{
@@ -1038,19 +1042,23 @@ public final class Utils extends StringUtils
*/
public static String getUserAgent(FacesContext context)
{
final String userAgent = context.getExternalContext().getRequestHeaderMap().get("User-Agent").toString();
Object userAgent = context.getExternalContext().getRequestHeaderMap().get("User-Agent");
if (userAgent != null)
{
if (userAgent.indexOf("Firefox/") != -1)
if (userAgent.toString().indexOf("Firefox/") != -1)
{
return USER_AGENT_FIREFOX;
}
else if (userAgent.indexOf("MSIE") != -1)
else if (userAgent.toString().indexOf("MSIE") != -1)
{
return USER_AGENT_MSIE;
}
else
{
return userAgent.toString();
}
}
return userAgent;
return "";
}
/**