Send also info about the workspaces shared with current user.

Fix shares list issue - Ability for admin to list shares of a given user.

Author: cdujeu

core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php

@@ -624,6 +624,20 @@ public function switchAction($action, $httpVars, $fileVars)
                     HTMLWriter::charsetHeader("application/json");
                     $roleData = $role->getDataArray(true);
                     $allReps = ConfService::getRepositoriesList("all", false);
+                    $sharedRepos = array();
+                    if(isSet($userObject)){
+                        // Add User shared Repositories as well
+                        $acls = $userObject->mergedRole->listAcls();
+                        if(count($acls)) {
+                            $sharedRepos = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria(array(
+                                "uuid" => array_keys($acls),
+                                "parent_uuid" => AJXP_FILTER_NOT_EMPTY,
+                                "owner_user_id" => AJXP_FILTER_NOT_EMPTY
+                                ));
+                            $allReps = array_merge($allReps, $sharedRepos);
+                        }
+                    }
+
                     $repos = array();
                     $repoDetailed = array();
                     // USER
@@ -642,7 +656,6 @@ public function switchAction($action, $httpVars, $fileVars)
                             )){
                             continue;
                         }
-                        $repos[$repositoryId] = SystemTextEncoding::toUTF8($repositoryObject->getDisplay());
                         $meta = array();
                         if($repositoryObject->getOption("META_SOURCES") != null){
                             $meta = array_keys($repositoryObject->getOption("META_SOURCES"));
@@ -653,6 +666,28 @@ public function switchAction($action, $httpVars, $fileVars)
                             "scope"  => $repositoryObject->securityScope(),
                             "meta"   => $meta
                         );
+
+                        if(array_key_exists($repositoryId, $sharedRepos)){
+                            $sharedRepos[$repositoryId] = SystemTextEncoding::toUTF8($repositoryObject->getDisplay());
+                            $repoParentLabel = $repoParentId = $repositoryObject->getParentId();
+                            $repoOwnerLabel = $repoOwnerId = $repositoryObject->getOwner();
+                            if(isSet($allReps[$repoParentId])){
+                                $repoParentLabel = SystemTextEncoding::toUTF8($allReps[$repoParentId]->getDisplay());
+                            }
+                            $ownerObject = ConfService::getConfStorageImpl()->createUserObject($repoOwnerId);
+                            if(isSet($ownerObject)){
+                                $repoOwnerLabel = $ownerObject->personalRole->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, $repoOwnerId);
+                            }
+                            $repoDetailed[$repositoryId]["share"] = array(
+                                "parent_user" => $repoOwnerId,
+                                "parent_user_label" => $repoOwnerLabel,
+                                "parent_repository" => $repoParentId,
+                                "parent_repository_label" => $repoParentLabel
+                            );
+                        }else{
+                            $repos[$repositoryId] = SystemTextEncoding::toUTF8($repositoryObject->getDisplay());
+                        }
+
                     }
                     // Make sure it's utf8
                     $data = array(
@@ -663,6 +698,7 @@ public function switchAction($action, $httpVars, $fileVars)
                                 "GLOBAL_PLUGINS" => array("action.avatar", "action.disclaimer", "action.scheduler", "action.skeleton", "action.updater")
                             ),
                             "REPOSITORIES" => $repos,
+                            "SHARED_REPOSITORIES" => $sharedRepos,
                             "REPOSITORIES_DETAILS" => $repoDetailed,
                             "PROFILES" => array("standard|Standard","admin|Administrator","shared|Shared","guest|Guest")
                         )

core/src/plugins/action.share/class.ShareCenter.php

@@ -506,6 +506,8 @@ public function switchAction($action, $httpVars, $fileVars)
                 $currentUser = true;
                 if($userContext == "global" && AuthService::getLoggedUser()->isAdmin()){
                     $currentUser = false;
+                }else if($userContext == "user" && AuthService::getLoggedUser()->isAdmin() && !empty($httpVars["user_id"])){
+                    $currentUser = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
                 }
                 $nodes = $this->listSharesAsNodes("/data/repositories/$parentRepoId/shares", $currentUser, $parentRepoId);
 
@@ -2124,18 +2126,30 @@ public function findSharesForRepo($repositoryId){
         return $this->getShareStore()->findSharesForRepo($repositoryId);
     }
 
+    /**
+     * @param bool|string $currentUser if true, currently logged user. if false all users. If string, user ID.
+     * @param string $parentRepositoryId
+     * @param null $cursor
+     * @return array
+     */
     public function listShares($currentUser = true, $parentRepositoryId="", $cursor = null){
-        if(AuthService::usersEnabled()){
-            $crtUser = ($currentUser?AuthService::getLoggedUser()->getId():'');
+        if($currentUser === false){
+            $crtUser = "";
+        }else if(AuthService::usersEnabled()){
+            if($currentUser === true){
+                $crtUser = AuthService::getLoggedUser()->getId();
+            }else{
+                $crtUser = $currentUser;
+            }
         }else{
-            $crtUser = ($currentUser?'shared':'');
+            $crtUser = "shared";
         }
         return $this->getShareStore()->listShares($crtUser, $parentRepositoryId, $cursor);
     }
 
     /**
      * @param $rootPath
-     * @param bool $currentUser
+     * @param bool|string $currentUser if true, currently logged user. if false all users. If string, user ID.
      * @param string $parentRepositoryId
      * @param null $cursor
      * @param bool $xmlPrint
@@ -2180,11 +2194,16 @@ public function listSharesAsNodes($rootPath, $currentUser = true, $parentReposit
                     $meta["copy_url"]  = $this->buildPublicletLink($hash);
                 }
                 $meta["shared_element_parent_repository"] = $repoObject->getParentId();
-                if(!empty($parent)){
+                if(!empty($parent)) {
                     $parentPath = $parent->getOption("PATH", false, $meta["owner"]);
                     $meta["shared_element_parent_repository_label"] = $parent->getDisplay();
                 }else{
-                    $meta["shared_element_parent_repository_label"] = $repoObject->getParentId();
+                    $crtParent = ConfService::getRepositoryById($repoObject->getParentId());
+                    if(!empty($crtParent)){
+                        $meta["shared_element_parent_repository_label"] = $crtParent->getDisplay();
+                    }else {
+                        $meta["shared_element_parent_repository_label"] = $repoObject->getParentId();
+                    }
                 }
                 if($shareType != "repository"){
                     if($repoObject->hasContentFilter()){
@@ -2200,7 +2219,7 @@ public function listSharesAsNodes($rootPath, $currentUser = true, $parentReposit
                 }else{
                     $meta["original_path"] = $repoObject->getOption("PATH");
                 }
-                if(isSet($parentPath) &&  strpos($meta["original_path"], $parentPath) === 0){
+                if(!empty($parentPath) &&  strpos($meta["original_path"], $parentPath) === 0){
                     $meta["original_path"] = substr($meta["original_path"], strlen($parentPath));
                 }