X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FPageBuilder.php;h=291860adeb61912af4f8671c8544849224804713;hb=b3e1f92e9cd0cae35bc726ca3a2356b4e631ccfa;hp=8e39455bffe443b975be7d376628e66382e7b8bc;hpb=f9ff7f1b69f19b42569ffa67280807ba56f5d48a;p=github%2Fshaarli%2FShaarli.git diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 8e39455b..291860ad 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -21,16 +21,23 @@ class PageBuilder */ 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 ConfigManager $conf Configuration Manager instance (reference). + * @param LinkDB $linkDB instance. */ - public function __construct(&$conf) + public function __construct(&$conf, $linkDB = null) { $this->tpl = false; $this->conf = $conf; + $this->linkDB = $linkDB; } /** @@ -42,7 +49,7 @@ class PageBuilder try { $version = ApplicationUtils::checkUpdate( - shaarli_version, + SHAARLI_VERSION, $this->conf->get('resource.update_check'), $this->conf->get('updates.check_updates_interval'), $this->conf->get('updates.check_updates'), @@ -68,9 +75,14 @@ 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('privateonly', !empty($_SESSION['privateonly'])); // Show only private links? + $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')); @@ -81,6 +93,10 @@ class PageBuilder $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', getToken($this->conf)); + + 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); }