X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FApplicationUtils.php;h=e67b29021504ccada967da6dea47d191aa5f6b67;hb=ceeb8fbeb89f69e41791ae192d073d6afea00f4b;hp=37deb4b3fd50540fe4d62a519cf83242c5262aad;hpb=da10377b3c263d96a46cf9101c202554343d2cd0;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index 37deb4b3..e67b2902 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -132,19 +132,20 @@ class ApplicationUtils
     /**
      * Checks Shaarli has the proper access permissions to its resources
      *
+     * @param ConfigManager $conf Configuration Manager instance.
+     *
      * @return array A list of the detected configuration issues
      */
-    public static function checkResourcePermissions()
+    public static function checkResourcePermissions($conf)
     {
         $errors = array();
-        $conf = ConfigManager::getInstance();
 
         // Check script and template directories are readable
         foreach (array(
             'application',
             'inc',
             'plugins',
-            $conf->get('path.raintpl_tpl'),
+            $conf->get('resource.raintpl_tpl'),
         ) as $path) {
             if (! is_readable(realpath($path))) {
                 $errors[] = '"'.$path.'" directory is not readable';
@@ -153,10 +154,10 @@ class ApplicationUtils
 
         // Check cache and data directories are readable and writeable
         foreach (array(
-            $conf->get('path.thumbnails_cache'),
-            $conf->get('path.data_dir'),
-            $conf->get('path.page_cache'),
-            $conf->get('path.raintpl_tmp'),
+            $conf->get('resource.thumbnails_cache'),
+            $conf->get('resource.data_dir'),
+            $conf->get('resource.page_cache'),
+            $conf->get('resource.raintpl_tmp'),
         ) as $path) {
             if (! is_readable(realpath($path))) {
                 $errors[] = '"'.$path.'" directory is not readable';
@@ -168,11 +169,11 @@ class ApplicationUtils
 
         // Check configuration files are readable and writeable
         foreach (array(
-            $conf->getConfigFile(),
-            $conf->get('path.datastore'),
-            $conf->get('path.ban_file'),
-            $conf->get('path.log'),
-            $conf->get('path.update_check'),
+            $conf->getConfigFileExt(),
+            $conf->get('resource.datastore'),
+            $conf->get('resource.ban_file'),
+            $conf->get('resource.log'),
+            $conf->get('resource.update_check'),
         ) as $path) {
             if (! is_file(realpath($path))) {
                 # the file may not exist yet