Rename configuration keys and fix GLOBALS in templates

1 files changed, 9 insertions, 10 deletions

diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index ed9abc39..37deb4b3 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -144,20 +144,19 @@ class ApplicationUtils
             'application',
             'inc',
             'plugins',
-            $conf->get('config.RAINTPL_TPL'),
+            $conf->get('path.raintpl_tpl'),
         ) as $path) {
             if (! is_readable(realpath($path))) {
                 $errors[] = '"'.$path.'" directory is not readable';
             }
         }
 
-        $datadir = $conf->get('config.DATADIR');
         // Check cache and data directories are readable and writeable
         foreach (array(
-            $conf->get('config.CACHEDIR'),
-            $datadir,
-            $conf->get('config.PAGECACHE'),
-            $conf->get('config.RAINTPL_TMP'),
+            $conf->get('path.thumbnails_cache'),
+            $conf->get('path.data_dir'),
+            $conf->get('path.page_cache'),
+            $conf->get('path.raintpl_tmp'),
         ) as $path) {
             if (! is_readable(realpath($path))) {
                 $errors[] = '"'.$path.'" directory is not readable';
@@ -170,10 +169,10 @@ class ApplicationUtils
         // Check configuration files are readable and writeable
         foreach (array(
             $conf->getConfigFile(),
-            $conf->get('config.DATASTORE'),
-            $conf->get('config.IPBANS_FILENAME'),
-            $conf->get('config.LOG_FILE'),
-            $conf->get('config.UPDATECHECK_FILENAME'),
+            $conf->get('path.datastore'),
+            $conf->get('path.ban_file'),
+            $conf->get('path.log'),
+            $conf->get('path.update_check'),
         ) as $path) {
             if (! is_file(realpath($path))) {
                 # the file may not exist yet