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 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4462 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\model\filefolder\FileFolderPerformanceTester.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn resolved  root\projects\3rd-party\.classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 16:15:44 +00:00
parent c4e8e02cf8
commit aceb710ab6
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
View File

@@ -751,16 +751,13 @@ public class NTLMAuthenticationFilter extends AbstractAuthenticationFilter imple
try try
{ {
tx.begin(); tx.begin();
// Get user details for the authenticated user
m_authComponent.setCurrentUser(userName.toLowerCase());
// The user name used may be a different case to the NTLM supplied user name, read the current
// user and use that name
userName = m_authComponent.getCurrentUserName();
// Setup User object and Home space ID etc. // Setup User object and Home space ID etc.
NodeRef personNodeRef = m_personService.getPerson(userName); NodeRef personNodeRef = m_personService.getPerson(userName);
// User name should match the uid in the person entry found
userName = (String) m_nodeService.getProperty(personNodeRef, ContentModel.PROP_USERNAME);
m_authComponent.setCurrentUser(userName);
String currentTicket = m_authService.getCurrentTicket(); String currentTicket = m_authService.getCurrentTicket();
user = new User(userName, currentTicket, personNodeRef); user = new User(userName, currentTicket, personNodeRef);

6
source/web/jsp/users/change-my-password.jsp
View File

@@ -137,21 +137,21 @@
<tr> <tr>
<td><h:outputText value="#{msg.old_password}"/>:</td> <td><h:outputText value="#{msg.old_password}"/>:</td>
<td> <td>
<h:inputSecret id="old-password" value="#{UsersBean.oldPassword}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;* <h:inputSecret id="old-password" value="#{UsersBean.oldPassword}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
&nbsp;<h:message id="errors0" for="old-password" style="color:red" /> &nbsp;<h:message id="errors0" for="old-password" style="color:red" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td><h:outputText value="#{msg.new_password}"/>:</td> <td><h:outputText value="#{msg.new_password}"/>:</td>
<td> <td>
<h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;* <h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
&nbsp;<h:message id="errors1" for="password" style="color:red" /> &nbsp;<h:message id="errors1" for="password" style="color:red" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td><h:outputText value="#{msg.confirm}"/>:</td> <td><h:outputText value="#{msg.confirm}"/>:</td>
<td> <td>
<h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;* <h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
&nbsp;<h:message id="errors2" for="confirm" style="color:red" /> &nbsp;<h:message id="errors2" for="confirm" style="color:red" />
</td> </td>
</tr> </tr>

4
source/web/jsp/users/change-password.jsp
View File

@@ -136,14 +136,14 @@
<tr> <tr>
<td><h:outputText value="#{msg.password}"/>:</td> <td><h:outputText value="#{msg.password}"/>:</td>
<td> <td>
<h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;* <h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
&nbsp;<h:message id="errors1" for="password" style="color:red" /> &nbsp;<h:message id="errors1" for="password" style="color:red" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td><h:outputText value="#{msg.confirm}"/>:</td> <td><h:outputText value="#{msg.confirm}"/>:</td>
<td> <td>
<h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;* <h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
&nbsp;<h:message id="errors2" for="confirm" style="color:red" /> &nbsp;<h:message id="errors2" for="confirm" style="color:red" />
</td> </td>
</tr> </tr>