X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/ee1a19b1912be975baa2725728256afd3426ff7e..8a277662d5755d3f28a53a77f82d4376bdcbccba:/Resources/config/routes/rapsys_air.yaml?ds=sidebyside

diff --git a/Resources/config/routes/rapsys_air.yaml b/Resources/config/routes/rapsys_air.yaml
index 675376e..3fd3afe 100644
--- a/Resources/config/routes/rapsys_air.yaml
+++ b/Resources/config/routes/rapsys_air.yaml
@@ -94,7 +94,7 @@ rapsys_air_application_add:
         en_gb: '/en/application'
         fr_fr: '/reservation'
     controller: Rapsys\AirBundle\Controller\ApplicationController::add
-    methods: POST
+    methods: GET|POST
 
 rapsys_air_session:
     path:
@@ -125,6 +125,13 @@ rapsys_air_session_view:
     controller: Rapsys\AirBundle\Controller\SessionController::view
     methods: GET
 
+rapsys_air_session_view2:
+    path:
+        en_gb: '/en/session2/{id<\d+>}'
+        fr_fr: '/seance2/{id<\d+>}'
+    controller: Rapsys\AirBundle\Controller\SessionController::view2
+    methods: GET
+
 rapsys_air_snippet_add:
     path:
         en_gb: '/en/snippet'
@@ -143,41 +150,47 @@ rapsys_air_user:
     path:
         en_gb: '/en/user'
         fr_fr: '/utilisateur'
-    controller: Rapsys\AirBundle\Controller\UserController::index
+    controller: Rapsys\AirBundle\Controller\DefaultController::userIndex
     methods: GET
 
 rapsys_air_user_view:
     path:
         en_gb: '/en/user/{id<\d+>}'
         fr_fr: '/utilisateur/{id<\d+>}'
-    controller: Rapsys\AirBundle\Controller\UserController::view
+    controller: Rapsys\AirBundle\Controller\DefaultController::userView
     methods: GET|POST
 
 rapsys_user_confirm:
     path:
-        en_gb: '/en/confirm/{mail}/{extra}/{hash}'
-        fr_fr: '/confirmer/{mail}/{extra}/{hash}'
+        en_gb: '/en/confirm/{hash}/{mail}'
+        fr_fr: '/confirmer/{hash}/{mail}'
     controller: Rapsys\UserBundle\Controller\DefaultController::confirm
     requirements:
         mail: '[a-zA-Z0-9=_-]+'
-        extra: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_edit:
     path:
-        en_gb: '/en/user/{mail}'
-        fr_fr: '/utilisateur/{mail}'
-    controller: Rapsys\UserBundle\Controller\DefaultController::edit
+        en_gb: '/en/user/{hash}/{mail}'
+        fr_fr: '/utilisateur/{hash}/{mail}'
+    controller: Rapsys\AirBundle\Controller\UserController::edit
     requirements:
         mail: '[a-zA-Z0-9=_-]+'
+        hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_login:
     path:
-        en_gb: '/en/login'
-        fr_fr: '/connecter'
+        en_gb: '/en/login/{hash}/{mail}'
+        fr_fr: '/connecter/{hash}/{mail}'
     controller: Rapsys\UserBundle\Controller\DefaultController::login
+    defaults:
+        mail: ~
+        hash: ~
+    requirements:
+        mail: '[a-zA-Z0-9=_-]+'
+        hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_logout:
@@ -188,8 +201,8 @@ rapsys_user_logout:
 
 rapsys_user_recover:
     path:
-        en_gb: '/en/recover/{mail}/{pass}/{hash}'
-        fr_fr: '/recuperer/{mail}/{pass}/{hash}'
+        en_gb: '/en/recover/{hash}/{pass}/{mail}'
+        fr_fr: '/recuperer/{hash}/{pass}/{mail}'
     controller: Rapsys\UserBundle\Controller\DefaultController::recover
     defaults:
         mail: ~
@@ -203,13 +216,15 @@ rapsys_user_recover:
 
 rapsys_user_register:
     path:
-        en_gb: '/en/register/{field}/{hash}'
-        fr_fr: '/enregistrer/{field}/{hash}'
+        en_gb: '/en/register/{hash}/{field}/{mail}'
+        fr_fr: '/enregistrer/{hash}/{field}/{mail}'
     controller: Rapsys\UserBundle\Controller\DefaultController::register
     defaults:
+        mail: ~
         field: ~
         hash: ~
     requirements:
+        mail: '[a-zA-Z0-9=_-]+'
         field: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST