Fix #268, there was a double "basegroup filtering".

pydio · Aug 20, 2013 · 8bef2fd · 8bef2fd
1 parent 4d12eb1
commit 8bef2fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php b/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
@@ -413,13 +413,14 @@ function switchAction($action, $httpVars, $fileVars){
 				$roleId = SystemTextEncoding::magicDequote($httpVars["role_id"]);
                 $roleGroup = false;
                 if(strpos($roleId, "AJXP_GRP_") === 0){
-                    $groupPath = AuthService::filterBaseGroup(substr($roleId, strlen("AJXP_GRP_/")));
+                    $groupPath = substr($roleId, strlen("AJXP_GRP_"));
+                    $filteredGroupPath = AuthService::filterBaseGroup($groupPath);
                     $groups = AuthService::listChildrenGroups(AJXP_Utils::forwardSlashDirname($groupPath));
                     $key = "/".basename($groupPath);
                     if(!array_key_exists($key, $groups)){
                         throw new Exception("Cannot find group with this id!");
                     }
-                    $roleId = "AJXP_GRP_".$groupPath;
+                    $roleId = "AJXP_GRP_".$filteredGroupPath;
                     $groupLabel = $groups[$key];
                     $roleGroup = true;
                 }
@@ -483,8 +484,9 @@ function switchAction($action, $httpVars, $fileVars){
                 $roleId = SystemTextEncoding::magicDequote($httpVars["role_id"]);
                 $roleGroup = false;
                 if(strpos($roleId, "AJXP_GRP_") === 0){
-                    $groupPath = AuthService::filterBaseGroup(substr($roleId, strlen("AJXP_GRP_")));
-                    $roleId = "AJXP_GRP_".$groupPath;
+                    $groupPath = substr($roleId, strlen("AJXP_GRP_"));
+                    $filteredGroupPath = AuthService::filterBaseGroup($groupPath);
+                    $roleId = "AJXP_GRP_".$filteredGroupPath;
                     $groups = AuthService::listChildrenGroups(AJXP_Utils::forwardSlashDirname($groupPath));
                     $key = "/".basename($groupPath);
                     if(!array_key_exists($key, $groups)){
@@ -531,7 +533,7 @@ function switchAction($action, $httpVars, $fileVars){
                     $userObject->setProfile($data["USER"]["PROFILE"]);
                 }
                 if(isSet($data["GROUP_LABEL"]) && isSet($groupLabel) && $groupLabel != $data["GROUP_LABEL"]){
-                    ConfService::getConfStorageImpl()->relabelGroup($groupPath, $data["GROUP_LABEL"]);
+                    ConfService::getConfStorageImpl()->relabelGroup($filteredGroupPath, $data["GROUP_LABEL"]);
                 }
 
                 $output = array();

diff --git a/core/src/plugins/editor.ajxp_role/class.RoleEditor.js b/core/src/plugins/editor.ajxp_role/class.RoleEditor.js
@@ -406,6 +406,8 @@ Class.create("RoleEditor", AbstractEditor, {
             ];
             defs = $A(defs);
             f.createParametersInputs(this.element.down("#pane-infos").down("#account_infos"), defs, true, false, false, true);
+            // UPDATE MAIN HEADER
+            this.element.down("span.header_label").update(this.roleData.GROUP.LABEL);
 
             // REMOVE BUTTONS
             this.element.down("#pane-infos").down("#account_actions").remove();