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

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source 
Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
	templates/admin/default/customers.html
This commit is contained in:
mespeche
2013-09-11 10:26:56 +02:00
parent 40a87d50ce 557940c5cf
commit 2f351fd4d9
194 changed files with 1310 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/lib/Thelia/Controller/Admin/AttributeController.php
View File

@@ -23,18 +23,6 @@
namespace Thelia\Controller\Admin;
use Thelia\Core\Event\MessageDeleteEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Tools\URL;
use Thelia\Core\Event\MessageUpdateEvent;
use Thelia\Core\Event\MessageCreateEvent;
use Thelia\Log\Tlog;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Model\MessageQuery;
use Thelia\Form\MessageModificationForm;
use Thelia\Form\MessageCreationForm;
/**
* Manages messages sent by mail
*
@@ -47,17 +35,15 @@ class AttributeController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function defaultAction() {
public function defaultAction()
{
if (null !== $response = $this->checkAuth("admin.configuration.attributes.view")) return $response;
return $this->render('product-attributes');
}
public function updateAction() {
public function updateAction()
{
if (null !== $response = $this->checkAuth("admin.configuration.attributes.update")) return $response;
return $this->render('product-attributes-edit');
}
}
}

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

@@ -25,6 +25,7 @@ namespace Thelia\Controller\Admin;
use Symfony\Component\Routing\Exception\InvalidParameterException;
use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
use Symfony\Component\Routing\Router;
use Thelia\Controller\BaseController;
use Symfony\Component\HttpFoundation\Response;
use Thelia\Core\Security\Exception\AuthorizationException;
@@ -33,7 +34,6 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Tools\URL;
use Thelia\Tools\Redirect;
use Thelia\Core\Security\SecurityContext;
use Thelia\Model\AdminLog;
use Thelia\Model\Lang;
use Thelia\Model\LangQuery;
@@ -50,14 +50,15 @@ class BaseAdminController extends BaseController
*
* @param unknown $message
*/
public function adminLogAppend($message) {
public function adminLogAppend($message)
{
AdminLog::append($message, $this->getRequest(), $this->getSecurityContext()->getAdminUser());
}
/**
* This method process the rendering of view called from an admin page
*
* @param unknown $template
* @param unknown $template
* @return Response the reponse which contains the rendered view
*/
public function processTemplateAction($template)
@@ -66,12 +67,10 @@ class BaseAdminController extends BaseController
if (! empty($template)) {
// If we have a view in the URL, render this view
return $this->render($template);
}
elseif (null != $view = $this->getRequest()->get('view')) {
} elseif (null != $view = $this->getRequest()->get('view')) {
return $this->render($view);
}
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
return $this->errorPage($ex->getMessage());
}
@@ -135,7 +134,8 @@ class BaseAdminController extends BaseController
/*
* Create the standard message displayed to the user when the form cannot be validated.
*/
protected function createStandardFormValidationErrorMessage(FormValidationException $exception) {
protected function createStandardFormValidationErrorMessage(FormValidationException $exception)
{
return $this->getTranslator()->trans(
"Please check your input: %error",
array(
@@ -147,13 +147,13 @@ class BaseAdminController extends BaseController
/**
* Setup the error context when an error occurs in a action method.
*
* @param string $action the action that caused the error (category modification, variable creation, currency update, etc.)
* @param BaseForm $form the form where the error occured, or null if no form was involved
* @param string $error_message the error message
* @param Exception $exception the exception or null if no exception
* @param string $action the action that caused the error (category modification, variable creation, currency update, etc.)
* @param BaseForm $form the form where the error occured, or null if no form was involved
* @param string $error_message the error message
* @param Exception $exception the exception or null if no exception
*/
protected function setupFormErrorContext($action, $error_message, BaseForm $form = null, \Exception $exception = null) {
protected function setupFormErrorContext($action, $error_message, BaseForm $form = null, \Exception $exception = null)
{
if ($error_message !== false) {
// Log the error message
@@ -214,7 +214,7 @@ class BaseAdminController extends BaseController
/**
* Return the route path defined for the givent route ID
*
* @param string $routeId a route ID, as defines in Config/Resources/routing/admin.xml
* @param string $routeId a route ID, as defines in Config/Resources/routing/admin.xml
* @param mixed $parameters An array of parameters
* @param Boolean|string $referenceType The type of reference to be generated (one of the constants)
*
@@ -222,12 +222,13 @@ class BaseAdminController extends BaseController
* @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
* @throws InvalidParameterException When a parameter value for a placeholder is not correct because
* it does not match the requirement
* @throws \InvalidArgumentException When the router doesn't exist
* @return string The generated URL
* @throws \InvalidArgumentException When the router doesn't exist
* @return string The generated URL
*
* @see \Thelia\Controller\BaseController::getRouteFromRouter()
*/
protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
protected function getRoute($routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
{
return $this->getRouteFromRouter(
'router.admin',
$routeId,
@@ -239,18 +240,19 @@ class BaseAdminController extends BaseController
/**
* Redirect to à route ID related URL
*
* @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param unknown $urlParameters the URL parametrs, as a var/value pair array
*/
public function redirectToRoute($routeId, $urlParameters = array()) {
public function redirectToRoute($routeId, $urlParameters = array())
{
$this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId), $urlParameters));
}
/**
* Get the current edition lang ID, checking if a change was requested in the current request.
*/
protected function getCurrentEditionLang() {
protected function getCurrentEditionLang()
{
// Return the new language if a change is required.
if (null !== $edit_language_id = $this->getRequest()->get('edit_language_id', null)) {
@@ -266,7 +268,8 @@ class BaseAdminController extends BaseController
/**
* A simple helper to get the current edition locale.
*/
protected function getCurrentEditionLocale() {
protected function getCurrentEditionLocale()
{
return $this->getCurrentEditionLang()->getLocale();
}
@@ -322,13 +325,11 @@ class BaseAdminController extends BaseController
$data = $this->getParser()->render($templateName, $args);
return $data;
}
catch (AuthenticationException $ex) {
} catch (AuthenticationException $ex) {
// User is not authenticated, and templates requires authentication -> redirect to login page
// We user login_tpl as a path, not a template.
Redirect::exec(URL::getInstance()->absoluteUrl($ex->getLoginTemplate()));
}
catch (AuthorizationException $ex) {
} catch (AuthorizationException $ex) {
// User is not allowed to perform the required action. Return the error page instead of the requested page.
return $this->errorPage($this->getTranslator()->trans("Sorry, you are not allowed to perform this action."));
}

62
core/lib/Thelia/Controller/Admin/CategoryController.php
View File

@@ -23,18 +23,10 @@
namespace Thelia\Controller\Admin;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Log\Tlog;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Event\CategoryCreateEvent;
use Thelia\Form\CategoryCreationForm;
use Thelia\Core\Event\CategoryDeleteEvent;
use Thelia\Core\Event\CategoryToggleVisibilityEvent;
use Thelia\Core\Event\CategoryChangePositionEvent;
use Thelia\Form\CategoryDeletionForm;
use Thelia\Model\Lang;
use Thelia\Core\Translation\Translator;
use Thelia\Core\Event\CategoryUpdatePositionEvent;
use Thelia\Model\CategoryQuery;
use Thelia\Form\CategoryModificationForm;
@@ -46,12 +38,13 @@ class CategoryController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
protected function renderList() {
protected function renderList()
{
return $this->render('categories', $this->getTemplateArgs());
}
protected function getTemplateArgs() {
protected function getTemplateArgs()
{
// Get the category ID
$category_id = $this->getRequest()->get('category_id', 0);
@@ -77,10 +70,9 @@ class CategoryController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function defaultAction() {
public function defaultAction()
{
if (null !== $response = $this->checkAuth("admin.categories.view")) return $response;
return $this->renderList();
}
@@ -89,8 +81,8 @@ class CategoryController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function createAction() {
public function createAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.categories.create")) return $response;
@@ -126,12 +118,10 @@ class CategoryController extends BaseAdminController
// Redirect to the success URL
$this->redirect($successUrl);
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$error_msg = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$error_msg = $ex->getMessage();
}
@@ -147,8 +137,8 @@ class CategoryController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function changeAction() {
public function changeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
@@ -189,8 +179,8 @@ class CategoryController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function saveChangeAction() {
public function saveChangeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
@@ -241,12 +231,10 @@ class CategoryController extends BaseAdminController
// Redirect to the success URL
$this->redirect($changeForm->getSuccessUrl());
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$error_msg = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$error_msg = $ex->getMessage();
}
@@ -260,7 +248,8 @@ class CategoryController extends BaseAdminController
/**
* Online status toggle category
*/
public function setToggleVisibilityAction() {
public function setToggleVisibilityAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
@@ -271,8 +260,7 @@ class CategoryController extends BaseAdminController
try {
$this->dispatch(TheliaEvents::CATEGORY_SET_DEFAULT, $changeEvent);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any error
return $this->errorPage($ex);
}
@@ -283,7 +271,8 @@ class CategoryController extends BaseAdminController
/**
* Update categoryposition
*/
public function updatePositionAction() {
public function updatePositionAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.categories.update")) return $response;
@@ -306,8 +295,7 @@ class CategoryController extends BaseAdminController
);
$this->dispatch(TheliaEvents::CATEGORY_UPDATE_POSITION, $event);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any error
return $this->errorPage($ex);
}
@@ -320,8 +308,8 @@ class CategoryController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function deleteAction() {
public function deleteAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.categories.delete")) return $response;
@@ -335,4 +323,4 @@ class CategoryController extends BaseAdminController
$this->redirectToRoute('admin.categories.default');
}
}
}

47
core/lib/Thelia/Controller/Admin/ConfigController.php
View File

@@ -28,9 +28,7 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Tools\URL;
use Thelia\Core\Event\ConfigUpdateEvent;
use Thelia\Core\Event\ConfigCreateEvent;
use Thelia\Log\Tlog;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Model\ConfigQuery;
use Thelia\Form\ConfigModificationForm;
use Thelia\Form\ConfigCreationForm;
@@ -47,8 +45,8 @@ class ConfigController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
protected function renderList() {
protected function renderList()
{
// Find the current order
$order = $this->getRequest()->get(
'order',
@@ -66,10 +64,9 @@ class ConfigController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function defaultAction() {
public function defaultAction()
{
if (null !== $response = $this->checkAuth("admin.configuration.variables.view")) return $response;
return $this->renderList();
}
@@ -78,8 +75,8 @@ class ConfigController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function createAction() {
public function createAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.variables.create")) return $response;
@@ -120,12 +117,10 @@ class ConfigController extends BaseAdminController
// Redirect to the success URL
$this->redirect($successUrl);
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$message = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$message = $ex->getMessage();
}
@@ -141,8 +136,8 @@ class ConfigController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function changeAction() {
public function changeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.variables.update")) return $response;
@@ -183,8 +178,8 @@ class ConfigController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function saveChangeAction() {
public function saveChangeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.variables.update")) return $response;
@@ -240,12 +235,10 @@ class ConfigController extends BaseAdminController
// Redirect to the success URL
$this->redirect($changeForm->getSuccessUrl());
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$message = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$message = $ex->getMessage();
}
@@ -261,15 +254,15 @@ class ConfigController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function changeValuesAction() {
public function changeValuesAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.variables.update")) return $response;
$variables = $this->getRequest()->get('variable', array());
// Process all changed variables
foreach($variables as $id => $value) {
foreach ($variables as $id => $value) {
$event = new ConfigUpdateEvent($id);
$event->setValue($value);
@@ -284,8 +277,8 @@ class ConfigController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function deleteAction() {
public function deleteAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.variables.delete")) return $response;
@@ -299,4 +292,4 @@ class ConfigController extends BaseAdminController
$this->redirectToRoute('admin.configuration.variables.default');
}
}
}

11
core/lib/Thelia/Controller/Admin/CouponController.php
View File

@@ -26,17 +26,12 @@ namespace Thelia\Controller\Admin;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Router;
use Thelia\Constraint\ConstraintFactory;
use Thelia\Constraint\ConstraintFactoryTest;
use Thelia\Constraint\Rule\AvailableForTotalAmount;
use Thelia\Constraint\Rule\CouponRuleInterface;
use Thelia\Constraint\Validator\PriceParam;
use Thelia\Core\Event\Coupon\CouponCreateEvent;
use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent;
use Thelia\Core\Event\Coupon\CouponEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\HttpFoundation\Session\Session;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Core\Translation\Translator;
use Thelia\Coupon\CouponAdapterInterface;
use Thelia\Coupon\CouponManager;
@@ -222,7 +217,6 @@ class CouponController extends BaseAdminController
);
}
/**
* Manage Coupons Rule creation display
*
@@ -311,8 +305,6 @@ class CouponController extends BaseAdminController
);
}
/**
* Manage Coupons read display
*
@@ -375,7 +367,6 @@ class CouponController extends BaseAdminController
);
}
/**
* Manage Coupons read display
*
@@ -697,6 +688,4 @@ class CouponController extends BaseAdminController
// }
// }
}

60
core/lib/Thelia/Controller/Admin/CurrencyController.php
View File

@@ -28,9 +28,7 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Tools\URL;
use Thelia\Core\Event\CurrencyUpdateEvent;
use Thelia\Core\Event\CurrencyCreateEvent;
use Thelia\Log\Tlog;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Model\CurrencyQuery;
use Thelia\Form\CurrencyModificationForm;
use Thelia\Form\CurrencyCreationForm;
@@ -48,8 +46,8 @@ class CurrencyController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
protected function renderList() {
protected function renderList()
{
// Find the current order
$order = $this->getRequest()->get(
'order',
@@ -67,10 +65,9 @@ class CurrencyController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function defaultAction() {
public function defaultAction()
{
if (null !== $response = $this->checkAuth("admin.configuration.currencies.view")) return $response;
return $this->renderList();
}
@@ -79,8 +76,8 @@ class CurrencyController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function createAction() {
public function createAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.currencies.create")) return $response;
@@ -120,12 +117,10 @@ class CurrencyController extends BaseAdminController
// Redirect to the success URL
$this->redirect($successUrl);
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$error_msg = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$error_msg = $ex->getMessage();
}
@@ -141,8 +136,8 @@ class CurrencyController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function changeAction() {
public function changeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
@@ -179,8 +174,8 @@ class CurrencyController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function saveChangeAction() {
public function saveChangeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
@@ -231,12 +226,10 @@ class CurrencyController extends BaseAdminController
// Redirect to the success URL
$this->redirect($changeForm->getSuccessUrl());
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$error_msg = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$error_msg = $ex->getMessage();
}
@@ -250,7 +243,8 @@ class CurrencyController extends BaseAdminController
/**
* Sets the default currency
*/
public function setDefaultAction() {
public function setDefaultAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
@@ -261,8 +255,7 @@ class CurrencyController extends BaseAdminController
try {
$this->dispatch(TheliaEvents::CURRENCY_SET_DEFAULT, $changeEvent);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any error
return $this->errorPage($ex);
}
@@ -273,14 +266,14 @@ class CurrencyController extends BaseAdminController
/**
* Update currencies rates
*/
public function updateRatesAction() {
public function updateRatesAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
try {
$this->dispatch(TheliaEvents::CURRENCY_UPDATE_RATES);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any error
return $this->errorPage($ex);
}
@@ -291,7 +284,8 @@ class CurrencyController extends BaseAdminController
/**
* Update currencyposition
*/
public function updatePositionAction() {
public function updatePositionAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
@@ -314,8 +308,7 @@ class CurrencyController extends BaseAdminController
);
$this->dispatch(TheliaEvents::CURRENCY_UPDATE_POSITION, $event);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any error
return $this->errorPage($ex);
}
@@ -323,14 +316,13 @@ class CurrencyController extends BaseAdminController
$this->redirectToRoute('admin.configuration.currencies.default');
}
/**
* Delete a currency object
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function deleteAction() {
public function deleteAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.currencies.delete")) return $response;
@@ -344,4 +336,4 @@ class CurrencyController extends BaseAdminController
$this->redirectToRoute('admin.configuration.currencies.default');
}
}
}

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

@@ -23,7 +23,6 @@
namespace Thelia\Controller\Admin;
/**
* Class CustomerController
* @package Thelia\Controller\Admin
@@ -34,7 +33,6 @@ class CustomerController extends BaseAdminController
public function indexAction()
{
if (null !== $response = $this->checkAuth("admin.customers.view")) return $response;
return $this->render("customers", array("display_customer" => 20));
}

40
core/lib/Thelia/Controller/Admin/MessageController.php
View File

@@ -28,9 +28,7 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Tools\URL;
use Thelia\Core\Event\MessageUpdateEvent;
use Thelia\Core\Event\MessageCreateEvent;
use Thelia\Log\Tlog;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Model\MessageQuery;
use Thelia\Form\MessageModificationForm;
use Thelia\Form\MessageCreationForm;
@@ -47,7 +45,8 @@ class MessageController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
protected function renderList() {
protected function renderList()
{
return $this->render('messages');
}
@@ -56,10 +55,9 @@ class MessageController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function defaultAction() {
public function defaultAction()
{
if (null !== $response = $this->checkAuth("admin.configuration.messages.view")) return $response;
return $this->renderList();
}
@@ -68,8 +66,8 @@ class MessageController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function createAction() {
public function createAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.messages.create")) return $response;
@@ -107,12 +105,10 @@ class MessageController extends BaseAdminController
// Redirect to the success URL
$this->redirect($successUrl);
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$message = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$message = $ex->getMessage();
}
@@ -128,8 +124,8 @@ class MessageController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function changeAction() {
public function changeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.messages.update")) return $response;
@@ -168,8 +164,8 @@ class MessageController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function saveChangeAction() {
public function saveChangeAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.messages.update")) return $response;
@@ -221,12 +217,10 @@ class MessageController extends BaseAdminController
// Redirect to the success URL
$this->redirect($changeForm->getSuccessUrl());
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Form cannot be validated
$message = $this->createStandardFormValidationErrorMessage($ex);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Any other error
$message = $ex->getMessage();
}
@@ -242,8 +236,8 @@ class MessageController extends BaseAdminController
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
public function deleteAction() {
public function deleteAction()
{
// Check current user authorization
if (null !== $response = $this->checkAuth("admin.configuration.messages.delete")) return $response;
@@ -257,4 +251,4 @@ class MessageController extends BaseAdminController
$this->redirectToRoute('admin.configuration.messages.default');
}
}
}

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

@@ -27,7 +27,6 @@ use Thelia\Form\AdminLogin;
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;
use Thelia\Core\Event\TheliaEvents;
@@ -74,20 +73,17 @@ class SessionController extends BaseAdminController
// Redirect to the success URL
return Redirect::exec($adminLoginForm->getSuccessUrl());
}
catch (FormValidationException $ex) {
} catch (FormValidationException $ex) {
// Validation problem
$message = $this->createStandardFormValidationErrorMessage($ex);
}
catch (AuthenticationException $ex) {
} catch (AuthenticationException $ex) {
// Log authentication failure
AdminLog::append(sprintf("Authentication failure for username '%s'", $authenticator->getUsername()), $request);
$message = $this->getTranslator()->trans("Login failed. Please check your username and password.");
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
// Log authentication failure
AdminLog::append(sprintf("Undefined error: %s", $ex->getMessage()), $request);
@@ -103,4 +99,4 @@ class SessionController extends BaseAdminController
// Display the login form again
return $this->render("login");
}
}
}

31
core/lib/Thelia/Controller/BaseController.php
View File

@@ -39,7 +39,6 @@ use Thelia\Form\BaseForm;
use Thelia\Form\Exception\FormValidationException;
use Symfony\Component\EventDispatcher\Event;
use Thelia\Core\Event\DefaultActionEvent;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
@@ -65,8 +64,8 @@ class BaseController extends ContainerAware
/**
* Dispatch a Thelia event
*
* @param string $eventName a TheliaEvent name, as defined in TheliaEvents class
* @param Event $event the action event, or null (a DefaultActionEvent will be dispatched)
* @param string $eventName a TheliaEvent name, as defined in TheliaEvents class
* @param Event $event the action event, or null (a DefaultActionEvent will be dispatched)
*/
protected function dispatch($eventName, ActionEvent $event = null)
{
@@ -139,11 +138,11 @@ class BaseController extends ContainerAware
/**
* Get all errors that occured in a form
*
* @param \Symfony\Component\Form\Form $form
* @return string the error string
* @param \Symfony\Component\Form\Form $form
* @return string the error string
*/
private function getErrorMessages(\Symfony\Component\Form\Form $form) {
private function getErrorMessages(\Symfony\Component\Form\Form $form)
{
$errors = '';
foreach ($form->getErrors() as $key => $error) {
@@ -177,8 +176,7 @@ class BaseController extends ContainerAware
if ($form->isValid()) {
return $form;
}
else {
} else {
$errorMessage = null;
if ($form->get("error_message")->getData() != null) {
$errorMessage = $form->get("error_message")->getData();
@@ -188,8 +186,7 @@ class BaseController extends ContainerAware
throw new FormValidationException($errorMessage);
}
}
else {
} else {
throw new FormValidationException(sprintf("Wrong form method, %s expected.", $expectedMethod));
}
}
@@ -214,8 +211,7 @@ class BaseController extends ContainerAware
{
if ($form != null) {
$url = $form->getSuccessUrl();
}
else {
} else {
$url = $this->getRequest()->get("success_url");
}
@@ -236,10 +232,11 @@ class BaseController extends ContainerAware
* @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
* @throws InvalidParameterException When a parameter value for a placeholder is not correct because
* it does not match the requirement
* @throws \InvalidArgumentException When the router doesn't exist
* @return string The generated URL
* @throws \InvalidArgumentException When the router doesn't exist
* @return string The generated URL
*/
protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
{
/** @var Router $router */
$router = $this->container->get($routerName);
@@ -268,4 +265,4 @@ class BaseController extends ContainerAware
{
return $this->container->getParameter('kernel.debug');
}
}
}

17
core/lib/Thelia/Controller/Front/AddressController.php
View File

@@ -31,7 +31,6 @@ use Thelia\Model\Base\AddressQuery;
use Thelia\Model\Customer;
use Thelia\Tools\URL;
/**
* Class AddressController
* @package Thelia\Controller\Front
@@ -64,10 +63,9 @@ class AddressController extends BaseFrontController
$this->dispatch(TheliaEvents::ADDRESS_CREATE, $event);
$this->redirectSuccess($addressCreate);
}catch (FormValidationException $e) {
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
}
catch (\Exception $e) {
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
}
@@ -91,7 +89,7 @@ class AddressController extends BaseFrontController
$this->redirectToRoute("home");
}
if(null === $address_id = $request->get("address_id")) {
if (null === $address_id = $request->get("address_id")) {
$this->redirectToRoute("home");
}
@@ -108,7 +106,7 @@ class AddressController extends BaseFrontController
$this->redirectToRoute("home");
}
if($address->getCustomer()->getId() != $customer->getId()) {
if ($address->getCustomer()->getId() != $customer->getId()) {
$this->redirectToRoute("home");
}
@@ -118,10 +116,9 @@ class AddressController extends BaseFrontController
$this->dispatch(TheliaEvents::ADDRESS_UPDATE, $event);
$this->redirectSuccess($addressUpdate);
}catch (FormValidationException $e) {
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
}
catch (\Exception $e) {
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
}
@@ -155,4 +152,4 @@ class AddressController extends BaseFrontController
$form->get("company")->getData()
);
}
}
}

8
core/lib/Thelia/Controller/Front/BaseFrontController.php
View File

@@ -35,17 +35,19 @@ class BaseFrontController extends BaseController
*
* @see \Thelia\Controller\BaseController::getRouteFromRouter()
*/
protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
{
return $this->getRouteFromRouter('router.front', $routeId, $parameters, $referenceType);
}
/**
* Redirect to à route ID related URL
*
* @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param unknown $urlParameters the URL parametrs, as a var/value pair array
*/
public function redirectToRoute($routeId, $urlParameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
public function redirectToRoute($routeId, $urlParameters = array(), $referenceType = Router::ABSOLUTE_PATH)
{
$this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId, array(), $referenceType), $urlParameters));
}
}

3
core/lib/Thelia/Controller/Front/CartController.php
View File

@@ -77,7 +77,7 @@ class CartController extends BaseFrontController
$this->getDispatcher()->dispatch(TheliaEvents::CART_UPDATEITEM, $cartEvent);
$this->redirectSuccess();
} catch(PropelException $e) {
} catch (PropelException $e) {
$this->getParserContext()->setGeneralError($e->getMessage());
}
@@ -97,7 +97,6 @@ class CartController extends BaseFrontController
$this->getParserContext()->setGeneralError($e->getMessage());
}
}
/**

33
core/lib/Thelia/Controller/Front/CustomerController.php
View File

@@ -27,19 +27,15 @@ use Thelia\Core\Event\CustomerLoginEvent;
use Thelia\Core\Security\Authentication\CustomerUsernamePasswordFormAuthenticator;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\Exception\UsernameNotFoundException;
use Thelia\Core\Security\SecurityContext;
use Thelia\Form\CustomerCreation;
use Thelia\Form\CustomerLogin;
use Thelia\Form\CustomerModification;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Model\Customer;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Event\CustomerEvent;
use Thelia\Core\Factory\ActionEventFactory;
use Thelia\Tools\URL;
use Thelia\Log\Tlog;
use Thelia\Core\Security\Exception\WrongPasswordException;
use Symfony\Component\Routing\Router;
/**
* Class CustomerController
@@ -70,11 +66,9 @@ class CustomerController extends BaseFrontController
$this->processLogin($customerCreateEvent->getCustomer());
$this->redirectSuccess($customerCreation);
}
catch (FormValidationException $e) {
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
}
catch (\Exception $e) {
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
}
@@ -118,11 +112,9 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerModification);
}
catch (FormValidationException $e) {
} catch (FormValidationException $e) {
$message = sprintf("Please check your input: %s", $e->getMessage());
}
catch (\Exception $e) {
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
}
@@ -166,29 +158,24 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerLoginForm);
}
catch (FormValidationException $e) {
} catch (FormValidationException $e) {
if ($request->request->has("account")) {
$account = $request->request->get("account");
$form = $customerLoginForm->getForm();
if($account == 0 && $form->get("email")->getData() !== null) {
if ($account == 0 && $form->get("email")->getData() !== null) {
$this->redirectToRoute("customer.create.view", array("email" => $form->get("email")->getData()));
}
}
$message = sprintf("Please check your input: %s", $e->getMessage());
}
catch(UsernameNotFoundException $e) {
} catch (UsernameNotFoundException $e) {
$message = "Wrong email or password. Please try again";
}
catch (WrongPasswordException $e) {
} catch (WrongPasswordException $e) {
$message = "Wrong email or password. Please try again";
}
catch(AuthenticationException $e) {
} catch (AuthenticationException $e) {
$message = "Wrong email or password. Please try again";
}
catch (\Exception $e) {
} catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());
}

8
core/lib/Thelia/Controller/Front/DefaultController.php
View File

@@ -53,7 +53,7 @@ class DefaultController extends BaseFrontController
$view = $request->request->get('view');
}
}
if(null !== $view) {
if (null !== $view) {
$request->attributes->set('_view', $view);
}
@@ -61,11 +61,11 @@ class DefaultController extends BaseFrontController
$request->attributes->set("_view", "index");
}
if(ConfigQuery::isRewritingEnable()) {
if($request->attributes->get('_rewritten', false) === false) {
if (ConfigQuery::isRewritingEnable()) {
if ($request->attributes->get('_rewritten', false) === false) {
/* Does the query GET parameters match a rewritten URL ? */
$rewrittenUrl = URL::getInstance()->retrieveCurrent($request);
if($rewrittenUrl->rewrittenUrl !== null) {
if ($rewrittenUrl->rewrittenUrl !== null) {
/* 301 redirection to rewritten URL */
$this->redirect($rewrittenUrl->rewrittenUrl, 301);
}

3
core/lib/Thelia/Controller/Front/DeliveryController.php
View File

@@ -25,7 +25,6 @@ namespace Thelia\Controller\Front;
use Thelia\Model\ModuleQuery;
use Thelia\Tools\URL;
/**
* Class DeliveryController
* @package Thelia\Controller\Front
@@ -53,4 +52,4 @@ class DeliveryController extends BaseFrontController
$this->pageNotFound();
}
}
}
}

3
core/lib/Thelia/Controller/Install/BaseInstallController.php
View File

@@ -25,7 +25,6 @@ namespace Thelia\Controller\Install;
use Symfony\Component\HttpFoundation\Response;
use Thelia\Controller\BaseController;
/**
* Class BaseInstallController
* @package Thelia\Controller\Install
@@ -57,4 +56,4 @@ class BaseInstallController extends BaseController
return $data;
}
}
}

9
core/lib/Thelia/Controller/Install/InstallController.php
View File

@@ -22,7 +22,6 @@
/*************************************************************************************/
namespace Thelia\Controller\Install;
use Thelia\Install\BaseInstall;
use Thelia\Install\CheckPermission;
/**
@@ -30,8 +29,8 @@ use Thelia\Install\CheckPermission;
* @package Thelia\Controller\Install
* @author Manuel Raynaud <mraynaud@openstudio.fr>
*/
class InstallController extends BaseInstallController {
class InstallController extends BaseInstallController
{
public function index()
{
$this->verifyStep(1);
@@ -58,7 +57,7 @@ class InstallController extends BaseInstallController {
return true;
}
switch($step) {
switch ($step) {
case "1" :
if ($sessionStep > 1) {
$this->redirect("/install/step/2");
@@ -66,4 +65,4 @@ class InstallController extends BaseInstallController {
break;
}
}
}
}