From 21650e310ef4064d436ffc8364e9c6ad2c7629fc Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 22 Mar 2018 23:21:49 -0300 Subject: Permalink support --- data/templates/default/bookmarks.tpl.php | 18 ++++- www/permalink.php | 122 +++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 www/permalink.php diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php index 818eea0..20b5336 100644 --- a/data/templates/default/bookmarks.tpl.php +++ b/data/templates/default/bookmarks.tpl.php @@ -112,6 +112,7 @@ if($userservice->isLoggedOn()) { window.onload = playerLoad; + 1) { ?>

- "> / + getObjectUser($row['uId']); + $row['username'] = $userinfo->username; + } + $cats = ''; $tagsForCopy = ''; $tags = $row['tags']; @@ -310,12 +318,13 @@ if ($currenttag!= '') { $update = ' ('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') '; // User attribution - $copy = ' ' . T_('by') . ' '; if ($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username'] ) { + $copy = ' ' . T_('by') . ' '; $copy .= T_('you'); - } else { + } else if (isset($row['username'])) { + $copy = ' ' . T_('by') . ' '; $copy .= '' . SemanticScuttle_Model_UserArray::getName($row) . ''; @@ -506,6 +515,7 @@ if ($currenttag!= '') { . $edit . "\n" . $update . "\n" . $cacheLink ."\n" + . ' | Permalink' ."\n" . " \n"; echo $privateNoteField != '' ? '

'.$privateNoteField."
\n" @@ -524,8 +534,10 @@ if ($currenttag!= '') { if(getPerPageCount($currentUser)>7) { echo '

'.T_('Top of the page').'

'; } - echo $pagesBanner; // display previous and next links pages + RSS link + if (isset($bookmarks) && count($bookmarks) > 1) { + echo $pagesBanner; // display previous and next links pages + RSS link + } } else { echo '

'.T_('No bookmarks available').'

'; diff --git a/www/permalink.php b/www/permalink.php new file mode 100644 index 0000000..d389294 --- /dev/null +++ b/www/permalink.php @@ -0,0 +1,122 @@ +logout(); + $tplVars['currentUser'] = null; + $tplvars['msg'] = T_('You have now logged out'); +} + + +// Header variables +$tplVars['loadjs'] = true; +$tplVars['rsschannels'] = array( + array( + sprintf(T_('%s: Recent bookmarks'), $sitename), + createURL('rss') . '?sort=' . getSortOrder() + ) +); + +if ($userservice->isLoggedOn()) { + if ($userservice->isPrivateKeyValid($currentUser->getPrivateKey())) { + $currentUsername = $currentUser->getUsername(); + array_push( + $tplVars['rsschannels'], + array( + sprintf( + T_('%s: Recent bookmarks (+private %s)'), + $sitename, $currentUsername + ), + createURL('rss') + . '?sort=' . getSortOrder() + . '&privateKey=' . $currentUser->getPrivateKey() + ) + ); + } +} + +if ($usecache) { + // Generate hash for caching on + $hashtext = $_SERVER['REQUEST_URI']; + if ($userservice->isLoggedOn()) { + $hashtext .= $userservice->getCurrentUserID(); + } + $hash = md5($hashtext); + + // Cache for 15 minutes + $cacheservice->Start($hash, 900); +} + +// Pagination +$perpage = getPerPageCount($currentUser); +if (intval(GET_PAGE) > 1) { + $page = intval(GET_PAGE); + $start = ($page - 1) * $perpage; +} else { + $page = 0; + $start = 0; +} + +$tplVars['page'] = $page; +$tplVars['start'] = $start; +$tplVars['popCount'] = 30; +$tplVars['sidebar_blocks'] = $GLOBALS["index_sidebar_blocks"]; +$tplVars['range'] = 'all'; +$tplVars['pagetitle'] = T_('Store, share and tag your favourite links'); +$tplVars['subtitle'] = T_('All Bookmarks'); +$tplVars['bookmarkCount'] = $start + 1; + +//$bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, NULL); +list ($url, $bid) = explode('/', $_SERVER['PATH_INFO']); +$bookmark = $bookmarkservice->getBookmark($bid, TRUE); +$bookmarks = array('bookmarks' => array($bookmark)); +$tplVars['pagetitle'] = $bookmark['bTitle']; + +$tplVars['total'] = $bookmarks['total']; +$tplVars['bookmarks'] = $bookmarks['bookmarks']; +$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); +//$tplVars['cat_url'] = createURL('tags', '%2$s'); +$tplVars['nav_url'] = createURL('index', '%3$s'); +$tplVars['summarizeLinkedTags'] = true; +$tplVars['pageName'] = PAGE_BOOKMARKS; +$tplVars['user'] = ''; +$tplVars['currenttag'] = ''; + +$templateservice->loadTemplate('bookmarks.tpl', $tplVars); + +if ($usecache) { + // Cache output if existing copy has expired + $cacheservice->End($hash); +} +?> -- cgit v1.2.3