diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index a5e593a85..98017f979 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -55,12 +55,6 @@ - - - - - - - Thelia\Admin\Controller\AdminController::indexAction + Thelia\Controller\Admin\AdminController::indexAction - Thelia\Admin\Controller\SessionController::showLoginAction + Thelia\Controller\Admin\SessionController::showLoginAction - Thelia\Admin\Controller\SessionController::checkLogoutAction + Thelia\Controller\Admin\SessionController::checkLogoutAction - Thelia\Admin\Controller\SessionController::checkLoginAction + Thelia\Controller\Admin\SessionController::checkLoginAction - Thelia\Admin\Controller\CategoryController::indexAction + Thelia\Controller\Admin\CategoryController::indexAction - Thelia\Admin\Controller\CategoryController::processAction + Thelia\Controller\Admin\CategoryController::processAction - Thelia\Admin\Controller\AdminController::processTemplateAction + Thelia\Controller\Admin\AdminController::processTemplateAction .* \ No newline at end of file diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml new file mode 100644 index 000000000..af56e6c85 --- /dev/null +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -0,0 +1,11 @@ + + + + + + Thelia\Controller\Front\CustomerController::createAction + + + \ No newline at end of file diff --git a/core/lib/Thelia/Admin/Controller/AdminController.php b/core/lib/Thelia/Controller/Admin/AdminController.php similarity index 95% rename from core/lib/Thelia/Admin/Controller/AdminController.php rename to core/lib/Thelia/Controller/Admin/AdminController.php index 41be586d7..46cee94a0 100755 --- a/core/lib/Thelia/Admin/Controller/AdminController.php +++ b/core/lib/Thelia/Controller/Admin/AdminController.php @@ -23,7 +23,9 @@ namespace Thelia\Admin\Controller; -class AdminController extends BaseAdminController { +use Thelia\Controller\BaseController; + +class AdminController extends BaseController { public function indexAction() { diff --git a/core/lib/Thelia/Admin/Controller/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php similarity index 98% rename from core/lib/Thelia/Admin/Controller/CategoryController.php rename to core/lib/Thelia/Controller/Admin/CategoryController.php index d2054e1c0..4fccc44b5 100644 --- a/core/lib/Thelia/Admin/Controller/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -26,8 +26,9 @@ namespace Thelia\Admin\Controller; use Thelia\Model\CategoryQuery; use Thelia\Core\Security\Exception\AuthenticationException; use Thelia\Core\Security\Exception\AuthorizationException; +use Thelia\Controller\BaseController; -class CategoryController extends BaseAdminController { +class CategoryController extends BaseController { protected function createNewCategory($args) { $this->dispatchEvent("createCategory"); diff --git a/core/lib/Thelia/Admin/Controller/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php similarity index 98% rename from core/lib/Thelia/Admin/Controller/SessionController.php rename to core/lib/Thelia/Controller/Admin/SessionController.php index 75d102bdb..633ff80a1 100755 --- a/core/lib/Thelia/Admin/Controller/SessionController.php +++ b/core/lib/Thelia/Controller/Admin/SessionController.php @@ -32,8 +32,9 @@ use Symfony\Component\Validator\Exception\ValidatorException; use Thelia\Tools\URL; use Thelia\Tools\Redirect; use Thelia\Core\Event\TheliaEvents; +use Thelia\Controller\BaseController; -class SessionController extends BaseAdminController { +class SessionController extends BaseController { public function showLoginAction() { diff --git a/core/lib/Thelia/Admin/Controller/BaseAdminController.php b/core/lib/Thelia/Controller/BaseController.php similarity index 98% rename from core/lib/Thelia/Admin/Controller/BaseAdminController.php rename to core/lib/Thelia/Controller/BaseController.php index 64bd0b665..92fd1a97e 100755 --- a/core/lib/Thelia/Admin/Controller/BaseAdminController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -20,12 +20,12 @@ /* along with this program. If not, see . */ /* */ /*************************************************************************************/ -namespace Thelia\Admin\Controller; +namespace Thelia\Controller; use Symfony\Component\Routing\RequestContext; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\DependencyInjection\ContainerAware; -use Thelia\Core\DependencyInjection\ContainerAwareAdmin; use Thelia\Form\BaseForm; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpKernel\HttpKernelInterface; @@ -51,7 +51,7 @@ use Thelia\Core\Security\Exception\AuthorizationException; * @author Manuel Raynaud */ -class BaseAdminController extends ContainerAwareAdmin +class BaseController extends ContainerAware { const TEMPLATE_404 = "404"; diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php new file mode 100644 index 000000000..9ba42c3a9 --- /dev/null +++ b/core/lib/Thelia/Controller/Front/CustomerController.php @@ -0,0 +1,36 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Controller\Front; + +use Thelia\Controller\BaseController; +use Symfony\Component\DependencyInjection\ContainerAware; +use Thelia\Core\Security\SecurityContext; + +class CustomerController extends BaseController { + + public function createAction() + { + + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php index 9837a3c14..5e2d1f78e 100755 --- a/core/lib/Thelia/Form/CustomerCreation.php +++ b/core/lib/Thelia/Form/CustomerCreation.php @@ -33,7 +33,7 @@ class CustomerCreation extends BaseForm protected function buildForm() { $this->formBuilder - ->add("auto_login", "boolean") + ->add("auto_login", "integer") ->add("firstname", "text", array( "constraints" => array( new Constraints\NotBlank()