writeRepositoriesData: remove unnecessary code

Definitely skip the admin rights check, just give the access to ajxp_conf

Author: cdujeu

core/src/core/classes/class.AJXP_XMLWriter.php

@@ -629,11 +629,6 @@ public static function writeRepositoriesData($loggedUser)
 
         $accessible = ConfService::getAccessibleRepositories($loggedUser, false, false);
         foreach ($accessible as $repoId => $repoObject) {
-            $toLast = false;
-            if ($repoObject->getAccessType()=="ajxp_conf") {
-                if(AuthService::usersEnabled() && !$loggedUser->isAdmin())continue;
-                $toLast = true;
-            }
             $rightString = "";
             $streamString = "";
             if (in_array($repoObject->accessType, $streams)) {
@@ -648,13 +643,11 @@ public static function writeRepositoriesData($loggedUser)
                 $slugString = "repositorySlug=\"$slug\"";
             }
             $isSharedString = "";
-            $ownerLabel = null;
             if ($repoObject->hasOwner()) {
                 $uId = $repoObject->getOwner();
                 $uObject = ConfService::getConfStorageImpl()->createUserObject($uId);
                 $label = $uObject->personalRole->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, $uId);
                 if(empty($label)) $label = $uId;
-                $ownerLabel = $label;
                 $isSharedString =  'owner="'.AJXP_Utils::xmlEntities($label).'"';
             }
             $descTag = "";
@@ -686,17 +679,9 @@ public static function writeRepositoriesData($loggedUser)
                 }
                 $roleString.='acl="'.$merged->getAcl($repoId).'"';
             }
-            $xmlString = "<repo access_type=\"".$repoObject->accessType."\" id=\"".$repoId."\"$rightString $streamString $slugString $isSharedString $roleString><label>".SystemTextEncoding::toUTF8(AJXP_Utils::xmlEntities($repoObject->getDisplay()))."</label>".$descTag.$repoObject->getClientSettings()."</repo>";
-            if ($toLast) {
-                $lastString = $xmlString;
-            } else {
-                $st .= $xmlString;
-            }
+            $st .= "<repo access_type=\"".$repoObject->accessType."\" id=\"".$repoId."\"$rightString $streamString $slugString $isSharedString $roleString><label>".SystemTextEncoding::toUTF8(AJXP_Utils::xmlEntities($repoObject->getDisplay()))."</label>".$descTag.$repoObject->getClientSettings()."</repo>";
         }
 
-        if (isSet($lastString)) {
-            $st.= $lastString;
-        }
         $st .= "</repositories>";
         return $st;
     }

core/src/core/classes/class.AuthService.php

@@ -592,23 +592,6 @@ public static function getDefaultRootId()
             if (!empty($right) && ConfService::getRepositoryById($key) != null) return $key;
         }
         return 0;
-        /*
-        $repoList = ConfService::getRepositoriesList();
-        foreach ($repoList as $rootDirIndex => $rootDirObject) {
-            if ($loggedUser->canRead($rootDirIndex."") || $loggedUser->canWrite($rootDirIndex."")) {
-                // Warning : do not grant access to admin repository to a non admin, or there will be
-                // an "Empty Repository Object" error.
-                if ($rootDirObject->getAccessType()=="ajxp_conf" && self::usersEnabled() && !$loggedUser->isAdmin()) {
-                    continue;
-                }
-                if ($rootDirObject->getAccessType() == "ajxp_shared" && count($repoList) > 1) {
-                    continue;
-                }
-                return $rootDirIndex;
-            }
-        }
-        return 0;
-        */
     }
 
     /**
@@ -618,16 +601,7 @@ public static function getDefaultRootId()
     */
     public static function updateAdminRights($adminUser)
     {
-        if(ConfService::getCoreConf("SKIP_ADMIN_RIGHTS_ALL_REPOS") !== true){
-            $allRepoList = ConfService::getRepositoriesList("all", false);
-            foreach ($allRepoList as $repoId => $repoObject) {
-                if(!self::allowedForCurrentGroup($repoObject, $adminUser)) continue;
-                if($repoObject->hasOwner() && $repoObject->getOwner() != $adminUser->getId()) continue;
-                $adminUser->personalRole->setAcl($repoId, "rw");
-            }
-            $adminUser->recomputeMergedRole();
-            $adminUser->save("superuser");
-        }else if($adminUser->personalRole->getAcl('ajxp_conf') != "rw"){
+        if($adminUser->personalRole->getAcl('ajxp_conf') != "rw"){
             $adminUser->personalRole->setAcl('ajxp_conf', 'rw');
             $adminUser->recomputeMergedRole();
             $adminUser->save("superuser");

core/src/core/classes/class.ConfService.php

@@ -603,7 +603,7 @@ public static function repositoryIsAccessible($repositoryId, $repositoryObject,
         if ($repositoryObject->isTemplate) {
             return false;
         }
-        if ($repositoryObject->getAccessType()=="ajxp_conf" && $userObject != null) {
+        if (($repositoryObject->getAccessType()=="ajxp_conf" || $repositoryObject->getAccessType()=="ajxp_admin") && $userObject != null) {
             if (AuthService::usersEnabled() && !$userObject->isAdmin()) {
                 return false;
             }
@@ -1612,7 +1612,7 @@ private function loadRepositoryDriverInst(&$repository = null)
     }
 
     /**
-     * Search the manifests declaring ajxpdriver as their root node. Remove ajxp_conf & ajxp_shared
+     * Search the manifests declaring ajxpdriver as their root node. Remove ajxp_* drivers
      * @static
      * @param string $filterByTagName
      * @param string $filterByDriverName
@@ -1626,7 +1626,7 @@ public static function availableDriversToXML($filterByTagName = "", $filterByDri
         foreach ($nodeList as $node) {
             $dName = $node->getAttribute("name");
             if($filterByDriverName != "" && $dName != $filterByDriverName) continue;
-            if($dName == "ajxp_conf" || $dName == "ajxp_shared") continue;
+            if(strpos($dName, "ajxp_") === 0) continue;
             if ($filterByTagName == "") {
                 $xmlBuffer .= $node->ownerDocument->saveXML($node);
                 continue;

core/src/core/classes/class.Repository.php

@@ -640,7 +640,7 @@ public function securityScope()
             if(strpos($path, "AJXP_GROUP_PATH_FLAT") !== false) return "GROUP";
         }
         $path = $this->getOption("PATH", true);
-        if($this->accessType == "ajxp_conf") return "USER";
+        if($this->accessType == "ajxp_conf" || $this->accessType == "ajxp_admin") return "USER";
         if(empty($path)) return false;
         if(strpos($path, "AJXP_USER") !== false) return "USER";
         if(strpos($path, "AJXP_GROUP_PATH") !== false) return "GROUP";