Fix repository_last_connected flag

pydio · Mar 10, 2016 · 10adbb8 · 10adbb8
1 parent 3d96335
commit 10adbb8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php
@@ -401,7 +401,6 @@ public static function parseApplicationGetParameters($parameters, &$output, &$se
                     $output["EXT_REP"] = SystemTextEncoding::toUTF8(urldecode($parameters["folder"]));
                     $loggedUser->setArrayPref("history", "last_repository", $parameters["repository_id"]);
                     $loggedUser->setPref("pending_folder", SystemTextEncoding::toUTF8(AJXP_Utils::decodeSecureMagic($parameters["folder"])));
-                    $loggedUser->save("user");
                     AuthService::updateUser($loggedUser);
                 } else {
                     $session["PENDING_REPOSITORY_ID"] = $parameters["repository_id"];

diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -438,7 +438,6 @@ public static function switchUserToActiveRepository($loggedUser, $parameterId =
         if (isSet($_SESSION["PENDING_REPOSITORY_ID"]) && isSet($_SESSION["PENDING_FOLDER"])) {
             $loggedUser->setArrayPref("history", "last_repository", $_SESSION["PENDING_REPOSITORY_ID"]);
             $loggedUser->setPref("pending_folder", $_SESSION["PENDING_FOLDER"]);
-            $loggedUser->save("user");
             AuthService::updateUser($loggedUser);
             unset($_SESSION["PENDING_REPOSITORY_ID"]);
             unset($_SESSION["PENDING_FOLDER"]);
@@ -539,7 +538,6 @@ public function switchRootDirInst($rootDirIndex=-1, $temporary=false)
         if ($rootDirIndex!=-1 && AuthService::usersEnabled() && AuthService::getLoggedUser()!=null) {
             $loggedUser = AuthService::getLoggedUser();
             $loggedUser->setArrayPref("history", "last_repository", $rootDirIndex);
-            $loggedUser->save("user");
         }
 
     }

diff --git a/core/src/plugins/core.conf/class.AbstractAjxpUser.php b/core/src/plugins/core.conf/class.AbstractAjxpUser.php
@@ -363,17 +363,19 @@ public function setPref($prefName, $prefValue)
 
     public function setArrayPref($prefName, $prefPath, $prefValue)
     {
-        if(!isSet($this->prefs[$prefName])) $this->prefs[$prefName] = array();
-        $this->prefs[$prefName][$prefPath] = $prefValue;
-        if($prefName == "history" && $prefPath == "last_repository"){
-            $this->setArrayPref("repository_last_connected", $prefValue, time());
+        $data = $this->getPref($prefName);
+        if(!is_array($data)){
+            $data = array();
         }
+        $data[$prefPath] = $prefValue;
+        $this->setPref($prefName, $data);
     }
 
     public function getArrayPref($prefName, $prefPath)
     {
-        if(!isSet($this->prefs[$prefName]) || !isSet($this->prefs[$prefName][$prefPath])) return "";
-        return $this->prefs[$prefName][$prefPath];
+        $prefArray = $this->getPref($prefName);
+        if(empty($prefArray) || !is_array($prefArray) || !isSet($prefArray[$prefPath])) return "";
+        return $prefArray[$prefPath];
     }
 
     public function addBookmark($path, $title="", $repId = -1)

diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -597,6 +597,7 @@ public function switchAction($action, $httpVars, $fileVars)
                     $user = AuthService::getLoggedUser();
                     $activeRepId = ConfService::getCurrentRepositoryId();
                     $user->setArrayPref("history", "last_repository", $activeRepId);
+                    $user->setArrayPref("repository_last_connected", $activeRepId, time());
                     $user->save("user");
                 }
                 //$logMessage = "Successfully Switched!";

diff --git a/core/src/plugins/core.ocs/src/Model/RemoteShare.php b/core/src/plugins/core.ocs/src/Model/RemoteShare.php
@@ -135,6 +135,7 @@ public function buildVirtualRepository(){
         );
         $repo = \ConfService::createRepositoryFromArray($repositoryId, $data);
         $repo->setRepositoryType("remote");
+        $repo->setAccessStatus($this->getStatus() == OCS_INVITATION_STATUS_ACCEPTED ? "accepted":"");
         $repo->setWriteable(false);
         $repo->setOwnerData(null, $this->getSender()." [remote]");
         if($this->isDocumentIsLeaf()){