Merge pull request #1012 from ArthurHoaro/hotfix/urlencode

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

diff --git a/application/PageBuilder.php b/application/PageBuilder.php
index 1d3ba9e8641b8ae978bef499d68cf2edfb377fa3..468f144b873871136a1aa6c573994d34acf842ef 100644 (file)
--- a/application/PageBuilder.php
+++ b/application/PageBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+use Shaarli\Config\ConfigManager;
+
 /**
  * This class is in charge of building the final page.
  * (This is basically a wrapper around RainTPL which pre-fills some fields.)
@@ -14,13 +16,30 @@ class PageBuilder
      */
     private $tpl;
 
+    /**
+     * @var ConfigManager $conf Configuration Manager instance.
+     */
+    protected $conf;
+
+    /**
+     * @var LinkDB $linkDB instance.
+     */
+    protected $linkDB;
+
     /**
      * PageBuilder constructor.
      * $tpl is initialized at false for lazy loading.
+     *
+     * @param ConfigManager $conf   Configuration Manager instance (reference).
+     * @param LinkDB        $linkDB instance.
+     * @param string        $token  Session token
      */
-    function __construct()
+    public function __construct(&$conf, $linkDB = null, $token = null)
     {
         $this->tpl = false;
+        $this->conf = $conf;
+        $this->linkDB = $linkDB;
+        $this->token = $token;
     }
 
     /**
@@ -29,22 +48,21 @@ class PageBuilder
     private function initialize()
     {
         $this->tpl = new RainTPL();
-        $conf = ConfigManager::getInstance();
 
         try {
             $version = ApplicationUtils::checkUpdate(
-                shaarli_version,
-                $conf->get('config.UPDATECHECK_FILENAME'),
-                $conf->get('config.UPDATECHECK_INTERVAL'),
-                $conf->get('config.ENABLE_UPDATECHECK'),
+                SHAARLI_VERSION,
+                $this->conf->get('resource.update_check'),
+                $this->conf->get('updates.check_updates_interval'),
+                $this->conf->get('updates.check_updates'),
                 isLoggedIn(),
-                $conf->get('config.UPDATECHECK_BRANCH')
+                $this->conf->get('updates.check_updates_branch')
             );
             $this->tpl->assign('newVersion', escape($version));
             $this->tpl->assign('versionError', '');
 
         } catch (Exception $exc) {
-            logm($conf->get('config.LOG_FILE'), $_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()));
         }
@@ -59,27 +77,30 @@ class PageBuilder
         }
         $this->tpl->assign('searchcrits', $searchcrits);
         $this->tpl->assign('source', index_url($_SERVER));
-        $this->tpl->assign('version', shaarli_version);
+        $this->tpl->assign('version', SHAARLI_VERSION);
+        $this->tpl->assign(
+            'version_hash',
+            ApplicationUtils::getVersionHash(SHAARLI_VERSION, $this->conf->get('credentials.salt'))
+        );
         $this->tpl->assign('scripturl', index_url($_SERVER));
-        $this->tpl->assign('pagetitle', 'Shaarli');
         $this->tpl->assign('privateonly', !empty($_SESSION['privateonly'])); // Show only private links?
-        if ($conf->exists('title')) {
-            $this->tpl->assign('pagetitle', $conf->get('title'));
-        }
-        if ($conf->exists('titleLink')) {
-            $this->tpl->assign('titleLink', $conf->get('titleLink'));
+        $this->tpl->assign('untaggedonly', !empty($_SESSION['untaggedonly']));
+        $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 ($conf->exists('pagetitle')) {
-            $this->tpl->assign('pagetitle', $conf->get('pagetitle'));
-        }
-        $this->tpl->assign('shaarlititle', $conf->get('title', 'Shaarli'));
-        $this->tpl->assign('openshaarli', $conf->get('config.OPEN_SHAARLI', false));
-        $this->tpl->assign('showatom', $conf->get('config.SHOW_ATOM', false));
-        $this->tpl->assign('hide_timestamps', $conf->get('config.HIDE_TIMESTAMPS', false));
-        // FIXME! Globals
-        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', true));
+        $this->tpl->assign('feed_type', $this->conf->get('feed.show_atom', true) !== false ? 'atom' : 'rss');
+        $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false));
+        $this->tpl->assign('token', $this->token);
+
+        if ($this->linkDB !== null) {
+            $this->tpl->assign('tags', $this->linkDB->linksCountPerTag());
         }
+        // To be removed with a proper theme configuration.
+        $this->tpl->assign('conf', $this->conf);
     }
 
     /**
@@ -90,7 +111,6 @@ class PageBuilder
      */
     public function assign($placeholder, $value)
     {
-        // Lazy initialization
         if ($this->tpl === false) {
             $this->initialize();
         }
@@ -106,7 +126,6 @@ class PageBuilder
      */
     public function assignAll($data)
     {
-        // Lazy initialization
         if ($this->tpl === false) {
             $this->initialize();
         }
@@ -118,6 +137,7 @@ class PageBuilder
         foreach ($data as $key => $value) {
             $this->assign($key, $value);
         }
+        return true;
     }
 
     /**
@@ -128,10 +148,10 @@ class PageBuilder
      */
     public function renderPage($page)
     {
-        // Lazy initialization
-        if ($this->tpl===false) {
+        if ($this->tpl === false) {
             $this->initialize();
         }
+
         $this->tpl->draw($page);
     }
 
@@ -141,9 +161,12 @@ class PageBuilder
      *
      * @param string $message A messate to display what is not found
      */
-    public function render404($message = 'The page you are trying to reach does not exist or has been deleted.')
+    public function render404($message = '')
     {
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
+        if (empty($message)) {
+            $message = t('The page you are trying to reach does not exist or has been deleted.');
+        }
+        header($_SERVER['SERVER_PROTOCOL'] .' '. t('404 Not Found'));
         $this->tpl->assign('error_message', $message);
         $this->renderPage('404');
     }