Author: gmazza
Date: Fri Jul 25 23:54:12 2014
New Revision: 1613536
URL: http://svn.apache.org/r1613536
Log:
ROL-2034 shut off password change functionality on Profile page if SSO (LDAP)
is being used. Reported by Juergen Weber.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Fri Jul 25 23:54:12 2014
@@ -322,7 +322,7 @@ public class Register extends UIAction i
setFromSSO(false);
boolean usingSSO =
WebloggerConfig.getBooleanProperty("users.sso.enabled");
if (usingSSO) {
- boolean storePassword =
WebloggerConfig.getBooleanProperty("users.sso.passwords.saveInRollerDb");
+ boolean storePassword =
WebloggerConfig.getBooleanProperty("users.sso.passwords.save");
String password =
WebloggerConfig.getProperty("users.sso.passwords.defaultValue", "<unknown>");
// Preserve username and password, Spring Security case
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Fri Jul
25 23:54:12 2014
@@ -1773,7 +1773,7 @@ yourWebsites.createWeblog.desc=\
Feel like you''ve got more to say? Maybe another weblog is what you need.
yourWebsites.editProfile=Edit user profile
-yourWebsites.editProfile.desc=Change password, contact info, select language.
+yourWebsites.editProfile.desc=Change user info, locale, timezone.
yourWebsites.oauthKeys=OAuth Credentials
yourWebsites.oauthKeys.desc=Enable other sites and programs to access your \
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Fri
Jul 25 23:54:12 2014
@@ -948,7 +948,7 @@ yourWebsites.decline=Ablehnen
yourWebsites.declined=Sie haben eine Einladung in das Weblog [{0}] abgelehnt.
yourWebsites.editEntries=Eintr\u00E4ge
yourWebsites.editProfile=Benutzerprofil anpassen
-yourWebsites.editProfile.desc=Passwort \u00E4ndern, Kontaktinformationen,
Sprachauswahl.
+yourWebsites.editProfile.desc=Kontaktinformationen, Sprachauswahl, Zeitzone.
yourWebsites.globalAdmin=Systemadministration
yourWebsites.globalAdmin.desc=Systemweite Einstellungen vornehmen.
yourWebsites.invitations=Weblog Einladungen
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Fri
Jul 25 23:54:12 2014
@@ -586,7 +586,7 @@ yourWebsites.manage=Configuraci\u00F3n
yourWebsites.createWeblog=Crear nuevo weblog
yourWebsites.createWeblog.desc=\u00BFSiente como si tuviera m\u00E1s que
decir? Tal vez lo que usted necesita es otro weblog.
yourWebsites.editProfile=Editar perfil de usuario
-yourWebsites.editProfile.desc=Cambiar contrase\u00F1a, informaci\u00F3n de
contacto, idioma.
+yourWebsites.editProfile.desc=Cambiar informaci\u00F3n de contacto, idioma.
yourWebsites.globalAdmin=Administraci\u00F3n del servidor
yourWebsites.globalAdmin.desc=Hacer cambios generales de administraci\u00F3n.
yourWebsites.planetAdmin=Administraci\u00F3n de Planet
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Fri
Jul 25 23:54:12 2014
@@ -1213,7 +1213,7 @@ yourWebsites.createWeblog.desc=\
Vous sentez que vous avez d'autres choses à dire ? Peut-être vous faut-il un
autre blog ?
yourWebsites.editProfile=Edition du profil utilisateur
-yourWebsites.editProfile.desc=Changer le mot de passe, les informations de
contact ou la langue.
+yourWebsites.editProfile.desc=Changer les informations de contact ou la langue.
yourWebsites.globalAdmin=Administration du serveur
yourWebsites.globalAdmin.desc=Apporter des changements à la configuration
générale du site.
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Fri Jul 25 23:54:12 2014
@@ -331,7 +331,7 @@ authentication.cma.enabled=false
# Enable/disable OpenID (requires Spring Security, will not work with CMA)
# This can be set to one of three values:
# - disabled: no OpenID support, no evidence of OpenID in the Web UI
-# - hybrid: allow users to use either password and/or OpenID
+# - hybrid: allow users to use either password or OpenID
# - only: users must use OpenID only, no password allowed
authentication.openid=disabled
@@ -374,10 +374,10 @@ schemeenforcement.https.ignored=css,gif,
salt.ignored.urls=mediaFileAdd!save.rol,mediaFileEdit!save.rol,bookmarksImport!save.rol
#----------------------------------
-# Single-Sign-On
+# Single-Sign-On (LDAP)
# Enables Roller to behave differently when registering new users
-# in an SSO-enabled environment. You must configure security.xml appropriately.
+# in an SSO-enabled environment. You must configure WEB-INF/security.xml
appropriately.
users.sso.enabled=false
# Set these properties for a custom LDAP schema (optional)
@@ -392,7 +392,7 @@ users.sso.enabled=false
users.sso.passwords.save=false
# if you don't want passwords stored in DB, set this to the default value.
-users.sso.passwords.defaultValue=<unknown>
+users.sso.passwords.defaultValue=<usingSSO>
users.sso.autoProvision.enabled=false
users.sso.autoProvision.className=\
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp Fri Jul 25
23:54:12 2014
@@ -48,24 +48,24 @@
<td class="description"><s:text name="userRegister.tip.email"
/></td>
</tr>
- <s:if test="openIdConfiguration != 'only'">
- <tr>
- <td class="label"><label for="passwordText" /><s:text
name="userSettings.password" /></label></td>
- <td class="field">
- <s:password name="bean.passwordText" size="20" maxlength="20"
/>
- </td>
- <td class="description"><s:text name="userRegister.tip.password"
/></td>
- </tr>
-
- <tr>
- <td class="label"><label for="passwordConfirm" /><s:text
name="userSettings.passwordConfirm" /></label></td>
- <td class="field"><s:password name="bean.passwordConfirm"
size="20" maxlength="20" /></td>
- <td class="description"><s:text
name="userRegister.tip.passwordConfirm" /></td>
- </tr>
+ <s:if test="openIdConfiguration != 'only' && !usingSso">
+ <tr>
+ <td class="label"><label for="passwordText" /><s:text
name="userSettings.password" /></label></td>
+ <td class="field">
+ <s:password name="bean.passwordText" size="20"
maxlength="20" />
+ </td>
+ <td class="description"><s:text
name="userRegister.tip.password" /></td>
+ </tr>
+
+ <tr>
+ <td class="label"><label for="passwordConfirm" /><s:text
name="userSettings.passwordConfirm" /></label></td>
+ <td class="field"><s:password name="bean.passwordConfirm"
size="20" maxlength="20" /></td>
+ <td class="description"><s:text
name="userRegister.tip.passwordConfirm" /></td>
+ </tr>
</s:if>
+
<s:else>
<s:hidden name="bean.password" />
- <s:hidden name="bean.passwordConfirm" />
</s:else>
<s:if test="openIdConfiguration != 'disabled'">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp?rev=1613536&r1=1613535&r2=1613536&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp Fri
Jul 25 23:54:12 2014
@@ -51,7 +51,7 @@
<s:else>
| <a href="<s:url action="login-redirect"
namespace="/roller-ui" />"><s:text name="navigationBar.login"/></a>
- <s:if test="getBooleanProp('users.registration.enabled')">
+ <s:if test="getBooleanProp('users.registration.enabled')
&& !getBooleanProp('users.sso.enabled')">
| <a href="<s:url action="register"
namespace="/roller-ui" />"><s:text name="navigationBar.register"/></a>
</s:if>
<s:elseif test="getProp('users.registration.url') != null
&& getProp('users.registration.url') > 0">
