From 13d03100e4f44e8ea43df3c0fbf3867e1b3a8fd4 Mon Sep 17 00:00:00 2001 From: Polonkai Gergely Date: Sat, 7 Jul 2012 22:15:36 +0200 Subject: [PATCH] Fixed registration issues --- app/AppKernel.php | 1 + app/config/config.yml | 10 ++++--- app/config/routing.yml | 4 +++ app/config/security.yml | 1 + .../Controller/DefaultController.php | 13 +++++++++ .../DependencyInjection/Configuration.php | 29 +++++++++++++++++++ .../KekRozsakAdminExtension.php | 28 ++++++++++++++++++ .../AdminBundle/KekRozsakAdminBundle.php | 9 ++++++ .../AdminBundle/Resources/config/routing.yml | 4 +++ .../AdminBundle/Resources/config/services.yml | 7 +++++ .../views/Default/manage_regs.html.twig | 1 + .../Controller/DefaultControllerTest.php | 17 +++++++++++ .../Controller/DefaultController.php | 9 +++++- .../Default/registration_success.html.twig | 2 +- .../views/Email/new_registration.txt.twig | 9 ++++++ 15 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 src/KekRozsak/AdminBundle/Controller/DefaultController.php create mode 100644 src/KekRozsak/AdminBundle/DependencyInjection/Configuration.php create mode 100644 src/KekRozsak/AdminBundle/DependencyInjection/KekRozsakAdminExtension.php create mode 100644 src/KekRozsak/AdminBundle/KekRozsakAdminBundle.php create mode 100644 src/KekRozsak/AdminBundle/Resources/config/routing.yml create mode 100644 src/KekRozsak/AdminBundle/Resources/config/services.yml create mode 100644 src/KekRozsak/AdminBundle/Resources/views/Default/manage_regs.html.twig create mode 100644 src/KekRozsak/AdminBundle/Tests/Controller/DefaultControllerTest.php create mode 100644 src/KekRozsak/SecurityBundle/Resources/views/Email/new_registration.txt.twig diff --git a/app/AppKernel.php b/app/AppKernel.php index 1716e6f..16d46c8 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -21,6 +21,7 @@ class AppKernel extends Kernel new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), new KekRozsak\FrontBundle\KekRozsakFrontBundle(), new KekRozsak\SecurityBundle\KekRozsakSecurityBundle(), + new KekRozsak\AdminBundle\KekRozsakAdminBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff --git a/app/config/config.yml b/app/config/config.yml index ff16149..06053b1 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -53,8 +53,10 @@ doctrine: # Swiftmailer Configuration swiftmailer: - transport: %mailer_transport% - host: %mailer_host% - username: %mailer_user% - password: %mailer_password% + transport: %mailer_transport% + encryption: %mailer_encryption% + auth_mode: %mailer_auth_mode% + host: %mailer_host% + username: %mailer_user% + password: %mailer_password% spool: { type: memory } diff --git a/app/config/routing.yml b/app/config/routing.yml index c525b24..81455ae 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,3 +1,7 @@ +KekRozsakAdminBundle: + resource: "@KekRozsakAdminBundle/Resources/config/routing.yml" + prefix: /admin + KekRozsakSecurityBundle: resource: "@KekRozsakSecurityBundle/Resources/config/routing.yml" prefix: / diff --git a/app/config/security.yml b/app/config/security.yml index 1482b8c..6b724f7 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -42,6 +42,7 @@ security: - { path: ^/$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/cikk/, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/jelentkezes, roles: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/most-varj, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/, roles: [ IS_AUTHENTICATED_FULLY, IS_AUTHENTICATED_REMEMBERED ] } #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } #- { path: ^/_internal/secure, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 } diff --git a/src/KekRozsak/AdminBundle/Controller/DefaultController.php b/src/KekRozsak/AdminBundle/Controller/DefaultController.php new file mode 100644 index 0000000..f75b1eb --- /dev/null +++ b/src/KekRozsak/AdminBundle/Controller/DefaultController.php @@ -0,0 +1,13 @@ +render('KekRozsakAdminBundle:Default:manage_regs.html.twig'); + } +} diff --git a/src/KekRozsak/AdminBundle/DependencyInjection/Configuration.php b/src/KekRozsak/AdminBundle/DependencyInjection/Configuration.php new file mode 100644 index 0000000..60f778e --- /dev/null +++ b/src/KekRozsak/AdminBundle/DependencyInjection/Configuration.php @@ -0,0 +1,29 @@ +root('kek_rozsak_admin'); + + // Here you should define the parameters that are allowed to + // configure your bundle. See the documentation linked above for + // more information on that topic. + + return $treeBuilder; + } +} diff --git a/src/KekRozsak/AdminBundle/DependencyInjection/KekRozsakAdminExtension.php b/src/KekRozsak/AdminBundle/DependencyInjection/KekRozsakAdminExtension.php new file mode 100644 index 0000000..7b2feee --- /dev/null +++ b/src/KekRozsak/AdminBundle/DependencyInjection/KekRozsakAdminExtension.php @@ -0,0 +1,28 @@ +processConfiguration($configuration, $configs); + + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yml'); + } +} diff --git a/src/KekRozsak/AdminBundle/KekRozsakAdminBundle.php b/src/KekRozsak/AdminBundle/KekRozsakAdminBundle.php new file mode 100644 index 0000000..50494c4 --- /dev/null +++ b/src/KekRozsak/AdminBundle/KekRozsakAdminBundle.php @@ -0,0 +1,9 @@ +request('GET', '/hello/Fabien'); + + $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0); + } +} diff --git a/src/KekRozsak/SecurityBundle/Controller/DefaultController.php b/src/KekRozsak/SecurityBundle/Controller/DefaultController.php index 952d46a..39a4cd6 100644 --- a/src/KekRozsak/SecurityBundle/Controller/DefaultController.php +++ b/src/KekRozsak/SecurityBundle/Controller/DefaultController.php @@ -50,13 +50,20 @@ class DefaultController extends Controller { $user->setPassword($this->get('security.encoder_factory')->getEncoder($user)->encodePassword($user->getPassword(), $user->getSalt())); $roleRepo = $this->getDoctrine()->getRepository('KekRozsakFrontBundle:Role'); - $regRole = $roleRepo->findOneByName('ROLE_REGISTERED'); + $regRole = $roleRepo->findOneByName('REGISTERED'); $user->addRole($regRole); $user->setRegisteredAt(new \DateTime('now')); $em = $this->getDoctrine()->getEntityManager(); $em->persist($user); $em->flush(); + $message = \Swift_Message::newInstance() + ->setSubject('Új jelentkező') + ->setFrom('info@blueroses.hu') + ->setTo('nauryl@blueroses.hu') + ->setBody($this->renderView('KekRozsakSecurityBundle:Email:new_registration.txt.twig', array('user' => $user))); + $this->get('mailer')->send($message); + return $this->redirect($this->generateUrl('KekRozsakSecurityBundle_reg_success')); } } diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig index 49bb171..8b040fa 100644 --- a/src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig +++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig @@ -1,5 +1,5 @@ {% extends '::main_template.html.twig' %} {% block title %} - Sikeres regisztráció{% endblock %} {% block content %} - A regisztrációd sikeres volt. + A regisztrációd sikeres volt. A Vének hamarosan kapcsolatba lépnek Veled, és elbírálják jelentkezésedet. Kérünk, addig légy türelemmel! {% endblock %} diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Email/new_registration.txt.twig b/src/KekRozsak/SecurityBundle/Resources/views/Email/new_registration.txt.twig new file mode 100644 index 0000000..e7222cb --- /dev/null +++ b/src/KekRozsak/SecurityBundle/Resources/views/Email/new_registration.txt.twig @@ -0,0 +1,9 @@ +Valaki jelentkezett a Kék Rózsák Körbe. Az adatok, amiket a regisztráció során +megadott: + +Név: {{ user.displayName }} +E-mail: {{ user.email }} + +A jelentkezők listáját itt tekintheted meg: + +{{ url('KekRozsakAdminBundle_manage_regs') }}