Fix problems with specific values when saving roles parameters.

pydio · Mar 19, 2014 · f7f5126 · f7f5126
1 parent 789e2cf
commit f7f5126
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/src/core/classes/class.AJXP_Role.php b/core/src/core/classes/class.AJXP_Role.php
@@ -181,7 +181,7 @@ public function bunchUpdate($roleData)
     public function setParameterValue($pluginId, $parameterName, $parameterValue, $repositoryId = null)
     {
         if($repositoryId === null) $repositoryId = AJXP_REPO_SCOPE_ALL;
-        if (empty($parameterValue) && $parameterValue !== false) {
+        if (empty($parameterValue) && $parameterValue !== false && $parameterValue !== "0") {
             if (isSet($this->parameters[$repositoryId][$pluginId][$parameterName])) {
                 unset($this->parameters[$repositoryId][$pluginId][$parameterName]);
                 if(!count($this->parameters[$repositoryId][$pluginId])) unset($this->parameters[$repositoryId][$pluginId]);

diff --git a/core/src/core/classes/class.AuthService.php b/core/src/core/classes/class.AuthService.php
@@ -426,7 +426,7 @@ public static function bootSequence(&$START_PARAMETERS)
                     }
                 }
             }
-            if(!empty($dashId)) $rootRole->setParameterValue("core.conf", "DEFAULT_REPOSITORY", $dashId);
+            if(!empty($dashId)) $rootRole->setParameterValue("core.conf", "DEFAULT_START_REPOSITORY", $dashId);
             $paramNodes = AJXP_PluginsService::searchAllManifests("//server_settings/param[@scope]", "node", false, false, true);
             if (is_array($paramNodes) && count($paramNodes)) {
                 foreach ($paramNodes as $xmlNode) {

diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -651,8 +651,8 @@ public function switchAction($action, $httpVars, $fileVars)
                                 $pluginId = $parentNode->nodeName.".".$parentNode->getAttribute("name");
                             }
                             $name = $xmlNode->getAttribute("name");
-                            if (isSet($data[$name]) || $data[$name] == "") {
-                                if ($data[$name] == "" || $userObject->parentRole == null || $userObject->parentRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name]) {
+                            if (isSet($data[$name]) || $data[$name] === "") {
+                                if ($data[$name] === "" || $userObject->parentRole == null || $userObject->parentRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name]) {
                                     $userObject->personalRole->setParameterValue($pluginId, $name, $data[$name]);
                                     $rChanges = true;
                                 }