From 8107dd3ae44f3b6a54c54b7ed6dc5cec2ccfd514 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 10 Mar 2009 13:37:53 +0000 Subject: [PATCH] Merged V3.1 to HEAD 12895: Merged DEV/LIVECYCLE-3.1 to V3.1 12858: Merged V2.1-A to DEV/LIVECYCLE-3.1 8275: *Record Only* Bootstrap and patch for Office add-in installers into Adobe repo 8276: *Record Only* Forgot to bump the schema number after officeAddin patch commit 8665: *Record Only* Added favicon.ico. Added two tags to PageTag.java - both required so that old IE versions are supported. 9064: ACT 2836 - Office plugins not able to autheticate properly with LiveCycle Content Services 9065: ACT 2836 - Long, xml-based tickets not supported in Office webscripts 9078: Further fixes for ACT 2836 Adobe tickets are too long for Internet Explorer GET URLs (2048 limit vs. 2426 encoded length). WebClientAuthenticator modified to also look for ticket within HTTP header (if not found on URL). Office add-ins updated to support header-based ticket passing. 9109: More updates for ACT 2836 9118: More Adobe rebranding (No rebranding merged - strings externalised only) 9131: Workaround for PowerPoint WebDAV/ticket bug 9132: *Record Only* Fix for Office add-in search page regression 9133: Update long ticket/Office fix to pass ticket if the entire URL is < 255 characters. Pop-up login dialog cancellation returns to config panel. 9294: Workaround for ACT 3093 - Limitations of Win32 API when using WebDAV paths ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.1-A:r8275-8276,8665,9064-9065,9078,9109,9118,9131-9133,9294 Merged /alfresco/BRANCHES/V3.1:r12895 Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12858 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/office/documentDetails.get.html.ftl | 6 +++--- .../org/alfresco/office/myAlfresco.get.html.ftl | 4 ++-- .../alfresco/office/myTasksDetail.get.html.ftl | 8 ++++---- .../org/alfresco/office/navigation.get.html.ftl | 4 ++-- .../alfresco/office/searchResults.get.html.ftl | 2 +- .../repo/webdav/auth/AuthenticationFilter.java | 16 +++++----------- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl index 0f49042586..0d0e43dadb 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl @@ -157,10 +157,10 @@ <#assign versionRow=versionRow+1> - Open ${record.versionLabel} + Open ${record.versionLabel} - ${record.versionLabel}
+ ${record.versionLabel}
Author: ${record.creator}
Date: ${record.createdDate?datetime}
<#if record.description?exists> @@ -239,7 +239,7 @@
  • - + Open Full Details Open Full Details diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl index 9235b0a04c..5326c814a7 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl @@ -57,7 +57,7 @@ <#if child.name?ends_with(extn) || child.name?ends_with(extnx)> ${child.name?html}
    <#else> - ${child.name?html}
    + ${child.name?html}
    <#if child.properties.description?exists> <#if (child.properties.description?length > 0)> @@ -150,7 +150,7 @@
    Create a new Collaboration Space in the Alfresco Repository
  • - + Launch Alfresco Launch Alfresco diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl index f6d1a65f96..8bc8761bcc 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl @@ -12,7 +12,7 @@ Task item - ${task.description!""?html} + ${(task.description!"")?html}
    @@ -52,9 +52,9 @@ +
    ${res.name?html} <#else> - ${res.name?html}${res.name?html} - ${res.name?html} + ${res.name?html}
    Modified: ${res.properties.modified?datetime} (${(res.size / 1024)?int}Kb)
    @@ -88,7 +88,7 @@ - Manage... + Manage... diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl index dd9893215a..d01f9ec50f 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl @@ -156,14 +156,14 @@ <#if child.name?ends_with(extn) || child.name?ends_with(extnx)> Open ${child.name?html} <#else> - Open ${child.name?html} + Open ${child.name?html} <#if child.name?ends_with(extn) || child.name?ends_with(extnx)> ${child.name?html} <#else> - ${child.name?html} + ${child.name?html}
    <#if child.properties.description?exists> diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl index a7d2f5d4a9..45f9a00bd5 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl @@ -26,7 +26,7 @@ <#assign openURL = "#"> <#assign hrefExtra = " onClick=\"window.external.openDocument('${relativePath}')\""> <#else> - <#assign openURL = "${url.context}${child.url}?ticket=${session.ticket}"> + <#assign openURL = "${url.context}${child.url}"> <#assign hrefExtra = " target=\"_blank\""> <#else> diff --git a/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java index 6cfcfedcf7..88bdfa9035 100644 --- a/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java @@ -72,8 +72,8 @@ public class AuthenticationFilter implements Filter // Allow an authentication ticket to be passed as part of a request to bypass authentication private static final String ARG_TICKET = "ticket"; - private static final String PPT_EXTN = ".ppt"; - private static final String VTI_IGNORE = "&vtiIgnore"; + private static final String PPT_EXTN = ".ppt"; + private static final String VTI_IGNORE = "&vtiIgnore"; // Servlet context @@ -197,17 +197,11 @@ public class AuthenticationFilter implements Filter if ( ticket != null && ticket.length() > 0) { // PowerPoint bug fix - if (ticket.endsWith(PPT_EXTN)) + if (ticket.endsWith(PPT_EXTN)) { - ticket = ticket.substring(0, ticket.length() - PPT_EXTN.length()); + ticket = ticket.substring(0, ticket.length() - PPT_EXTN.length()); } - - // vtiIgnore argument may find its way onto the ticket due to a double-encoding issue with Office - if (ticket.endsWith(VTI_IGNORE)) - { - ticket = ticket.substring(0, ticket.length() - VTI_IGNORE.length()); - } - + // Debug if ( logger.isDebugEnabled())