TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix source header alignment

Browse Source
This commit is contained in:
franck
2013-07-17 15:06:53 +02:00
parent 466b402246
commit 3d5caa2341
92 changed files with 332 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Admin/Controller/AdminController.php
View File

@@ -4,7 +4,7 @@
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */

16
core/lib/Thelia/Admin/Controller/BaseAdminController.php
View File

@@ -35,6 +35,7 @@ use Thelia\Model\ConfigQuery;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\SecurityContext;
use Thelia\Tools\URL;
use Thelia\Tools\Redirect;
/**
*
@@ -94,7 +95,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(URL::absoluteUrl('admin/login')); // FIXME shoud be a parameter
Redirect::exec(URL::absoluteUrl('admin/login')); // FIXME shoud be a parameter
}
}
@@ -172,17 +173,4 @@ class BaseAdminController extends ContainerAware
return $this->container->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
}
/**
* Returns a RedirectResponse to the given URL.
*
* @param string $url The URL to redirect to
* @param integer $status The status code to use for the Response
*
* @return RedirectResponse
*/
protected function redirect($url, $status = 302)
{
return new RedirectResponse($url, $status);
}
}

37
core/lib/Thelia/Admin/Controller/SessionController.php
View File

@@ -4,7 +4,7 @@
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -25,15 +25,12 @@ namespace Thelia\Admin\Controller;
use Symfony\Component\HttpFoundation\Response;
use Thelia\Form\AdminLogin;
use Thelia\Core\Security\Token\UsernamePasswordToken;
use Thelia\Core\Security\Authentication\UsernamePasswordAuthenticator;
use Thelia\Core\Security\Encoder\PasswordPhpCompatEncoder;
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;
use Thelia\Tools\Redirect;
class SessionController extends BaseAdminController {
@@ -47,7 +44,7 @@ class SessionController extends BaseAdminController {
$this->getSecurityContext()->clear();
// Go back to login page.
return $this->redirect(URL::absoluteUrl('admin/login'));
return Redirect::exec(URL::absoluteUrl('admin/login'));
}
public function checkLoginAction()
@@ -72,11 +69,12 @@ class SessionController extends BaseAdminController {
if (null == $successUrl) $successUrl = 'admin/home';
// Redirect to home page - FIXME: requested URL, if we come from another page ?
return $this->redirect(URL::absoluteUrl($successUrl));
// Redirect to the success URL
return Redirect::exec(URL::absoluteUrl($successUrl));
}
catch (ValidatorException $ex) {
// Validation problem
$message = "Missing or invalid information. Please check your input.";
}
catch (AuthenticationException $ex) {
@@ -86,19 +84,20 @@ class SessionController extends BaseAdminController {
$message = "Login failed. Please check your username and password.";
}
catch (\Exception $ex) {
// Store the form in session (see Form Smlarty plugin to find usage of this parameter)
// Log authentication failure
AdminLog::append(sprintf("Undefined error: %s", $ex->getMessage()), $request);
$message = "Unable to process your request. Please try again.";
}
// Store the form name in session (see Form Smarty plugin to find usage of this parameter)
$request->getSession()->setErrorFormName($form->getName());
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));
}
// Display the login form again, with an error message if required
return $this->render("login.html", array(
"message" => $message
));
}
}