X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fconfig%2FConfigPhp.php;h=cad3459462b2f396039ddd8c085794fe555114be;hb=bcf056c9d92e5240e645c76a4cdc8ae159693f9a;hp=b122f4f1bca0a1a3d726a7481dd375c822504eec;hpb=da10377b3c263d96a46cf9101c202554343d2cd0;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php
index b122f4f1..cad34594 100644
--- a/application/config/ConfigPhp.php
+++ b/application/config/ConfigPhp.php
@@ -1,4 +1,5 @@
 <?php
+namespace Shaarli\Config;
 
 /**
  * Class ConfigPhp (ConfigIO implementation)
@@ -26,7 +27,7 @@ class ConfigPhp implements ConfigIO
     /**
      * Map legacy config keys with the new ones.
      * If ConfigPhp is used, getting <newkey> will actually look for <legacykey>.
-     * The Updater will use this array to transform keys when switching to JSON.
+     * The updater will use this array to transform keys when switching to JSON.
      *
      * @var array current key => legacy key.
      */
@@ -34,44 +35,45 @@ class ConfigPhp implements ConfigIO
         'credentials.login' => 'login',
         'credentials.hash' => 'hash',
         'credentials.salt' => 'salt',
-        'path.data_dir' => 'config.DATADIR',
-        'path.config' => 'config.CONFIG_FILE',
-        'path.datastore' => 'config.DATASTORE',
-        'path.updates' => 'config.UPDATES_FILE',
-        'path.log' => 'config.LOG_FILE',
-        'path.update_check' => 'config.UPDATECHECK_FILENAME',
-        'path.raintpl_tpl' => 'config.RAINTPL_TPL',
-        'path.raintpl_tmp' => 'config.RAINTPL_TMP',
-        'path.thumbnails_cache' => 'config.CACHEDIR',
-        'path.page_cache' => 'config.PAGECACHE',
-        'path.ban_file' => 'config.IPBANS_FILENAME',
+        'resource.data_dir' => 'config.DATADIR',
+        'resource.config' => 'config.CONFIG_FILE',
+        'resource.datastore' => 'config.DATASTORE',
+        'resource.updates' => 'config.UPDATES_FILE',
+        'resource.log' => 'config.LOG_FILE',
+        'resource.update_check' => 'config.UPDATECHECK_FILENAME',
+        'resource.raintpl_tpl' => 'config.RAINTPL_TPL',
+        'resource.theme' => 'config.theme',
+        'resource.raintpl_tmp' => 'config.RAINTPL_TMP',
+        'resource.thumbnails_cache' => 'config.CACHEDIR',
+        'resource.page_cache' => 'config.PAGECACHE',
+        'resource.ban_file' => 'config.IPBANS_FILENAME',
         'security.session_protection_disabled' => 'disablesessionprotection',
         'security.ban_after' => 'config.BAN_AFTER',
         'security.ban_duration' => 'config.BAN_DURATION',
         'general.title' => 'title',
         'general.timezone' => 'timezone',
         'general.header_link' => 'titleLink',
-        'general.check_updates' => 'config.ENABLE_UPDATECHECK',
-        'general.check_updates_branch' => 'config.UPDATECHECK_BRANCH',
-        'general.check_updates_interval' => 'config.UPDATECHECK_INTERVAL',
-        'general.default_private_links' => 'privateLinkByDefault',
-        'general.rss_permalinks' => 'config.ENABLE_RSS_PERMALINKS',
+        'updates.check_updates' => 'config.ENABLE_UPDATECHECK',
+        'updates.check_updates_branch' => 'config.UPDATECHECK_BRANCH',
+        'updates.check_updates_interval' => 'config.UPDATECHECK_INTERVAL',
+        'privacy.default_private_links' => 'privateLinkByDefault',
+        'feed.rss_permalinks' => 'config.ENABLE_RSS_PERMALINKS',
         'general.links_per_page' => 'config.LINKS_PER_PAGE',
-        'general.enable_thumbnails' => 'config.ENABLE_THUMBNAILS',
-        'general.enable_localcache' => 'config.ENABLE_LOCALCACHE',
+        'thumbnail.enable_thumbnails' => 'config.ENABLE_THUMBNAILS',
+        'thumbnail.enable_localcache' => 'config.ENABLE_LOCALCACHE',
         'general.enabled_plugins' => 'config.ENABLED_PLUGINS',
-        'extras.redirector' => 'redirector',
-        'extras.redirector_encode_url' => 'config.REDIRECTOR_URLENCODE',
-        'extras.show_atom' => 'config.SHOW_ATOM',
-        'extras.hide_public_links' => 'config.HIDE_PUBLIC_LINKS',
-        'extras.hide_timestamps' => 'config.HIDE_TIMESTAMPS',
-        'extras.open_shaarli' => 'config.OPEN_SHAARLI',
+        'redirector.url' => 'redirector',
+        'redirector.encode_url' => 'config.REDIRECTOR_URLENCODE',
+        'feed.show_atom' => 'config.SHOW_ATOM',
+        'privacy.hide_public_links' => 'config.HIDE_PUBLIC_LINKS',
+        'privacy.hide_timestamps' => 'config.HIDE_TIMESTAMPS',
+        'security.open_shaarli' => 'config.OPEN_SHAARLI',
     );
 
     /**
      * @inheritdoc
      */
-    function read($filepath)
+    public function read($filepath)
     {
         if (! file_exists($filepath) || ! is_readable($filepath)) {
             return array();
@@ -81,17 +83,17 @@ class ConfigPhp implements ConfigIO
 
         $out = array();
         foreach (self::$ROOT_KEYS as $key) {
-            $out[$key] = $GLOBALS[$key];
+            $out[$key] = isset($GLOBALS[$key]) ? $GLOBALS[$key] : '';
         }
-        $out['config'] = $GLOBALS['config'];
-        $out['plugins'] = !empty($GLOBALS['plugins']) ? $GLOBALS['plugins'] : array();
+        $out['config'] = isset($GLOBALS['config']) ? $GLOBALS['config'] : [];
+        $out['plugins'] = isset($GLOBALS['plugins']) ? $GLOBALS['plugins'] : [];
         return $out;
     }
 
     /**
      * @inheritdoc
      */
-    function write($filepath, $conf)
+    public function write($filepath, $conf)
     {
         $configStr = '<?php '. PHP_EOL;
         foreach (self::$ROOT_KEYS as $key) {
@@ -99,25 +101,33 @@ class ConfigPhp implements ConfigIO
                 $configStr .= '$GLOBALS[\'' . $key . '\'] = ' . var_export($conf[$key], true) . ';' . PHP_EOL;
             }
         }
-        
+
         // Store all $conf['config']
         foreach ($conf['config'] as $key => $value) {
-            $configStr .= '$GLOBALS[\'config\'][\''. $key .'\'] = '.var_export($conf['config'][$key], true).';'. PHP_EOL;
+            $configStr .= '$GLOBALS[\'config\'][\''
+                . $key
+                .'\'] = '
+                .var_export($conf['config'][$key], true).';'
+                . PHP_EOL;
         }
 
         if (isset($conf['plugins'])) {
             foreach ($conf['plugins'] as $key => $value) {
-                $configStr .= '$GLOBALS[\'plugins\'][\''. $key .'\'] = '.var_export($conf['plugins'][$key], true).';'. PHP_EOL;
+                $configStr .= '$GLOBALS[\'plugins\'][\''
+                    . $key
+                    .'\'] = '
+                    .var_export($conf['plugins'][$key], true).';'
+                    . PHP_EOL;
             }
         }
 
         if (!file_put_contents($filepath, $configStr)
             || strcmp(file_get_contents($filepath), $configStr) != 0
         ) {
-            throw new IOException(
+            throw new \Shaarli\Exceptions\IOException(
                 $filepath,
-                'Shaarli could not create the config file.
-                Please make sure Shaarli has the right to write in the folder is it installed in.'
+                t('Shaarli could not create the config file. '.
+                  'Please make sure Shaarli has the right to write in the folder is it installed in.')
             );
         }
     }
@@ -125,7 +135,7 @@ class ConfigPhp implements ConfigIO
     /**
      * @inheritdoc
      */
-    function getExtension()
+    public function getExtension()
     {
         return '.php';
     }