Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Do not load links if they're hidden (also fix shaarli/Shaarli#202)

Browse source
This commit is contained in:
ArthurHoaro 2015-06-09 14:58:54 +02:00
parent cbecab7735
commit a037ac6963
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
index.php
View file

@ -794,6 +794,12 @@ class linkdb implements Iterator, Countable, ArrayAccess
// Read database from disk to memory // Read database from disk to memory
private function readdb() private function readdb()
{ {
// Public links are hidden and user not logged in => nothing to show
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) {
$this->links = array();
return;
}
// Read data // Read data
$this->links=(file_exists($GLOBALS['config']['DATASTORE']) ? unserialize(gzinflate(base64_decode(substr(file_get_contents($GLOBALS['config']['DATASTORE']),strlen(PHPPREFIX),-strlen(PHPSUFFIX))))) : array() ); $this->links=(file_exists($GLOBALS['config']['DATASTORE']) ? unserialize(gzinflate(base64_decode(substr(file_get_contents($GLOBALS['config']['DATASTORE']),strlen(PHPPREFIX),-strlen(PHPSUFFIX))))) : array() );
// Note that gzinflate is faster than gzuncompress. See: http://www.php.net/manual/en/function.gzdeflate.php#96439 // Note that gzinflate is faster than gzuncompress. See: http://www.php.net/manual/en/function.gzdeflate.php#96439
@ -949,9 +955,6 @@ function showRSS()
else if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); else if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
else $linksToDisplay = $LINKSDB; else $linksToDisplay = $LINKSDB;
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$linksToDisplay = array();
$nblinksToDisplay = 50; // Number of links to display. $nblinksToDisplay = 50; // Number of links to display.
if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
{ {
@ -1028,9 +1031,6 @@ function showATOM()
else if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); else if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
else $linksToDisplay = $LINKSDB; else $linksToDisplay = $LINKSDB;
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$linksToDisplay = array();
$nblinksToDisplay = 50; // Number of links to display. $nblinksToDisplay = 50; // Number of links to display.
if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
{ {
@ -1190,8 +1190,7 @@ function showDaily()
} }
$linksToDisplay=$LINKSDB->filterDay($day); $linksToDisplay=$LINKSDB->filterDay($day);
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$linksToDisplay = array();
// We pre-format some fields for proper output. // We pre-format some fields for proper output.
foreach($linksToDisplay as $key=>$link) foreach($linksToDisplay as $key=>$link)
{ {
@ -1271,9 +1270,6 @@ function renderPage()
elseif (!empty($_GET['searchtags'])) $links = $LINKSDB->filterTags(trim($_GET['searchtags'])); elseif (!empty($_GET['searchtags'])) $links = $LINKSDB->filterTags(trim($_GET['searchtags']));
else $links = $LINKSDB; else $links = $LINKSDB;
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$links = array();
$body=''; $body='';
$linksToDisplay=array(); $linksToDisplay=array();
@ -1300,8 +1296,7 @@ function renderPage()
if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tagcloud')) if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tagcloud'))
{ {
$tags= $LINKSDB->allTags(); $tags= $LINKSDB->allTags();
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$tags = array();
// We sort tags alphabetically, then choose a font size according to count. // We sort tags alphabetically, then choose a font size according to count.
// First, find max value. // First, find max value.
$maxcount=0; foreach($tags as $key=>$value) $maxcount=max($maxcount,$value); $maxcount=0; foreach($tags as $key=>$value) $maxcount=max($maxcount,$value);
@ -1914,16 +1909,12 @@ function buildLinkList($PAGE,$LINKSDB)
if (isset($_GET['searchterm'])) // Fulltext search if (isset($_GET['searchterm'])) // Fulltext search
{ {
$linksToDisplay = $LINKSDB->filterFulltext(trim($_GET['searchterm'])); $linksToDisplay = $LINKSDB->filterFulltext(trim($_GET['searchterm']));
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$linksToDisplay = array();
$search_crits=htmlspecialchars(trim($_GET['searchterm'])); $search_crits=htmlspecialchars(trim($_GET['searchterm']));
$search_type='fulltext'; $search_type='fulltext';
} }
elseif (isset($_GET['searchtags'])) // Search by tag elseif (isset($_GET['searchtags'])) // Search by tag
{ {
$linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$linksToDisplay = array();
$search_crits=explode(' ',trim($_GET['searchtags'])); $search_crits=explode(' ',trim($_GET['searchtags']));
$search_type='tags'; $search_type='tags';
} }
@ -1939,9 +1930,6 @@ function buildLinkList($PAGE,$LINKSDB)
} }
$search_type='permalink'; $search_type='permalink';
} }
// We chose to disable all private links and the user isn't logged in, do not return any link.
else if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn())
$linksToDisplay = array();
else else
$linksToDisplay = $LINKSDB; // Otherwise, display without filtering. $linksToDisplay = $LINKSDB; // Otherwise, display without filtering.