Fix rights management : do not assign minisite-role for remote shares.

pydio · Mar 1, 2016 · 855b780 · 855b780
1 parent dd3c570
commit 855b780
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/plugins/action.share/class.ShareRightsManager.php b/core/src/plugins/action.share/class.ShareRightsManager.php
@@ -114,6 +114,9 @@ public function prepareSharedUserEntry($httpVars, &$shareObject, $update, $guest
             throw new Exception("share_center.58");
         }
         $hiddenUserEntry["DISABLE_DOWNLOAD"] = $shareObject->disableDownload();
+        if($shareObject instanceof \Pydio\OCS\Model\TargettedLink){
+            $hiddenUserEntry["REMOTE"] = true;
+        }
         return $hiddenUserEntry;
     }
 
@@ -194,7 +197,7 @@ public function createUsersFromParameters($httpVars, &$users = array(), &$groups
                         throw new Exception("You are not allowed to create users.");
                     }
                     if(!empty($this->options["SHARED_USERS_TMP_PREFIX"]) && strpos($u, $this->options["SHARED_USERS_TMP_PREFIX"])!==0 ){
-                        $u = $this->tmpUsersPrefix . $u;
+                        $u = $this->options["SHARED_USERS_TMP_PREFIX"] . $u;
                     }
                 }
                 $entry = array("ID" => $u, "TYPE" => "user");
@@ -406,7 +409,7 @@ public function assignSharedRepositoryPermissions($parentRepository, $childRepos
             }
 
             // CREATE A MINISITE-LIKE ROLE FOR THIS REPOSITORY
-            if (isSet($userEntry["HIDDEN"])) {
+            if (isSet($userEntry["HIDDEN"]) && !isSet($userEntry["REMOTE"])) {
                 $minisiteRole = $this->createRoleForMinisite($childRepoId, $userEntry["DISABLE_DOWNLOAD"], $isUpdate);
                 if($minisiteRole != null){
                     $userObject->addRole($minisiteRole);