From 89ccc83ba497fa91eaaf2a2a52d8549aea5e2aee Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Wed, 18 Apr 2018 23:45:05 +0200 Subject: [PATCH] Login: update PageBuilder and default/vintage templates Signed-off-by: VirtualTam --- application/PageBuilder.php | 9 +++++++-- index.php | 15 +++++++++------ tpl/default/linklist.html | 8 ++++---- tpl/default/linklist.paging.html | 4 ++-- tpl/default/page.footer.html | 2 +- tpl/default/page.header.html | 10 +++++----- tpl/default/tag.list.html | 6 +++--- tpl/vintage/daily.html | 2 +- tpl/vintage/linklist.html | 4 ++-- tpl/vintage/linklist.paging.html | 2 +- tpl/vintage/page.footer.html | 2 +- tpl/vintage/page.header.html | 4 ++-- 12 files changed, 38 insertions(+), 30 deletions(-) diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 3233d6b6..a4483870 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -25,6 +25,9 @@ class PageBuilder * @var LinkDB $linkDB instance. */ protected $linkDB; + + /** @var bool $isLoggedIn Whether the user is logged in **/ + protected $isLoggedIn = false; /** * PageBuilder constructor. @@ -34,12 +37,13 @@ class PageBuilder * @param LinkDB $linkDB instance. * @param string $token Session token */ - public function __construct(&$conf, $linkDB = null, $token = null) + public function __construct(&$conf, $linkDB = null, $token = null, $isLoggedIn = false) { $this->tpl = false; $this->conf = $conf; $this->linkDB = $linkDB; $this->token = $token; + $this->isLoggedIn = $isLoggedIn; } /** @@ -55,7 +59,7 @@ class PageBuilder $this->conf->get('resource.update_check'), $this->conf->get('updates.check_updates_interval'), $this->conf->get('updates.check_updates'), - isLoggedIn(), + $this->isLoggedIn, $this->conf->get('updates.check_updates_branch') ); $this->tpl->assign('newVersion', escape($version)); @@ -67,6 +71,7 @@ class PageBuilder $this->tpl->assign('versionError', escape($exc->getMessage())); } + $this->tpl->assign('is_logged_in', $this->isLoggedIn); $this->tpl->assign('feedurl', escape(index_url($_SERVER))); $searchcrits = ''; // Search criteria if (!empty($_GET['searchtags'])) { diff --git a/index.php b/index.php index 04b0e4ba..c87ebf65 100644 --- a/index.php +++ b/index.php @@ -182,9 +182,11 @@ define('STAY_SIGNED_IN_TOKEN', sha1($conf->get('credentials.hash') . $_SERVER['R $loginManager->checkLoginState($_SESSION, $_COOKIE, WEB_PATH, $clientIpId, STAY_SIGNED_IN_TOKEN); /** - * Adapter function for PageBuilder + * Adapter function to ensure compatibility with third-party templates * - * TODO: update PageBuilder and tests + * @see https://github.com/shaarli/Shaarli/pull/1086 + * + * @return bool true when the user is logged in, false otherwise */ function isLoggedIn() { @@ -383,9 +385,10 @@ function showDailyRSS($conf, $loginManager) { * @param PageBuilder $pageBuilder Template engine wrapper. * @param LinkDB $LINKSDB LinkDB instance. * @param ConfigManager $conf Configuration Manager instance. - * @param PluginManager $pluginManager Plugin Manager instane. + * @param PluginManager $pluginManager Plugin Manager instance. + * @param LoginManager $loginManager Login Manager instance */ -function showDaily($pageBuilder, $LINKSDB, $conf, $pluginManager) +function showDaily($pageBuilder, $LINKSDB, $conf, $pluginManager, $loginManager) { $day = date('Ymd', strtotime('-1 day')); // Yesterday, in format YYYYMMDD. if (isset($_GET['day'])) { @@ -523,7 +526,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager, die($e->getMessage()); } - $PAGE = new PageBuilder($conf, $LINKSDB, $sessionManager->generateToken()); + $PAGE = new PageBuilder($conf, $LINKSDB, $sessionManager->generateToken(), $loginManager->isLoggedIn()); $PAGE->assign('linkcount', count($LINKSDB)); $PAGE->assign('privateLinkcount', count_private($LINKSDB)); $PAGE->assign('plugin_errors', $pluginManager->getErrors()); @@ -708,7 +711,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager, // Daily page. if ($targetPage == Router::$PAGE_DAILY) { - showDaily($PAGE, $LINKSDB, $conf, $pluginManager); + showDaily($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager); } // ATOM and RSS feed. diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index d546be0a..322cddd5 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -136,7 +136,7 @@
{$thumb}
{/if} - {if="isLoggedIn()"} + {if="$is_logged_in"}
{if="$value.private"} {$strPrivate} @@ -179,7 +179,7 @@
- {if="isLoggedIn()"} + {if="$is_logged_in"}
@@ -196,7 +196,7 @@
{/if} - {if="!$hide_timestamps || isLoggedIn()"} + {if="!$hide_timestamps || $is_logged_in"} {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink} @@ -236,7 +236,7 @@ {if="$link_plugin_counter - 1 != $counter"}·{/if} {/loop} {/if} - {if="isLoggedIn()"} + {if="$is_logged_in"} · diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 72bdd931..5309e348 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -1,11 +1,11 @@
- {if="isLoggedIn() or !empty($action_plugin)"} + {if="$is_logged_in or !empty($action_plugin)"} {'Filters'|t} - {if="isLoggedIn()"} + {if="$is_logged_in"} diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index 34193743..5af39be7 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html @@ -4,7 +4,7 @@
- {if="!isLoggedIn()"} + {if="!$is_logged_in"}
{/if} -{if="!empty($plugin_errors) && isLoggedIn()"} +{if="!empty($plugin_errors) && $is_logged_in"}
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index 772d6ad3..bcddcd56 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html @@ -49,7 +49,7 @@ {loop="tags"}
- {if="isLoggedIn()===true"} + {if="$is_logged_in===true"}    @@ -63,7 +63,7 @@ {$value} {/loop}
- {if="isLoggedIn()===true"} + {if="$is_logged_in===true"}
@@ -81,7 +81,7 @@
-{if="isLoggedIn()===true"} +{if="$is_logged_in===true"}
- {if="!$hide_timestamps || isLoggedIn()"} + {if="!$hide_timestamps || $is_logged_in"}
{function="strftime('%c', $link.timestamp)"}
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index e7137246..1ca51be3 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html @@ -82,7 +82,7 @@
{$value.url|thumbnail}
- {if="isLoggedIn()"} + {if="$is_logged_in"}
@@ -102,7 +102,7 @@
{if="$value.description"}
{$value.description}
{/if} - {if="!$hide_timestamps || isLoggedIn()"} + {if="!$hide_timestamps || $is_logged_in"} {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'} diff --git a/tpl/vintage/linklist.paging.html b/tpl/vintage/linklist.paging.html index e3b88ee6..35149a6b 100644 --- a/tpl/vintage/linklist.paging.html +++ b/tpl/vintage/linklist.paging.html @@ -1,5 +1,5 @@
-{if="isLoggedIn()"} +{if="$is_logged_in"}
{if="$visibility=='private'"} diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html index 1485e1ce..f409721e 100644 --- a/tpl/vintage/page.footer.html +++ b/tpl/vintage/page.footer.html @@ -25,7 +25,7 @@ -{if="isLoggedIn()"} +{if="$is_logged_in"} {/if} diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html index 8a58844e..40c53e5b 100644 --- a/tpl/vintage/page.header.html +++ b/tpl/vintage/page.header.html @@ -17,7 +17,7 @@ {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore} {else}
  • Home
    • - {if="isLoggedIn()"} + {if="$is_logged_in"}
  • Logout
  • Tools
  • Add link
    • @@ -46,7 +46,7 @@
    -{if="!empty($plugin_errors) && isLoggedIn()"} +{if="!empty($plugin_errors) && $is_logged_in"}
      {loop="$plugin_errors"}
    • {$value}
      • -- 2.41.0