Fix updateAdminRights

Display a deprecation message on no-db install.
pydio · Nov 27, 2014 · 1ea33ed · 1ea33ed
1 parent 886f361
commit 1ea33ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/src/core/classes/class.AuthService.php b/core/src/core/classes/class.AuthService.php
@@ -597,8 +597,8 @@ public static function getDefaultRootId()
     */
     public static function updateAdminRights($adminUser)
     {
-        if(!ConfService::getCoreConf("SKIP_ADMIN_RIGHTS_ALL_REPOS")){
-            foreach (ConfService::getRepositoriesList() as $repoId => $repoObject) {
+        if(ConfService::getCoreConf("SKIP_ADMIN_RIGHTS_ALL_REPOS") !== true){
+            foreach (ConfService::getRepositoriesList("all") as $repoId => $repoObject) {
                 if(!self::allowedForCurrentGroup($repoObject, $adminUser)) continue;
                 if($repoObject->hasParent() && $repoObject->getParentId() != $adminUser->getId()) continue;
                 $adminUser->personalRole->setAcl($repoId, "rw");

diff --git a/core/src/plugins/boot.conf/i18n/conf/en.php b/core/src/plugins/boot.conf/i18n/conf/en.php
@@ -48,7 +48,7 @@
 "How the application configuration data will be stored (users, plugins, etc. &lt;b&gt;not&lt;/b&gt; how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connection." => "How the application configuration data will be stored (users, plugins, etc. &lt;b&gt;not&lt;/b&gt; how your actual documents are managed). 'No DB' mode can be suited for a quick test of the system, but it's not suited for production and you should always prefer a db-based setup (sqlite does not require any additional service).",
 "Storage Type" => "Storage Type",
 "Select how the configurations will be stored" => "Select how the configurations will be stored",
-"No Database (Quick Start)" => "No DB (Quick Start, not for production)",
+"No Database (Quick Start)" => "No DB (Deprecated, use sqlite instead!)",
 "Database system (production environments, requires a DBMS supported by APPLICATION_TITLE))" => "Database (production environments, requires a DBMS supported by APPLICATION_TITLE)",
 "Enable Notifications" => "Enable Notifications",
 "Log all events and alerts" => "Log all events and alerts",

diff --git a/core/src/plugins/boot.conf/i18n/conf/fr.php b/core/src/plugins/boot.conf/i18n/conf/fr.php
@@ -48,7 +48,7 @@
 "How the application configuration data will be stored (users, plugins, etc. &lt;b&gt;not&lt;/b&gt; how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connection." => "Stockage des configurations de l'application (utilisateurs, plugins, etc. &lt;b&gt;ceci ne définit pas&lt;/b&gt; la manière dont vos documents sont stockés). Le mode 'Pas de base de données' permet un démarrage rapide. Configurez une base de données pour accéder aux fonctionnalités avancées.",
 "Storage Type" => "Type de stockage",
 "Select how the configurations will be stored" => "Choisissez comment les configurations seront stockées",
-"No Database (Quick Start)" => "Pas de base de données (Démarrage rapide, pas pour la production)",
+"No Database (Quick Start)" => "Pas de base de données (Deprecié, utilisez Sqlite à la place!)",
 "Database system (production environments, requires a DBMS supported by APPLICATION_TITLE))" => "Base de données (environnement de production, nécessite un SGBD compatible avec APPLICATION_TITLE)",
 "Enable Notifications" => "Activer les notifications",
 "Log all events and alerts" => "Journaliser tous les événéments et alertes",