xlawrence 2005/08/31 16:08:42 CEST
Modified files:
core/src/conf/java JahiaAdministrationResources.properties
JahiaAdministrationResources_en.properties
JahiaAdministrationResources_fr.properties
core/src/java/org/jahia/bin JahiaConfigurationWizard.java
Log:
Added check and displays an error message if the user tries to set the admin
username = root userName
Revision Changes Path
1.14 +1 -1
jahia/core/src/conf/java/JahiaAdministrationResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaAdministrationResources.properties.diff?r1=1.13&r2=1.14&f=h
1.14 +1 -1
jahia/core/src/conf/java/JahiaAdministrationResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaAdministrationResources_en.properties.diff?r1=1.13&r2=1.14&f=h
1.13 +1 -1
jahia/core/src/conf/java/JahiaAdministrationResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaAdministrationResources_fr.properties.diff?r1=1.12&r2=1.13&f=h
1.23 +6 -2
jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.22&r2=1.23&f=h
Index: JahiaAdministrationResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaAdministrationResources.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JahiaAdministrationResources.properties 30 Aug 2005 14:39:11 -0000
1.13
+++ JahiaAdministrationResources.properties 31 Aug 2005 14:08:41 -0000
1.14
@@ -682,7 +682,7 @@
org.jahia.admin.JahiaDisplayMessage.invalidExtractName.label
= Invalid Characters in Extraction Name
org.jahia.admin.JahiaDisplayMessage.chooseExtractName.label
= Please choose another Extraction Name
org.jahia.admin.JahiaDisplayMessage.noCreateExtractFolder.label
= Cannot create extraction folder
-org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label
= Username cannot be the same as your login.
+org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label
= Site admin username cannot be the same as the root user's
org.jahia.admin.JahiaDisplayMessage.usernameMustLeast4Chars.label
= Username must be set (at least 4 characters).
org.jahia.admin.JahiaDisplayMessage.usernameTooShort.label
= Username is too short. It must be at least 4 characters.
org.jahia.admin.JahiaDisplayMessage.confirmPasswdBeSame.label
= Confirm password must be the same as password.
Index: JahiaAdministrationResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaAdministrationResources_en.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JahiaAdministrationResources_en.properties 30 Aug 2005 14:39:11
-0000 1.13
+++ JahiaAdministrationResources_en.properties 31 Aug 2005 14:08:41
-0000 1.14
@@ -682,7 +682,7 @@
org.jahia.admin.JahiaDisplayMessage.invalidExtractName.label
= Invalid Characters in Extraction Name
org.jahia.admin.JahiaDisplayMessage.chooseExtractName.label
= Please choose another Extraction Name
org.jahia.admin.JahiaDisplayMessage.noCreateExtractFolder.label
= Cannot create extraction folder
-org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label
= Username cannot be the same as your login.
+org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label
= Site admin username cannot be the same as the root user's
org.jahia.admin.JahiaDisplayMessage.usernameMustLeast4Chars.label
= Username must be set (at least 4 characters).
org.jahia.admin.JahiaDisplayMessage.usernameTooShort.label
= Username is too short. It must be at least 4 characters.
org.jahia.admin.JahiaDisplayMessage.confirmPasswdBeSame.label
= Confirm password must be the same as password.
Index: JahiaAdministrationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaAdministrationResources_fr.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JahiaAdministrationResources_fr.properties 30 Aug 2005 14:39:11
-0000 1.12
+++ JahiaAdministrationResources_fr.properties 31 Aug 2005 14:08:41
-0000 1.13
@@ -303,7 +303,7 @@
org.jahia.admin.JahiaDisplayMessage.templateUpdated.label=Modèle mis
à jour avec succès
org.jahia.admin.JahiaDisplayMessage.useCurrentDB.label=Vous avez
sélectionné la base de données courante.
org.jahia.admin.JahiaDisplayMessage.usernameMustLeast4Chars.label=Le nom
d'utilisateur doit être spécifié (min 4 car.).
-org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label=Le nom
d'utilisateur ne peut pas être le même que le login.
+org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label=Le nom
d'utilisateur de l'administrateur du site ne peut pas être le même
que celui du super administrateur.
org.jahia.admin.JahiaDisplayMessage.usernameTooShort.label=Le nom
d'utilisateur est trop court. Il doit être d'au moins 4 caractères.
org.jahia.admin.jeffiles.ManageJefFiles.ioFileError.label=IO File erreur
rencontrée
org.jahia.admin.jeffiles.ManageJefFiles.javaSecurityError.label=Une erreur
de sécurité java est survenue
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JahiaConfigurationWizard.java 31 Aug 2005 10:34:12 -0000 1.22
+++ JahiaConfigurationWizard.java 31 Aug 2005 14:08:42 -0000 1.23
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.22 2005/08/31 10:34:12 xlawrence
Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.23 2005/08/31 14:08:42 xlawrence
Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -69,6 +69,7 @@
import org.jahia.utils.*;
import org.jahia.utils.properties.PropertiesManager;
import org.jahia.utils.zip.JahiaArchiveFileHandler;
+import org.jahia.registries.ServicesRegistry;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -538,7 +539,10 @@
&& siteservername != null && (siteservername.length() >
0)
&& sitekey != null && (sitekey.length() > 0)) {
- if (!JahiaTools.isAlphaValid(sitekey)) {
+ if
(values.get("root_user").equals(values.get("adminUsername"))) {
+ msg =
JahiaResourceBundle.getMessageResource("org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label",
+ newSelectedLocale,
JahiaResourceBundle.ADMIN_DEFAULT_RESOURCE_BUNDLE);
+ } else if (!JahiaTools.isAlphaValid(sitekey)) {
msg =
JahiaResourceBundle.getMessageResource("org.jahia.admin.warningMsg.onlyLettersDigitsUnderscore.label",
newSelectedLocale,
JahiaResourceBundle.ADMIN_DEFAULT_RESOURCE_BUNDLE);
} else if (sitekey.equals("site")) {
