Set mail as last field as it may be empty

[userbundle] / Resources / config / routes / rapsys_user.yaml

diff --git a/Resources/config/routes/rapsys_user.yaml b/Resources/config/routes/rapsys_user.yaml
index 3fbe262df21dd523e73b9f8990db818c9c5408c5..e2af83c8747bf5348300bc0890e62990422296bd 100644 (file)
--- a/Resources/config/routes/rapsys_user.yaml
+++ b/Resources/config/routes/rapsys_user.yaml
@@ -1,5 +1,5 @@
 rapsys_user_confirm:
 rapsys_user_confirm:

-    path: /confirm/{mail}/{hash}
+    path: /confirm/{hash}/{mail}

     controller: Rapsys\UserBundle\Controller\DefaultController::registerMail
     requirements:
         mail: '[a-zA-Z0-9=_-]+'
     controller: Rapsys\UserBundle\Controller\DefaultController::registerMail
     requirements:
         mail: '[a-zA-Z0-9=_-]+'


@@ -7,8 +7,14 @@ rapsys_user_confirm:
     methods: GET|POST
 
 rapsys_user_login:
     methods: GET|POST
 
 rapsys_user_login:

-    path: /login
+    path: /login/{hash}/{mail}

     controller: Rapsys\UserBundle\Controller\DefaultController::login
     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:
     methods: GET|POST
 
 rapsys_user_logout:


@@ -16,7 +22,7 @@ rapsys_user_logout:
     methods: GET
 
 rapsys_user_recover:
     methods: GET
 
 rapsys_user_recover:

-    path: /recover/{mail}/pass/{hash}
+    path: /recover/{hash}/{pass}/{mail}

     controller: Rapsys\UserBundle\Controller\DefaultController::recover
     defaults:
         mail: ~
     controller: Rapsys\UserBundle\Controller\DefaultController::recover
     defaults:
         mail: ~


@@ -29,21 +35,24 @@ rapsys_user_recover:
     methods: GET|POST
 
 rapsys_user_register:
     methods: GET|POST
 
 rapsys_user_register:

-    path: /register/{fields}/{hash}
+    path: /register/{hash}/{field}/{mail}

     controller: Rapsys\UserBundle\Controller\DefaultController::register
     defaults:
     controller: Rapsys\UserBundle\Controller\DefaultController::register
     defaults:

-        fields: ~
+        mail: ~
+        field: ~

         hash: ~
     requirements:
         hash: ~
     requirements:

-        fields: '[a-zA-Z0-9=_-]+'
+        mail: '[a-zA-Z0-9=_-]+'
+        field: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_edit:
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_edit:

-    path: /user/{mail}
+    path: /user/{hash}/{mail}

     controller: Rapsys\UserBundle\Controller\DefaultController::edit
     requirements:
         mail: '[a-zA-Z0-9=_-]+'
     controller: Rapsys\UserBundle\Controller\DefaultController::edit
     requirements:
         mail: '[a-zA-Z0-9=_-]+'

+        hash: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
 rapsys_user_index:
     methods: GET|POST
 
 rapsys_user_index: