Merge pull request #447 from ArthurHoaro/hidden-tags

Private/Hidden tags
This commit is contained in:
Arthur 2016-02-15 21:22:35 +01:00
commit 3a38c95d42
4 changed files with 27 additions and 2 deletions

View file

@ -264,8 +264,15 @@ You use the community supported version of the original Shaarli project, by Seba
foreach ($this->_links as &$link) {
// Keep the list of the mapping URLs-->linkdate up-to-date.
$this->_urls[$link['url']] = $link['linkdate'];
// Sanitize data fields.
sanitizeLink($link);
// Remove private tags if the user is not logged in.
if (! $this->_loggedIn) {
$link['tags'] = preg_replace('/(^| )\.[^($| )]+/', '', $link['tags']);
}
// Do not use the redirector for internal links (Shaarli note URL starting with a '?').
if (!empty($this->_redirector) && !startsWith($link['url'], '?')) {
$link['real_url'] = $this->_redirector . urlencode($link['url']);

View file

@ -298,6 +298,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
'css' => 1,
'Mercurial' => 1,
'-exclude' => 1,
'.hidden' => 1,
),
self::$privateLinkDB->allTags()
);
@ -349,4 +350,22 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
count(self::$privateLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
);
}
/**
* Test hidden tags feature:
* tags starting with a dot '.' are only visible when logged in.
*/
public function testHiddenTags()
{
$tags = '.hidden';
$this->assertEquals(
1,
count(self::$privateLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
);
$this->assertEquals(
0,
count(self::$publicLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
);
}
}

View file

@ -239,7 +239,6 @@ class UpdaterTest extends PHPUnit_Framework_TestCase
$this->assertEmpty($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude'));
$updater = new Updater(array(), self::$configFields, $linkDB, true);
$updater->updateMethodRenameDashTags();
var_dump($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude'));
$this->assertNotEmpty($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude'));
}
}

View file

@ -28,7 +28,7 @@ class ReferenceLinkDB
'A free software media publishing platform',
0,
'20130614_184135',
'gnu media web'
'gnu media web .hidden'
);
$this->addLink(