From a454dc748397efc0e0bfc81b9ebef9ae1601f165 Mon Sep 17 00:00:00 2001
From: Polonkai Gergely <polesz@w00d5t0ck.info>
Date: Sat, 7 Jul 2012 11:13:13 +0200
Subject: [PATCH] Added the possibility to register

---
 app/Resources/views/main_template.html.twig   |  7 ++-
 app/config/security.yml                       |  1 +
 src/KekRozsak/FrontBundle/Entity/Role.php     |  2 +-
 src/KekRozsak/FrontBundle/Entity/User.php     | 57 ++++++++++++++++-
 .../Extension/HelpMessageTypeExtension.php    | 33 ++++++++++
 .../FrontBundle/Form/Type/UserType.php        | 61 +++++++++++++++++++
 .../Resources/config/doctrine/User.orm.yml    |  4 ++
 .../FrontBundle/Resources/config/services.yml |  4 ++
 .../Resources/config/validation.yml           | 29 +++++++++
 .../Resources/views/Form/user_form.html.twig  | 10 +++
 .../Controller/DefaultController.php          | 37 +++++++++++
 .../Resources/config/routing.yml              | 10 +++
 .../views/Default/registration.html.twig      | 15 +++++
 .../Default/registration_success.html.twig    |  5 ++
 14 files changed, 270 insertions(+), 5 deletions(-)
 create mode 100644 src/KekRozsak/FrontBundle/Form/Extension/HelpMessageTypeExtension.php
 create mode 100644 src/KekRozsak/FrontBundle/Form/Type/UserType.php
 create mode 100644 src/KekRozsak/FrontBundle/Resources/config/validation.yml
 create mode 100644 src/KekRozsak/FrontBundle/Resources/views/Form/user_form.html.twig
 create mode 100644 src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig
 create mode 100644 src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig

diff --git a/app/Resources/views/main_template.html.twig b/app/Resources/views/main_template.html.twig
index 5a6c9cf..e0e4894 100644
--- a/app/Resources/views/main_template.html.twig
+++ b/app/Resources/views/main_template.html.twig
@@ -14,8 +14,11 @@
 					<li><a href="{{ path('KekRozsakFrontBundle_article', { articleSlug: 'a-magiarol-roviden' }) }}">A Mágiáról röviden</a></li>
 					<li><a href="{{ path('KekRozsakFrontBundle_article', { articleSlug: 'rendek' }) }}">Rendek</a></li>
 					<li><a href="{{ path('KekRozsakFrontBundle_article', { articleSlug: 'a-regiek' }) }}">A régiek</a></li>
-					<li><a href="">Archívum</a></li>
-					<li><a href="">Ajánlott oldalak</a></li>
+{% if app.user %}
+					<li><a href="{{ path('KekRozsakSecurityBundle_logout') }}">Kijelentkezés</a></li>
+{% else %}
+					<li><a href="{{ path('KekRozsakSecurityBundle_registration') }}">Jelentkezés</a></li>
+{% endif %}
 				</ul>
 			</div>
 			<div id="header">
diff --git a/app/config/security.yml b/app/config/security.yml
index 86c9e6a..1482b8c 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -41,6 +41,7 @@ security:
         - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/cikk/, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/jelentkezes, 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/FrontBundle/Entity/Role.php b/src/KekRozsak/FrontBundle/Entity/Role.php
index a988273..12e4a47 100644
--- a/src/KekRozsak/FrontBundle/Entity/Role.php
+++ b/src/KekRozsak/FrontBundle/Entity/Role.php
@@ -142,4 +142,4 @@ class Role implements RoleInterface
     {
 	return $this->name;
     }
-}
\ No newline at end of file
+}
diff --git a/src/KekRozsak/FrontBundle/Entity/User.php b/src/KekRozsak/FrontBundle/Entity/User.php
index b79790f..aff4a20 100644
--- a/src/KekRozsak/FrontBundle/Entity/User.php
+++ b/src/KekRozsak/FrontBundle/Entity/User.php
@@ -4,11 +4,12 @@ namespace KekRozsak\FrontBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 
 /**
  * KekRozsak\FrontBundle\Entity\User
  */
-class User implements UserInterface
+class User implements UserInterface, AdvancedUserInterface
 {
     /**
      * @var integer $id
@@ -192,6 +193,11 @@ class User implements UserInterface
         return $this->roles->toArray();
     }
 
+    public function getRolesCollection()
+    {
+	return $this->roles;
+    }
+
     public function eraseCredentials()
     {
     }
@@ -254,4 +260,51 @@ class User implements UserInterface
     {
         return $this->forum_posts;
     }
-}
\ No newline at end of file
+    /**
+     * @var KekRozsak\FrontBundle\Entity\User
+     */
+    private $accepted_by;
+
+
+    /**
+     * Set accepted_by
+     *
+     * @param KekRozsak\FrontBundle\Entity\User $acceptedBy
+     * @return User
+     */
+    public function setAcceptedBy(\KekRozsak\FrontBundle\Entity\User $acceptedBy = null)
+    {
+        $this->accepted_by = $acceptedBy;
+        return $this;
+    }
+
+    /**
+     * Get accepted_by
+     *
+     * @return KekRozsak\FrontBundle\Entity\User 
+     */
+    public function getAcceptedBy()
+    {
+        return $this->accepted_by;
+    }
+
+    public function isAccountNonExpired()
+    {
+	    return true;
+    }
+    
+    public function isAccountNonLocked()
+    {
+	    return true;
+    }
+    
+    public function isCredentialsNonExpired()
+    {
+	return true;
+    }
+    
+    public function isEnabled()
+    {
+	return ($this->accepted_by !== null);
+    }
+}
diff --git a/src/KekRozsak/FrontBundle/Form/Extension/HelpMessageTypeExtension.php b/src/KekRozsak/FrontBundle/Form/Extension/HelpMessageTypeExtension.php
new file mode 100644
index 0000000..c4fb781
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Form/Extension/HelpMessageTypeExtension.php
@@ -0,0 +1,33 @@
+<?php
+namespace KekRozsak\FrontBundle\Form\Extension;
+
+use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormViewInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class HelpMessageTypeExtension extends AbstractTypeExtension
+{
+	public function buildForm(FormBuilderInterface $builder, array $options)
+	{
+		$builder->setAttribute('help', $options['help']);
+	}
+
+	public function buildView(FormViewInterface $view, FormInterface $form, array $options)
+	{
+		$view->setVar('help', $form->getAttribute('help'));
+	}
+
+	public function getDefaultOptions()
+	{
+		return array(
+			'help' => null,
+		);
+	}
+
+	public function getExtendedType()
+	{
+		return 'field';
+	}
+}
+
diff --git a/src/KekRozsak/FrontBundle/Form/Type/UserType.php b/src/KekRozsak/FrontBundle/Form/Type/UserType.php
new file mode 100644
index 0000000..492299e
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Form/Type/UserType.php
@@ -0,0 +1,61 @@
+<?php
+namespace KekRozsak\FrontBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UserType extends AbstractType
+{
+	protected $_registration;
+
+	public function __construct($registration)
+	{
+		$this->_registration = $registration;
+	}
+
+	public function buildForm(FormBuilderInterface $builder, array $options)
+	{
+		$builder->add('username', null, array(
+			'label' => 'Felhasználónév',
+			'help'  => 'Ezt fogod használni az oldalra való bejelentkezéshez. Jelszavadhoz hasonlóan kezeld bizalmasan! Jelentkezés után nem lehet megváltoztatni!',
+		));
+		$builder->add('password', 'repeated', array(
+			'type'            => 'password',
+			'second_name'     => 'confirm',
+			'invalid_message' => 'A két jelszó nem egyezik meg!',
+			'options'         => array(
+						'label' => 'Jelszó',
+						'help'  => 'Ezt fogod használni az oldalra való bejelentkezéshez. Soha ne add meg senkinek!',
+			),
+		));
+		$builder->add('email', null, array(
+			'label' => 'E-mail cím',
+		));
+		$builder->add('displayName', null, array(
+			'label' => 'Név',
+			'help'  => 'Ezen a néven fog szólítani a közösség. Bármikor megváltoztathatod, de az egyértelműség kedvéért ezt mindig jelezd a többiek felé!',
+		));
+		$builder->add('agree', 'checkbox', array(
+			'property_path' => false,
+			'label'         => ' ',
+			'help'          => 'A Jelentkezés gomb megnyomásával kijelentem, hogy a Kék Rózsa okkultista kör Házirendjét elolvastam, és azt felvételem esetén magamra nézve teljes mértékben elfogadom.',
+		));
+	}
+
+	public function getName()
+	{
+		return 'user';
+	}
+
+	public function getDefaultOptions()
+	{
+		$opts = array(
+			'data_class' => 'KekRozsak\FrontBundle\Entity\User',
+		);
+		if ($this->_registration)
+			$opts['validation_groups'] = array('registration');
+
+		return $opts;
+	}
+}
+
diff --git a/src/KekRozsak/FrontBundle/Resources/config/doctrine/User.orm.yml b/src/KekRozsak/FrontBundle/Resources/config/doctrine/User.orm.yml
index 1efe6c2..ee0ed90 100644
--- a/src/KekRozsak/FrontBundle/Resources/config/doctrine/User.orm.yml
+++ b/src/KekRozsak/FrontBundle/Resources/config/doctrine/User.orm.yml
@@ -30,6 +30,10 @@ KekRozsak\FrontBundle\Entity\User:
                         targetEntity: ForumPost
                         mappedBy: created_by
                         fetch: EXTRA_LAZY
+        manyToOne:
+                accepted_by:
+                        targetEntity: User
+                        fetch: EXTRA_LAZY
         manyToMany:
                 roles:
                         targetEntity: Role
diff --git a/src/KekRozsak/FrontBundle/Resources/config/services.yml b/src/KekRozsak/FrontBundle/Resources/config/services.yml
index c8836fb..dda9023 100644
--- a/src/KekRozsak/FrontBundle/Resources/config/services.yml
+++ b/src/KekRozsak/FrontBundle/Resources/config/services.yml
@@ -11,3 +11,7 @@ services:
                         doctrine: @doctrine
                 tags:
                         - { name: twig.extension }
+        form.type_extension.help_message:
+                class: KekRozsak\FrontBundle\Form\Extension\HelpMessageTypeExtension
+                tags:
+                        - { name: "form.type_extension", alias: "field" }
diff --git a/src/KekRozsak/FrontBundle/Resources/config/validation.yml b/src/KekRozsak/FrontBundle/Resources/config/validation.yml
new file mode 100644
index 0000000..796c79e
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Resources/config/validation.yml
@@ -0,0 +1,29 @@
+KekRozsak\FrontBundle\Entity\User:
+        constraints:
+                - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity:
+                        fields: username
+                        message: "Ez a felhasználónév már foglalt. Kérlek, válassz egy másikat!"
+                        groups: [ registration ]
+                - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity:
+                        fields: email
+                        message: "Ez az e-mail cím már foglalt. Kérlek, válassz egy másikat!"
+                        groups: [ registration ]
+                - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity:
+                        fields: display_name
+                        message: "Ez a név már foglalt. Kérlek, válassz egy másikat!"
+                        groups: [ registration ]
+        properties:
+                username:
+                        - NotBlank: { groups: [ registration ] }
+                password:
+                        - NotBlank: { groups: [ registration ] }
+                email:
+                        - NotBlank: { groups: [ registration ] }
+                        - Email:    { groups: [ registration ] }
+                registered_at:
+                        - NotBlank: ~
+                        - Type: \DateTime
+                display_name:
+                        - NotBlank: { groups: [ registration ] }
+KekRozsak\FrontBundle\Form\Type\UserType:
+        
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Form/user_form.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Form/user_form.html.twig
new file mode 100644
index 0000000..65fd507
--- /dev/null
+++ b/src/KekRozsak/FrontBundle/Resources/views/Form/user_form.html.twig
@@ -0,0 +1,10 @@
+{% block field_row %}
+<tr>
+	<td>{{ form_label(form) }}</td>
+	<td>{{ form_widget(form) }}</td>
+	<td>
+		{{ help }}
+	</td>
+	<td>{{ form_errors(form) }}</td>
+</td>
+{% endblock %}
diff --git a/src/KekRozsak/SecurityBundle/Controller/DefaultController.php b/src/KekRozsak/SecurityBundle/Controller/DefaultController.php
index 684c9d4..6127a4b 100644
--- a/src/KekRozsak/SecurityBundle/Controller/DefaultController.php
+++ b/src/KekRozsak/SecurityBundle/Controller/DefaultController.php
@@ -4,6 +4,10 @@ namespace KekRozsak\SecurityBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Security\Core\SecurityContext;
+use Symfony\Component\HttpFoundation\Request;
+
+use KekRozsak\FrontBundle\Entity\User;
+use KekRozsak\FrontBundle\Form\Type\UserType;
 
 class DefaultController extends Controller
 {
@@ -27,4 +31,37 @@ class DefaultController extends Controller
 			'error'         => $error,
 		));
 	}
+
+	public function registrationAction(Request $request)
+	{
+		$user = new User();
+		$form = $this->createForm(new UserType(true), $user);
+
+		if ($request->getMethod() == 'POST')
+		{
+			$form->bindRequest($request);
+			if ($form->isValid(array('registration')))
+			{
+				$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');
+				$user->addRole($regRole);
+				$user->setRegisteredAt(new \DateTime('now'));
+				$em = $this->getDoctrine()->getEntityManager();
+				$em->persist($user);
+				$em->flush();
+
+				return $this->redirect($this->generateUrl('KekRozsakSecurityBundle_reg_success'));
+			}
+		}
+
+		return $this->render('KekRozsakSecurityBundle:Default:registration.html.twig', array(
+			'form' => $form->createView(),
+		));
+	}
+
+	public function registrationSuccessAction()
+	{
+		return $this->render('KekRozsakSecurityBundle:Default:registration_success.html.twig', array());
+	}
 }
diff --git a/src/KekRozsak/SecurityBundle/Resources/config/routing.yml b/src/KekRozsak/SecurityBundle/Resources/config/routing.yml
index ab25035..4aa2771 100644
--- a/src/KekRozsak/SecurityBundle/Resources/config/routing.yml
+++ b/src/KekRozsak/SecurityBundle/Resources/config/routing.yml
@@ -8,3 +8,13 @@ KekRozsakSecurityBundle_login_check:
 
 KekRozsakSecurityBundle_logout:
         pattern:  /logout
+
+KekRozsakSecurityBundle_registration:
+        pattern:  /jelentkezes
+        defaults:
+                _controller: KekRozsakSecurityBundle:Default:registration
+
+KekRozsakSecurityBundle_reg_success:
+        pattern:  /most-varj
+        defaults:
+                _controller: KekRozsakSecurityBundle:Default:registrationSuccess
diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig
new file mode 100644
index 0000000..562f46a
--- /dev/null
+++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration.html.twig
@@ -0,0 +1,15 @@
+{# vim: ft=htmljinja: #}
+{% extends '::main_template.html.twig' %}
+{% form_theme form 'KekRozsakFrontBundle:Form:user_form.html.twig' %}
+{% block title %} - Regisztráció {% endblock %}
+{% block content %}
+<h3>Jelentkezés</h3>
+<p>Az alábbi űrlap kitöltésével jelentkezhetsz a Kék Rózsa okkultista kör tagjai közé. Kérünk, hogy jelentkezés előtt figyelmesen olvasd el a <a href="{{ path('KekRozsakFrontBundle_article', { articleSlug: 'rolunk' }) }}">Rólunk</a> menüpont szövegét, különös tekintettel a Házirendre.</p>
+<p>A jelentkezés NEM jár automatikus tagsággal. A Házirend szerint a Vének jogot formálhatnak arra, hogy a jelentkezésedet elutasítsák, vagy próbáknak vessenek alá, mielőtt a tagok közé fogadnak.</p>
+	<p><strong>FONTOS!</strong> Aki a régi fórumon írt bármilyen bejegyzést, az már regisztrálva van ezen az oldalon is! Ez esetben kérlek lépjetek kapcsolatba velem <a href="http://www.facebook.com/Polesz" target="_blank">Facebookon</a> vagy e-mailben a <a href="jelentkezes@blueroses.hu">jelentkezes@blueroses.hu</a> címen!</p>
+<form method="post" action="{{ path('KekRozsakSecurityBundle_registration') }}">
+	<table>
+{{ form_widget(form) }}
+	</table>
+	<button type="submit">Jelentkezés</button>
+{% endblock content %}
diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig
new file mode 100644
index 0000000..49bb171
--- /dev/null
+++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/registration_success.html.twig
@@ -0,0 +1,5 @@
+{% extends '::main_template.html.twig' %}
+{% block title %} - Sikeres regisztráció{% endblock %}
+{% block content %}
+	A regisztrációd sikeres volt.
+{% endblock %}