Fix #958 - Reset Password is broken due to URL rewriting when guest user is enabled.

Author: cdujeu

core/src/plugins/gui.user/class.UserGuiController.php

@@ -69,11 +69,13 @@ public function processUserAccessPoint($action, $httpVars, $fileVars)
                 $uri = trim(str_replace(rtrim($realUri, "/")."/user", "", $requestURI), "/");
                 $uriParts = explode("/", $uri);
                 $action = array_shift($uriParts);
+                $key = ($action == "reset-password" && count($uriParts)) ? array_shift($uriParts) : "";
                 try{
                     $this->processSubAction($action, $uriParts);
                     $_SESSION['OVERRIDE_GUI_START_PARAMETERS'] = array(
                         "REBASE"=>"../../",
-                        "USER_GUI_ACTION" => $action
+                        "USER_GUI_ACTION" => $action,
+                        "USER_ACTION_KEY" => $key
                     );
                 }catch(Exception $e){
                     $_SESSION['OVERRIDE_GUI_START_PARAMETERS'] = array(

core/src/plugins/gui.user/manifest.xml

@@ -100,7 +100,7 @@
 							conn.addParameter("get_action", "reset-password");
 							conn.addParameter("new_pass", userPass);
 							conn.addParameter("user_id", oForm.down('#user_id').getValue());
-							conn.addParameter("key", $A(document.location.pathname.trim('/').split('/')).last());
+							conn.addParameter("key", pydioBootstrap.parameters.get('USER_ACTION_KEY'));
 							conn.onComplete = onComplete;
 							conn.sendAsync();
 						}