Set mail as last field as it may be empty

Set hash as first field as it should never be empty

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

-    path: /confirm/{mail}/{extra}/{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=_-]+'

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

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

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

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


@@ -23,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: ~


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

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

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

+        mail: ~

         field: ~
         hash: ~
     requirements:
         field: ~
         hash: ~
     requirements:

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

         field: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
 rapsys_user_edit:
         field: '[a-zA-Z0-9=_-]+'
         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: