*/
private $tpl;
+ /**
+ * @var ConfigManager $conf Configuration Manager instance.
+ */
+ protected $conf;
+
/**
* PageBuilder constructor.
* $tpl is initialized at false for lazy loading.
+ *
+ * @param ConfigManager $conf Configuration Manager instance (reference).
*/
- function __construct()
+ function __construct(&$conf)
{
$this->tpl = false;
+ $this->conf = $conf;
}
/**
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'),
+ $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()));
}
$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 ($conf->exists('title')) {
- $this->tpl->assign('pagetitle', $conf->get('title'));
- }
- if ($conf->exists('titleLink')) {
- $this->tpl->assign('titleLink', $conf->get('titleLink'));
- }
- 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('pagetitle', $this->conf->get('general.title', 'Shaarli'));
+ if ($this->conf->exists('general.header_link')) {
+ $this->tpl->assign('titleLink', $this->conf->get('general.header_link'));
}
+ $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);
}
/**
*/
public function assign($placeholder, $value)
{
- // Lazy initialization
if ($this->tpl === false) {
$this->initialize();
}
*/
public function assignAll($data)
{
- // Lazy initialization
if ($this->tpl === false) {
$this->initialize();
}
foreach ($data as $key => $value) {
$this->assign($key, $value);
}
+ return true;
}
/**
*/
public function renderPage($page)
{
- // Lazy initialization
- if ($this->tpl===false) {
+ if ($this->tpl === false) {
$this->initialize();
}
+
$this->tpl->draw($page);
}