Error in slug generation, make sure to look at the reserved slugs whe…

…n building new ones
pydio · Feb 18, 2015 · e861e31 · e861e31
1 parent d30ce58
commit e861e31
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -766,6 +766,23 @@ public static function findRepositoryByIdOrAlias($idOrAlias)
         return null;
     }
 
+    /**
+     * Get the reserved slugs used for config defined repositories
+     * @return array
+     */
+    public static function reservedSlugsFromConfig(){
+        $inst = self::getInstance();
+        $slugs = array();
+        if(isSet($inst->configs["DEFAULT_REPOSITORIES"])){
+            foreach($inst->configs["DEFAULT_REPOSITORIES"] as $repo){
+                if(isSet($repo["AJXP_SLUG"])){
+                    $slugs[] = $repo["AJXP_SLUG"];
+                }
+            }
+        }
+        return $slugs;
+    }
+
     /**
      * Retrieve a repository object
      *

diff --git a/core/src/plugins/conf.sql/class.sqlConfDriver.php b/core/src/plugins/conf.sql/class.sqlConfDriver.php
@@ -367,6 +367,10 @@ protected function uniquifySlug($slug, $repositoryId = null){
             $res = dibi::query("SELECT [slug],[uuid] FROM [ajxp_repo] WHERE [slug] LIKE '".$slug."%'");
         }
         $existingSlugs = $res->fetchPairs();
+        $configSlugs = ConfService::reservedSlugsFromConfig();
+        if(in_array($slug, $configSlugs)){
+            $existingSlugs[$slug] = $slug;
+        }
         if(!count($existingSlugs)) return $slug;
         $index = 1;
         $base = $slug;