From c5bd76a8f5260f9758ad4166643f53fe7ddbeae8 Mon Sep 17 00:00:00 2001
From: Nicolas Michard <nicolas.michard@gmail.com>
Date: Mon, 4 Feb 2008 15:52:30 +0000
Subject: [PATCH] Correction bug Lien vers user registration / modifier le
 profil via le menu du haut

---
 .../WEB-INF/classes/messages.properties       | 11 ++++++++
 YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp | 26 +++++++++++++++----
 .../WEB-INF/jsp/secure/userinformation.jsp    |  2 +-
 YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml |  5 ++--
 YACOSWeb/WebContent/login.jsp                 |  2 +-
 .../system/controller/LogonController.java    |  9 ++++---
 6 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index c494b30..8d40cee 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -10,6 +10,17 @@ disclaimer.link.about=About
 login.btn.submit=Submit
 login.btn.logout=Logout
 login.field.login=Login
+#Login
+login.label.login=Login
+login.label.password=Password
+login.label.rememberme=Remember me
+login.label.connexion=Connexion
+login.label.alreadyaccount:I have already an account
+# New user
+login.label.createnewuser=Create an account
+login.label.createaccount="When creating an account on Yacos.com, you may post an article and follow the conference."
+login.label.continue=Continue
+login.message.error=Your login attempt was not successful, try again.
 
 ###################
 # USER MENU
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
index d6532ca..ee08454 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
@@ -6,13 +6,29 @@
 
 	<c:if test="${not empty param.login_error}">
 		<div class="login_error">
-			Your login attempt was not successful, try again.<br /><br />
+			<fmt:message key="login.message.error" /><br /><br />
 		</div>
-	</c:if>
+	</c:if><br />
 	
-	<br /> FORMULAIRE DE CONNEXION
-	<br /> NOUVEL UTILISATEUR
-
+	<br /> 
+	
+	<table width="100%">
+	<tr><td width="50%">
+		<fmt:message key="login.label.createnewuser" /><br />
+		<fmt:message key="login.label.createaccount" /><br />
+		<a href="registerUser.htm"><fmt:message key="login.label.continue" /></a>
+	</td><td>
+	<fmt:message key="login.label.alreadyaccount" /> :<br />
+	<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="formlogin">
+		<fmt:message key="login.label.login" /> : <input type='text' name='j_username' /><br />
+		<fmt:message key="login.label.password" /> : <input type='password' name='j_password' /><br />
+		<input type="checkbox" name="_acegi_security_remember_me"/>&nbsp;&nbsp;<fmt:message key='login.label.rememberme' /><br />
+
+		<br /><br />
+		<a href="javascript:document.getElementById('formlogin').submit();" id="submit_btn"><fmt:message key="login.label.connexion" /></a>
+	</form>
 
+	</td></tr>
+	</table>
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
index 7017a4c..8338f9d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
@@ -8,7 +8,7 @@
 	${ currentUser.firstName } ${ currentUser.lastName } <b>(<authz:authentication operation="username"></authz:authentication>)</b><br />
 	You currently follow <b>4</b> conferences<br />
 	You have the following rights : <b>Author, Chairman, PC Member</b><br />
-	<a href="#">Change my profile</a><br />
+	<a href="registerUser.htm">Change my profile</a><br />
 	<a href="j_acegi_logout" id="submit_btn"><fmt:message key="login.btn.logout" /></a>
 
 </body>
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index 2edbc23..dcb9aba 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -99,9 +99,8 @@
 		class="org.yacos.web.system.controller.SUserRegistrationController">
 		<property name="sessionForm" value="true" />
 		<property name="commandName" value="registerUser" />
-		<property name="commandClass"
-			value="org.yacos.web.system.form.FormUser" />
-		<property name="formView" value="registerUser.htm" />
+		<property name="commandClass" value="org.yacos.web.system.form.FormUser" />
+		<property name="formView" value="registerUser" />
 		<property name="successView" value="listArticle.htm" />
 		<property name="userManager" ref="userManager" />
 	</bean>
diff --git a/YACOSWeb/WebContent/login.jsp b/YACOSWeb/WebContent/login.jsp
index dad463a..e23a23e 100644
--- a/YACOSWeb/WebContent/login.jsp
+++ b/YACOSWeb/WebContent/login.jsp
@@ -5,7 +5,7 @@
 <body>
 	
 	<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="formlogin">
-		<a href="#" id="connexion">Connexion :</a>
+		<a href="login.htm" id="connexion"><fmt:message key="login.label.connexion"/> :</a>
 		<input type='text' name='j_username' value="<fmt:message key='login.field.login' />" onfocus="if (this.value == '<fmt:message key='login.field.login' />') { this.value = ''; }" onblur="if (this.value == '') { this.value = '<fmt:message key='login.field.login' />'; }" />
 		<input type='password' name='j_password' />
 		<a href="javascript:document.getElementById('formlogin').submit();" id="submit_btn"><fmt:message key="login.btn.submit" /></a>
diff --git a/YACOSWeb/src/org/yacos/web/system/controller/LogonController.java b/YACOSWeb/src/org/yacos/web/system/controller/LogonController.java
index 457a6a8..3b8d179 100644
--- a/YACOSWeb/src/org/yacos/web/system/controller/LogonController.java
+++ b/YACOSWeb/src/org/yacos/web/system/controller/LogonController.java
@@ -11,9 +11,12 @@ public class LogonController implements Controller {
 	public ModelAndView handleRequest(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
 
-		// get ID Error
-		int idError = Integer.parseInt(request.getParameter("login_error")); 
-		request.getSession().setAttribute("login_error",idError);
+		// get ID Error if exist
+		if (request.getParameter("login_error") != null)
+		{
+			int idError = Integer.parseInt(request.getParameter("login_error")); 
+			request.getSession().setAttribute("login_error",idError);
+		}
 
 		return new ModelAndView("loginFull"); 
 	}