From 54624dcedf5f6e497cb36e900c7b4b32a79847c1 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 12 Mar 2009 12:18:25 +0000 Subject: [PATCH] Merged V3.1 to HEAD 13409: Fix for ETHREEOH-1337 - to escape query characters in Site/People service filter methods. 13410: Fix for ETHREEOH-1272 - another missing pager control. 13425: Italian lang pack for TinyMCE editors. Fixes ETHREEOH-1491. 13430: Fix for ETHREEOH-1488. Also IDs added to a couple of pagers - not causing a bug, but completes the pager fixes. 13464: Fix for ETHREEOH-1474 - now possible to use NTLM auth with Alfresco and SURF apps hosted in same app-server with same user browser session in different tabs. Added additional NTLM filter debugging info for Session ID. 13483: Fix for ETHREEOH-1547 - System error happens when trying to create any Web Project. Also fixes issue where webproject FormImpl objects did not deserialize correctly due to unsafe service call usage in constructor. 13501: Fix for ETHREEOH-965 - disallow guest login until explicit Guest support is added to Share. 13507: Fix for ETHREEOH-1586 - language selectable at login working again. 13512: Fix for ETHREEOH-1522 - wiki RSS feed template variable named incorrectly. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/slingshot/wiki/pagelist.get.rss.ftl | 2 +- .../repo/webdav/auth/BaseNTLMAuthenticationFilter.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl index 653a368d30..7d450c41b0 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl @@ -10,7 +10,7 @@ Alfresco - Wiki Page Recent Changes ${absurl(url.context)?replace("alfresco", "share/proxy/alfresco")}/images/logo/AlfrescoLogo200.png - <#list pageList.pages?sort_by(['modified'])?reverse as p> + <#list wiki.pages?sort_by(['modified'])?reverse as p> <#assign page = p.page> ${page.properties.title!""?html} diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java index d76519d712..ed305e184d 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java @@ -318,8 +318,8 @@ public abstract class BaseNTLMAuthenticationFilter extends BaseSSOAuthentication if (getLogger().isDebugEnabled()) getLogger().debug("New NTLM auth request from " + req.getRemoteHost() + " (" + - req.getRemoteAddr() + ":" + req.getRemotePort() + ")"); - + req.getRemoteAddr() + ":" + req.getRemotePort() + ") SID:" + req.getSession().getId()); + // Send back a request for NTLM authentication restartLoginChallenge(resp, httpSess); }