Minor improvements regarding #705 (coding style, unit tests, etc.)

[github/shaarli/Shaarli.git] / application / PageBuilder.php

diff --git a/application/PageBuilder.php b/application/PageBuilder.php
index 843cc0dc136bccad7758dd5adc7343236e67ff75..32c7f9f18b01ba131be61bb778dc3d7a9239b727 100644 (file)
--- a/application/PageBuilder.php
+++ b/application/PageBuilder.php
@@ -41,17 +41,17 @@ class PageBuilder
         try {
             $version = ApplicationUtils::checkUpdate(
                 shaarli_version,
-                $this->conf->get('path.update_check'),
-                $this->conf->get('general.check_updates_interval'),
-                $this->conf->get('general.check_updates'),
+                $this->conf->get('resource.update_check'),
+                $this->conf->get('updates.check_updates_interval'),
+                $this->conf->get('updates.check_updates'),
                 isLoggedIn(),
-                $this->conf->get('general.check_updates_branch')
+                $this->conf->get('updates.check_updates_branch')
             );
             $this->tpl->assign('newVersion', escape($version));
             $this->tpl->assign('versionError', '');
 
         } catch (Exception $exc) {
-            logm($this->conf->get('path.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage());
+            logm($this->conf->get('resource.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage());
             $this->tpl->assign('newVersion', '');
             $this->tpl->assign('versionError', escape($exc->getMessage()));
         }
@@ -68,24 +68,18 @@ class PageBuilder
         $this->tpl->assign('source', index_url($_SERVER));
         $this->tpl->assign('version', shaarli_version);
         $this->tpl->assign('scripturl', index_url($_SERVER));
-        $this->tpl->assign('pagetitle', 'Shaarli');
         $this->tpl->assign('privateonly', !empty($_SESSION['privateonly'])); // Show only private links?
-        if ($this->conf->exists('general.title')) {
-            $this->tpl->assign('pagetitle', $this->conf->get('general.title'));
-        }
+        $this->tpl->assign('pagetitle', $this->conf->get('general.title', 'Shaarli'));
         if ($this->conf->exists('general.header_link')) {
             $this->tpl->assign('titleLink', $this->conf->get('general.header_link'));
         }
-        if ($this->conf->exists('pagetitle')) {
-            $this->tpl->assign('pagetitle', $this->conf->get('pagetitle'));
-        }
-        $this->tpl->assign('shaarlititle', $this->conf->get('title', 'Shaarli'));
-        $this->tpl->assign('openshaarli', $this->conf->get('extras.open_shaarli', false));
-        $this->tpl->assign('showatom', $this->conf->get('extras.show_atom', false));
-        $this->tpl->assign('hide_timestamps', $this->conf->get('extras.hide_timestamps', false));
-        if (!empty($GLOBALS['plugin_errors'])) {
-            $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']);
-        }
+        $this->tpl->assign('shaarlititle', $this->conf->get('general.title', 'Shaarli'));
+        $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false));
+        $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false));
+        $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false));
+        $this->tpl->assign('token', getToken($this->conf));
+        // To be removed with a proper theme configuration.
+        $this->tpl->assign('conf', $this->conf);
     }
 
     /**