Refactored Form system to get simple error handling and a clearer

interface

core/lib/Thelia/Admin/Controller/BaseAdminController.php

@@ -34,6 +34,7 @@ use Thelia\Core\Security\Exception\AuthenticationTokenNotFoundException;
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\Security\Exception\AuthenticationException;
 use Thelia\Core\Security\SecurityContext;
+use Thelia\Tools\URL;
 
 /**
  *
@@ -93,7 +94,7 @@ class BaseAdminController extends ContainerAware
 
 			// User is not authenticated, and templates requires authentication -> redirect to login page
 			// (see Thelia\Core\Template\Smarty\Plugins\Security)
-        	return new RedirectResponse($this->generateUrl('admin/login')); // FIXME shoud be a parameter
+        	return new RedirectResponse(URL::absoluteUrl('admin/login')); // FIXME shoud be a parameter
         }
     }
 
@@ -155,32 +156,6 @@ class BaseAdminController extends ContainerAware
         return $this->getFormFactory()->createBuilder("form");
     }
 
-    /**
-     * Generates a URL from the given parameters.
-     *
-     * @param string         $route         The name of the route
-     * @param mixed          $parameters    An array of parameters
-     * @param Boolean|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
-     *
-     * @return string The generated URL
-     *
-     * @see UrlGeneratorInterface
-     */
-    protected function generateUrl($path, array $parameters = array())
-    {
-    	$base = ConfigQuery::read("base_url", "/").$path; //FIXME
-
-    	$queryString = '';
-
-    	foreach($parameters as $name => $value) {
-    		$queryString = sprintf("%s=%s&", urlencode($name), urlencode($value));
-    	}
-
-    	if ('' !== $queryString = rtrim($queryString, "&")) $queryString = '?' . $queryString;
-
-    	return $base . $queryString;
-    }
-
     /**
      * Forwards the request to another controller.
      *

core/lib/Thelia/Admin/Controller/SessionController.php

@@ -32,16 +32,14 @@ use Thelia\Core\Security\Token\TokenInterface;
 use Thelia\Core\Security\Authentication\AdminUsernamePasswordFormAuthenticator;
 use Thelia\Model\AdminLog;
 use Thelia\Core\Security\Exception\AuthenticationException;
+use Symfony\Component\Validator\Exception\ValidatorException;
+use Thelia\Tools\URL;
 
 class SessionController extends BaseAdminController {
 
 	public function showLoginAction()
 	{
-		$form = $this->getLoginForm();
-
-		return $this->render("login.html", array(
-				"form" => $form->createView()
-		));
+		return $this->render("login.html");
 	}
 
 	public function checkLogoutAction()
@@ -49,12 +47,12 @@ class SessionController extends BaseAdminController {
 		$this->getSecurityContext()->clear();
 
 		// Go back to login page.
-		return $this->redirect($this->generateUrl('admin/login'));
+		return $this->redirect(URL::absoluteUrl('admin/login'));
 	}
 
     public function checkLoginAction()
     {
-		$form = $this->getLoginForm();
+		$form = new AdminLogin($this->getRequest());
 
     	$request = $this->getRequest();
 
@@ -69,8 +67,17 @@ class SessionController extends BaseAdminController {
     		// Log authentication success
     		AdminLog::append("Authentication successufull", $request, $user);
 
+    		// Get the success URL to redirect the user to
+    		$successUrl = $form->getForm()->get('success_url')->getData();
+
+    		if (null == $successUrl) $successUrl = 'admin/home';
+
     		// Redirect to home page - FIXME: requested URL, if we come from another page ?
-    		return $this->redirect($this->generateUrl('admin'));
+    		return $this->redirect(URL::absoluteUrl($successUrl));
+     	}
+         catch (ValidatorException $ex) {
+
+     		$message = "Missing or invalid information. Please check your input.";
      	}
      	catch (AuthenticationException $ex) {
 
@@ -80,17 +87,18 @@ class SessionController extends BaseAdminController {
      		$message = "Login failed. Please check your username and password.";
      	}
 
-     	// Display the login form again
-     	return $this->render("login.html", array(
-			"form" => $authenticator->getLoginForm()->createView(),
-     		"message" => $message
-     	));
-    }
+     	// Store the form in session (see Form Smlarty plugin to find usage of this parameter)
+     	$request->getSession()->setErrorFormName($form->getName());
 
-    protected function getLoginForm()
-    {
-        $adminLogin = new AdminLogin($this->getRequest());
-
-        return $adminLogin->getForm();
+      	if (empty($failureUrl)) {
+	     	// Display the login form again, with an error message if required
+    	 	return $this->render("login.html", array(
+     			"message" => $message
+     		));
+     	}
+     	else {
+     		// Redirect to the provided URL
+     		return $this->redirect(URL::absoluteUrl($failureUrl));
+     	}
     }
 }