aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/PageBuilder.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-05-29 16:10:32 +0200
committerArthurHoaro <arthur@hoa.ro>2016-06-11 09:30:56 +0200
commitda10377b3c263d96a46cf9101c202554343d2cd0 (patch)
treed91d1fcdbd79367418007add4d135d3f84e57a04 /application/PageBuilder.php
parenteeea1c3daa87f133c57c96fa17ed26b02c392636 (diff)
downloadShaarli-da10377b3c263d96a46cf9101c202554343d2cd0.tar.gz
Shaarli-da10377b3c263d96a46cf9101c202554343d2cd0.tar.zst
Shaarli-da10377b3c263d96a46cf9101c202554343d2cd0.zip
Rename configuration keys and fix GLOBALS in templates
Diffstat (limited to 'application/PageBuilder.php')
-rw-r--r--application/PageBuilder.php25
1 files changed, 12 insertions, 13 deletions
diff --git a/application/PageBuilder.php b/application/PageBuilder.php
index 1d3ba9e8..04454865 100644
--- a/application/PageBuilder.php
+++ b/application/PageBuilder.php
@@ -34,17 +34,17 @@ class PageBuilder
34 try { 34 try {
35 $version = ApplicationUtils::checkUpdate( 35 $version = ApplicationUtils::checkUpdate(
36 shaarli_version, 36 shaarli_version,
37 $conf->get('config.UPDATECHECK_FILENAME'), 37 $conf->get('path.update_check'),
38 $conf->get('config.UPDATECHECK_INTERVAL'), 38 $conf->get('general.check_updates_interval'),
39 $conf->get('config.ENABLE_UPDATECHECK'), 39 $conf->get('general.check_updates'),
40 isLoggedIn(), 40 isLoggedIn(),
41 $conf->get('config.UPDATECHECK_BRANCH') 41 $conf->get('general.check_updates_branch')
42 ); 42 );
43 $this->tpl->assign('newVersion', escape($version)); 43 $this->tpl->assign('newVersion', escape($version));
44 $this->tpl->assign('versionError', ''); 44 $this->tpl->assign('versionError', '');
45 45
46 } catch (Exception $exc) { 46 } catch (Exception $exc) {
47 logm($conf->get('config.LOG_FILE'), $_SERVER['REMOTE_ADDR'], $exc->getMessage()); 47 logm($conf->get('path.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage());
48 $this->tpl->assign('newVersion', ''); 48 $this->tpl->assign('newVersion', '');
49 $this->tpl->assign('versionError', escape($exc->getMessage())); 49 $this->tpl->assign('versionError', escape($exc->getMessage()));
50 } 50 }
@@ -63,20 +63,19 @@ class PageBuilder
63 $this->tpl->assign('scripturl', index_url($_SERVER)); 63 $this->tpl->assign('scripturl', index_url($_SERVER));
64 $this->tpl->assign('pagetitle', 'Shaarli'); 64 $this->tpl->assign('pagetitle', 'Shaarli');
65 $this->tpl->assign('privateonly', !empty($_SESSION['privateonly'])); // Show only private links? 65 $this->tpl->assign('privateonly', !empty($_SESSION['privateonly'])); // Show only private links?
66 if ($conf->exists('title')) { 66 if ($conf->exists('general.title')) {
67 $this->tpl->assign('pagetitle', $conf->get('title')); 67 $this->tpl->assign('pagetitle', $conf->get('general.title'));
68 } 68 }
69 if ($conf->exists('titleLink')) { 69 if ($conf->exists('general.header_link')) {
70 $this->tpl->assign('titleLink', $conf->get('titleLink')); 70 $this->tpl->assign('titleLink', $conf->get('general.header_link'));
71 } 71 }
72 if ($conf->exists('pagetitle')) { 72 if ($conf->exists('pagetitle')) {
73 $this->tpl->assign('pagetitle', $conf->get('pagetitle')); 73 $this->tpl->assign('pagetitle', $conf->get('pagetitle'));
74 } 74 }
75 $this->tpl->assign('shaarlititle', $conf->get('title', 'Shaarli')); 75 $this->tpl->assign('shaarlititle', $conf->get('title', 'Shaarli'));
76 $this->tpl->assign('openshaarli', $conf->get('config.OPEN_SHAARLI', false)); 76 $this->tpl->assign('openshaarli', $conf->get('extras.open_shaarli', false));
77 $this->tpl->assign('showatom', $conf->get('config.SHOW_ATOM', false)); 77 $this->tpl->assign('showatom', $conf->get('extras.show_atom', false));
78 $this->tpl->assign('hide_timestamps', $conf->get('config.HIDE_TIMESTAMPS', false)); 78 $this->tpl->assign('hide_timestamps', $conf->get('extras.hide_timestamps', false));
79 // FIXME! Globals
80 if (!empty($GLOBALS['plugin_errors'])) { 79 if (!empty($GLOBALS['plugin_errors'])) {
81 $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); 80 $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']);
82 } 81 }