) * This function fills all the necessary fields in the $PAGE for the template 'linklist.html' diff --git a/tests/NetscapeBookmarkUtils/BookmarkExportTest.php b/tests/NetscapeBookmarkUtils/BookmarkExportTest.php new file mode 100644 index 00000000..cc54ab9f --- /dev/null +++ b/tests/NetscapeBookmarkUtils/BookmarkExportTest.php @@ -0,0 +1,134 @@ +write(self::$testDatastore); + self::$linkDb = new LinkDB(self::$testDatastore, true, false); + } + + /** + * Attempt to export an invalid link selection + * @expectedException Exception + * @expectedExceptionMessageRegExp /Invalid export selection/ + */ + public function testFilterAndFormatInvalid() + { + NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'derp', false, ''); + } + + /** + * Prepare all links for export + */ + public function testFilterAndFormatAll() + { + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'all', false, ''); + $this->assertEquals(self::$refDb->countLinks(), sizeof($links)); + foreach ($links as $link) { + $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); + $this->assertEquals( + $date->getTimestamp(), + $link['timestamp'] + ); + $this->assertEquals( + str_replace(' ', ',', $link['tags']), + $link['taglist'] + ); + } + } + + /** + * Prepare private links for export + */ + public function testFilterAndFormatPrivate() + { + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'private', false, ''); + $this->assertEquals(self::$refDb->countPrivateLinks(), sizeof($links)); + foreach ($links as $link) { + $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); + $this->assertEquals( + $date->getTimestamp(), + $link['timestamp'] + ); + $this->assertEquals( + str_replace(' ', ',', $link['tags']), + $link['taglist'] + ); + } + } + + /** + * Prepare public links for export + */ + public function testFilterAndFormatPublic() + { + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public', false, ''); + $this->assertEquals(self::$refDb->countPublicLinks(), sizeof($links)); + foreach ($links as $link) { + $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); + $this->assertEquals( + $date->getTimestamp(), + $link['timestamp'] + ); + $this->assertEquals( + str_replace(' ', ',', $link['tags']), + $link['taglist'] + ); + } + } + + /** + * Do not prepend notes with the Shaarli index's URL + */ + public function testFilterAndFormatDoNotPrependNoteUrl() + { + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public', false, ''); + $this->assertEquals( + '?WDWyig', + $links[0]['url'] + ); + } + + /** + * Prepend notes with the Shaarli index's URL + */ + public function testFilterAndFormatPrependNoteUrl() + { + $indexUrl = 'http://localhost:7469/shaarli/'; + $links = NetscapeBookmarkUtils::filterAndFormat( + self::$linkDb, + 'public', + true, + $indexUrl + ); + $this->assertEquals( + $indexUrl . '?WDWyig', + $links[0]['url'] + ); + } +} diff --git a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php new file mode 100644 index 00000000..2d4e7557 --- /dev/null +++ b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php @@ -0,0 +1,518 @@ + array( + 'name' => $filename, + 'tmp_name' => __DIR__ . '/input/' . $filename, + 'size' => filesize(__DIR__ . '/input/' . $filename) + ) + ); +} + + +/** + * Netscape bookmark import + */ +class BookmarkImportTest extends PHPUnit_Framework_TestCase +{ + /** + * @var string datastore to test write operations + */ + protected static $testDatastore = 'sandbox/datastore.php'; + + /** + * @var LinkDB private LinkDB instance + */ + protected $linkDb = null; + + /** + * @var string Dummy page cache + */ + protected $pagecache = 'tests'; + + /** + * Resets test data before each test + */ + protected function setUp() + { + if (file_exists(self::$testDatastore)) { + unlink(self::$testDatastore); + } + // start with an empty datastore + file_put_contents(self::$testDatastore, ''); + $this->linkDb = new LinkDB(self::$testDatastore, true, false); + } + + /** + * Attempt to import bookmarks from an empty file + */ + public function testImportEmptyData() + { + $files = file2array('empty.htm'); + $this->assertEquals( + 'File empty.htm (0 bytes) has an unknown file format.' + .' Nothing was imported.', + NetscapeBookmarkUtils::import(NULL, $files, NULL, NULL) + ); + $this->assertEquals(0, count($this->linkDb)); + } + + /** + * Attempt to import bookmarks from a file with no Doctype + */ + public function testImportNoDoctype() + { + $files = file2array('no_doctype.htm'); + $this->assertEquals( + 'File no_doctype.htm (350 bytes) has an unknown file format. Nothing was imported.', + NetscapeBookmarkUtils::import(NULL, $files, NULL, NULL) + ); + $this->assertEquals(0, count($this->linkDb)); + } + + /** + * Import bookmarks nested in a folder hierarchy + */ + public function testImportNested() + { + $files = file2array('netscape_nested.htm'); + $this->assertEquals( + 'File netscape_nested.htm (1337 bytes) was successfully processed:' + .' 8 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(8, count($this->linkDb)); + $this->assertEquals(2, count_private($this->linkDb)); + + $this->assertEquals( + array( + 'linkdate' => '20160225_205541', + 'title' => 'Nested 1', + 'url' => 'http://nest.ed/1', + 'description' => '', + 'private' => 0, + 'tags' => 'tag1 tag2' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/1') + ); + $this->assertEquals( + array( + 'linkdate' => '20160225_205542', + 'title' => 'Nested 1-1', + 'url' => 'http://nest.ed/1-1', + 'description' => '', + 'private' => 0, + 'tags' => 'folder1 tag1 tag2' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/1-1') + ); + $this->assertEquals( + array( + 'linkdate' => '20160225_205547', + 'title' => 'Nested 1-2', + 'url' => 'http://nest.ed/1-2', + 'description' => '', + 'private' => 0, + 'tags' => 'folder1 tag3 tag4' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/1-2') + ); + $this->assertEquals( + array( + 'linkdate' => '20160202_172222', + 'title' => 'Nested 2-1', + 'url' => 'http://nest.ed/2-1', + 'description' => 'First link of the second section', + 'private' => 1, + 'tags' => 'folder2' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/2-1') + ); + $this->assertEquals( + array( + 'linkdate' => '20160119_200227', + 'title' => 'Nested 2-2', + 'url' => 'http://nest.ed/2-2', + 'description' => 'Second link of the second section', + 'private' => 1, + 'tags' => 'folder2' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/2-2') + ); + $this->assertEquals( + array( + 'linkdate' => '20160202_172223', + 'title' => 'Nested 3-1', + 'url' => 'http://nest.ed/3-1', + 'description' => '', + 'private' => 0, + 'tags' => 'folder3 folder3-1 tag3' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/3-1') + ); + $this->assertEquals( + array( + 'linkdate' => '20160119_200228', + 'title' => 'Nested 3-2', + 'url' => 'http://nest.ed/3-2', + 'description' => '', + 'private' => 0, + 'tags' => 'folder3 folder3-1' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/3-2') + ); + $this->assertEquals( + array( + 'linkdate' => '20160229_081541', + 'title' => 'Nested 2', + 'url' => 'http://nest.ed/2', + 'description' => '', + 'private' => 0, + 'tags' => 'tag4' + ), + $this->linkDb->getLinkFromUrl('http://nest.ed/2') + ); + } + + /** + * Import bookmarks with the default privacy setting (reuse from file) + * + * The $_POST array is not set. + */ + public function testImportDefaultPrivacyNoPost() + { + $files = file2array('netscape_basic.htm'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(1, count_private($this->linkDb)); + + $this->assertEquals( + array( + 'linkdate' => '20001010_105536', + 'title' => 'Secret stuff', + 'url' => 'https://private.tld', + 'description' => "Super-secret stuff you're not supposed to know about", + 'private' => 1, + 'tags' => 'private secret' + ), + $this->linkDb->getLinkFromUrl('https://private.tld') + ); + $this->assertEquals( + array( + 'linkdate' => '20160225_205548', + 'title' => 'Public stuff', + 'url' => 'http://public.tld', + 'description' => '', + 'private' => 0, + 'tags' => 'public hello world' + ), + $this->linkDb->getLinkFromUrl('http://public.tld') + ); + } + + /** + * Import bookmarks with the default privacy setting (reuse from file) + */ + public function testImportKeepPrivacy() + { + $post = array('privacy' => 'default'); + $files = file2array('netscape_basic.htm'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(1, count_private($this->linkDb)); + + $this->assertEquals( + array( + 'linkdate' => '20001010_105536', + 'title' => 'Secret stuff', + 'url' => 'https://private.tld', + 'description' => "Super-secret stuff you're not supposed to know about", + 'private' => 1, + 'tags' => 'private secret' + ), + $this->linkDb->getLinkFromUrl('https://private.tld') + ); + $this->assertEquals( + array( + 'linkdate' => '20160225_205548', + 'title' => 'Public stuff', + 'url' => 'http://public.tld', + 'description' => '', + 'private' => 0, + 'tags' => 'public hello world' + ), + $this->linkDb->getLinkFromUrl('http://public.tld') + ); + } + + /** + * Import links as public + */ + public function testImportAsPublic() + { + $post = array('privacy' => 'public'); + $files = file2array('netscape_basic.htm'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + $this->assertEquals( + 0, + $this->linkDb['20001010_105536']['private'] + ); + $this->assertEquals( + 0, + $this->linkDb['20160225_205548']['private'] + ); + } + + /** + * Import links as private + */ + public function testImportAsPrivate() + { + $post = array('privacy' => 'private'); + $files = file2array('netscape_basic.htm'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(2, count_private($this->linkDb)); + $this->assertEquals( + 1, + $this->linkDb['20001010_105536']['private'] + ); + $this->assertEquals( + 1, + $this->linkDb['20160225_205548']['private'] + ); + } + + /** + * Overwrite private links so they become public + */ + public function testOverwriteAsPublic() + { + $files = file2array('netscape_basic.htm'); + + // import links as private + $post = array('privacy' => 'private'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(2, count_private($this->linkDb)); + $this->assertEquals( + 1, + $this->linkDb['20001010_105536']['private'] + ); + $this->assertEquals( + 1, + $this->linkDb['20160225_205548']['private'] + ); + + // re-import as public, enable overwriting + $post = array( + 'privacy' => 'public', + 'overwrite' => 'true' + ); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 2 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + $this->assertEquals( + 0, + $this->linkDb['20001010_105536']['private'] + ); + $this->assertEquals( + 0, + $this->linkDb['20160225_205548']['private'] + ); + } + + /** + * Overwrite public links so they become private + */ + public function testOverwriteAsPrivate() + { + $files = file2array('netscape_basic.htm'); + + // import links as public + $post = array('privacy' => 'public'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + $this->assertEquals( + 0, + $this->linkDb['20001010_105536']['private'] + ); + $this->assertEquals( + 0, + $this->linkDb['20160225_205548']['private'] + ); + + // re-import as private, enable overwriting + $post = array( + 'privacy' => 'private', + 'overwrite' => 'true' + ); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 2 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(2, count_private($this->linkDb)); + $this->assertEquals( + 1, + $this->linkDb['20001010_105536']['private'] + ); + $this->assertEquals( + 1, + $this->linkDb['20160225_205548']['private'] + ); + } + + /** + * Attept to import the same links twice without enabling overwriting + */ + public function testSkipOverwrite() + { + $post = array('privacy' => 'public'); + $files = file2array('netscape_basic.htm'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + + // re-import as private, DO NOT enable overwriting + $post = array('privacy' => 'private'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 0 links imported, 0 links overwritten, 2 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + } + + /** + * Add user-specified tags to all imported bookmarks + */ + public function testSetDefaultTags() + { + $post = array( + 'privacy' => 'public', + 'default_tags' => 'tag1,tag2 tag3' + ); + $files = file2array('netscape_basic.htm'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + $this->assertEquals( + 'tag1 tag2 tag3 private secret', + $this->linkDb['20001010_105536']['tags'] + ); + $this->assertEquals( + 'tag1 tag2 tag3 public hello world', + $this->linkDb['20160225_205548']['tags'] + ); + } + + /** + * The user-specified tags contain characters to be escaped + */ + public function testSanitizeDefaultTags() + { + $post = array( + 'privacy' => 'public', + 'default_tags' => 'tag1&,tag2 "tag3"' + ); + $files = file2array('netscape_basic.htm'); + $this->assertEquals( + 'File netscape_basic.htm (482 bytes) was successfully processed:' + .' 2 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(2, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + $this->assertEquals( + 'tag1& tag2 "tag3" private secret', + $this->linkDb['20001010_105536']['tags'] + ); + $this->assertEquals( + 'tag1& tag2 "tag3" public hello world', + $this->linkDb['20160225_205548']['tags'] + ); + } + + /** + * Ensure each imported bookmark has a unique linkdate + * + * See https://github.com/shaarli/Shaarli/issues/351 + */ + public function testImportSameDate() + { + $files = file2array('same_date.htm'); + $this->assertEquals( + 'File same_date.htm (453 bytes) was successfully processed:' + .' 3 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(3, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + $this->assertEquals( + '20160225_205548', + $this->linkDb['20160225_205548']['linkdate'] + ); + $this->assertEquals( + '20160225_205549', + $this->linkDb['20160225_205549']['linkdate'] + ); + $this->assertEquals( + '20160225_205550', + $this->linkDb['20160225_205550']['linkdate'] + ); + } +} diff --git a/tests/NetscapeBookmarkUtils/input/empty.htm b/tests/NetscapeBookmarkUtils/input/empty.htm new file mode 100644 index 00000000..e69de29b diff --git a/tests/NetscapeBookmarkUtils/input/netscape_basic.htm b/tests/NetscapeBookmarkUtils/input/netscape_basic.htm new file mode 100644 index 00000000..affe0cf8 --- /dev/null +++ b/tests/NetscapeBookmarkUtils/input/netscape_basic.htm @@ -0,0 +1,11 @@ + + +Bookmarks +

Bookmarks

Secret stuff +: Super-secret stuff you're not supposed to know about +
Public stuff +

diff --git a/tests/NetscapeBookmarkUtils/input/netscape_nested.htm b/tests/NetscapeBookmarkUtils/input/netscape_nested.htm new file mode 100644 index 00000000..b486fe18 --- /dev/null +++ b/tests/NetscapeBookmarkUtils/input/netscape_nested.htm @@ -0,0 +1,31 @@ + + +Bookmarks +

Bookmarks

Nested 1 +

Folder1 + + Nested 1-1 + Nested 1-2 + +

Folder2 +

This second folder contains wonderful links! +

Nested 2-1 +: First link of the second section +
Nested 2-2 +: Second link of the second section +

Folder3 + + Folder3-1 + + Nested 3-1 + Nested 3-2 + + +

Nested 2 +

diff --git a/tests/NetscapeBookmarkUtils/input/no_doctype.htm b/tests/NetscapeBookmarkUtils/input/no_doctype.htm new file mode 100644 index 00000000..766d398b --- /dev/null +++ b/tests/NetscapeBookmarkUtils/input/no_doctype.htm @@ -0,0 +1,7 @@ +Bookmarks +

Bookmarks

Secret stuff +: Super-secret stuff you're not supposed to know about +
Public stuff +

diff --git a/tests/NetscapeBookmarkUtils/input/same_date.htm b/tests/NetscapeBookmarkUtils/input/same_date.htm new file mode 100644 index 00000000..9d58a582 --- /dev/null +++ b/tests/NetscapeBookmarkUtils/input/same_date.htm @@ -0,0 +1,11 @@ + + +Bookmarks +

Bookmarks

Today's first link +
Today's second link +
Today's third link +

diff --git a/tests/NetscapeBookmarkUtilsTest.php b/tests/NetscapeBookmarkUtilsTest.php deleted file mode 100644 index 41e6d84c..00000000 --- a/tests/NetscapeBookmarkUtilsTest.php +++ /dev/null @@ -1,134 +0,0 @@ -write(self::$testDatastore); - self::$linkDb = new LinkDB(self::$testDatastore, true, false); - } - - /** - * Attempt to export an invalid link selection - * @expectedException Exception - * @expectedExceptionMessageRegExp /Invalid export selection/ - */ - public function testFilterAndFormatInvalid() - { - NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'derp', false, ''); - } - - /** - * Prepare all links for export - */ - public function testFilterAndFormatAll() - { - $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'all', false, ''); - $this->assertEquals(self::$refDb->countLinks(), sizeof($links)); - foreach ($links as $link) { - $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); - $this->assertEquals( - $date->getTimestamp(), - $link['timestamp'] - ); - $this->assertEquals( - str_replace(' ', ',', $link['tags']), - $link['taglist'] - ); - } - } - - /** - * Prepare private links for export - */ - public function testFilterAndFormatPrivate() - { - $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'private', false, ''); - $this->assertEquals(self::$refDb->countPrivateLinks(), sizeof($links)); - foreach ($links as $link) { - $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); - $this->assertEquals( - $date->getTimestamp(), - $link['timestamp'] - ); - $this->assertEquals( - str_replace(' ', ',', $link['tags']), - $link['taglist'] - ); - } - } - - /** - * Prepare public links for export - */ - public function testFilterAndFormatPublic() - { - $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public', false, ''); - $this->assertEquals(self::$refDb->countPublicLinks(), sizeof($links)); - foreach ($links as $link) { - $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); - $this->assertEquals( - $date->getTimestamp(), - $link['timestamp'] - ); - $this->assertEquals( - str_replace(' ', ',', $link['tags']), - $link['taglist'] - ); - } - } - - /** - * Do not prepend notes with the Shaarli index's URL - */ - public function testFilterAndFormatDoNotPrependNoteUrl() - { - $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public', false, ''); - $this->assertEquals( - '?WDWyig', - $links[0]['url'] - ); - } - - /** - * Prepend notes with the Shaarli index's URL - */ - public function testFilterAndFormatPrependNoteUrl() - { - $indexUrl = 'http://localhost:7469/shaarli/'; - $links = NetscapeBookmarkUtils::filterAndFormat( - self::$linkDb, - 'public', - true, - $indexUrl - ); - $this->assertEquals( - $indexUrl . '?WDWyig', - $links[0]['url'] - ); - } -} diff --git a/tpl/import.html b/tpl/import.html index 6c4f9421..071e1160 100644 --- a/tpl/import.html +++ b/tpl/import.html @@ -3,19 +3,31 @@ {include="includes"}

- {include="page.header"} -

- Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes). - -

+ {include="page.header"} +

+ Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes). + +

{include="page.footer"} - \ No newline at end of file + -- cgit v1.2.3 From b039a061ebc55f2b62ec3fbead3e4a34666a0aaa Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 12 Aug 2016 22:02:59 +0200 Subject: Fix: keep composer.json in release archives Relates to https://github.com/shaarli/Shaarli/issues/607 Signed-off-by: VirtualTam --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index aaf6a39e..d753b1db 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,7 +21,6 @@ Dockerfile text .gitattributes export-ignore .gitignore export-ignore .travis.yml export-ignore -composer.json export-ignore doc/**/*.json export-ignore doc/**/*.md export-ignore docker/ export-ignore -- cgit v1.2.3 From f4ad7bde56b769cea0a2a26eb739e57500705555 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 12 Aug 2016 23:22:15 +0200 Subject: Fix: ensure Internet Explorer bookmark dumps can be imported Relates to https://github.com/shaarli/Shaarli/issues/607 Modifications: - [application][tests] NetscapeBookmarkUtils: more permissive doctype detection The IE bookmark exports contain extra escape sequences, which can be observed by binary comparison of the reference input data used in tests: $ cmp -b -l -n 8 netscape_basic.htm internet_explorer_encoding.htm 1 74 < 357 M-o 2 41 ! 273 M-; 3 104 D 277 M-? 4 117 O 74 < 5 103 C 41 ! 6 124 T 104 D 7 131 Y 117 O 8 120 P 103 C Signed-off-by: VirtualTam --- application/NetscapeBookmarkUtils.php | 3 +-- tests/NetscapeBookmarkUtils/BookmarkImportTest.php | 28 ++++++++++++++++++++++ .../input/internet_explorer_encoding.htm | 9 +++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 tests/NetscapeBookmarkUtils/input/internet_explorer_encoding.htm diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php index b99a432e..c3181254 100644 --- a/application/NetscapeBookmarkUtils.php +++ b/application/NetscapeBookmarkUtils.php @@ -98,8 +98,7 @@ class NetscapeBookmarkUtils $filesize = $files['filetoupload']['size']; $data = file_get_contents($files['filetoupload']['tmp_name']); - // Sniff file type - if (! startsWith($data, '')) { + if (strpos($data, '') === false) { return self::importStatus($filename, $filesize); } diff --git a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php index 2d4e7557..f0ad500f 100644 --- a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php +++ b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php @@ -82,6 +82,34 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals(0, count($this->linkDb)); } + /** + * Ensure IE dumps are supported + */ + public function testImportInternetExplorerEncoding() + { + $files = file2array('internet_explorer_encoding.htm'); + $this->assertEquals( + 'File internet_explorer_encoding.htm (356 bytes) was successfully processed:' + .' 1 links imported, 0 links overwritten, 0 links skipped.', + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + ); + $this->assertEquals(1, count($this->linkDb)); + $this->assertEquals(0, count_private($this->linkDb)); + + $this->assertEquals( + array( + 'linkdate' => '20160618_173944', + 'title' => 'Hg Init a Mercurial tutorial by Joel Spolsky', + 'url' => 'http://hginit.com/', + 'description' => '', + 'private' => 0, + 'tags' => '' + ), + $this->linkDb->getLinkFromUrl('http://hginit.com/') + ); + } + + /** * Import bookmarks nested in a folder hierarchy */ diff --git a/tests/NetscapeBookmarkUtils/input/internet_explorer_encoding.htm b/tests/NetscapeBookmarkUtils/input/internet_explorer_encoding.htm new file mode 100644 index 00000000..18703cf6 --- /dev/null +++ b/tests/NetscapeBookmarkUtils/input/internet_explorer_encoding.htm @@ -0,0 +1,9 @@ + + +Bookmarks +

Bookmarks

Hg Init a Mercurial tutorial by Joel Spolsky +

-- cgit v1.2.3 From db6dec0de10d0ee3b35658ae9f431935d17e8a7c Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 13 Aug 2016 14:22:22 +0200 Subject: Fix: add missing final newlines, untabify text Signed-off-by: VirtualTam --- application/PluginManager.php | 2 +- application/Router.php | 2 +- plugins/addlink_toolbar/addlink_toolbar.php | 2 +- plugins/playvideos/playvideos.php | 2 +- plugins/wallabag/README.md | 24 ++++++++++++------------ tests/PluginManagerTest.php | 2 +- tests/utils/config/configInvalid.json.php | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/application/PluginManager.php b/application/PluginManager.php index dca7e63e..1afc8d5c 100644 --- a/application/PluginManager.php +++ b/application/PluginManager.php @@ -210,4 +210,4 @@ class PluginFileNotFoundException extends Exception { $this->message = 'Plugin "'. $pluginName .'" files not found.'; } -} \ No newline at end of file +} diff --git a/application/Router.php b/application/Router.php index 2c3934b0..caed4a28 100644 --- a/application/Router.php +++ b/application/Router.php @@ -138,4 +138,4 @@ class Router return self::$PAGE_LINKLIST; } -} \ No newline at end of file +} diff --git a/plugins/addlink_toolbar/addlink_toolbar.php b/plugins/addlink_toolbar/addlink_toolbar.php index ba3849cf..cfd74207 100644 --- a/plugins/addlink_toolbar/addlink_toolbar.php +++ b/plugins/addlink_toolbar/addlink_toolbar.php @@ -35,4 +35,4 @@ function hook_addlink_toolbar_render_includes($data) } return $data; -} \ No newline at end of file +} diff --git a/plugins/playvideos/playvideos.php b/plugins/playvideos/playvideos.php index 0a80aa58..7645b778 100644 --- a/plugins/playvideos/playvideos.php +++ b/plugins/playvideos/playvideos.php @@ -37,4 +37,4 @@ function hook_playvideos_render_footer($data) } return $data; -} \ No newline at end of file +} diff --git a/plugins/wallabag/README.md b/plugins/wallabag/README.md index 3f930564..ea21a519 100644 --- a/plugins/wallabag/README.md +++ b/plugins/wallabag/README.md @@ -4,19 +4,19 @@ For each link in your Shaarli, adds a button to save the target page in your [wa ### Installation -Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there. +Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there. The directory structure should look like: -``` +```bash └── tpl └── plugins - └── wallabag - ├── README.md - ├── wallabag.html - ├── wallabag.meta - ├── wallabag.php - ├── wallabag.php - └── WallabagInstance.php + └── wallabag + ├── README.md + ├── wallabag.html + ├── wallabag.meta + ├── wallabag.php + ├── wallabag.php + └── WallabagInstance.php ``` To enable the plugin, you can either: @@ -28,10 +28,10 @@ To enable the plugin, you can either: Go to the plugin administration page, and edit the following settings (with the plugin enabled). -**WALLABAG_URL**: *Wallabag instance URL* +**WALLABAG_URL**: *Wallabag instance URL* Example value: `http://v2.wallabag.org` -**WALLABAG_VERSION**: *Wallabag version* +**WALLABAG_VERSION**: *Wallabag version* Value: either `1` (for 1.x) or `2` (for 2.x) -> Note: these settings can also be set in `data/config.json.php`, in the plugins section. \ No newline at end of file +> Note: these settings can also be set in `data/config.json.php`, in the plugins section. diff --git a/tests/PluginManagerTest.php b/tests/PluginManagerTest.php index 61efce68..c7511051 100644 --- a/tests/PluginManagerTest.php +++ b/tests/PluginManagerTest.php @@ -86,4 +86,4 @@ class PluginManagerTest extends PHPUnit_Framework_TestCase $this->assertEquals('test plugin', $meta[self::$pluginName]['description']); $this->assertEquals($expectedParameters, $meta[self::$pluginName]['parameters']); } -} \ No newline at end of file +} diff --git a/tests/utils/config/configInvalid.json.php b/tests/utils/config/configInvalid.json.php index 167f2168..e39d640a 100644 --- a/tests/utils/config/configInvalid.json.php +++ b/tests/utils/config/configInvalid.json.php @@ -2,4 +2,4 @@ { bad: bad, } -*/ ?> \ No newline at end of file +*/ ?> -- cgit v1.2.3 From 90f12b12ca9a828e2aaf2535c09ec9c73ff1e2a6 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 12 Aug 2016 21:36:54 +0200 Subject: Docker: update dependencies, introduce Composer Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/shaarli/Shaarli/pull/612 Relates to https://github.com/shaarli/Shaarli/pull/624 See https://github.com/shaarli/Shaarli/wiki/Server-requirements Modifications: - [all][env] set $TERM=dumb to avoid debconf-related issues - [all][pkg] install ca-certificates - [all][pkg] cleanup APT cache after installing packages - [dev] refactor Dockerfile - [prod][master] refactor Dockerfile - [prod][master][php] use Composer to resolve PHP dependencies Signed-off-by: VirtualTam --- docker/development/Dockerfile | 30 +++++++++++++++++++----------- docker/production/Dockerfile | 23 +++++++++++++++++++---- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 2ed59b89..0c19b085 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -1,26 +1,34 @@ FROM debian:jessie MAINTAINER Shaarli Community +ENV TERM dumb RUN apt-get update \ - && apt-get install -y \ - nginx-light php5-fpm php5-gd supervisor \ - git nano - -ADD https://getcomposer.org/composer.phar /usr/local/bin/composer -RUN chmod 755 /usr/local/bin/composer + && apt-get install --no-install-recommends -y \ + ca-certificates \ + nginx-light \ + php5-curl \ + php5-fpm \ + php5-gd \ + php5-intl \ + supervisor \ + git \ + nano \ + && apt-get clean COPY nginx.conf /etc/nginx/nginx.conf COPY supervised.conf /etc/supervisor/conf.d/supervised.conf -RUN echo "" > /var/www/index.php + +ADD https://getcomposer.org/composer.phar /usr/local/bin/composer +RUN chmod 755 /usr/local/bin/composer WORKDIR /var/www +RUN git clone https://github.com/shaarli/Shaarli.git shaarli \ + && cd shaarli \ + && composer --prefer-dist install RUN rm -rf html \ - && git clone https://github.com/shaarli/Shaarli.git shaarli \ + && echo "" > index.php \ && chown -R www-data:www-data . -WORKDIR /var/www/shaarli -RUN composer install - VOLUME /var/www/shaarli/data EXPOSE 80 diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 3db4eb56..d93ed262 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -1,17 +1,32 @@ FROM debian:jessie MAINTAINER Shaarli Community +ENV TERM dumb RUN apt-get update \ - && apt-get install -y curl nginx-light php5-fpm php5-gd supervisor + && apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + nginx-light \ + php5-curl \ + php5-fpm \ + php5-gd \ + php5-intl \ + supervisor \ + && apt-get clean COPY nginx.conf /etc/nginx/nginx.conf COPY supervised.conf /etc/supervisor/conf.d/supervised.conf +ADD https://getcomposer.org/composer.phar /usr/local/bin/composer +RUN chmod 755 /usr/local/bin/composer + WORKDIR /var/www -RUN rm -rf html \ - && curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xvzf - \ +RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf - \ && mv Shaarli-master shaarli \ - && chown -R www-data:www-data shaarli + && cd shaarli \ + && composer --prefer-dist --no-dev install +RUN rm -rf html \ + && chown -R www-data:www-data . VOLUME /var/www/shaarli/data -- cgit v1.2.3 From 665279ec99d31c7d571f90bf0186edb268020bb8 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 14 Aug 2016 16:20:06 +0200 Subject: Docker: update dependencies, introduce Composer Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/shaarli/Shaarli/pull/612 Relates to https://github.com/shaarli/Shaarli/pull/624 Relates to https://github.com/shaarli/Shaarli/pull/633 See https://github.com/shaarli/Shaarli/wiki/Server-requirements Modifications: - [prod][stable] refactor Dockerfile - [prod][stable] set $TERM=dumb to avoid debconf-related issues - [prod][stable] install ca-certificates - [prod][stable] cleanup APT cache after installing packages - [prod][stable] use Composer to resolve PHP dependencies Signed-off-by: VirtualTam --- docker/production/stable/Dockerfile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile index 2bb3948c..178d1cef 100644 --- a/docker/production/stable/Dockerfile +++ b/docker/production/stable/Dockerfile @@ -1,17 +1,32 @@ FROM debian:jessie MAINTAINER Shaarli Community +ENV TERM dumb RUN apt-get update \ - && apt-get install -y curl nginx-light php5-fpm php5-gd supervisor + && apt-get install --no-install-recommends -y \ + ca-certificates \ + curl \ + nginx-light \ + php5-curl \ + php5-fpm \ + php5-gd \ + php5-intl \ + supervisor \ + && apt-get clean COPY nginx.conf /etc/nginx/nginx.conf COPY supervised.conf /etc/supervisor/conf.d/supervised.conf +ADD https://getcomposer.org/composer.phar /usr/local/bin/composer +RUN chmod 755 /usr/local/bin/composer + WORKDIR /var/www +RUN curl -L https://github.com/shaarli/Shaarli/archive/stable.tar.gz | tar xzf - \ + && mv Shaarli-stable shaarli + && cd shaarli \ + && composer --prefer-dist --no-dev install RUN rm -rf html \ - && curl -L https://github.com/shaarli/Shaarli/archive/stable.tar.gz | tar xvzf - \ - && mv Shaarli-stable shaarli \ - && chown -R www-data:www-data shaarli + && chown -R www-data:www-data . VOLUME /var/www/shaarli/data -- cgit v1.2.3 From ca089c5bad8ee0f85df571ffa0f0beba51fa4efc Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 17 Aug 2016 16:07:54 +0200 Subject: update link to install instuctions in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8328d83..664da0a9 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ It runs the latest development version of Shaarli and is updated/reset daily. Login: `demo`; Password: `demo` ### Installation & upgrade -- [Download](https://github.com/shaarli/Shaarli/wiki/Download) +- [Download and installation](hhttps://github.com/shaarli/Shaarli/wiki/Download-and-Installation) - [Upgrade and migration](https://github.com/shaarli/Shaarli/wiki/Upgrade-and-migration) - [Server requirements](https://github.com/shaarli/Shaarli/wiki/Server-requirements) - [Server configuration](https://github.com/shaarli/Shaarli/wiki/Server-configuration) -- cgit v1.2.3 From e1fd94b545a6783853eeee03264596111fdf767e Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 20 Aug 2016 16:42:35 +0200 Subject: README: fix link address typo Fixes https://github.com/shaarli/Shaarli/issues/642 Signed-off-by: VirtualTam --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 664da0a9..5d5b743d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ It runs the latest development version of Shaarli and is updated/reset daily. Login: `demo`; Password: `demo` ### Installation & upgrade -- [Download and installation](hhttps://github.com/shaarli/Shaarli/wiki/Download-and-Installation) +- [Download and installation](https://github.com/shaarli/Shaarli/wiki/Download-and-Installation) - [Upgrade and migration](https://github.com/shaarli/Shaarli/wiki/Upgrade-and-migration) - [Server requirements](https://github.com/shaarli/Shaarli/wiki/Server-requirements) - [Server configuration](https://github.com/shaarli/Shaarli/wiki/Server-configuration) -- cgit v1.2.3 From 5283175367638850d34124afd336ccfcb6884723 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 4 Sep 2016 23:57:21 +0200 Subject: composer: display an error message if the autoload script is missing Closes https://github.com/shaarli/Shaarli/issues/645 Relates to https://github.com/shaarli/Shaarli/issues/607 Signed-off-by: VirtualTam --- index.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/index.php b/index.php index 1f148d78..c6f86c59 100644 --- a/index.php +++ b/index.php @@ -45,6 +45,16 @@ error_reporting(E_ALL^E_WARNING); // 3rd-party libraries +if (! file_exists(__DIR__ . '/vendor/autoload.php')) { + header('Content-Type: text/plain; charset=utf-8'); + echo "Error: missing Composer configuration\n\n" + ."If you installed Shaarli through Git or using the development branch,\n" + ."please refer to the installation documentation to install PHP" + ." dependencies using Composer:\n" + ."- https://github.com/shaarli/Shaarli/wiki/Server-requirements\n" + ."- https://github.com/shaarli/Shaarli/wiki/Download-and-Installation"; + exit; +} require_once 'inc/rain.tpl.class.php'; require_once __DIR__ . '/vendor/autoload.php'; -- cgit v1.2.3 From 7329118e9cfb41e4db0d898183304fcb0b204f7b Mon Sep 17 00:00:00 2001 From: Gary Marigliano Date: Wed, 14 Sep 2016 11:08:11 +0200 Subject: Add a missing backslash in stable Dockerfile version --- docker/production/stable/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile index 178d1cef..a509fda6 100644 --- a/docker/production/stable/Dockerfile +++ b/docker/production/stable/Dockerfile @@ -22,7 +22,7 @@ RUN chmod 755 /usr/local/bin/composer WORKDIR /var/www RUN curl -L https://github.com/shaarli/Shaarli/archive/stable.tar.gz | tar xzf - \ - && mv Shaarli-stable shaarli + && mv Shaarli-stable shaarli \ && cd shaarli \ && composer --prefer-dist --no-dev install RUN rm -rf html \ -- cgit v1.2.3 From fdf88d194874a533cf3a8de3d317d70018aa8a62 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 12 Oct 2016 12:36:59 +0200 Subject: Bump version to v0.8.0 Signed-off-by: ArthurHoaro --- doc/3rd-party-libraries.html | 9 +- doc/3rd-party-libraries.md | 1 + doc/Backup,-restore,-import-and-export.html | 34 ++- doc/Backup,-restore,-import-and-export.md | 31 +++ doc/Browsing-and-searching.html | 8 +- doc/Coding-guidelines.html | 8 +- doc/Community-&-Related-software.html | 11 +- doc/Community-&-Related-software.md | 3 +- ...installation-over-SSH-and-serve-it-locally.html | 58 ++-- doc/Create-and-serve-multiple-Shaarlis-(farm).html | 52 ++-- doc/Datastore-hacks.html | 8 +- doc/Development.html | 8 +- doc/Directory-structure.html | 60 ++--- doc/Docker.html | 104 ++++--- doc/Download-CSS-styles-from-an-OPML-list.html | 12 +- doc/Download-and-Installation.html | 165 ++++++++++++ doc/Download-and-Installation.md | 97 +++++++ doc/Download.html | 123 --------- doc/Download.md | 31 --- ...xample-patch---add-new-via-field-for-links.html | 8 +- doc/FAQ.html | 8 +- doc/Firefox-share.html | 8 +- doc/GnuPG-signature.html | 58 ++-- doc/Home.html | 8 +- doc/Plugin-System.html | 8 +- doc/Plugins.html | 8 +- doc/RSS-feeds.html | 8 +- doc/Release-Shaarli.html | 69 +++-- doc/Release-Shaarli.md | 24 +- doc/Security.html | 8 +- doc/Server-configuration.html | 41 ++- doc/Server-configuration.md | 12 - doc/Server-requirements.html | 46 +++- doc/Server-requirements.md | 19 +- doc/Server-security.html | 28 +- doc/Server-security.md | 14 + doc/Shaarli-configuration.html | 277 ++++++++++--------- doc/Shaarli-configuration.md | 298 +++++++++++++-------- doc/Shaarli-installation.html | 72 ----- doc/Shaarli-installation.md | 6 - doc/Sharing-button.html | 8 +- doc/Static-analysis.html | 8 +- doc/TODO.html | 74 ----- doc/TODO.md | 4 - doc/Theming.html | 25 +- doc/Theming.md | 1 + doc/Troubleshooting.html | 11 +- doc/Troubleshooting.md | 3 +- doc/Unit-tests.html | 110 ++++---- doc/Upgrade-and-migration.html | 242 +++++++++++++++++ doc/Upgrade-and-migration.md | 161 +++++++++++ doc/Upgrade-from-original-sebsauvage-Shaarli.html | 74 ----- doc/Upgrade-from-original-sebsauvage-Shaarli.md | 4 - doc/Usage.html | 8 +- doc/_Footer.html | 12 +- doc/_Footer.md | 2 +- doc/_Sidebar.html | 16 +- doc/_Sidebar.md | 8 +- doc/sidebar.html | 8 +- index.php | 4 +- shaarli_version.php | 2 +- 61 files changed, 1537 insertions(+), 1099 deletions(-) create mode 100644 doc/Download-and-Installation.html create mode 100644 doc/Download-and-Installation.md delete mode 100644 doc/Download.html delete mode 100644 doc/Download.md delete mode 100644 doc/Shaarli-installation.html delete mode 100644 doc/Shaarli-installation.md delete mode 100644 doc/TODO.html delete mode 100644 doc/TODO.md create mode 100644 doc/Upgrade-and-migration.html create mode 100644 doc/Upgrade-and-migration.md delete mode 100644 doc/Upgrade-from-original-sebsauvage-Shaarli.html delete mode 100644 doc/Upgrade-from-original-sebsauvage-Shaarli.md diff --git a/doc/3rd-party-libraries.html b/doc/3rd-party-libraries.html index f6ff4763..946ca037 100644 --- a/doc/3rd-party-libraries.html +++ b/doc/3rd-party-libraries.html @@ -15,13 +15,13 @@

@@ -81,6 +79,7 @@

PHP

shaarli/netscape-bookmark-parser - Netscape bookmark parser
RainTPL - HTML templating for PHP

diff --git a/doc/3rd-party-libraries.md b/doc/3rd-party-libraries.md index 3101c90a..e6370549 100644 --- a/doc/3rd-party-libraries.md +++ b/doc/3rd-party-libraries.md @@ -10,4 +10,5 @@ - [qr.js](http://neocotic.com/qr.js/) ([GitHub](https://github.com/neocotic/qr.js)) - QR code generation[](.html) ## PHP +- [shaarli/netscape-bookmark-parser](https://github.com/shaarli/netscape-bookmark-parser) - Netscape bookmark parser[](.html) - [RainTPL](https://github.com/rainphp/raintpl) - HTML templating for PHP[](.html) diff --git a/doc/Backup,-restore,-import-and-export.html b/doc/Backup,-restore,-import-and-export.html index 4d72728e..a4a48ad7 100644 --- a/doc/Backup,-restore,-import-and-export.html +++ b/doc/Backup,-restore,-import-and-export.html @@ -52,13 +52,13 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf

Backup, restore, import and export

Backup and restore the datastore file
Export links as...
Import links from...
Import Shaarli links to Firefox

Backup and restore the datastore file

Backup the file data/datastore.php (by FTP or SSH). Restore by putting the file back in place.

Example command:

rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php

rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php

Export links as...

To export links as an HTML file, under Tools > Export, choose:

This can be done using the shaarchiver tool.

Example command:

./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all

./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all

Import links from...

Diigo

If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.)

@@ -126,5 +131,20 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf

See this issue for import tweaks.

SemanticScuttle

To correctly import the tags from a SemanticScuttle HTML export, edit the HTML file before importing and replace all occurences of tags= (lowercase) to TAGS= (uppercase).

Scuttle

Shaarli cannot import data directly from Scuttle. However, you can use this third party tool: https://github.com/q2apro/scuttle-to-shaarli to export the Scuttle database to the Netscape HTML format compatible with the Shaarli importer.

Import Shaarli links to Firefox

Export your Shaarli links as described above.
For compatibility reasons, check Prepend note permalinks with this Shaarli instance's URL (useful to import bookmarks in a web browser)
In Firefox, open the bookmark manager (not the sidebar! Bookmarks menu > Show all bookmarks or Ctrl+Shift+B)
Select Import and Backup > Import bookmarks in HTML format

Your bookmarks will be imported in Firefox, ready to use, with tags and descriptions retained. "Self" (notes) shaares will still point to the Shaarli instance you exported them from, but the note text can be viewed directly in the bookmark properties inside your browser. Depending on the number of bookmarks, the import can take some time.

You may be interested in these Firefox addons to manage links imported from Shaarli

Bookmark Deduplicator - provides an easy way to deduplicate your bookmarks
TagSieve - browse your bookmarks by their tags

diff --git a/doc/Backup,-restore,-import-and-export.md b/doc/Backup,-restore,-import-and-export.md index cf6b9f48..9f5598ef 100644 --- a/doc/Backup,-restore,-import-and-export.md +++ b/doc/Backup,-restore,-import-and-export.md @@ -1,4 +1,12 @@ #Backup, restore, import and export + * [Backup and restore the datastore file](#backup-and-restore-the-datastore-file)[](.html) + * [Export links as...](#export-links-as)[](.html) + * [Import links from...](#import-links-from)[](.html) + * [Import Shaarli links to Firefox](#import-shaarli-links-to-firefox)[](.html) + + +---------------------- + ## Backup and restore the datastore file Backup the file `data/datastore.php` (by FTP or SSH). Restore by putting the file back in place. @@ -9,6 +17,7 @@ rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date + ``` ## Export links as... + To export links as an HTML file, under _Tools > Export_, choose: - _Export all_ to export both public and private links - _Export public_ to export public links only @@ -23,13 +32,35 @@ Example command: ``` ## Import links from... + + ### Diigo If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.) + ### Mister Wong + See [this issue](https://github.com/sebsauvage/Shaarli/issues/146) for import tweaks.[](.html) ### SemanticScuttle To correctly import the tags from a [SemanticScuttle](http://semanticscuttle.sourceforge.net/) HTML export, edit the HTML file before importing and replace all occurences of `tags=` (lowercase) to `TAGS=` (uppercase).[](.html) + +### Scuttle + +Shaarli cannot import data directly from [Scuttle](https://github.com/scronide/scuttle). However, you can use this third party tool: https://github.com/q2apro/scuttle-to-shaarli to export the Scuttle database to the Netscape HTML format compatible with the Shaarli importer.[](.html) + +## Import Shaarli links to Firefox + + * Export your Shaarli links as described above. + * For compatibility reasons, check `Prepend note permalinks with this Shaarli instance's URL (useful to import bookmarks in a web browser)` + * In Firefox, open the bookmark manager (not the sidebar! `Bookmarks menu > Show all bookmarks` or `Ctrl+Shift+B`) + * Select `Import and Backup > Import bookmarks in HTML format` + +Your bookmarks will be imported in Firefox, ready to use, with tags and descriptions retained. "Self" (notes) shaares will still point to the Shaarli instance you exported them from, but the note text can be viewed directly in the bookmark properties inside your browser. Depending on the number of bookmarks, the import can take some time. + +You may be interested in these Firefox addons to manage links imported from Shaarli + + * [Bookmark Deduplicator](https://addons.mozilla.org/en-US/firefox/addon/bookmark-deduplicator/) - provides an easy way to deduplicate your bookmarks[](.html) + * [TagSieve](https://addons.mozilla.org/en-US/firefox/addon/tagsieve/) - browse your bookmarks by their tags[](.html) diff --git a/doc/Browsing-and-searching.html b/doc/Browsing-and-searching.html index 39806128..23001bcb 100644 --- a/doc/Browsing-and-searching.html +++ b/doc/Browsing-and-searching.html @@ -15,13 +15,13 @@ diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html index add69631..1a2a9351 100644 --- a/doc/Coding-guidelines.html +++ b/doc/Coding-guidelines.html @@ -15,13 +15,13 @@ diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html index 77b9793f..accbacdc 100644 --- a/doc/Community-&-Related-software.html +++ b/doc/Community-&-Related-software.html @@ -15,13 +15,13 @@ @@ -84,8 +82,9 @@

autosave by @kalvn: Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.

Code Coloration by @ArthurHoaro: client side code syntax highlighter.

social by @alexisju: share links to social networks.

emojione by @NerosTie: Add colorful emojis to your Shaarli.

launch - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli.

Disqus by @kalvn: Adds Disqus comment system to your Shaarli.

Themes

See Theming for the list of community-contributed themes, and an installation guide.

diff --git a/doc/Community-&-Related-software.md b/doc/Community-&-Related-software.md index 03a3dea9..3945d005 100644 --- a/doc/Community-&-Related-software.md +++ b/doc/Community-&-Related-software.md @@ -21,8 +21,9 @@ _TODO: contact repos owners to see if they'd like to standardize their work with * [autosave](https://github.com/kalvn/shaarli-plugin-autosave) by [@kalvn](https://github.com/kalvn): Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.[](.html) * [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter.[](.html) * [social](https://github.com/alexisju/social) by [@alexisju](https://github.com/alexisju): share links to social networks.[](.html) - * [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie/emojione): Add colorful emojis to your Shaarli.[](.html) + * [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli.[](.html) * [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli.[](.html) + * [Disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli.[](.html) ### Themes diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html index edb1555f..9efb1ad6 100644 --- a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html +++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html @@ -52,13 +52,13 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf @@ -111,55 +109,55 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf #Usage: ./local-shaarli.sh #Author: nodiscc (nodiscc@gmail.com) #License: MIT (http://opensource.org/licenses/MIT) -set -o errexit -set -o nounset +set -o errexit +set -o nounset ##### CONFIG ################# #The port used by php's local server -php_local_port=7431 +php_local_port=7431 #Name of the SSH server and path where Shaarli is installed #TODO: pass these as command-line arguments -remotehost="my.ssh.server" -remote_shaarli_dir="/var/www/shaarli" +remotehost="my.ssh.server" +remote_shaarli_dir="/var/www/shaarli" ###### FUNCTIONS ############# _main() { - _CBSyncShaarli - _CBServeShaarli + _CBSyncShaarli + _CBServeShaarli } _CBSyncShaarli() { - remote_temp_dir=$(ssh $remotehost mktemp -d) - remote_ssh_user=$(ssh $remotehost whoami) - ssh -t "$remotehost" sudo cp -r "$remote_shaarli_dir" "$remote_temp_dir" - ssh -t "$remotehost" sudo chown -R "$remote_ssh_user":"$remote_ssh_user" "$remote_temp_dir" - scp -rq "$remotehost":"$remote_temp_dir" local-shaarli - ssh "$remotehost" rm -r "$remote_temp_dir" + remote_temp_dir=$(ssh $remotehost mktemp -d) + remote_ssh_user=$(ssh $remotehost whoami) + ssh -t "$remotehost" sudo cp -r "$remote_shaarli_dir" "$remote_temp_dir" + ssh -t "$remotehost" sudo chown -R "$remote_ssh_user":"$remote_ssh_user" "$remote_temp_dir" + scp -rq "$remotehost":"$remote_temp_dir" local-shaarli + ssh "$remotehost" rm -r "$remote_temp_dir" } _CBServeShaarli() { #TODO: allow serving a previously downloaded Shaarli #TODO: ask before overwriting local copy, if it exists - cd local-shaarli/ - php -S localhost:${php_local_port} - echo "Please go to http://localhost:${php_local_port}" + cd local-shaarli/ + php -S localhost:${php_local_port} + echo "Please go to http://localhost:${php_local_port}" } ##### MAIN ################# -_main

Library	Required?	Usage
`shaarli/netscape-bookmark-parser`	All	Import bookmarks from Netscape files

-- cgit v1.2.3 From 7fde6de1212323418401c15efba06026c704ca87 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 14 Oct 2016 13:22:58 +0200 Subject: New init function for plugins, supports errors reporting All plugins can optionally add an init function named `pluginname_init()` which is called when the plugin is loaded. This function is aware of the config, and can return initialization errors, which are displayed in the header template. Note that the previous error system hack no longer work. --- application/PageBuilder.php | 3 --- application/PluginManager.php | 25 +++++++++++++++++++++++++ index.php | 1 + plugins/demo_plugin/demo_plugin.php | 17 +++++++++++++++++ plugins/readityourself/readityourself.php | 19 +++++++++++++++---- plugins/wallabag/wallabag.php | 19 +++++++++++++++---- tests/plugins/PluginReadityourselfTest.php | 23 +++++++++++++++++++++-- tests/plugins/PluginWallabagTest.php | 23 +++++++++++++++++++++-- 8 files changed, 115 insertions(+), 15 deletions(-) diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 42932f32..32c7f9f1 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -77,9 +77,6 @@ class PageBuilder $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)); - if (!empty($GLOBALS['plugin_errors'])) { - $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); - } $this->tpl->assign('token', getToken($this->conf)); // To be removed with a proper theme configuration. $this->tpl->assign('conf', $this->conf); diff --git a/application/PluginManager.php b/application/PluginManager.php index 1e132a7f..59ece4fa 100644 --- a/application/PluginManager.php +++ b/application/PluginManager.php @@ -24,6 +24,11 @@ class PluginManager */ protected $conf; + /** + * @var array List of plugin errors. + */ + protected $errors; + /** * Plugins subdirectory. * @var string $PLUGINS_PATH @@ -44,6 +49,7 @@ class PluginManager public function __construct(&$conf) { $this->conf = $conf; + $this->errors = array(); } /** @@ -106,6 +112,7 @@ class PluginManager /** * Load a single plugin from its files. + * Call the init function if it exists, and collect errors. * Add them in $loadedPlugins if successful. * * @param string $dir plugin's directory. @@ -128,6 +135,14 @@ class PluginManager $conf = $this->conf; include_once $pluginFilePath; + $initFunction = $pluginName . '_init'; + if (function_exists($initFunction)) { + $errors = call_user_func($initFunction, $this->conf); + if (!empty($errors)) { + $this->errors = array_merge($this->errors, $errors); + } + } + $this->loadedPlugins[] = $pluginName; } @@ -195,6 +210,16 @@ class PluginManager return $metaData; } + + /** + * Return the list of encountered errors. + * + * @return array List of errors (empty array if none exists). + */ + public function getErrors() + { + return $this->errors; + } } /** diff --git a/index.php b/index.php index 5bc13d49..f7e73bde 100644 --- a/index.php +++ b/index.php @@ -778,6 +778,7 @@ function renderPage($conf, $pluginManager) $PAGE = new PageBuilder($conf); $PAGE->assign('linkcount', count($LINKSDB)); $PAGE->assign('privateLinkcount', count_private($LINKSDB)); + $PAGE->assign('plugin_errors', $pluginManager->getErrors()); // Determine which page will be rendered. $query = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : ''; diff --git a/plugins/demo_plugin/demo_plugin.php b/plugins/demo_plugin/demo_plugin.php index 18834e53..7335c9d4 100644 --- a/plugins/demo_plugin/demo_plugin.php +++ b/plugins/demo_plugin/demo_plugin.php @@ -14,6 +14,23 @@ * and check user status with _LOGGEDIN_. */ +/** + * Initialization function. + * It will be called when the plugin is loaded. + * This function can be used to return a list of initialization errors. + * + * @param $conf ConfigManager instance. + * + * @return array List of errors (optional). + */ +function demo_plugin_init($conf) +{ + $conf->get('toto', 'nope'); + + $errors[] = 'This a demo init error.'; + return $errors; +} + /** * Hook render_header. * Executed on every page redering. diff --git a/plugins/readityourself/readityourself.php b/plugins/readityourself/readityourself.php index 4bfcf501..961c5bda 100644 --- a/plugins/readityourself/readityourself.php +++ b/plugins/readityourself/readityourself.php @@ -8,10 +8,21 @@ // it seems kinda dead. // Not tested. -$riyUrl = $conf->get('plugins.READITYOUSELF_URL'); -if (empty($riyUrl)) { - $GLOBALS['plugin_errors'][] = 'Readityourself plugin error: '. - 'Please define the "READITYOUSELF_URL" setting in the plugin administration page.'; +/** + * Init function, return an error if the server is not set. + * + * @param $conf ConfigManager instance. + * + * @return array Eventual error. + */ +function readityourself_init($conf) +{ + $riyUrl = $conf->get('plugins.READITYOUSELF_URL'); + if (empty($riyUrl)) { + $error = 'Readityourself plugin error: '. + 'Please define the "READITYOUSELF_URL" setting in the plugin administration page.'; + return array($error); + } } /** diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php index ec09c8a1..641e4cc2 100644 --- a/plugins/wallabag/wallabag.php +++ b/plugins/wallabag/wallabag.php @@ -6,10 +6,21 @@ require_once 'WallabagInstance.php'; -$wallabagUrl = $conf->get('plugins.WALLABAG_URL'); -if (empty($wallabagUrl)) { - $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '. - 'Please define the "WALLABAG_URL" setting in the plugin administration page.'; +/** + * Init function, return an error if the server is not set. + * + * @param $conf ConfigManager instance. + * + * @return array Eventual error. + */ +function wallabag_init($conf) +{ + $wallabagUrl = $conf->get('plugins.WALLABAG_URL'); + if (empty($wallabagUrl)) { + $error = 'Wallabag plugin error: '. + 'Please define the "WALLABAG_URL" setting in the plugin administration page.'; + return array($error); + } } /** diff --git a/tests/plugins/PluginReadityourselfTest.php b/tests/plugins/PluginReadityourselfTest.php index d73e666a..532db146 100644 --- a/tests/plugins/PluginReadityourselfTest.php +++ b/tests/plugins/PluginReadityourselfTest.php @@ -4,8 +4,6 @@ * PluginReadityourselfTest.php.php */ -// FIXME! add an init method. -$conf = new ConfigManager(''); require_once 'plugins/readityourself/readityourself.php'; /** @@ -22,6 +20,27 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase PluginManager::$PLUGINS_PATH = 'plugins'; } + /** + * Test Readityourself init without errors. + */ + function testReadityourselfInitNoError() + { + $conf = new ConfigManager(''); + $conf->set('plugins.READITYOUSELF_URL', 'value'); + $errors = readityourself_init($conf); + $this->assertEmpty($errors); + } + + /** + * Test Readityourself init with errors. + */ + function testReadityourselfInitError() + { + $conf = new ConfigManager(''); + $errors = readityourself_init($conf); + $this->assertNotEmpty($errors); + } + /** * Test render_linklist hook. */ diff --git a/tests/plugins/PluginWallabagTest.php b/tests/plugins/PluginWallabagTest.php index 302ee296..2c268cbd 100644 --- a/tests/plugins/PluginWallabagTest.php +++ b/tests/plugins/PluginWallabagTest.php @@ -4,8 +4,6 @@ * PluginWallabagTest.php.php */ -// FIXME! add an init method. -$conf = new ConfigManager(''); require_once 'plugins/wallabag/wallabag.php'; /** @@ -22,6 +20,27 @@ class PluginWallabagTest extends PHPUnit_Framework_TestCase PluginManager::$PLUGINS_PATH = 'plugins'; } + /** + * Test wallabag init without errors. + */ + function testWallabagInitNoError() + { + $conf = new ConfigManager(''); + $conf->set('plugins.WALLABAG_URL', 'value'); + $errors = wallabag_init($conf); + $this->assertEmpty($errors); + } + + /** + * Test wallabag init with errors. + */ + function testWallabagInitError() + { + $conf = new ConfigManager(''); + $errors = wallabag_init($conf); + $this->assertNotEmpty($errors); + } + /** * Test render_linklist hook. */ -- cgit v1.2.3 From dec5fe9c6973054a1301982f910de86a19502b55 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 16 Oct 2016 17:41:08 +0200 Subject: Cleanup: explicitely loop over PHP variables in templates Relates to https://github.com/shaarli/Shaarli/issues/613 Before: {loop="someVariable"} After: {loop="$someVariable"} Signed-off-by: VirtualTam --- tpl/daily.html | 6 +++--- tpl/dailyrss.html | 2 +- tpl/export.bookmarks.html | 2 +- tpl/feed.atom.html | 2 +- tpl/feed.rss.html | 2 +- tpl/linklist.html | 4 ++-- tpl/page.header.html | 2 +- tpl/picwall.html | 2 +- tpl/tagcloud.html | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tpl/daily.html b/tpl/daily.html index dde1f376..b82ad483 100644 --- a/tpl/daily.html +++ b/tpl/daily.html @@ -42,10 +42,10 @@

{if="$linksToDisplay"} - {loop="cols"} + {loop="$cols"} {if="isset($value[0])"}

- {loop="value"} + {loop="$value"} {$link=$value}

@@ -60,7 +60,7 @@ {/if} {if="$link.tags"}

- {loop="link.taglist"} + {loop="$link.taglist"} {$value} - {/loop}

diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html index b14a3859..ddbd6c5e 100644 --- a/tpl/dailyrss.html +++ b/tpl/dailyrss.html @@ -4,7 +4,7 @@ {$absurl} {$rssdate} {$value.title} {if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}
{$value.url}
diff --git a/tpl/export.bookmarks.html b/tpl/export.bookmarks.html index da733257..127a5c20 100644 --- a/tpl/export.bookmarks.html +++ b/tpl/export.bookmarks.html @@ -5,6 +5,6 @@ Do Not Edit! -->{ignore}The RainTPL loop is formatted to avoid generating extra newlines{/ignore} {$pagetitle}

Shaarli export of {$selection} bookmarks on {$date}

{loop="links"} +

{$value.title}{if="$value.description"}{$eol}: {$value.description}{/if}{/loop}

diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html index 1932f507..40fd421a 100644 --- a/tpl/feed.atom.html +++ b/tpl/feed.atom.html @@ -17,7 +17,7 @@ {$index_url} Shaarli - {loop="links"} + {loop="$links"} {$value.title} {if="$usepermalinks"} diff --git a/tpl/feed.rss.html b/tpl/feed.rss.html index 4bfe4196..e18dbf9b 100644 --- a/tpl/feed.rss.html +++ b/tpl/feed.rss.html @@ -12,7 +12,7 @@ {/if} - {loop="links"} + {loop="$links"} {$value.title} {$value.guid} diff --git a/tpl/linklist.html b/tpl/linklist.html index 9979f12a..ddfd729a 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -63,7 +63,7 @@

{/if}

{$value.url|thumbnail}

@@ -110,7 +110,7 @@ {$value.url}
{if="$value.tags"}

- {loop="value.taglist"}{$value} {/loop} + {loop="$value.taglist"}{$value} {/loop}

{/if} diff --git a/tpl/page.header.html b/tpl/page.header.html index 0012c689..eac2ed4a 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html @@ -43,7 +43,7 @@ {if="!empty($plugin_errors) && isLoggedIn()"}

{$value}

diff --git a/tpl/picwall.html b/tpl/picwall.html index 230c948b..4e227e37 100644 --- a/tpl/picwall.html +++ b/tpl/picwall.html @@ -14,7 +14,7 @@

- {loop="linksToDisplay"} + {loop="$linksToDisplay"}

{$value.thumbnail}{$value.title} {loop="$value.picwall_plugin"} diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html index e449f293..05e45273 100644 --- a/tpl/tagcloud.html +++ b/tpl/tagcloud.html @@ -11,7 +11,7 @@

- {loop="tags"} + {loop="$tags"} {$value.count}{$key} {loop="$value.tag_plugin"} -- cgit v1.2.3 From 44a718090d716e53c0e78bf3a0225fd2fb30071e Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 16 Oct 2016 20:52:35 +0200 Subject: Fix: return the proper value for the "self" feed attribute Fixes https://github.com/shaarli/Shaarli/issues/629 Closes https://github.com/shaarli/Shaarli/pull/630 Note: you might need to empty the "pagecache" directory for the fix to be taken into account Signed-off-by: VirtualTam --- application/FeedBuilder.php | 3 ++- tests/FeedBuilderTest.php | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php index 58c6bb17..c6657fbb 100644 --- a/application/FeedBuilder.php +++ b/application/FeedBuilder.php @@ -124,7 +124,8 @@ class FeedBuilder $data['last_update'] = $this->getLatestDateFormatted(); $data['show_dates'] = !$this->hideDates || $this->isLoggedIn; // Remove leading slash from REQUEST_URI. - $data['self_link'] = $pageaddr . escape(ltrim($this->serverInfo['REQUEST_URI'], '/')); + $data['self_link'] = escape(server_url($this->serverInfo)) + . escape($this->serverInfo['REQUEST_URI']); $data['index_url'] = $pageaddr; $data['usepermalinks'] = $this->usePermalinks === true; $data['links'] = $linkDisplayed; diff --git a/tests/FeedBuilderTest.php b/tests/FeedBuilderTest.php index c9ff397d..aa57f44e 100644 --- a/tests/FeedBuilderTest.php +++ b/tests/FeedBuilderTest.php @@ -217,4 +217,37 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase $this->assertEquals(ReferenceLinkDB::$NB_LINKS_TOTAL, count($data['links'])); $this->assertEquals('http://pubsubhub.io', $data['pubsubhub_url']); } + + /** + * Test buildData when Shaarli is served from a subdirectory + */ + public function testBuildDataServerSubdir() + { + $serverInfo = array( + 'HTTPS' => 'Off', + 'SERVER_NAME' => 'host.tld', + 'SERVER_PORT' => '8080', + 'SCRIPT_NAME' => '/~user/shaarli/index.php', + 'REQUEST_URI' => '/~user/shaarli/index.php?do=feed', + ); + $feedBuilder = new FeedBuilder( + self::$linkDB, + FeedBuilder::$FEED_ATOM, + $serverInfo, + null, + false + ); + $feedBuilder->setLocale(self::$LOCALE); + $data = $feedBuilder->buildData(); + + $this->assertEquals( + 'http://host.tld:8080/~user/shaarli/index.php?do=feed', + $data['self_link'] + ); + + // Test first link (note link) + $link = array_shift($data['links']); + $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['guid']); + $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['url']); + } } -- cgit v1.2.3 From bf26e7ebcb5ee69523b93a5ec7b7a65b39acb916 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 3 Oct 2016 09:43:49 +0200 Subject: Isso comments plugin Use Isso client to let visitors comments on permalinks --- plugins/isso/isso.css | 3 + plugins/isso/isso.html | 14 ++++ plugins/isso/isso.meta | 3 + plugins/isso/isso.php | 54 ++++++++++++++++ tests/plugins/PluginIssoTest.php | 136 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 210 insertions(+) create mode 100644 plugins/isso/isso.css create mode 100644 plugins/isso/isso.html create mode 100644 plugins/isso/isso.meta create mode 100644 plugins/isso/isso.php create mode 100644 tests/plugins/PluginIssoTest.php diff --git a/plugins/isso/isso.css b/plugins/isso/isso.css new file mode 100644 index 00000000..b89babc3 --- /dev/null +++ b/plugins/isso/isso.css @@ -0,0 +1,3 @@ +#isso-thread > h4 { + text-align: center; +} diff --git a/plugins/isso/isso.html b/plugins/isso/isso.html new file mode 100644 index 00000000..babab9b8 --- /dev/null +++ b/plugins/isso/isso.html @@ -0,0 +1,14 @@ + +

diff --git a/plugins/isso/isso.meta b/plugins/isso/isso.meta new file mode 100644 index 00000000..62473abc --- /dev/null +++ b/plugins/isso/isso.meta @@ -0,0 +1,3 @@ +description="Let visitor comment your shaares on permalinks with Isso." +parameters="ISSO_SERVER" +parameter.ISSO_SERVER="Isso server URL (without 'http://')" diff --git a/plugins/isso/isso.php b/plugins/isso/isso.php new file mode 100644 index 00000000..ffb7cfac --- /dev/null +++ b/plugins/isso/isso.php @@ -0,0 +1,54 @@ +get('plugins.ISSO_SERVER'); + if (empty($issoUrl)) { + $error = 'Isso plugin error: '. + 'Please define the "ISSO_SERVER" setting in the plugin administration page.'; + return array($error); + } +} + +/** + * Render linklist hook. + * Will only display Isso comments on permalinks. + * + * @param $data array List of links + * @param $conf ConfigManager instance + * + * @return mixed - linklist data with Isso plugin. + */ +function hook_isso_render_linklist($data, $conf) +{ + $issoUrl = $conf->get('plugins.ISSO_SERVER'); + if (empty($issoUrl)) { + return $data; + } + + // Only display comments for permalinks. + if (count($data['links']) == 1 && empty($data['search_tags']) && empty($data['search_term'])) { + $link = reset($data['links']); + $isso_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/isso/isso.html'); + + $isso = sprintf($isso_html, $issoUrl, $issoUrl, $link['linkdate'], $link['linkdate']); + $data['plugin_end_zone'][] = $isso; + + // Hackish way to include this CSS file only when necessary. + $data['plugins_includes']['css_files'][] = PluginManager::$PLUGINS_PATH . '/isso/isso.css'; + } + + return $data; +} diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php new file mode 100644 index 00000000..1f545c7d --- /dev/null +++ b/tests/plugins/PluginIssoTest.php @@ -0,0 +1,136 @@ +set('plugins.ISSO_SERVER', 'value'); + $errors = isso_init($conf); + $this->assertEmpty($errors); + } + + /** + * Test Isso init with errors. + */ + function testWallabagInitError() + { + $conf = new ConfigManager(''); + $errors = isso_init($conf); + $this->assertNotEmpty($errors); + } + + /** + * Test render_linklist hook with valid settings to display the comment form. + */ + function testIssoDisplayed() + { + $conf = new ConfigManager(''); + $conf->set('plugins.ISSO_SERVER', 'value'); + + $str = 'http://randomstr.com/test'; + $data = array( + 'title' => $str, + 'links' => array( + array( + 'url' => $str, + 'linkdate' => 'abc', + ) + ) + ); + + $data = hook_isso_render_linklist($data, $conf); + + // data shouldn't be altered + $this->assertEquals($str, $data['title']); + $this->assertEquals($str, $data['links'][0]['url']); + + // plugin data + $this->assertEquals(1, count($data['plugin_end_zone'])); + $this->assertNotFalse(strpos($data['plugin_end_zone'][0], 'abc')); + $this->assertNotFalse(strpos($data['plugin_end_zone'][0], 'embed.min.js')); + } + + /** + * Test isso plugin when multiple links are displayed (shouldn't be displayed). + */ + function testIssoMultipleLinks() + { + $conf = new ConfigManager(''); + $conf->set('plugins.ISSO_SERVER', 'value'); + + $str = 'http://randomstr.com/test'; + $data = array( + 'title' => $str, + 'links' => array( + array( + 'url' => $str, + 'linkdate' => 'abc', + ), + array( + 'url' => $str . '2', + 'linkdate' => 'abc2', + ), + ) + ); + + $processed = hook_isso_render_linklist($data, $conf); + // data shouldn't be altered + $this->assertEquals($data, $processed); + } + + /** + * Test isso plugin when using search (shouldn't be displayed). + */ + function testIssoNotDisplayedWhenSearch() + { + $conf = new ConfigManager(''); + $conf->set('plugins.ISSO_SERVER', 'value'); + + $str = 'http://randomstr.com/test'; + $data = array( + 'title' => $str, + 'links' => array( + array( + 'url' => $str, + 'linkdate' => 'abc', + ) + ), + 'search_term' => $str + ); + + $processed = hook_isso_render_linklist($data, $conf); + + // data shouldn't be altered + $this->assertEquals($data, $processed); + } + + /** + * Test isso plugin without server configuration (shouldn't be displayed). + */ + function testIssoWithoutConf() + { + $data = 'abc'; + $conf = new ConfigManager(''); + $processed = hook_isso_render_linklist($data, $conf); + $this->assertEquals($data, $processed); + } +} -- cgit v1.2.3 From 5eb724785209fd0ddf34784be8f872d83208eb54 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Mon, 17 Oct 2016 18:00:29 +0200 Subject: CHANGELOG.md: add published Shaarli Community releases Relates to https://github.com/shaarli/Shaarli/issues/663 See http://keepachangelog.com/en/0.3.0/ This file mirrors the content of the Shaarli release notes available at https://github.com/shaarli/Shaarli/releases Signed-off-by: VirtualTam --- CHANGELOG.md | 318 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + 2 files changed, 319 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..f3dd5153 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,318 @@ +# Change Log +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/) +and this project adheres to [Semantic Versioning](http://semver.org/). + +## [v0.8.0](https://github.com/shaarli/Shaarli/releases/tag/v0.8.0) - 2016-10-12 +Shaarli now uses [Composer](https://getcomposer.org/) to handle its dependencies. +Please use our release archives, or follow the [installation documentation](https://github.com/shaarli/Shaarli/wiki/Download-and-Installation). + +### Added +- Composer is required to resolve Shaarli's PHP dependencies +- Shaarli now supports `#hashtags` +- Firefox social share now uses selected text as a description +- Plugin parameters can have a description in each plugin's `.meta` file + +### Changed +- Configuration is now stored as a JSON file +- Previous configuration format will be automatically updated (PHP -> JSON) +- Shaarli now defaults to cURL to fetch shaare titles +- URL cleanup: remove `PHPSESSID` parameter +- `nomarkdown` tag is no longer private, and now affects visitors +- Cleanup template indentation +- Rewrite bookmark import using a generic Netscape parser + +### Removed +- Shaarli no longer references Delicious in its description + +### Deprecated +- Shaarli configuration is not held as PHP globals anymore + +### Fixed +- Ignore case for tags in autocompletion and cloud tag +- Avoid generating empty tags +- Fix a Dockerfile syntax error + +### Security +- Fixed a bug preventing to change password +- XSRF token now generated each time a page is rendered + +## [v0.7.0](https://github.com/shaarli/Shaarli/releases/tag/v0.7.0) - 2016-05-14 +### Added +- Adds an option to encode redirector URL parameter +- Atom/RSS feeds now support Markdown formatting, and plugins in general +- Markdown: use the tag `.nomarkdown` to avoid markdown processing +- Prefill the login field when the authentication has failed +- Show a private links counter + +### Changed +- Allow to use the bookmarklet in Firefox reader view (URL clean up) +- Improve tagcloud font size +- Improve title retrieving +- Markdown: inline code background color +- Refactor Netscape bookmark export +- Refactor Atom/RSS feed generation + +### Removed +- Remove delicious from Shaarli description + +### Fixed +- Fix bad login redirections causing a 404 in a few cases +- Fix tagcloud font-size with French locale +- Don't display empty tags in tag search +- Fix Awesomeplete conflicts with jQuery +- Fix UTC timezone selection +- Fix a bug preventing to import notes in browsers from bookmarks export +- Don't redirect to ?post if ?addlink is reached while logged out + +## [v0.6.5](https://github.com/shaarli/Shaarli/releases/tag/v0.6.5) - 2016-03-02 +### Fixed +- Fixes a regression generating an unnecessary warning (language in HTTP request). +- Fixes a bug where going through multiple reverse proxy could generate malformed URL. +- Markdown: Fixes a bug where empty description blocks were displayed. + +## [v0.6.4](https://github.com/shaarli/Shaarli/releases/tag/v0.6.4) - 2016-02-28 +### Added +- Add an updater class to automate user data upgrades +- Plugin admin page: adds a label for checkboxes and improve name display +- Plugin Wallabag: API version can be specified in plugin admin page + +### Changed +- Better tag cloud sorting, including special chars (`a > E > é > z`) +- Autolocale now sets all locale categories, not just time +- Use PHP's DateTime object instead of custom functions +- Plugin hooks: process includes before header/footer +- Markdown plugin: better styles for `

` and `` tags
+- Improve searching:
+    - search terms are now considered separated and won't only return exact results anymore
+    - exact search can be done with quotes `"this exact sentence"`
+    - search supports excluded terms starting a dash `-exclude`
+    - implement crossed search: terms + tags
+    - all of them combined across all shaare fields
+- New tag behaviour:
+    - tags starting with a dash will be renamed without it
+    - tags starting with a dot `.` will be hidden unless the user is logged in
+
+### Fixed
+- Fix Markdown plugin escape issues (code/quote blocks, etc.)
+- Link description aren't trimmed anymore to allow markdown format at the beginning of a shaare
+- Fixes plugin admin redirection page on error
+
+### Security
+- Fix a bug where non initialized variables were causing a warning
+- Fix a bug where saving a link after edit could cause a 404 error
+
+## [v0.6.3](https://github.com/shaarli/Shaarli/releases/tag/v0.6.3) - 2016-01-31
+### Added
+- Plugins administration page
+- Markdown plugin added for shaares description
+- Docker: Dockerfile is now in the main git repository and improved
+- Add a `.gitattributes` to ease repository management
+- Travis: include file permission checks
+
+### Changed
+- Auto retrieve of title know works with websites (HTTPS, follow redirections, etc.)
+- 404 page is now handled in a template
+- Date in log files updated to work with fail2ban
+- Wallabag: support of Wallabag v2 and minor fixes
+- Link search refactoring
+- Logging function refactoring
+
+### Fixed
+- Fix a bug where renaming a tag was causing a 404
+- Fix a bug allowing to search blank terms
+- Fix a bug preventing to remove a tag with special chars when searching 
+
+
+## [v0.6.2](https://github.com/shaarli/Shaarli/releases/tag/v0.6.2) - 2015-12-23
+### Changed
+- Plugins: new footer hook
+- Plugins: improve QR code
+- Cleanup templates
+
+### Fixed
+- Plugins: use the actual link URL to generate QR codes
+- Templates: missing/erroneous page titles
+- Templates: missing variables resulting in PHP errors
+
+### Security
+- Fix invalid file permissions (remove executable bit)
+
+
+## [v0.6.1](https://github.com/shaarli/Shaarli/releases/tag/v0.6.1) - 2015-12-01
+### Added
+- Add OpenSearch support
+- Add a Doxygen makefile target
+- Tools: add fine-grained file/directory permission checks (installation)
+
+### Changed
+- Tools: check the 'stable' branch for new versions (updates)
+- Cleanup: introduce an `ApplicationUtils` class
+
+### Removed
+ - Cleanup: remove `json_encode()` function (built-in since PHP 5.2)
+
+### Fixed
+ - Auto-complete more than one tag
+ - Bookmarklet: support titles containing quotes
+ - URL encode links when setting a redirector
+
+## [v0.6.0](https://github.com/shaarli/Shaarli/releases/tag/v0.6.0) - 2015-11-18
+### Added
+- Introduce a plugin system
+- Add a demo_plugin
+- Add plugins:
+    - addlink_toolbar
+    - archiveorg
+    - playvideos
+    - qrcode
+    - readityourself
+    - wallabag
+
+### Changed
+- Coding style
+
+### Fixed
+- Adding a new link now returns the correct anchor in the URL
+- Set default file permissions
+
+
+## [v0.5.4](https://github.com/shaarli/Shaarli/releases/tag/v0.5.4) - 2015-09-15
+### Added
+- HTTPS: support being served behing an SSL-enabled proxy
+
+### Changed
+- HTTP/Server utilities: refactor & add test coverage
+- Project & documentation:
+    - improve/rewrite `README.md`
+    - update contributor list
+    - update `index.php` header
+
+### Fixed
+- PHP session IDs: handle hash algorithms and bits per char representations
+
+
+## [v0.5.3](https://github.com/shaarli/Shaarli/releases/tag/v0.5.3) - 2015-09-02
+### Fixed
+- Fix a bug that could prevent user to login
+
+## [0.5.3](https://github.com/shaarli/Shaarli/releases/tag/0.5.3) - 2015-09-02
+This release has been YANKED as it points to a tag that does not follow our naming convention. Please use `v0.5.3` instead.
+
+### Fixed
+- Allow uppercase letters in PHP sessionid format
+
+## [v0.5.2](https://github.com/shaarli/Shaarli/releases/tag/v0.5.2) - 2015-08-31
+### Added
+- Add PHP 7 to Travis platforms
+
+### Changed
+- Also extract HTTPS page metadata (title)
+
+### Fixed
+- Fix regression preventing to load LinkDB info when adding an existing link
+
+### Security
+- Fix Full Path Disclosure upon cookie forgery
+
+## [v0.5.1](https://github.com/shaarli/Shaarli/releases/tag/v0.5.1) - 2015-08-17
+### Added
+- Add a link to the shaarli/shaarli DockerHub repository
+
+### Changed
+- Update local documentation
+- Improve timezone detection at installation
+- Improve feed cache handling
+- Improve URL cleanup for new links
+
+### Fixed
+- Fix 404 after editing a link while being logged out
+
+## [v0.5.0](https://github.com/shaarli/Shaarli/releases/tag/v0.5.0) - 2015-07-31
+### Added
+- Add Firefox Social API
+- Start code refactoring:
+    - add unit test coverage
+    - add Travis integration
+
+### Changed
+- Search/Filter by tag fieds can now be accessed quickly with the `Tab` key
+- Update documentation
+- Remove duplicate tags in links
+- Remove annoying URL patterns
+- Start code refactoring:
+    - move all settings to `data/config.php`
+    - refactor Config, LinkDB, TimeZone, Utils
+
+### Fixed
+- Fix locale handling
+- Fix note URLs
+- Fix page redirections
+- Fix daily RSS browsing
+- Fix title display
+- Restore compatibility with PHP 5.3
+
+### Security
+- Fix links not being hidden when `HIDE_PUBLIC_LINKS` is set
+
+## [v0.0.45beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.45beta) - 2015-03-16
+### Fixed
+- Fix improperly displayed Unicode character
+- Fix incorrect font size for "Add link" input field
+
+## [v0.0.44beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.44beta) - 2015-03-15
+### Added
+- Add a Makefile to run static code checkers
+- Add local documentation (help link in page footer)
+- Use awesomplete library for autocompletion
+- Use bLazy.js library for images lazy loading
+- New 'Add Note' bookmarklet to immediatly open a note (text post) compose window
+
+### Changed
+- Theme improvements and cleanup (menu, search fields, icons, linklist...)
+- Allow 'javascript:' links sharing (bookmarklets)
+- Make update check optional
+- Redirect to homepage after adding a link via "Add Link" dialog
+- Remove more annoying URL parameters for shared links
+- Code cleanup
+
+### Removed
+- Remove jQuery
+
+### Security
+- Don't disclose version to visitors (shaarli-version.txt)
+
+## [v0.0.43beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.43beta) - 2015-02-20
+### Added
+- Title button link URL is now configurable
+- RainTPL's TMP and TPL directories path are now configurable
+- Displayed URLs for each link are now clickable links
+- Show links timestamps in Daily view
+
+### Changed
+- Automatically prepend "Note:" to title of self-posts (posts not pointing to an URL)
+- Make ATOM toolbar button optional (`SHOW_ATOM` configuration variable)
+- Optional archive.org links for each Shaarli link (`ARCHIVE_ORG` option)
+- Thumbnails: force HTTPS when possible
+- Improve tag cloud font scaling
+- Allow pointing RSS items to the permalink instead of the direct URL (`ENABLE_RSS_PERMALINKS` option)
+- Update JS libraries and add version numbers in filenames
+- Updates to README and footer
+
+### Fixed
+- Fix problems when running Shaarli behind a reverse proxy (invalid RSS feed URL)
+- Update check now checks against the community fork version
+- Include cache/ data/ pagecache/ and tmp/ directories in the repository
+- Fix duplicate tag search returning no results
+- Fix unnecessary 404 error on "Add link" when the user is logged out
+- Fixes to copyright/licensing information and unlicensed media
+- Fixes for tag cloud invalid links
+- Coding style fixes/cleanup
+- Fix redirection after deleteing a link leading to a 404 error
+- Shaarli's HTML is now W3C-compliant
+- Search now works with Unicode characters
+
+### Security
+- Do not leak server's PHP version and Shaarli's full path on errors
+- Prevent Shaarli from sending a lot of duplicate cookies
diff --git a/README.md b/README.md
index 5d5b743d..21062b9b 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ _It is designed to be personal (single-user), fast and handy._
 
 ## Quickstart
 - [Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)
+- [Change log](CHANGELOG.md)
 - [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/)
 
 ### Demo
-- 
cgit v1.2.3


From 31081154b901580a01155fc5ca488e05f1d5a862 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Mon, 17 Oct 2016 18:36:12 +0200
Subject: CHANGELOG.md: add unpublished Shaarli Community releases

Relates to https://github.com/shaarli/Shaarli/issues/663
See http://keepachangelog.com/en/0.3.0/

These entries correspond to the first lightweight tags present on the
Shaarli Community repository. As there are no corresponding release (notes),
the changelog is based on relevant elements from the Git commit log.

Signed-off-by: VirtualTam 
---
 CHANGELOG.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3dd5153..845a42e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -316,3 +316,56 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Security
 - Do not leak server's PHP version and Shaarli's full path on errors
 - Prevent Shaarli from sending a lot of duplicate cookies
+
+## [v0.0.42beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.42beta) - 2014-07-27
+### Added
+- Add QRCode Javascript library
+- Allow importing bookmarks with the same timestamp (hack)
+- Allow putting a description in the bookmarklet URL
+- Add `json_encode()` implementation for PHP<5.2
+- Highlight search results
+
+### Changed
+- Improve 'Stay signed in' behaviour
+- Improve `smallHash()`
+- Refactor QRCode generation
+- Update Javascript lazyloading
+- Update CSS
+
+### Removed
+- Remove jQuery from almost all pages
+
+### Fixed
+- Fix overlapping tags
+- Fix field foxus in the bookmarklet
+- Fix error message when `data/` is not writable
+- Fix HTML generation
+
+### Security
+- Fix XSS flaw
+
+## [v0.0.41beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.41beta) - 2013-03-08
+### Added
+- Add HTTPS to the allowed protocols
+- Add support for magnet links in link descriptions
+- Allow creating new links as private by default
+- Allow disabling jQuery
+- Check write permissions
+- Check session support before installation
+
+### Changed
+- Improve token security
+- RSS feed: allow inverting links/permalinks
+
+### Fixed
+- Fix display issues during installation
+- Fix popup redirection after login failure
+- Fix RSS formatting for Thunderbird
+- Fix thumbnail creation
+- Fix cache purge
+
+### Security
+- Fix login issue with WebKit browsers
+
+## [v0.0.40beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.40beta) - 2013-02-26
+Initial release on GitHub.
-- 
cgit v1.2.3


From f1f1156d84176271119cc1f50bb9bcf949ff2dce Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Mon, 17 Oct 2016 19:24:52 +0200
Subject: CHANGELOG.md: add legacy Shaarli releases

Relates to https://github.com/shaarli/Shaarli/issues/663
See http://keepachangelog.com/en/0.3.0/
See http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history
See http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history&do=revisions
See http://sebsauvage.net/rhaa/index.php?q=shaarli

These entries correspond to the original (legacy) Shaarli release
notes by Sebsauvage.

Signed-off-by: VirtualTam 
---
 CHANGELOG.md | 357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 356 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 845a42e1..998b51bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -303,7 +303,7 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Fixed
 - Fix problems when running Shaarli behind a reverse proxy (invalid RSS feed URL)
 - Update check now checks against the community fork version
-- Include cache/ data/ pagecache/ and tmp/ directories in the repository
+- Include `cache/`, `data/`, `pagecache/` and `tmp/` directories in the repository
 - Fix duplicate tag search returning no results
 - Fix unnecessary 404 error on "Add link" when the user is logged out
 - Fixes to copyright/licensing information and unlicensed media
@@ -369,3 +369,358 @@ This release has been YANKED as it points to a tag that does not follow our nami
 
 ## [v0.0.40beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.40beta) - 2013-02-26
 Initial release on GitHub.
+
+## [v0.0.40beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-08-24
+### Added
+- Flickr thumbnail now also support albums, galleries and users
+- Add a configuration option to disable session cookie protection.
+  Check this if your get disconnected often or your IP address changes often.
+
+### Removed
+- Removed the xml comment in cached RSS/ATOM feed
+  (although W3C-compliant, this may cause problems in some feed readers).
+
+### Fixed
+- A bug in the RSS cache would present old items as new in some cases
+- A small bug (non-initialized variable) in page cache cleaning.
+- Proper "Nothing found" message when search returns no results.
+- No more 404 error when searching with empty input.
+- Flickr thumbnails are back (Flick has made some changes in their domains).
+
+## [v0.0.39beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-08-10
+### Added
+- A cache for RSS feed, ATOM feed and Daily RSS feed, because these URLs are massively hammered. Cache is automatically purged whenever the database is changed. This will reduce server load. I may add cache to other pages later.
+
+### Changed
+- No more global $LINKSDB (Yuk).
+- Background color was removed when hovering a link.
+
+### Fixed
+- Small bug corrected in config screen on timezones.
+- Calling a non-existing permalink now returns a crude 404 error instead of 200 (OK).
+  This is done on purpose.
+- The shaarli session cookie now has a proper path.
+  Thus you can now install several Shaarlis on the same server in different paths,
+  and each will have its session.
+- Now when you delete a link, you go back the same page/search parameters you were on.
+- `error_get_last()` removed to ensure PHP 5.1 compatibility
+  (Yes, now it works on free.fr hosting)
+- Added `dialog=1` in bookmarklet code for some browsers.
+
+## [v0.0.38beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-02-06
+### Added
+- Automatic creation of the `tmp` directory with proper rights (for RainTPL).
+- When you click the key to see only private links, it turns yellow.
+
+### Changed
+- The "Daily" page now automatically skips empty days. 
+
+### Fixed
+- Corrected the tag encoding (there was a bug when selecting a second tag which contains accented characters).
+
+## [v0.0.37beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-02-01
+### Added
+- Basic CSS for mobiles, which makes Shaarli //much// more usable on mobile devices.
+- Picture wall no more instantly kills your browser. Now it uses [lazy image loading](http://www.appelsiini.net/projects/lazyload): The picture are loaded only as you scroll the page. This will reduce browser memory usage (especially on mobile devices) and will reduce server load. If you have javascript disabled, the page will still work as before (all images loaded at once).
+- RSS feed for the "Daily" page. 1 RSS entry per day, with all links of that day. RSS feed provides the last 7 days (only non-empty days are returned).
+- In link list, added an icon to see only private links. Click to toggle (only private / all).
+
+## [v0.0.36beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-25
+### Added
+- Shaarli licence in COPYING
+
+### Changed
+- Display adjustments in "Daily" page.
+
+### Fixed
+- Improper text color in install form.
+- Error in QRCode url (missing '?')
+
+## [v0.0.35beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-25
+### Fixed
+- Corrected a bug introduced in 0.0.34 which would improperly preprend data to URLs.
+
+## [v0.0.34beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-25
+### Added
+- There is now a QR-Code of each permalink to easily open a link on your smartphone.
+- Protocols `file:` and `apt:` are now also converted to clickable links (patch by Francis Chavanon)
+- Thumbnail support for http://xkcd.com/ (patch by Emilien Klein).
+- Thumbnail support for http://pix.toile-libre.org/
+- Well I had //some// mercy for users with antique browsers (IE) which do not have support for gradients: I added a few `background-color`.
+- First version of the "Shaarli Daily", a page showing all links of a specific day. By default, you see the links of the previous day. There is still work to do on this page (error checking, better navigation (calendar?), RSS feed, CSS for mobile and printing...)
+
+### Changed
+- Upgraded bundled versions of jQuery (1.7.1) and jQuery UI (1.8.17).
+- Upgraded bundled version of RainTPL (2.7).
+- Changed HTTPS detection code.
+
+### Fixed
+- In link edition, you can now click the word "Private" to check the box.
+- Clicking a tag would not work properly if the tag contained special characters (like +).
+- Added proper jQuery licence (shame on me).
+
+## [v0.0.33beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-17
+### Added
+- Shaarli packaged to ease Linux distributions integration
+  As a simple user, you do not need to cope with these versions.
+  Future releases of Shaarli will also be customized and published in these directories.
+  Differences with the standard Shaarli version:
+    - deb:
+        - .tar.gz instead of .zip
+        - COPYING licence file added
+        - jQuery/jQuery-UI libraries removed to cope with Debian rules.
+          This version links to the libs hosted at http://code.jquery.com
+    - rpm:
+        - sources located in a subdirectory with the same name as the zip file.
+        - COPYING licence file added
+    - WARNING: When downloading the .tar.gz, always use wget (and not your browser),
+      otherwise the .tar.gz will be corrupted.
+
+### Fixed
+- ATOM feed validates again.
+
+### Security
+- XSS vulnerability patched (thanks to Stanislas D. !)
+
+## [v0.0.32beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-12-16
+### Added
+- Better check on URL parameters (patch by gege2061).
+
+### Changed
+- HTML generation moved to RainTPL templates (in the `tpl/` directory).
+- Better detection of HTTPS (patch by gege2061).
+- In RSS/ATOM feeds, the GUID is now the permalink instead of the final URL (patch by gege2061).
+- Jerrywham CSS patch included.
+- Multiple spaces are now respected in description. Thus you can use Shaarli as a personal pastebin (for posting source code, for example). I also added a max-height and overflow:auto so that content can be scrolled if too large.
+
+### Removed
+- Page time generation was removed.
+
+### Fixed
+- Tab order changed in login screen.
+- Permalinks now work even if additional parameters have been added (eg. /?E8Yj2Q&utm_source=blablabla...)
+- user.css is included only if the file is present (This prevent a useless CSS include which makes a harmless but useless 404 error.).
+
+## [v0.0.31beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-29
+### Added
+- Support for TED Talks (ted.com/talks) thumbnails (patch by Emilien K.)
+- partial [patch](http://www.idleman.fr/blog/?p=508) by Idleman: Better design consistency, icon on private links. In-page popup was not included because it causes problem on some websites.
+- Support for bookmark files without ADD_DATE attributes.
+- Logo is clickable.
+- `user.css` can be added to overload Shaarli base CSS.(patch by Jerrywham)  Just put `user.css` in the same directory as shaarli.css. Example: #pageheader { background: blue; }Please note that Shaarli CSS are not stable and may completely change on each version.
+
+### Changed
+- Edit and Delete buttons in link list were replaced with icons. (patch by Jerrywham)
+
+### Fixed
+- Better error handling in thumbnail generation (patch by Emilien K.)
+- The top menu is no longer displayed in bookmarklet popup.
+- Bookmark which have the exact same date/time are now correctly imported. Most remaining import problem should be solved now.
+- Comment in Shaarli export moved to beginning of file to prevent clash with last link description.
+
+## [v0.0.30beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-18
+### Added
+- Now links also have a small `delete` button in list (after the `edit` button).
+
+### Fixed
+- Moved the call to PubSubHub.
+
+## [v0.0.29beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-18
+### Fixed
+- Corrected a bug introduced in 0.0.28 (there was an error if you use the bookmarklet and you're not logged in).
+
+## [v0.0.28beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-17
+### Added
+- Thumbnail support for youtu.be URLs (YouTube short url service).
+- PubSubHub protocol support (from http://aldarone.fr/les-flux-rss-shaarli-et-pubsubhubbub/). Warning: This was not tested. You need to set your hub url in `$GLOBALS['config']['PUBSUBHUB_URL']` and put the official client (`publisher.php`) in the same directory as Shaarli index.php.
+- RSS and ATOM feeds now also contain tags (in `category` tags, as per their respective specifications).
+
+### Changed
+- New Shaarli theme and logo by Idle (http://www.idleman.fr/blog/?p=469)
+- In picture wall, pictures point to Shaarli permalink instead of final URL. This way, users can read the description.
+- In RSS/ATOM feeds, guid and link URL of permalinks are now proper absolute URLs.
+- In RSS/ATOM feeds, URLs are now clickable.
+- http_parse_headers() function renamed to http_parse_headers_shaarli() to prevent name collision with some PHP extensions.
+
+### Fixed
+- Thumbnails removed for imgur.com/a/ URLs (Thumbnails are not available for albums on imgur).
+- Shaarli now correctly only tries to get thumbnails for vimeo video URLs.
+- A bug in imgur.com URLs handling would cause some thumbnails not to appear. This has been corrected. You should see //more// thumbnails now.
+
+- The search engine would not return a result if the word to search was the first in description.
+- Extracted title is now correct if the page has two `title` html tags.
+
+## [v0.0.27beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-10-18
+### Added
+- Picture wall (which can be filtered too: It will use the same filters (tags,text search) as current page when clicked.)
+
+## [v0.0.26beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-10-17
+### Changed
+- Made permalink more visible (smallHash).
+
+### Fixed
+- Removed extras space in description when URLs are converted to clickable links.
+- Thumbnail for subreddit imgur urls (/r/...) were corrected (thanks to Accent Grave).
+
+## [v0.0.25beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-10-13
+### Added
+- Better CSS for printing (thanks to jerrywham suggestion)
+- You can now use a redirector or anonymizing proxy for links (such as http://anonym.to/? to mask you HTTP_REFERER). Just go to Tools > Configure > Redirector. (thanks to Accent Grave for the suggestion)
+- The option ENABLE_LOCALCACHE can be set to `false` for those who have a limited quota on their host. This will disable the local thumbnail cache. Services which require the use of the cache will have no thumbnails (vimeo, flickr, direct link to image). Other services will still have a thumbnail (youtube,imgur.com,dailymotion,imageshack.us).
+
+### Changed
+- Now thumbnails generated by Shaarli are croped to a height of 120 pixels.
+- YouTube thumbnails now use `default.jpg` instead of `2.jpg` (This is usually more pertinent).
+- As per request, configuration options (such as HIDE_TIMESTAMPS, ENABLE_THUMBNAILS, etc.) can now be put in a an external file so that you do not have to tweak them again when you upgrade Shaarli. Just add the file `data/options.php`.
+- If a single link is displayed, the page title contains the title of the link.
+- Shaarli page title is clickable (and has the same link as "Home").
+- A few CSS tweaks (thanks to maethor for suggestion)
+
+### Fixed
+- Shaarli now supports newlines in titles (thanks to dixy).
+- The link to the RSS feed in page header was not correct.
+
+## [v0.0.24beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- As per request, you can now post an entry without a link. (You can use Shaarli as a kind of "personal twitter").
+- Each Shaarli entry now has a short link (just click on the date of a link). Now you can send a link that points to a single entry in your Shaarli.
+- In descriptions, URLs are now clickable.
+- Thumbnails will be generated for all link pointing to .jpg/png/gif (as long as the images are less than 4 Mb and take less than 30 seconds to download).
+
+### Fixed
+- Now thumnails also work for imgur gallery links (/gallery/...) (Thanks to Accent Grave for the correction)
+- Removed useless debugging information in log.
+- The filter in RSS/ATOM feed now works again properly (it was broken in 0.0.17beta)
+
+## [v0.0.23beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Added thumbnail support for imageshack.us
+
+### Changed
+- Now you can clic the sentence "Stay signed in" to tick the checkbox (patch by Emilien).
+- In tag editing, comma (,) are now automatically converted to spaces.
+- In tag editing, autocomplete no longuer suggests a tag you have already entered in the same line.
+
+## [v0.0.22beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Support for thumbnails for flickr.com.
+- As per request, you can now stay signed in (Your session will be kept open even if you close the browser). This is just a checkbox in login screen.
+
+### Changed
+- Some hosts (flickr, vimeo) are slow as hell for the thumbnails, or require an extra HTTP request. For these hosts the thumbnail generation has been deported outside the generation of the page to keep Shaarli snappy. For those slow services the thumbnails are also cached.
+
+### Fixed
+- Title was not properly passed if you had to login when using the bookmarklet (patch by shenshei).
+
+## [v0.0.21beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Thumbnails for some services (currently supports: YouTube.com, dailymotion.com, vimeo.com (slow!) and imgur.com). Thumbnails are enabled by default, but you can turn them off (set `define('ENABLE_THUMBNAILS',true);` to false.)
+
+### Changed
+- Removed the focus on the searchbox (this is cumbersome when you want to browse pages and scroll with the keyboard).
+
+## [v0.0.20beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Fixed
+- RSS feed is now served as `application/rss+xml` instead of `application/xhtml+xml` (which was causing problem in //RSS Lounge//)
+- ATOM feed is now served as `application/atom+xml` instead of `application/xhtml+xml`
+
+## [v0.0.19beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- ATOM feed.
+
+### Fixed
+- Patch by Emilien to remove the update notification after the update.
+
+## [v0.0.18beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- You can now configure the title of your page.
+- New screen to configure title and timezone.
+
+### Changed
+- Nicer timezone selection patch by killruana.
+
+### Fixed
+- New lines now appear correctly in the RSS feed descriptions. 
+
+## [v0.0.17beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Change password screen added (based on a patch by killruana).
+- Autocomplete in the tag search form.
+- You can rename or delete a tag in all links (very handy if you misspelled a tag or want to merge tags).
+- When you click the RSS feed, the feed will be filtered with the same filters as the page you were viewing.
+
+### Changed
+- CSS adjustments by jerrywham.
+- Minor corrections.
+
+## [v0.0.16beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Upgrade notification: If a new version of Shaarli is available, you will be notified by a discrete message in top-right corner. This message will only be visible if you are logged in, and the check will be performed at most once a day.
+- Preliminary tag cloud (ugly for the moment, I need to find something better).
+
+### Changed
+- Replaced `preg_match()` with `version_compare()` to check PHP version.
+- Includes a patch by Emilien K. to mask dates if user is not logged in. The option can be activated by changing `define('HIDE_TIMESTAMPS',false);` to `true`.
+
+## [v0.0.15beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- New in import: Option to overwrite existing links when importing.
+- On free.fr, automatic creation of the `/sessions` directory.
+
+### Changed
+- CSS Stylesheet is now an external file (shaarli.css). This reduces page size and eases customization.
+
+### Removed
+- Removed some parameters in URL added by some feed proxies (`#xtor=RSS-...`)
+
+### Fixed
+- Bug corrected: Prevented loop on login screen upon successful login after a failed login.
+- Bug corrected in import: HTML entities were not properly decoded. If you imported your Delicious/Diigo bookmarks, your should import them again an use the 'overwrite' option of the import feature.
+
+## [v0.0.14beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- You no longer need to disable `magic_quotes` on your host. Shaarli will cope with this option beeing activated. 
+
+## [v0.0.13beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Import: New option to import html bookmark file as private links.
+- Import: Importing a bookmark file will not overwrite existing links anymore.
+- Export: New options to export only public or private links.
+
+### Changed
+- In tag autocomplete, tags are presented in use order (most used tags first, instead of alphabetical order).
+- RSS Feed can now be filtered by tags or fulltext search. Just add to the feed url:
+  - `&searchtags=minecraft+video` for tag filtering
+  - `&searchterm=portal` for fulltext search to the feed url.
+
+## [v0.0.12beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Added a check that the config file was properly created (in case Shaarli does not have the write rights in its folder).
+- Open Shaarli: There is an option to open your Shaarli to anyone. Anybody will be able to add/edit/delete links without having to login. In code, change `define('OPEN_SHAARLI',false);` to `true`. Note: No anti-spam for the moment. You are warned.
+- Autocomplete for tags.
+
+## [v0.0.11beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Add a check and a warning for some hosts which still have magic_quotes activated.
+
+## [v0.0.10beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Get rid of `"` in titles.
+
+## [v0.0.9beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Added
+- Now works on hosts free.fr and 1and1
+- Now works with PHP 5.1
+- PHP version is now checked and an error message is displayed if version is not correct.
+
+### Fixed
+- No more error messages if the browser does not send `HTTP_REFERER`
+- No more error messages if the host has disabled http protocol in PHP config (eg. 1and1).
+
+## [v0.0.8beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
+### Changed
+- In RSS feed, GUID content replaced with the URL of the link, because some stupid RSS reader (like Google Reader) use `` as a link instead of using ``.
+
+## [v0.0.7beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-09-16
+First public release by Sebsauvage, see original article:
+[Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli !](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (FR)
-- 
cgit v1.2.3


From 17c9ac7c35754b607dba2db74b4aa69d1cec335c Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Mon, 17 Oct 2016 21:11:05 +0200
Subject: CHANGELOG.md: improve formatting, fix typos

Relates to #663
See http://keepachangelog.com/en/0.3.0/
See http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history

Modifications:
- keep 2 newlines between each release section
- keep reasonable line lengths (< 90 characters)
- remove extra final dots (only kept when there are several sentences)
- fix typos
- reword/rewrite/curate legacy changelog entries

Signed-off-by: VirtualTam 
---
 CHANGELOG.md | 416 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 268 insertions(+), 148 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 998b51bc..afcf1381 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
 ## [v0.8.0](https://github.com/shaarli/Shaarli/releases/tag/v0.8.0) - 2016-10-12
 Shaarli now uses [Composer](https://getcomposer.org/) to handle its dependencies.
-Please use our release archives, or follow the [installation documentation](https://github.com/shaarli/Shaarli/wiki/Download-and-Installation).
+Please use our release archives, or follow the
+[installation documentation](https://github.com/shaarli/Shaarli/wiki/Download-and-Installation).
 
 ### Added
 - Composer is required to resolve Shaarli's PHP dependencies
@@ -38,6 +40,7 @@ Please use our release archives, or follow the [installation documentation](http
 - Fixed a bug preventing to change password
 - XSRF token now generated each time a page is rendered
 
+
 ## [v0.7.0](https://github.com/shaarli/Shaarli/releases/tag/v0.7.0) - 2016-05-14
 ### Added
 - Adds an option to encode redirector URL parameter
@@ -66,11 +69,13 @@ Please use our release archives, or follow the [installation documentation](http
 - Fix a bug preventing to import notes in browsers from bookmarks export
 - Don't redirect to ?post if ?addlink is reached while logged out
 
+
 ## [v0.6.5](https://github.com/shaarli/Shaarli/releases/tag/v0.6.5) - 2016-03-02
 ### Fixed
-- Fixes a regression generating an unnecessary warning (language in HTTP request).
-- Fixes a bug where going through multiple reverse proxy could generate malformed URL.
-- Markdown: Fixes a bug where empty description blocks were displayed.
+- Fixes a regression generating an unnecessary warning (language in HTTP request)
+- Fixes a bug where going through multiple reverse proxy could generate malformed URL
+- Markdown: Fixes a bug where empty description blocks were displayed
+
 
 ## [v0.6.4](https://github.com/shaarli/Shaarli/releases/tag/v0.6.4) - 2016-02-28
 ### Added
@@ -103,6 +108,7 @@ Please use our release archives, or follow the [installation documentation](http
 - Fix a bug where non initialized variables were causing a warning
 - Fix a bug where saving a link after edit could cause a 404 error
 
+
 ## [v0.6.3](https://github.com/shaarli/Shaarli/releases/tag/v0.6.3) - 2016-01-31
 ### Added
 - Plugins administration page
@@ -158,6 +164,7 @@ Please use our release archives, or follow the [installation documentation](http
  - Bookmarklet: support titles containing quotes
  - URL encode links when setting a redirector
 
+
 ## [v0.6.0](https://github.com/shaarli/Shaarli/releases/tag/v0.6.0) - 2015-11-18
 ### Added
 - Introduce a plugin system
@@ -197,12 +204,14 @@ Please use our release archives, or follow the [installation documentation](http
 ### Fixed
 - Fix a bug that could prevent user to login
 
+
 ## [0.5.3](https://github.com/shaarli/Shaarli/releases/tag/0.5.3) - 2015-09-02
-This release has been YANKED as it points to a tag that does not follow our naming convention. Please use `v0.5.3` instead.
+This release has been YANKED as it points to a tag that does not follow our naming convention. Please use `v0.5.3` instead
 
 ### Fixed
 - Allow uppercase letters in PHP sessionid format
 
+
 ## [v0.5.2](https://github.com/shaarli/Shaarli/releases/tag/v0.5.2) - 2015-08-31
 ### Added
 - Add PHP 7 to Travis platforms
@@ -216,6 +225,7 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Security
 - Fix Full Path Disclosure upon cookie forgery
 
+
 ## [v0.5.1](https://github.com/shaarli/Shaarli/releases/tag/v0.5.1) - 2015-08-17
 ### Added
 - Add a link to the shaarli/shaarli DockerHub repository
@@ -229,6 +239,7 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Fixed
 - Fix 404 after editing a link while being logged out
 
+
 ## [v0.5.0](https://github.com/shaarli/Shaarli/releases/tag/v0.5.0) - 2015-07-31
 ### Added
 - Add Firefox Social API
@@ -256,11 +267,13 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Security
 - Fix links not being hidden when `HIDE_PUBLIC_LINKS` is set
 
+
 ## [v0.0.45beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.45beta) - 2015-03-16
 ### Fixed
 - Fix improperly displayed Unicode character
 - Fix incorrect font size for "Add link" input field
 
+
 ## [v0.0.44beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.44beta) - 2015-03-15
 ### Added
 - Add a Makefile to run static code checkers
@@ -283,6 +296,7 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Security
 - Don't disclose version to visitors (shaarli-version.txt)
 
+
 ## [v0.0.43beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.43beta) - 2015-02-20
 ### Added
 - Title button link URL is now configurable
@@ -317,6 +331,7 @@ This release has been YANKED as it points to a tag that does not follow our nami
 - Do not leak server's PHP version and Shaarli's full path on errors
 - Prevent Shaarli from sending a lot of duplicate cookies
 
+
 ## [v0.0.42beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.42beta) - 2014-07-27
 ### Added
 - Add QRCode Javascript library
@@ -344,6 +359,7 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Security
 - Fix XSS flaw
 
+
 ## [v0.0.41beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.41beta) - 2013-03-08
 ### Added
 - Add HTTPS to the allowed protocols
@@ -367,359 +383,463 @@ This release has been YANKED as it points to a tag that does not follow our nami
 ### Security
 - Fix login issue with WebKit browsers
 
+
 ## [v0.0.40beta](https://github.com/shaarli/Shaarli/releases/tag/v0.0.40beta) - 2013-02-26
 Initial release on GitHub.
 
+
 ## [v0.0.40beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-08-24
 ### Added
 - Flickr thumbnail now also support albums, galleries and users
-- Add a configuration option to disable session cookie protection.
-  Check this if your get disconnected often or your IP address changes often.
+- Add a configuration option to disable session cookie protection
+  Check this if your get disconnected often or your IP address changes often
 
 ### Removed
 - Removed the xml comment in cached RSS/ATOM feed
-  (although W3C-compliant, this may cause problems in some feed readers).
+  (although W3C-compliant, this may cause problems in some feed readers)
 
 ### Fixed
 - A bug in the RSS cache would present old items as new in some cases
-- A small bug (non-initialized variable) in page cache cleaning.
-- Proper "Nothing found" message when search returns no results.
-- No more 404 error when searching with empty input.
-- Flickr thumbnails are back (Flick has made some changes in their domains).
+- A small bug (non-initialized variable) in page cache cleaning
+- Proper "Nothing found" message when search returns no results
+- No more 404 error when searching with empty input
+- Flickr thumbnails are back (Flickr has made some changes to their domains)
 
 ## [v0.0.39beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-08-10
 ### Added
-- A cache for RSS feed, ATOM feed and Daily RSS feed, because these URLs are massively hammered. Cache is automatically purged whenever the database is changed. This will reduce server load. I may add cache to other pages later.
+- A cache for RSS feed, ATOM feed and Daily RSS feed, because these URLs
+  are massively hammered. Cache is automatically purged whenever the database
+  is changed. This will reduce server load. I may add cache to other pages later.
 
 ### Changed
-- No more global $LINKSDB (Yuk).
-- Background color was removed when hovering a link.
+- No more global `$LINKSDB` (Yuk)
+- Background color was removed when hovering a link
 
 ### Fixed
-- Small bug corrected in config screen on timezones.
-- Calling a non-existing permalink now returns a crude 404 error instead of 200 (OK).
-  This is done on purpose.
-- The shaarli session cookie now has a proper path.
+- Small bug corrected in config screen on timezones
+- Calling a non-existing permalink now returns a crude 404 error instead of 200 (OK)
+  This is done on purpose
+- The `shaarli` session cookie now has a proper path
   Thus you can now install several Shaarlis on the same server in different paths,
-  and each will have its session.
-- Now when you delete a link, you go back the same page/search parameters you were on.
-- `error_get_last()` removed to ensure PHP 5.1 compatibility
+  and each will have its session
+- Now when you delete a link, you go back the same page/search parameters you were on
+- Restore previously removed `error_get_last()`, to ensure PHP 5.1 compatibility
   (Yes, now it works on free.fr hosting)
-- Added `dialog=1` in bookmarklet code for some browsers.
+- Added `dialog=1` in bookmarklet code for some browsers
+
 
 ## [v0.0.38beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-02-06
 ### Added
-- Automatic creation of the `tmp` directory with proper rights (for RainTPL).
-- When you click the key to see only private links, it turns yellow.
+- Automatic creation of the `tmp` directory with proper rights (for RainTPL)
+- When you click the key to see only private links, it turns yellow
 
 ### Changed
 - The "Daily" page now automatically skips empty days. 
 
 ### Fixed
-- Corrected the tag encoding (there was a bug when selecting a second tag which contains accented characters).
+- Corrected the tag encoding (there was a bug when selecting a second tag which contains accented characters)
+
 
 ## [v0.0.37beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-02-01
 ### Added
-- Basic CSS for mobiles, which makes Shaarli //much// more usable on mobile devices.
-- Picture wall no more instantly kills your browser. Now it uses [lazy image loading](http://www.appelsiini.net/projects/lazyload): The picture are loaded only as you scroll the page. This will reduce browser memory usage (especially on mobile devices) and will reduce server load. If you have javascript disabled, the page will still work as before (all images loaded at once).
-- RSS feed for the "Daily" page. 1 RSS entry per day, with all links of that day. RSS feed provides the last 7 days (only non-empty days are returned).
-- In link list, added an icon to see only private links. Click to toggle (only private / all).
+- Basic CSS for mobiles, which makes Shaarli //much// more usable on mobile devices
+- Picture wall no more instantly kills your browser. Now it uses
+  [lazy image loading](http://www.appelsiini.net/projects/lazyload);
+  the pictures are loaded only as you scroll the page.
+  This will reduce browser memory usage (especially on mobile devices),
+  as well as server load.
+  If you have javascript disabled, the page will still work as before
+  (all images loaded at once)
+- RSS feed for the "Daily" page. 1 RSS entry per day, with all links of that day.
+  RSS feed provides the last 7 days (only non-empty days are returned).
+- In link list, added an icon to see only private links. Click to toggle (only private / all)
+
 
 ## [v0.0.36beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-25
 ### Added
 - Shaarli licence in COPYING
 
 ### Changed
-- Display adjustments in "Daily" page.
+- Display adjustments in "Daily" page
 
 ### Fixed
-- Improper text color in install form.
+- Improper text color in install form
 - Error in QRCode url (missing '?')
 
+
 ## [v0.0.35beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-25
 ### Fixed
-- Corrected a bug introduced in 0.0.34 which would improperly preprend data to URLs.
+- Corrected a bug introduced in 0.0.34 which would improperly preprend data to URLs
+
 
 ## [v0.0.34beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-25
 ### Added
-- There is now a QR-Code of each permalink to easily open a link on your smartphone.
+- There is now a QR-Code of each permalink to easily open a link on your smartphone
 - Protocols `file:` and `apt:` are now also converted to clickable links (patch by Francis Chavanon)
-- Thumbnail support for http://xkcd.com/ (patch by Emilien Klein).
+- Thumbnail support for http://xkcd.com/ (patch by Emilien Klein)
 - Thumbnail support for http://pix.toile-libre.org/
-- Well I had //some// mercy for users with antique browsers (IE) which do not have support for gradients: I added a few `background-color`.
-- First version of the "Shaarli Daily", a page showing all links of a specific day. By default, you see the links of the previous day. There is still work to do on this page (error checking, better navigation (calendar?), RSS feed, CSS for mobile and printing...)
+- Well I had _some_ mercy for users with antique browsers (IE) which do not have
+  support for gradients: I added a few `background-color`
+- First version of the "Shaarli Daily", a page showing all links of a specific day.
+  By default, you see the links of the previous day.
+  There is still work to do on this page (error checking, better navigation (calendar?),
+  RSS feed, CSS for mobile and printing...)
 
 ### Changed
-- Upgraded bundled versions of jQuery (1.7.1) and jQuery UI (1.8.17).
-- Upgraded bundled version of RainTPL (2.7).
-- Changed HTTPS detection code.
+- Upgraded bundled versions of jQuery (1.7.1) and jQuery UI (1.8.17)
+- Upgraded bundled version of RainTPL (2.7)
+- Changed HTTPS detection code
 
 ### Fixed
-- In link edition, you can now click the word "Private" to check the box.
-- Clicking a tag would not work properly if the tag contained special characters (like +).
-- Added proper jQuery licence (shame on me).
+- In link edition, you can now click the word "Private" to check the box
+- Clicking a tag would not work properly if the tag contained special characters (like +)
+- Added proper jQuery licence (shame on me)
+
 
 ## [v0.0.33beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2012-01-17
 ### Added
 - Shaarli packaged to ease Linux distributions integration
-  As a simple user, you do not need to cope with these versions.
-  Future releases of Shaarli will also be customized and published in these directories.
+  As a simple user, you do not need to cope with these versions
+  Future releases of Shaarli will also be customized and published in these directories
   Differences with the standard Shaarli version:
     - deb:
         - .tar.gz instead of .zip
         - COPYING licence file added
-        - jQuery/jQuery-UI libraries removed to cope with Debian rules.
+        - jQuery/jQuery-UI libraries removed to cope with Debian rules
           This version links to the libs hosted at http://code.jquery.com
     - rpm:
-        - sources located in a subdirectory with the same name as the zip file.
+        - sources located in a subdirectory with the same name as the zip file
         - COPYING licence file added
     - WARNING: When downloading the .tar.gz, always use wget (and not your browser),
-      otherwise the .tar.gz will be corrupted.
+      otherwise the .tar.gz will be corrupted
 
 ### Fixed
-- ATOM feed validates again.
+- ATOM feed validates again
 
 ### Security
-- XSS vulnerability patched (thanks to Stanislas D. !)
+- XSS vulnerability patched (thanks to Stanislas D.!)
+
 
 ## [v0.0.32beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-12-16
 ### Added
-- Better check on URL parameters (patch by gege2061).
+- Better check on URL parameters (patch by gege2061)
+- Add `max-height` and `overflow:auto` attributes so that content can be scrolled if too large
 
 ### Changed
-- HTML generation moved to RainTPL templates (in the `tpl/` directory).
-- Better detection of HTTPS (patch by gege2061).
-- In RSS/ATOM feeds, the GUID is now the permalink instead of the final URL (patch by gege2061).
-- Jerrywham CSS patch included.
-- Multiple spaces are now respected in description. Thus you can use Shaarli as a personal pastebin (for posting source code, for example). I also added a max-height and overflow:auto so that content can be scrolled if too large.
+- HTML generation moved to RainTPL templates (in the `tpl/` directory)
+- Better detection of HTTPS (patch by gege2061)
+- In RSS/ATOM feeds, the GUID is now the permalink instead of the final URL (patch by gege2061)
+- Jerrywham CSS patch included
+- Multiple spaces are now respected in description.
+  Thus you can use Shaarli as a personal pastebin (for posting source code, for example).
 
 ### Removed
-- Page time generation was removed.
+- Page time generation was removed
 
 ### Fixed
-- Tab order changed in login screen.
-- Permalinks now work even if additional parameters have been added (eg. /?E8Yj2Q&utm_source=blablabla...)
-- user.css is included only if the file is present (This prevent a useless CSS include which makes a harmless but useless 404 error.).
+- Tab order changed in login screen
+- Permalinks now work even if additional parameters have been added
+  (e.g. `/?E8Yj2Q&utm_source=blablabla...`)
+- user.css is included only if the file is present
+  (This prevents a useless CSS include which makes a harmless but useless 404 error.)
+
 
 ## [v0.0.31beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-29
 ### Added
 - Support for TED Talks (ted.com/talks) thumbnails (patch by Emilien K.)
-- partial [patch](http://www.idleman.fr/blog/?p=508) by Idleman: Better design consistency, icon on private links. In-page popup was not included because it causes problem on some websites.
-- Support for bookmark files without ADD_DATE attributes.
-- Logo is clickable.
-- `user.css` can be added to overload Shaarli base CSS.(patch by Jerrywham)  Just put `user.css` in the same directory as shaarli.css. Example: #pageheader { background: blue; }Please note that Shaarli CSS are not stable and may completely change on each version.
+- partial [patch](http://www.idleman.fr/blog/?p=508) by Idleman: Better design consistency, icon on private links. In-page popup was not included because it causes problem on some websites
+- Support for bookmark files without ADD_DATE attributes
+- Logo is clickable
+- `user.css` can be added to overload Shaarli base CSS.(patch by Jerrywham).
+  Just put `user.css` in the same directory as shaarli.css.
+  Example: `#pageheader { background: blue; }`
+  Please note that Shaarli CSS are not stable and may completely change on each version
 
 ### Changed
 - Edit and Delete buttons in link list were replaced with icons. (patch by Jerrywham)
 
 ### Fixed
 - Better error handling in thumbnail generation (patch by Emilien K.)
-- The top menu is no longer displayed in bookmarklet popup.
-- Bookmark which have the exact same date/time are now correctly imported. Most remaining import problem should be solved now.
-- Comment in Shaarli export moved to beginning of file to prevent clash with last link description.
+- The top menu is no longer displayed in bookmarklet popup
+- Bookmark which have the exact same date/time are now correctly imported.
+  Most remaining import problems should be solved now
+- Comment in Shaarli export moved to beginning of file to prevent clash with last link description
+
 
 ## [v0.0.30beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-18
 ### Added
-- Now links also have a small `delete` button in list (after the `edit` button).
+- Add a small `delete` button in link list (after the `edit` button)
 
 ### Fixed
-- Moved the call to PubSubHub.
+- Moved the call to PubSubHub
+
 
 ## [v0.0.29beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-18
 ### Fixed
-- Corrected a bug introduced in 0.0.28 (there was an error if you use the bookmarklet and you're not logged in).
+- Corrected a bug introduced in v0.0.28beta
+  (there was an error if you use the bookmarklet and you're not logged in)
+
 
 ## [v0.0.28beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-11-17
 ### Added
-- Thumbnail support for youtu.be URLs (YouTube short url service).
-- PubSubHub protocol support (from http://aldarone.fr/les-flux-rss-shaarli-et-pubsubhubbub/). Warning: This was not tested. You need to set your hub url in `$GLOBALS['config']['PUBSUBHUB_URL']` and put the official client (`publisher.php`) in the same directory as Shaarli index.php.
-- RSS and ATOM feeds now also contain tags (in `category` tags, as per their respective specifications).
+- Thumbnail support for youtu.be URLs (YouTube short url service)
+- PubSubHub protocol support (from http://aldarone.fr/les-flux-rss-shaarli-et-pubsubhubbub/).
+  Warning: This was not tested. You need to set your hub url in
+  `$GLOBALS['config']['PUBSUBHUB_URL']` and put the official client (`publisher.php`)
+  in the same directory as Shaarli's `index.php`
+- RSS and ATOM feeds now also contain tags (in `category` tags, as per their
+  respective specifications)
 
 ### Changed
 - New Shaarli theme and logo by Idle (http://www.idleman.fr/blog/?p=469)
-- In picture wall, pictures point to Shaarli permalink instead of final URL. This way, users can read the description.
-- In RSS/ATOM feeds, guid and link URL of permalinks are now proper absolute URLs.
-- In RSS/ATOM feeds, URLs are now clickable.
-- http_parse_headers() function renamed to http_parse_headers_shaarli() to prevent name collision with some PHP extensions.
+- In picture wall, pictures point to Shaarli permalink instead of final URL.
+  This way, users can read the description.
+- In RSS/ATOM feeds, guid and link URL of permalinks are now proper absolute URLs
+- In RSS/ATOM feeds, URLs are now clickable
+- Rename `http_parse_headers()` to `http_parse_headers_shaarli()` to prevent
+  name collision with some PHP extensions
 
 ### Fixed
-- Thumbnails removed for imgur.com/a/ URLs (Thumbnails are not available for albums on imgur).
-- Shaarli now correctly only tries to get thumbnails for vimeo video URLs.
-- A bug in imgur.com URLs handling would cause some thumbnails not to appear. This has been corrected. You should see //more// thumbnails now.
+- Thumbnails removed for imgur.com/a/ URLs (Thumbnails are not available for albums on imgur)
+- Shaarli now correctly only tries to get thumbnails for vimeo video URLs
+- Fix a bug in imgur.com URLs handling that would cause some thumbnails not to appear
+- The search engine would not return a result if the word to search was the first in description
+- Extracted title is now correct if the page has two `title` html tags
 
-- The search engine would not return a result if the word to search was the first in description.
-- Extracted title is now correct if the page has two `title` html tags.
 
 ## [v0.0.27beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-10-18
 ### Added
-- Picture wall (which can be filtered too: It will use the same filters (tags,text search) as current page when clicked.)
+- Add a picture wall, which can be filtered too: it will use the same filters
+  (tags,text search) as current page when clicked.
+
 
 ## [v0.0.26beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-10-17
 ### Changed
-- Made permalink more visible (smallHash).
+- Made permalink more visible (smallHash)
 
 ### Fixed
-- Removed extras space in description when URLs are converted to clickable links.
-- Thumbnail for subreddit imgur urls (/r/...) were corrected (thanks to Accent Grave).
+- Removed extras space in description when URLs are converted to clickable links
+- Thumbnail for subreddit imgur urls (/r/...) were corrected (thanks to Accent Grave)
+
 
 ## [v0.0.25beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-10-13
 ### Added
 - Better CSS for printing (thanks to jerrywham suggestion)
-- You can now use a redirector or anonymizing proxy for links (such as http://anonym.to/? to mask you HTTP_REFERER). Just go to Tools > Configure > Redirector. (thanks to Accent Grave for the suggestion)
-- The option ENABLE_LOCALCACHE can be set to `false` for those who have a limited quota on their host. This will disable the local thumbnail cache. Services which require the use of the cache will have no thumbnails (vimeo, flickr, direct link to image). Other services will still have a thumbnail (youtube,imgur.com,dailymotion,imageshack.us).
-
-### Changed
-- Now thumbnails generated by Shaarli are croped to a height of 120 pixels.
-- YouTube thumbnails now use `default.jpg` instead of `2.jpg` (This is usually more pertinent).
-- As per request, configuration options (such as HIDE_TIMESTAMPS, ENABLE_THUMBNAILS, etc.) can now be put in a an external file so that you do not have to tweak them again when you upgrade Shaarli. Just add the file `data/options.php`.
-- If a single link is displayed, the page title contains the title of the link.
-- Shaarli page title is clickable (and has the same link as "Home").
+- Allow using a redirector or anonymizing proxy for links
+  (such as `http://anonym.to/?` to mask you `HTTP_REFERER`).
+  Just go to `Tools > Configure > Redirector`
+  (thanks to Accent Grave for the suggestion).
+- The `ENABLE_LOCALCACHE` option can be set to `false` for those who have
+  a limited quota on their host.
+  This will disable the local thumbnail cache.
+  Services which require the use of the cache will have no thumbnails
+  (vimeo, flickr, direct link to image).
+  Other services will still have a thumbnail (youtube,imgur.com,dailymotion,imageshack.us)
+
+### Changed
+- Now thumbnails generated by Shaarli are croped to a height of 120 pixels
+- YouTube thumbnails now use `default.jpg` instead of `2.jpg` (This is usually more pertinent)
+- Configuration options (such as `HIDE_TIMESTAMPS`, `ENABLE_THUMBNAILS`, etc.)
+  can now be put in a an external file so that you do not have to tweak them again
+  when you upgrade Shaarli.
+  Just add the file `data/options.php`.
+- If a single link is displayed, the page title contains the title of the link
+- Shaarli page title is clickable (and has the same link as "Home")
 - A few CSS tweaks (thanks to maethor for suggestion)
 
 ### Fixed
-- Shaarli now supports newlines in titles (thanks to dixy).
-- The link to the RSS feed in page header was not correct.
+- Shaarli now supports newlines in titles (thanks to dixy)
+- The link to the RSS feed in page header was not correct
+
 
 ## [v0.0.24beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- As per request, you can now post an entry without a link. (You can use Shaarli as a kind of "personal twitter").
-- Each Shaarli entry now has a short link (just click on the date of a link). Now you can send a link that points to a single entry in your Shaarli.
-- In descriptions, URLs are now clickable.
-- Thumbnails will be generated for all link pointing to .jpg/png/gif (as long as the images are less than 4 Mb and take less than 30 seconds to download).
+- Allow posting an entry without a link. (You can use Shaarli as a kind of "personal twitter")
+- Each Shaarli entry now has a short link (just click on the date of a link).
+  Now you can send a link that points to a single entry in your Shaarli
+- In descriptions, URLs are now clickable
+- Thumbnails will be generated for all link pointing to .jpg/png/gif
+  (as long as the images are less than 4 Mb and take less than 30 seconds to download)
 
 ### Fixed
-- Now thumnails also work for imgur gallery links (/gallery/...) (Thanks to Accent Grave for the correction)
-- Removed useless debugging information in log.
+- Now thumbnails also work for imgur gallery links (/gallery/...)
+  (Thanks to Accent Grave for the correction)
+- Removed useless debugging information in log
 - The filter in RSS/ATOM feed now works again properly (it was broken in 0.0.17beta)
 
+
 ## [v0.0.23beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
 - Added thumbnail support for imageshack.us
 
 ### Changed
-- Now you can clic the sentence "Stay signed in" to tick the checkbox (patch by Emilien).
-- In tag editing, comma (,) are now automatically converted to spaces.
-- In tag editing, autocomplete no longuer suggests a tag you have already entered in the same line.
+- Now you can clic the sentence "Stay signed in" to tick the checkbox (patch by Emilien)
+- In tag editing, comma (,) are now automatically converted to spaces
+- In tag editing, autocomplete no longuer suggests a tag you have already entered in the same line
+
 
 ## [v0.0.22beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Support for thumbnails for flickr.com.
-- As per request, you can now stay signed in (Your session will be kept open even if you close the browser). This is just a checkbox in login screen.
+- Support for thumbnails for flickr.com
+- Allow staying signed in:
+  Your session will be kept open even if you close the browser.
+  This is available through a checkbox in the login screen.
 
 ### Changed
-- Some hosts (flickr, vimeo) are slow as hell for the thumbnails, or require an extra HTTP request. For these hosts the thumbnail generation has been deported outside the generation of the page to keep Shaarli snappy. For those slow services the thumbnails are also cached.
+- Some hosts (flickr, vimeo) are slow as hell for the thumbnails,
+  or require an extra HTTP request.
+  For these hosts the thumbnail generation has been deported outside the generation
+  of the page to keep Shaarli snappy.
+  For these slow services, the thumbnails are also cached.
 
 ### Fixed
-- Title was not properly passed if you had to login when using the bookmarklet (patch by shenshei).
+- Title was not properly passed if you had to login when using the bookmarklet (patch by shenshei)
+
 
 ## [v0.0.21beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Thumbnails for some services (currently supports: YouTube.com, dailymotion.com, vimeo.com (slow!) and imgur.com). Thumbnails are enabled by default, but you can turn them off (set `define('ENABLE_THUMBNAILS',true);` to false.)
+- Thumbnails for some services
+  Currently supports: YouTube.com, dailymotion.com, vimeo.com (slow!) and imgur.com.
+  Thumbnails are enabled by default, but you can turn them off
+  (set `define('ENABLE_THUMBNAILS',true);` to `false`).
 
 ### Changed
-- Removed the focus on the searchbox (this is cumbersome when you want to browse pages and scroll with the keyboard).
+- Removed the focus on the searchbox (this is cumbersome when you want to browse pages
+  and scroll with the keyboard)
+
 
 ## [v0.0.20beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Fixed
-- RSS feed is now served as `application/rss+xml` instead of `application/xhtml+xml` (which was causing problem in //RSS Lounge//)
+- RSS feed is now served as `application/rss+xml` instead of `application/xhtml+xml`
+  (which was causing problem in //RSS Lounge//)
 - ATOM feed is now served as `application/atom+xml` instead of `application/xhtml+xml`
 
+
 ## [v0.0.19beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- ATOM feed.
+- ATOM feed
 
 ### Fixed
-- Patch by Emilien to remove the update notification after the update.
+- Patch by Emilien to remove the update notification after the update
+
 
 ## [v0.0.18beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- You can now configure the title of your page.
-- New screen to configure title and timezone.
+- You can now configure the title of your page
+- New screen to configure title and timezone
 
 ### Changed
-- Nicer timezone selection patch by killruana.
+- Nicer timezone selection patch by killruana
 
 ### Fixed
 - New lines now appear correctly in the RSS feed descriptions. 
 
+
 ## [v0.0.17beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Change password screen added (based on a patch by killruana).
-- Autocomplete in the tag search form.
-- You can rename or delete a tag in all links (very handy if you misspelled a tag or want to merge tags).
-- When you click the RSS feed, the feed will be filtered with the same filters as the page you were viewing.
+- Change password screen added (based on a patch by killruana)
+- Autocomplete in the tag search form
+- You can rename or delete a tag in all links
+  (very handy if you misspelled a tag or want to merge tags)
+- When you click the RSS feed, the feed will be filtered with the same filters
+  as the page you were viewing
 
 ### Changed
-- CSS adjustments by jerrywham.
-- Minor corrections.
+- CSS adjustments by jerrywham
+- Minor corrections
+
 
 ## [v0.0.16beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Upgrade notification: If a new version of Shaarli is available, you will be notified by a discrete message in top-right corner. This message will only be visible if you are logged in, and the check will be performed at most once a day.
-- Preliminary tag cloud (ugly for the moment, I need to find something better).
+- Upgrade notification:
+  If a new version of Shaarli is available, you will be notified by a discreet
+  message in top-right corner.
+  This message will only be visible if you are logged in, and the check will be
+  performed at most once a day.
+- Preliminary tag cloud (ugly for the moment, I need to find something better)
 
 ### Changed
-- Replaced `preg_match()` with `version_compare()` to check PHP version.
-- Includes a patch by Emilien K. to mask dates if user is not logged in. The option can be activated by changing `define('HIDE_TIMESTAMPS',false);` to `true`.
+- Replaced `preg_match()` with `version_compare()` to check PHP version
+- Includes a patch by Emilien K. to mask dates if user is not logged in.
+  The option can be activated by changing `define('HIDE_TIMESTAMPS',false);` to `true`
+
 
 ## [v0.0.15beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- New in import: Option to overwrite existing links when importing.
-- On free.fr, automatic creation of the `/sessions` directory.
+- New in import: Option to overwrite existing links when importing
+- On free.fr, automatic creation of the `/sessions` directory
 
 ### Changed
-- CSS Stylesheet is now an external file (shaarli.css). This reduces page size and eases customization.
+- CSS Stylesheet is now an external file (shaarli.css).
+  This reduces page size and eases customization.
 
 ### Removed
 - Removed some parameters in URL added by some feed proxies (`#xtor=RSS-...`)
 
 ### Fixed
-- Bug corrected: Prevented loop on login screen upon successful login after a failed login.
-- Bug corrected in import: HTML entities were not properly decoded. If you imported your Delicious/Diigo bookmarks, your should import them again an use the 'overwrite' option of the import feature.
+- Bug corrected: Prevented loop on login screen upon successful login after a failed login
+- Bug corrected in import: HTML entities were not properly decoded.
+  If you imported your Delicious/Diigo bookmarks, your should import them again
+  and use the 'overwrite' option of the import feature.
+
 
 ## [v0.0.14beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- You no longer need to disable `magic_quotes` on your host. Shaarli will cope with this option beeing activated. 
+- You no longer need to disable `magic_quotes` on your host.
+  Shaarli will cope with this option beeing activated. 
+
 
 ## [v0.0.13beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Import: New option to import html bookmark file as private links.
-- Import: Importing a bookmark file will not overwrite existing links anymore.
-- Export: New options to export only public or private links.
+- Import: New option to import html bookmark file as private links
+- Import: Importing a bookmark file will not overwrite existing links anymore
+- Export: New options to export only public or private links
 
 ### Changed
-- In tag autocomplete, tags are presented in use order (most used tags first, instead of alphabetical order).
+- In tag autocomplete, tags are presented in use order
+  (most used tags first, instead of alphabetical order)
 - RSS Feed can now be filtered by tags or fulltext search. Just add to the feed url:
   - `&searchtags=minecraft+video` for tag filtering
-  - `&searchterm=portal` for fulltext search to the feed url.
+  - `&searchterm=portal` for fulltext search to the feed url
+
 
 ## [v0.0.12beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Added a check that the config file was properly created (in case Shaarli does not have the write rights in its folder).
-- Open Shaarli: There is an option to open your Shaarli to anyone. Anybody will be able to add/edit/delete links without having to login. In code, change `define('OPEN_SHAARLI',false);` to `true`. Note: No anti-spam for the moment. You are warned.
-- Autocomplete for tags.
+- Add a check that the config file was properly created
+  (in case Shaarli does not have the write rights in its folder)
+- Open Shaarli: there is an option to open your Shaarli to anyone.
+  Anybody will be able to add/edit/delete links without having to login.
+  In code, change `define('OPEN_SHAARLI',false);` to `true`.
+  Note: No anti-spam for the moment. You are warned!
+- Autocomplete for tags
+
 
 ## [v0.0.11beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Add a check and a warning for some hosts which still have magic_quotes activated.
+- Add a check and a warning for some hosts which still have `magic`_quotes activated
+
 
 ## [v0.0.10beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Get rid of `"` in titles.
+- Get rid of `"` in titles
+
 
 ## [v0.0.9beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Now works on hosts free.fr and 1and1
+- Now works on hosts `free.fr` and `1and1`
 - Now works with PHP 5.1
-- PHP version is now checked and an error message is displayed if version is not correct.
+- PHP version is now checked and an error message is displayed if version is not correct
 
 ### Fixed
 - No more error messages if the browser does not send `HTTP_REFERER`
-- No more error messages if the host has disabled http protocol in PHP config (eg. 1and1).
+- No more error messages if the host has disabled http protocol in PHP config (eg. 1and1)
+
 
 ## [v0.0.8beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Changed
-- In RSS feed, GUID content replaced with the URL of the link, because some stupid RSS reader (like Google Reader) use `` as a link instead of using ``.
+- In RSS feed, GUID content replaced with the URL of the link, because some
+  stupid RSS reader (like Google Reader) use `` as a link instead of using ``
+
 
 ## [v0.0.7beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - 2011-09-16
 First public release by Sebsauvage, see original article:
-- 
cgit v1.2.3


From c47d9723ce9a48b109e791ff7ebbae54ac057d22 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Tue, 18 Oct 2016 19:44:19 +0200
Subject: CHANGELOG.md: add an UNPUBLISHED draft for v0.8.1

Relates to #663
See http://keepachangelog.com/en/0.3.0/

Signed-off-by: VirtualTam 
---
 CHANGELOG.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afcf1381..23128b23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,27 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED
+## Added
+- Add CHANGELOG.md to track the whole project's history
+- Save the last edition date for shaares and use it in Atom/RSS feeds
+- Plugins:
+    - Add an [Isso](https://posativ.org/isso/) plugin to enable user comments on permalinks
+    - Allow defining init functions, e.g. for performing checks and error processing
+
+## Changed
+- Cleanup `{loop}` declarations in templates
+
+## Fixed
+- Fix the server `` value in Atom/RSS feeds
+- Plugins:
+    - Tools: only display parameter description when it exists
+    - archive.org: do not propose archival of private notes
+
+## Security
+- Allow whitelisting trusted IPs, else continue banning clients upon login failure
+
+
 ## [v0.8.0](https://github.com/shaarli/Shaarli/releases/tag/v0.8.0) - 2016-10-12
 Shaarli now uses [Composer](https://getcomposer.org/) to handle its dependencies.
 Please use our release archives, or follow the
@@ -816,7 +837,7 @@ Initial release on GitHub.
 
 ## [v0.0.11beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
 ### Added
-- Add a check and a warning for some hosts which still have `magic`_quotes activated
+- Add a check and a warning for some hosts which still have `magic_quotes` activated
 
 
 ## [v0.0.10beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)
-- 
cgit v1.2.3


From ca0ed5ca42fda5b1236fe22dbd596790e9291ab2 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Sun, 16 Oct 2016 19:33:29 +0200
Subject: Update release archive generation

Relates to https://github.com/shaarli/Shaarli/issues/607
Relates to https://github.com/shaarli/Shaarli/pull/608

Modifications:
- match the arborescence of the archives provided by GitHub
- generate compressed tarballs

Signed-off-by: VirtualTam 
---
 CHANGELOG.md | 11 +++++++----
 Makefile     | 13 +++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23128b23..5bd16dcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,23 +6,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
 ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED
-## Added
+### Added
 - Add CHANGELOG.md to track the whole project's history
 - Save the last edition date for shaares and use it in Atom/RSS feeds
 - Plugins:
     - Add an [Isso](https://posativ.org/isso/) plugin to enable user comments on permalinks
     - Allow defining init functions, e.g. for performing checks and error processing
 
-## Changed
+### Changed
 - Cleanup `{loop}` declarations in templates
+- Release archives now have the same structure as GitHub-generated archives:
+    - archives contain a `Shaarli` directory, itself containing sources + dependencies
+    - the tarball is now gzipped
 
-## Fixed
+### Fixed
 - Fix the server `` value in Atom/RSS feeds
 - Plugins:
     - Tools: only display parameter description when it exists
     - archive.org: do not propose archival of private notes
 
-## Security
+### Security
 - Allow whitelisting trusted IPs, else continue banning clients upon login failure
 
 
diff --git a/Makefile b/Makefile
index 22be0d96..60aec9a0 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ test:
 # to ease deployment on shared hosting.
 ##
 ARCHIVE_VERSION := shaarli-$$(git describe)-full
+ARCHIVE_PREFIX=Shaarli/
 
 release_archive: release_tar release_zip
 
@@ -147,13 +148,17 @@ composer_dependencies: clean
 
 ### generate a release tarball and include 3rd-party dependencies
 release_tar: composer_dependencies
-	git archive -o $(ARCHIVE_VERSION).tar HEAD
-	tar rvf $(ARCHIVE_VERSION).tar vendor/
+	git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
+	tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
+	gzip $(ARCHIVE_VERSION).tar
 
 ### generate a release zip and include 3rd-party dependencies
 release_zip: composer_dependencies
-	git archive -o $(ARCHIVE_VERSION).zip -9 HEAD
-	zip -r $(ARCHIVE_VERSION).zip vendor/
+	git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
+	mkdir $(ARCHIVE_PREFIX)
+	rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/
+	zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)vendor/
+	rm -rf $(ARCHIVE_PREFIX)
 
 ##
 # Targets for repository and documentation maintenance
-- 
cgit v1.2.3


From ae04803bb1f5107555b7c7fad49e4c1ae1f93ca7 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Thu, 20 Oct 2016 00:19:52 +0200
Subject: Travis: enable Composer cache

See:
- https://docs.travis-ci.com/user/caching/
- https://blog.wyrihaximus.net/2015/07/composer-cache-on-travis/

Signed-off-by: VirtualTam 
---
 .travis.yml  | 5 ++++-
 CHANGELOG.md | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7408b2e2..9ffb3d00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 sudo: false
 language: php
+cache:
+  directories:
+    - $HOME/.composer/cache
 php:
   - 7.0
   - 5.6
@@ -8,7 +11,7 @@ php:
   - 5.3
 install:
   - composer self-update
-  - composer install
+  - composer install --prefer-dist
 script:
   - make clean
   - make check_permissions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bd16dcd..60af7223 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED
 ### Added
 - Add CHANGELOG.md to track the whole project's history
+- Enable Composer cache for Travis builds
 - Save the last edition date for shaares and use it in Atom/RSS feeds
 - Plugins:
     - Add an [Isso](https://posativ.org/isso/) plugin to enable user comments on permalinks
-- 
cgit v1.2.3


From 7af9a41881ed0b9d44d18a0ce03a123a8441adf5 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Thu, 20 Oct 2016 11:31:52 +0200
Subject: Minor code cleanup: PHPDoc, spelling, unused variables, etc.

---
 CHANGELOG.md                          |  1 +
 application/ApplicationUtils.php      |  8 ++++++--
 application/CachedPage.php            |  2 +-
 application/LinkUtils.php             |  3 ++-
 application/NetscapeBookmarkUtils.php |  2 +-
 application/TimeZone.php              | 10 +++-------
 application/Updater.php               |  2 +-
 application/Url.php                   | 14 --------------
 application/Utils.php                 |  8 +++++++-
 application/config/ConfigJson.php     |  2 +-
 application/config/ConfigManager.php  |  2 ++
 index.php                             |  8 ++------
 tests/config/ConfigJsonTest.php       |  2 +-
 13 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60af7223..e32ef459 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Release archives now have the same structure as GitHub-generated archives:
     - archives contain a `Shaarli` directory, itself containing sources + dependencies
     - the tarball is now gzipped
+- Minor code cleanup: PHPDoc, spelling, unused variables, etc.
 
 ### Fixed
 - Fix the server `` value in Atom/RSS feeds
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index e67b2902..7f963e97 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -15,6 +15,9 @@ class ApplicationUtils
      *
      * The code is read from the raw content of the version file on the Git server.
      *
+     * @param string $url     URL to reach to get the latest version.
+     * @param int    $timeout Timeout to check the URL (in seconds).
+     *
      * @return mixed the version code from the repository if available, else 'false'
      */
     public static function getLatestGitVersionCode($url, $timeout=2)
@@ -49,6 +52,7 @@ class ApplicationUtils
      * @param int    $checkInterval  the minimum interval between update checks (in seconds
      * @param bool   $enableCheck    whether to check for new versions
      * @param bool   $isLoggedIn     whether the user is logged in
+     * @param string $branch         check update for the given branch
      *
      * @throws Exception an invalid branch has been set for update checks
      *
@@ -152,7 +156,7 @@ class ApplicationUtils
             }
         }
 
-        // Check cache and data directories are readable and writeable
+        // Check cache and data directories are readable and writable
         foreach (array(
             $conf->get('resource.thumbnails_cache'),
             $conf->get('resource.data_dir'),
@@ -167,7 +171,7 @@ class ApplicationUtils
             }
         }
 
-        // Check configuration files are readable and writeable
+        // Check configuration files are readable and writable
         foreach (array(
             $conf->getConfigFileExt(),
             $conf->get('resource.datastore'),
diff --git a/application/CachedPage.php b/application/CachedPage.php
index 50cfa9ac..5087d0c4 100644
--- a/application/CachedPage.php
+++ b/application/CachedPage.php
@@ -35,7 +35,7 @@ class CachedPage
     /**
      * Returns the cached version of a page, if it exists and should be cached
      *
-     * @return a cached version of the page if it exists, null otherwise
+     * @return string a cached version of the page if it exists, null otherwise
      */
     public function cachedVersion()
     {
diff --git a/application/LinkUtils.php b/application/LinkUtils.php
index eeca631f..9d9ae3cb 100644
--- a/application/LinkUtils.php
+++ b/application/LinkUtils.php
@@ -81,7 +81,7 @@ function html_extract_charset($html)
 /**
  * Count private links in given linklist.
  *
- * @param array $links Linklist.
+ * @param array|Countable $links Linklist.
  *
  * @return int Number of private links.
  */
@@ -162,6 +162,7 @@ function space2nbsp($text)
  *
  * @param string $description shaare's description.
  * @param string $redirector  if a redirector is set, use it to gerenate links.
+ * @param string $indexUrl    URL to Shaarli's index.
  *
  * @return string formatted description.
  */
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php
index c3181254..d6840d37 100644
--- a/application/NetscapeBookmarkUtils.php
+++ b/application/NetscapeBookmarkUtils.php
@@ -86,7 +86,7 @@ class NetscapeBookmarkUtils
      * Imports Web bookmarks from an uploaded Netscape bookmark dump
      *
      * @param array  $post      Server $_POST parameters
-     * @param array  $file      Server $_FILES parameters
+     * @param array  $files     Server $_FILES parameters
      * @param LinkDB $linkDb    Loaded LinkDB instance
      * @param string $pagecache Page cache
      *
diff --git a/application/TimeZone.php b/application/TimeZone.php
index 26f2232d..36a8fb12 100644
--- a/application/TimeZone.php
+++ b/application/TimeZone.php
@@ -7,9 +7,9 @@
  * Example: preselect Europe/Paris
  *  list($htmlform, $js) = generateTimeZoneForm('Europe/Paris');
  *
- * @param string $preselected_timezone preselected timezone (optional)
+ * @param string $preselectedTimezone preselected timezone (optional)
  *
- * @return an array containing the generated HTML form and Javascript code
+ * @return array containing the generated HTML form and Javascript code
  **/
 function generateTimeZoneForm($preselectedTimezone='')
 {
@@ -27,10 +27,6 @@ function generateTimeZoneForm($preselectedTimezone='')
         $pcity = substr($preselectedTimezone, $spos+1);
     }
 
-    // Display config form:
-    $timezoneForm = '';
-    $timezoneJs = '';
-
     // The list is in the form 'Europe/Paris', 'America/Argentina/Buenos_Aires'
     // We split the list in continents/cities.
     $continents = array();
@@ -97,7 +93,7 @@ function generateTimeZoneForm($preselectedTimezone='')
  * @param string $continent the timezone continent
  * @param string $city      the timezone city
  *
- * @return whether continent/city is a valid timezone
+ * @return bool whether continent/city is a valid timezone
  */
 function isTimeZoneValid($continent, $city)
 {
diff --git a/application/Updater.php b/application/Updater.php
index b6cbc56c..90913235 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -37,7 +37,7 @@ class Updater
      *
      * @param array         $doneUpdates Updates which are already done.
      * @param LinkDB        $linkDB      LinkDB instance.
-     * @oaram ConfigManager $conf        Configuration Manager instance.
+     * @param ConfigManager $conf        Configuration Manager instance.
      * @param boolean       $isLoggedIn  True if the user is logged in.
      */
     public function __construct($doneUpdates, $linkDB, $conf, $isLoggedIn)
diff --git a/application/Url.php b/application/Url.php
index c166ff6e..c5c7dd18 100644
--- a/application/Url.php
+++ b/application/Url.php
@@ -62,21 +62,7 @@ function add_trailing_slash($url)
 {
     return $url . (!endsWith($url, '/') ? '/' : '');
 }
-/**
- * Converts an URL with an IDN host to a ASCII one.
- *
- * @param string $url Input URL.
- *
- * @return string converted URL.
- */
-function url_with_idn_to_ascii($url)
-{
-    $parts = parse_url($url);
-    $parts['host'] = idn_to_ascii($parts['host']);
 
-    $httpUrl = new \http\Url($parts);
-    return $httpUrl->toString();
-}
 /**
  * URL representation and cleanup utilities
  *
diff --git a/application/Utils.php b/application/Utils.php
index 7d7eaffd..0166ee2a 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -32,6 +32,10 @@ function logm($logFile, $clientIp, $message)
  *
  *  In Shaarli, they are used as a tinyurl-like link to individual entries,
  *  e.g. smallHash('20111006_131924') --> yZH23w
+ *
+ * @param string $text Create a hash from this text.
+ *
+ * @return string generated small hash.
  */
 function smallHash($text)
 {
@@ -106,7 +110,9 @@ function unescape($str)
 }
 
 /**
- * Link sanitization before templating
+ * Sanitize link before rendering.
+ *
+ * @param array $link Link to escape.
  */
 function sanitizeLink(&$link)
 {
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index d07fefee..30007eb4 100644
--- a/application/config/ConfigJson.php
+++ b/application/config/ConfigJson.php
@@ -21,7 +21,7 @@ class ConfigJson implements ConfigIO
         $data = json_decode($data, true);
         if ($data === null) {
             $error = json_last_error();
-            throw new Exception('An error occured while parsing JSON file: error code #'. $error);
+            throw new Exception('An error occurred while parsing JSON file: error code #'. $error);
         }
         return $data;
     }
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index ff41772a..f5f753f8 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -37,6 +37,8 @@ class ConfigManager
 
     /**
      * Constructor.
+     *
+     * @param string $configFile Configuration file path without extension.
      */
     public function __construct($configFile = 'data/config')
     {
diff --git a/index.php b/index.php
index f7e73bde..6d712aee 100644
--- a/index.php
+++ b/index.php
@@ -606,8 +606,6 @@ function showDailyRSS($conf) {
         $absurl = escape(index_url($_SERVER).'?do=daily&day='.$day);  // Absolute URL of the corresponding "Daily" page.
 
         // Build the HTML body of this RSS entry.
-        $html = '';
-        $href = '';
         $links = array();
 
         // We pre-format some fields for proper output.
@@ -833,7 +831,7 @@ function renderPage($conf, $pluginManager)
         // Get only links which have a thumbnail.
         foreach($links as $link)
         {
-            $permalink='?'.escape(smallhash($link['linkdate']));
+            $permalink='?'.escape(smallHash($link['linkdate']));
             $thumb=lazyThumbnail($conf, $link['url'],$permalink);
             if ($thumb!='') // Only output links which have a thumbnail.
             {
@@ -867,7 +865,7 @@ function renderPage($conf, $pluginManager)
             $maxcount = max($maxcount, $value);
         }
 
-        // Sort tags alphabetically: case insensitive, support locale if avalaible.
+        // Sort tags alphabetically: case insensitive, support locale if available.
         uksort($tags, function($a, $b) {
             // Collator is part of PHP intl.
             if (class_exists('Collator')) {
@@ -1670,8 +1668,6 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager)
         $next_page_url = '?page=' . ($page-1) . $searchtermUrl . $searchtagsUrl;
     }
 
-    $token = isLoggedIn() ? getToken($conf) : '';
-
     // Fill all template fields.
     $data = array(
         'previous_page_url' => $previous_page_url,
diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php
index 99c88820..07f6ab49 100644
--- a/tests/config/ConfigJsonTest.php
+++ b/tests/config/ConfigJsonTest.php
@@ -41,7 +41,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
      * Read a non existent config file -> empty array.
      *
      * @expectedException Exception
-     * @expectedExceptionMessage An error occured while parsing JSON file: error code #4
+     * @expectedExceptionMessage An error occurred while parsing JSON file: error code #4
      */
     public function testReadInvalidJson()
     {
-- 
cgit v1.2.3


From fbc28ff1c892460e90e87a1be6dd3e28a4cd58b8 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Wed, 19 Oct 2016 11:05:20 +0200
Subject: Fix hashtags links in Feeds

Make the hashtag link absolute in feeds to work properly in RSS syndication tools.
---
 CHANGELOG.md                | 1 +
 application/FeedBuilder.php | 3 ++-
 tests/FeedBuilderTest.php   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60af7223..72914076 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Plugins:
     - Tools: only display parameter description when it exists
     - archive.org: do not propose archival of private notes
+- Use absolute URL for hashtags in RSS and ATOM feeds
 
 ### Security
 - Allow whitelisting trusted IPs, else continue banning clients upon login failure
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index c6657fbb..4036a7cc 100644
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -153,7 +153,8 @@ class FeedBuilder
         } else {
             $permalink = 'Permalink';
         }
-        $link['description'] = format_description($link['description']) . PHP_EOL .'
— '. $permalink;
+        $link['description']  = format_description($link['description'], '', $pageaddr);
+        $link['description'] .= PHP_EOL .'
— '. $permalink;
 
         $pubDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
         $link['pub_iso_date'] = $this->getIsoDate($pubDate);
diff --git a/tests/FeedBuilderTest.php b/tests/FeedBuilderTest.php
index aa57f44e..d7839402 100644
--- a/tests/FeedBuilderTest.php
+++ b/tests/FeedBuilderTest.php
@@ -249,5 +249,6 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $link = array_shift($data['links']);
         $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['guid']);
         $this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['url']);
+        $this->assertContains('http://host.tld:8080/~user/shaarli/?addtag=hashtag', $link['description']);
     }
 }
-- 
cgit v1.2.3


From 628b97cbdf276785eb9ff4f7a124e81e67d2f76c Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Thu, 20 Oct 2016 21:10:56 +0200
Subject: LinkDB: do not prefix privates with an underscore

Relates to #95

Signed-off-by: VirtualTam 
---
 application/LinkDB.php | 134 ++++++++++++++++++++++++-------------------------
 tests/LinkDBTest.php   |   4 +-
 2 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/application/LinkDB.php b/application/LinkDB.php
index de9e73b0..2d42c514 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -31,7 +31,7 @@
 class LinkDB implements Iterator, Countable, ArrayAccess
 {
     // Links are stored as a PHP serialized string
-    private $_datastore;
+    private $datastore;
 
     // Link date storage format
     const LINK_DATE_FORMAT = 'Ymd_His';
@@ -45,26 +45,26 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     // List of links (associative array)
     //  - key:   link date (e.g. "20110823_124546"),
     //  - value: associative array (keys: title, description...)
-    private $_links;
+    private $links;
 
     // List of all recorded URLs (key=url, value=linkdate)
     // for fast reserve search (url-->linkdate)
-    private $_urls;
+    private $urls;
 
     // List of linkdate keys (for the Iterator interface implementation)
-    private $_keys;
+    private $keys;
 
-    // Position in the $this->_keys array (for the Iterator interface)
-    private $_position;
+    // Position in the $this->keys array (for the Iterator interface)
+    private $position;
 
     // Is the user logged in? (used to filter private links)
-    private $_loggedIn;
+    private $loggedIn;
 
     // Hide public links
-    private $_hidePublicLinks;
+    private $hidePublicLinks;
 
     // link redirector set in user settings.
-    private $_redirector;
+    private $redirector;
 
     /**
      * Set this to `true` to urlencode link behind redirector link, `false` to leave it untouched.
@@ -95,13 +95,13 @@ class LinkDB implements Iterator, Countable, ArrayAccess
         $redirectorEncode = true
     )
     {
-        $this->_datastore = $datastore;
-        $this->_loggedIn = $isLoggedIn;
-        $this->_hidePublicLinks = $hidePublicLinks;
-        $this->_redirector = $redirector;
+        $this->datastore = $datastore;
+        $this->loggedIn = $isLoggedIn;
+        $this->hidePublicLinks = $hidePublicLinks;
+        $this->redirector = $redirector;
         $this->redirectorEncode = $redirectorEncode === true;
-        $this->_checkDB();
-        $this->_readDB();
+        $this->checkDB();
+        $this->readDB();
     }
 
     /**
@@ -109,7 +109,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     public function count()
     {
-        return count($this->_links);
+        return count($this->links);
     }
 
     /**
@@ -118,7 +118,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     public function offsetSet($offset, $value)
     {
         // TODO: use exceptions instead of "die"
-        if (!$this->_loggedIn) {
+        if (!$this->loggedIn) {
             die('You are not authorized to add a link.');
         }
         if (empty($value['linkdate']) || empty($value['url'])) {
@@ -127,8 +127,8 @@ class LinkDB implements Iterator, Countable, ArrayAccess
         if (empty($offset)) {
             die('You must specify a key.');
         }
-        $this->_links[$offset] = $value;
-        $this->_urls[$value['url']]=$offset;
+        $this->links[$offset] = $value;
+        $this->urls[$value['url']]=$offset;
     }
 
     /**
@@ -136,7 +136,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     public function offsetExists($offset)
     {
-        return array_key_exists($offset, $this->_links);
+        return array_key_exists($offset, $this->links);
     }
 
     /**
@@ -144,13 +144,13 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     public function offsetUnset($offset)
     {
-        if (!$this->_loggedIn) {
+        if (!$this->loggedIn) {
             // TODO: raise an exception
             die('You are not authorized to delete a link.');
         }
-        $url = $this->_links[$offset]['url'];
-        unset($this->_urls[$url]);
-        unset($this->_links[$offset]);
+        $url = $this->links[$offset]['url'];
+        unset($this->urls[$url]);
+        unset($this->links[$offset]);
     }
 
     /**
@@ -158,7 +158,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     public function offsetGet($offset)
     {
-        return isset($this->_links[$offset]) ? $this->_links[$offset] : null;
+        return isset($this->links[$offset]) ? $this->links[$offset] : null;
     }
 
     /**
@@ -166,7 +166,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     function current()
     {
-        return $this->_links[$this->_keys[$this->_position]];
+        return $this->links[$this->keys[$this->position]];
     }
 
     /**
@@ -174,7 +174,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     function key()
     {
-        return $this->_keys[$this->_position];
+        return $this->keys[$this->position];
     }
 
     /**
@@ -182,7 +182,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     function next()
     {
-        ++$this->_position;
+        ++$this->position;
     }
 
     /**
@@ -192,9 +192,9 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     function rewind()
     {
-        $this->_keys = array_keys($this->_links);
-        rsort($this->_keys);
-        $this->_position = 0;
+        $this->keys = array_keys($this->links);
+        rsort($this->keys);
+        $this->position = 0;
     }
 
     /**
@@ -202,7 +202,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      */
     function valid()
     {
-        return isset($this->_keys[$this->_position]);
+        return isset($this->keys[$this->position]);
     }
 
     /**
@@ -210,14 +210,14 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      *
      * If no DB file is found, creates a dummy DB.
      */
-    private function _checkDB()
+    private function checkDB()
     {
-        if (file_exists($this->_datastore)) {
+        if (file_exists($this->datastore)) {
             return;
         }
 
         // Create a dummy database for example
-        $this->_links = array();
+        $this->links = array();
         $link = array(
             'title'=>' Shaarli: the personal, minimalist, super-fast, no-database delicious clone',
             'url'=>'https://github.com/shaarli/Shaarli/wiki',
@@ -230,7 +230,7 @@ You use the community supported version of the original Shaarli project, by Seba
             'linkdate'=> date('Ymd_His'),
             'tags'=>'opensource software'
         );
-        $this->_links[$link['linkdate']] = $link;
+        $this->links[$link['linkdate']] = $link;
 
         $link = array(
             'title'=>'My secret stuff... - Pastebin.com',
@@ -240,7 +240,7 @@ You use the community supported version of the original Shaarli project, by Seba
             'linkdate'=> date('Ymd_His', strtotime('-1 minute')),
             'tags'=>'secretstuff'
         );
-        $this->_links[$link['linkdate']] = $link;
+        $this->links[$link['linkdate']] = $link;
 
         // Write database to disk
         $this->writeDB();
@@ -249,55 +249,55 @@ You use the community supported version of the original Shaarli project, by Seba
     /**
      * Reads database from disk to memory
      */
-    private function _readDB()
+    private function readDB()
     {
 
         // Public links are hidden and user not logged in => nothing to show
-        if ($this->_hidePublicLinks && !$this->_loggedIn) {
-            $this->_links = array();
+        if ($this->hidePublicLinks && !$this->loggedIn) {
+            $this->links = array();
             return;
         }
 
         // Read data
         // Note that gzinflate is faster than gzuncompress.
         // See: http://www.php.net/manual/en/function.gzdeflate.php#96439
-        $this->_links = array();
+        $this->links = array();
 
-        if (file_exists($this->_datastore)) {
-            $this->_links = unserialize(gzinflate(base64_decode(
-                substr(file_get_contents($this->_datastore),
+        if (file_exists($this->datastore)) {
+            $this->links = unserialize(gzinflate(base64_decode(
+                substr(file_get_contents($this->datastore),
                        strlen(self::$phpPrefix), -strlen(self::$phpSuffix)))));
         }
 
         // If user is not logged in, filter private links.
-        if (!$this->_loggedIn) {
+        if (!$this->loggedIn) {
             $toremove = array();
-            foreach ($this->_links as $link) {
+            foreach ($this->links as $link) {
                 if ($link['private'] != 0) {
                     $toremove[] = $link['linkdate'];
                 }
             }
             foreach ($toremove as $linkdate) {
-                unset($this->_links[$linkdate]);
+                unset($this->links[$linkdate]);
             }
         }
 
-        $this->_urls = array();
-        foreach ($this->_links as &$link) {
+        $this->urls = array();
+        foreach ($this->links as &$link) {
             // Keep the list of the mapping URLs-->linkdate up-to-date.
-            $this->_urls[$link['url']] = $link['linkdate'];
+            $this->urls[$link['url']] = $link['linkdate'];
 
             // Sanitize data fields.
             sanitizeLink($link);
 
             // Remove private tags if the user is not logged in.
-            if (! $this->_loggedIn) {
+            if (! $this->loggedIn) {
                 $link['tags'] = preg_replace('/(^|\s+)\.[^($|\s)]+\s*/', ' ', $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;
+            if (!empty($this->redirector) && !startsWith($link['url'], '?')) {
+                $link['real_url'] = $this->redirector;
                 if ($this->redirectorEncode) {
                     $link['real_url'] .= urlencode(unescape($link['url']));
                 } else {
@@ -317,17 +317,17 @@ You use the community supported version of the original Shaarli project, by Seba
      */
     private function writeDB()
     {
-        if (is_file($this->_datastore) && !is_writeable($this->_datastore)) {
+        if (is_file($this->datastore) && !is_writeable($this->datastore)) {
             // The datastore exists but is not writeable
-            throw new IOException($this->_datastore);
-        } else if (!is_file($this->_datastore) && !is_writeable(dirname($this->_datastore))) {
+            throw new IOException($this->datastore);
+        } else if (!is_file($this->datastore) && !is_writeable(dirname($this->datastore))) {
             // The datastore does not exist and its parent directory is not writeable
-            throw new IOException(dirname($this->_datastore));
+            throw new IOException(dirname($this->datastore));
         }
 
         file_put_contents(
-            $this->_datastore,
-            self::$phpPrefix.base64_encode(gzdeflate(serialize($this->_links))).self::$phpSuffix
+            $this->datastore,
+            self::$phpPrefix.base64_encode(gzdeflate(serialize($this->links))).self::$phpSuffix
         );
 
     }
@@ -339,7 +339,7 @@ You use the community supported version of the original Shaarli project, by Seba
      */
     public function savedb($pageCacheDir)
     {
-        if (!$this->_loggedIn) {
+        if (!$this->loggedIn) {
             // TODO: raise an Exception instead
             die('You are not authorized to change the database.');
         }
@@ -358,8 +358,8 @@ You use the community supported version of the original Shaarli project, by Seba
      */
     public function getLinkFromUrl($url)
     {
-        if (isset($this->_urls[$url])) {
-            return $this->_links[$this->_urls[$url]];
+        if (isset($this->urls[$url])) {
+            return $this->links[$this->urls[$url]];
         }
         return false;
     }
@@ -376,7 +376,7 @@ You use the community supported version of the original Shaarli project, by Seba
     public function filterHash($request)
     {
         $request = substr($request, 0, 6);
-        $linkFilter = new LinkFilter($this->_links);
+        $linkFilter = new LinkFilter($this->links);
         return $linkFilter->filter(LinkFilter::$FILTER_HASH, $request);
     }
 
@@ -388,7 +388,7 @@ You use the community supported version of the original Shaarli project, by Seba
      * @return array list of shaare found.
      */
     public function filterDay($request) {
-        $linkFilter = new LinkFilter($this->_links);
+        $linkFilter = new LinkFilter($this->links);
         return $linkFilter->filter(LinkFilter::$FILTER_DAY, $request);
     }
 
@@ -430,7 +430,7 @@ You use the community supported version of the original Shaarli project, by Seba
             $request = '';
         }
 
-        $linkFilter = new LinkFilter($this->_links);
+        $linkFilter = new LinkFilter($this->links);
         return $linkFilter->filter($type, $request, $casesensitive, $privateonly);
     }
 
@@ -442,7 +442,7 @@ You use the community supported version of the original Shaarli project, by Seba
     {
         $tags = array();
         $caseMapping = array();
-        foreach ($this->_links as $link) {
+        foreach ($this->links as $link) {
             foreach (preg_split('/\s+/', $link['tags'], 0, PREG_SPLIT_NO_EMPTY) as $tag) {
                 if (empty($tag)) {
                     continue;
@@ -467,7 +467,7 @@ You use the community supported version of the original Shaarli project, by Seba
     public function days()
     {
         $linkDays = array();
-        foreach (array_keys($this->_links) as $day) {
+        foreach (array_keys($this->links) as $day) {
             $linkDays[substr($day, 0, 8)] = 0;
         }
         $linkDays = array_keys($linkDays);
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 31306069..43652e72 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -117,7 +117,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
         unlink(self::$testDatastore);
         $this->assertFileNotExists(self::$testDatastore);
 
-        $checkDB = self::getMethod('_checkDB');
+        $checkDB = self::getMethod('checkDB');
         $checkDB->invokeArgs($linkDB, array());
         $this->assertFileExists(self::$testDatastore);
 
@@ -134,7 +134,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
         $datastoreSize = filesize(self::$testDatastore);
         $this->assertGreaterThan(0, $datastoreSize);
 
-        $checkDB = self::getMethod('_checkDB');
+        $checkDB = self::getMethod('checkDB');
         $checkDB->invokeArgs($linkDB, array());
 
         // ensure the datastore is left unmodified
-- 
cgit v1.2.3


From f21abf329234ae4d5a1d56c5a9dd0bc11f80bac8 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Thu, 20 Oct 2016 21:19:51 +0200
Subject: LinkDB: update datastore method names

Relates to https://github.com/shaarli/Shaarli/issues/95

Signed-off-by: VirtualTam 
---
 application/LinkDB.php                | 16 ++++++++--------
 application/NetscapeBookmarkUtils.php |  2 +-
 application/Updater.php               |  2 +-
 index.php                             |  8 ++++----
 tests/LinkDBTest.php                  |  8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/application/LinkDB.php b/application/LinkDB.php
index 2d42c514..f5f209f6 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -100,8 +100,8 @@ class LinkDB implements Iterator, Countable, ArrayAccess
         $this->hidePublicLinks = $hidePublicLinks;
         $this->redirector = $redirector;
         $this->redirectorEncode = $redirectorEncode === true;
-        $this->checkDB();
-        $this->readDB();
+        $this->check();
+        $this->read();
     }
 
     /**
@@ -210,7 +210,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      *
      * If no DB file is found, creates a dummy DB.
      */
-    private function checkDB()
+    private function check()
     {
         if (file_exists($this->datastore)) {
             return;
@@ -243,13 +243,13 @@ You use the community supported version of the original Shaarli project, by Seba
         $this->links[$link['linkdate']] = $link;
 
         // Write database to disk
-        $this->writeDB();
+        $this->write();
     }
 
     /**
      * Reads database from disk to memory
      */
-    private function readDB()
+    private function read()
     {
 
         // Public links are hidden and user not logged in => nothing to show
@@ -315,7 +315,7 @@ You use the community supported version of the original Shaarli project, by Seba
      *
      * @throws IOException the datastore is not writable
      */
-    private function writeDB()
+    private function write()
     {
         if (is_file($this->datastore) && !is_writeable($this->datastore)) {
             // The datastore exists but is not writeable
@@ -337,14 +337,14 @@ You use the community supported version of the original Shaarli project, by Seba
      *
      * @param string $pageCacheDir page cache directory
      */
-    public function savedb($pageCacheDir)
+    public function save($pageCacheDir)
     {
         if (!$this->loggedIn) {
             // TODO: raise an Exception instead
             die('You are not authorized to change the database.');
         }
 
-        $this->writeDB();
+        $this->write();
 
         invalidateCaches($pageCacheDir);
     }
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php
index d6840d37..dd21f05b 100644
--- a/application/NetscapeBookmarkUtils.php
+++ b/application/NetscapeBookmarkUtils.php
@@ -183,7 +183,7 @@ class NetscapeBookmarkUtils
             $importCount++;
         }
 
-        $linkDb->savedb($pagecache);
+        $linkDb->save($pagecache);
         return self::importStatus(
             $filename,
             $filesize,
diff --git a/application/Updater.php b/application/Updater.php
index 90913235..36eddd4f 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -143,7 +143,7 @@ class Updater
             $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true)));
             $this->linkDB[$link['linkdate']] = $link;
         }
-        $this->linkDB->savedb($this->conf->get('resource.page_cache'));
+        $this->linkDB->save($this->conf->get('resource.page_cache'));
         return true;
     }
 
diff --git a/index.php b/index.php
index 6d712aee..84282b8d 100644
--- a/index.php
+++ b/index.php
@@ -1211,7 +1211,7 @@ function renderPage($conf, $pluginManager)
                 $value['tags']=trim(implode(' ',$tags));
                 $LINKSDB[$key]=$value;
             }
-            $LINKSDB->savedb($conf->get('resource.page_cache'));
+            $LINKSDB->save($conf->get('resource.page_cache'));
             echo '';
             exit;
         }
@@ -1228,7 +1228,7 @@ function renderPage($conf, $pluginManager)
                 $value['tags']=trim(implode(' ',$tags));
                 $LINKSDB[$key]=$value;
             }
-            $LINKSDB->savedb($conf->get('resource.page_cache')); // Save to disk.
+            $LINKSDB->save($conf->get('resource.page_cache')); // Save to disk.
             echo '';
             exit;
         }
@@ -1283,7 +1283,7 @@ function renderPage($conf, $pluginManager)
         $pluginManager->executeHooks('save_link', $link);
 
         $LINKSDB[$linkdate] = $link;
-        $LINKSDB->savedb($conf->get('resource.page_cache'));
+        $LINKSDB->save($conf->get('resource.page_cache'));
         pubsubhub($conf);
 
         // If we are called from the bookmarklet, we must close the popup:
@@ -1325,7 +1325,7 @@ function renderPage($conf, $pluginManager)
         $pluginManager->executeHooks('delete_link', $LINKSDB[$linkdate]);
 
         unset($LINKSDB[$linkdate]);
-        $LINKSDB->savedb('resource.page_cache'); // save to disk
+        $LINKSDB->save('resource.page_cache'); // save to disk
 
         // If we are called from the bookmarklet, we must close the popup:
         if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo ''; exit; }
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 43652e72..9d79386c 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -117,7 +117,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
         unlink(self::$testDatastore);
         $this->assertFileNotExists(self::$testDatastore);
 
-        $checkDB = self::getMethod('checkDB');
+        $checkDB = self::getMethod('check');
         $checkDB->invokeArgs($linkDB, array());
         $this->assertFileExists(self::$testDatastore);
 
@@ -134,7 +134,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
         $datastoreSize = filesize(self::$testDatastore);
         $this->assertGreaterThan(0, $datastoreSize);
 
-        $checkDB = self::getMethod('checkDB');
+        $checkDB = self::getMethod('check');
         $checkDB->invokeArgs($linkDB, array());
 
         // ensure the datastore is left unmodified
@@ -180,7 +180,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
     /**
      * Save the links to the DB
      */
-    public function testSaveDB()
+    public function testSave()
     {
         $testDB = new LinkDB(self::$testDatastore, true, false);
         $dbSize = sizeof($testDB);
@@ -194,7 +194,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
             'tags'=>'unit test'
         );
         $testDB[$link['linkdate']] = $link;
-        $testDB->savedb('tests');
+        $testDB->save('tests');
 
         $testDB = new LinkDB(self::$testDatastore, true, false);
         $this->assertEquals($dbSize + 1, sizeof($testDB));
-- 
cgit v1.2.3


From 735ed4a94e1da5874195ac47c00612043a193edf Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Thu, 20 Oct 2016 21:24:39 +0200
Subject: LinkDB: explicit method visibility

Relates to https://github.com/shaarli/Shaarli/issues/95

Signed-off-by: VirtualTam 
---
 application/LinkDB.php          | 12 ++++++------
 tests/utils/ReferenceLinkDB.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/LinkDB.php b/application/LinkDB.php
index f5f209f6..c8b162b6 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -87,7 +87,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      * @param string  $redirector       link redirector set in user settings.
      * @param boolean $redirectorEncode Enable urlencode on redirected urls (default: true).
      */
-    function __construct(
+    public function __construct(
         $datastore,
         $isLoggedIn,
         $hidePublicLinks,
@@ -164,7 +164,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     /**
      * Iterator - Returns the current element
      */
-    function current()
+    public function current()
     {
         return $this->links[$this->keys[$this->position]];
     }
@@ -172,7 +172,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     /**
      * Iterator - Returns the key of the current element
      */
-    function key()
+    public function key()
     {
         return $this->keys[$this->position];
     }
@@ -180,7 +180,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     /**
      * Iterator - Moves forward to next element
      */
-    function next()
+    public function next()
     {
         ++$this->position;
     }
@@ -190,7 +190,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
      *
      * Entries are sorted by date (latest first)
      */
-    function rewind()
+    public function rewind()
     {
         $this->keys = array_keys($this->links);
         rsort($this->keys);
@@ -200,7 +200,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     /**
      * Iterator - Checks if current position is valid
      */
-    function valid()
+    public function valid()
     {
         return isset($this->keys[$this->position]);
     }
diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php
index 937961c8..abca4656 100644
--- a/tests/utils/ReferenceLinkDB.php
+++ b/tests/utils/ReferenceLinkDB.php
@@ -13,7 +13,7 @@ class ReferenceLinkDB
     /**
      * Populates the test DB with reference data
      */
-    function __construct()
+    public function __construct()
     {
         $this->addLink(
             'Link title: @website',
-- 
cgit v1.2.3


From e680cfea08051150827dae26ae5e59374880c46c Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Fri, 21 Oct 2016 11:48:51 +0200
Subject: Use Composer to import Parsedown library

Reference #613
---
 COPYING                        |    4 -
 composer.json                  |    3 +-
 plugins/markdown/Parsedown.php | 1528 ----------------------------------------
 plugins/markdown/markdown.php  |    2 -
 4 files changed, 2 insertions(+), 1535 deletions(-)
 delete mode 100644 plugins/markdown/Parsedown.php

diff --git a/COPYING b/COPYING
index 28939100..22929463 100644
--- a/COPYING
+++ b/COPYING
@@ -72,10 +72,6 @@ Files: plugins/wallabag/wallabag.png
 License: MIT License (http://opensource.org/licenses/MIT)
 Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag
 
-Files: plugins/markdown/Parsedown.php
-License: MIT License (http://opensource.org/licenses/MIT)
-Copyright: (C) 2015 Emanuil Rusev - https://github.com/erusev/parsedown
-
 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE
 
diff --git a/composer.json b/composer.json
index 89a7e446..f7d26a31 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
     "keywords": ["bookmark", "link", "share", "web"],
     "require": {
         "php": ">=5.3.4",
-        "shaarli/netscape-bookmark-parser": "1.*"
+        "shaarli/netscape-bookmark-parser": "1.*",
+        "erusev/parsedown": "1.6"
     },
     "require-dev": {
         "phpmd/phpmd" : "@stable",
diff --git a/plugins/markdown/Parsedown.php b/plugins/markdown/Parsedown.php
deleted file mode 100644
index 91e05dcc..00000000
--- a/plugins/markdown/Parsedown.php
+++ /dev/null
@@ -1,1528 +0,0 @@
-DefinitionData = array();
-
-        # standardize line breaks
-        $text = str_replace(array("\r\n", "\r"), "\n", $text);
-
-        # remove surrounding line breaks
-        $text = trim($text, "\n");
-
-        # split text into lines
-        $lines = explode("\n", $text);
-
-        # iterate through lines to identify blocks
-        $markup = $this->lines($lines);
-
-        # trim line breaks
-        $markup = trim($markup, "\n");
-
-        return $markup;
-    }
-
-    #
-    # Setters
-    #
-
-    function setBreaksEnabled($breaksEnabled)
-    {
-        $this->breaksEnabled = $breaksEnabled;
-
-        return $this;
-    }
-
-    protected $breaksEnabled;
-
-    function setMarkupEscaped($markupEscaped)
-    {
-        $this->markupEscaped = $markupEscaped;
-
-        return $this;
-    }
-
-    protected $markupEscaped;
-
-    function setUrlsLinked($urlsLinked)
-    {
-        $this->urlsLinked = $urlsLinked;
-
-        return $this;
-    }
-
-    protected $urlsLinked = true;
-
-    #
-    # Lines
-    #
-
-    protected $BlockTypes = array(
-        '#' => array('Header'),
-        '*' => array('Rule', 'List'),
-        '+' => array('List'),
-        '-' => array('SetextHeader', 'Table', 'Rule', 'List'),
-        '0' => array('List'),
-        '1' => array('List'),
-        '2' => array('List'),
-        '3' => array('List'),
-        '4' => array('List'),
-        '5' => array('List'),
-        '6' => array('List'),
-        '7' => array('List'),
-        '8' => array('List'),
-        '9' => array('List'),
-        ':' => array('Table'),
-        '<' => array('Comment', 'Markup'),
-        '=' => array('SetextHeader'),
-        '>' => array('Quote'),
-        '[' => array('Reference'),
-        '_' => array('Rule'),
-        '`' => array('FencedCode'),
-        '|' => array('Table'),
-        '~' => array('FencedCode'),
-    );
-
-    # ~
-
-    protected $unmarkedBlockTypes = array(
-        'Code',
-    );
-
-    #
-    # Blocks
-    #
-
-    private function lines(array $lines)
-    {
-        $CurrentBlock = null;
-
-        foreach ($lines as $line)
-        {
-            if (chop($line) === '')
-            {
-                if (isset($CurrentBlock))
-                {
-                    $CurrentBlock['interrupted'] = true;
-                }
-
-                continue;
-            }
-
-            if (strpos($line, "\t") !== false)
-            {
-                $parts = explode("\t", $line);
-
-                $line = $parts[0];
-
-                unset($parts[0]);
-
-                foreach ($parts as $part)
-                {
-                    $shortage = 4 - mb_strlen($line, 'utf-8') % 4;
-
-                    $line .= str_repeat(' ', $shortage);
-                    $line .= $part;
-                }
-            }
-
-            $indent = 0;
-
-            while (isset($line[$indent]) and $line[$indent] === ' ')
-            {
-                $indent ++;
-            }
-
-            $text = $indent > 0 ? substr($line, $indent) : $line;
-
-            # ~
-
-            $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
-
-            # ~
-
-            if (isset($CurrentBlock['continuable']))
-            {
-                $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
-
-                if (isset($Block))
-                {
-                    $CurrentBlock = $Block;
-
-                    continue;
-                }
-                else
-                {
-                    if (method_exists($this, 'block'.$CurrentBlock['type'].'Complete'))
-                    {
-                        $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
-                    }
-                }
-            }
-
-            # ~
-
-            $marker = $text[0];
-
-            # ~
-
-            $blockTypes = $this->unmarkedBlockTypes;
-
-            if (isset($this->BlockTypes[$marker]))
-            {
-                foreach ($this->BlockTypes[$marker] as $blockType)
-                {
-                    $blockTypes []= $blockType;
-                }
-            }
-
-            #
-            # ~
-
-            foreach ($blockTypes as $blockType)
-            {
-                $Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
-
-                if (isset($Block))
-                {
-                    $Block['type'] = $blockType;
-
-                    if ( ! isset($Block['identified']))
-                    {
-                        $Blocks []= $CurrentBlock;
-
-                        $Block['identified'] = true;
-                    }
-
-                    if (method_exists($this, 'block'.$blockType.'Continue'))
-                    {
-                        $Block['continuable'] = true;
-                    }
-
-                    $CurrentBlock = $Block;
-
-                    continue 2;
-                }
-            }
-
-            # ~
-
-            if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
-            {
-                $CurrentBlock['element']['text'] .= "\n".$text;
-            }
-            else
-            {
-                $Blocks []= $CurrentBlock;
-
-                $CurrentBlock = $this->paragraph($Line);
-
-                $CurrentBlock['identified'] = true;
-            }
-        }
-
-        # ~
-
-        if (isset($CurrentBlock['continuable']) and method_exists($this, 'block'.$CurrentBlock['type'].'Complete'))
-        {
-            $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
-        }
-
-        # ~
-
-        $Blocks []= $CurrentBlock;
-
-        unset($Blocks[0]);
-
-        # ~
-
-        $markup = '';
-
-        foreach ($Blocks as $Block)
-        {
-            if (isset($Block['hidden']))
-            {
-                continue;
-            }
-
-            $markup .= "\n";
-            $markup .= isset($Block['markup']) ? $Block['markup'] : $this->element($Block['element']);
-        }
-
-        $markup .= "\n";
-
-        # ~
-
-        return $markup;
-    }
-
-    #
-    # Code
-
-    protected function blockCode($Line, $Block = null)
-    {
-        if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
-        {
-            return;
-        }
-
-        if ($Line['indent'] >= 4)
-        {
-            $text = substr($Line['body'], 4);
-
-            $Block = array(
-                'element' => array(
-                    'name' => 'pre',
-                    'handler' => 'element',
-                    'text' => array(
-                        'name' => 'code',
-                        'text' => $text,
-                    ),
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockCodeContinue($Line, $Block)
-    {
-        if ($Line['indent'] >= 4)
-        {
-            if (isset($Block['interrupted']))
-            {
-                $Block['element']['text']['text'] .= "\n";
-
-                unset($Block['interrupted']);
-            }
-
-            $Block['element']['text']['text'] .= "\n";
-
-            $text = substr($Line['body'], 4);
-
-            $Block['element']['text']['text'] .= $text;
-
-            return $Block;
-        }
-    }
-
-    protected function blockCodeComplete($Block)
-    {
-        $text = $Block['element']['text']['text'];
-
-        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
-
-        $Block['element']['text']['text'] = $text;
-
-        return $Block;
-    }
-
-    #
-    # Comment
-
-    protected function blockComment($Line)
-    {
-        if ($this->markupEscaped)
-        {
-            return;
-        }
-
-        if (isset($Line['text'][3]) and $Line['text'][3] === '-' and $Line['text'][2] === '-' and $Line['text'][1] === '!')
-        {
-            $Block = array(
-                'markup' => $Line['body'],
-            );
-
-            if (preg_match('/-->$/', $Line['text']))
-            {
-                $Block['closed'] = true;
-            }
-
-            return $Block;
-        }
-    }
-
-    protected function blockCommentContinue($Line, array $Block)
-    {
-        if (isset($Block['closed']))
-        {
-            return;
-        }
-
-        $Block['markup'] .= "\n" . $Line['body'];
-
-        if (preg_match('/-->$/', $Line['text']))
-        {
-            $Block['closed'] = true;
-        }
-
-        return $Block;
-    }
-
-    #
-    # Fenced Code
-
-    protected function blockFencedCode($Line)
-    {
-        if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
-        {
-            $Element = array(
-                'name' => 'code',
-                'text' => '',
-            );
-
-            if (isset($matches[1]))
-            {
-                $class = 'language-'.$matches[1];
-
-                $Element['attributes'] = array(
-                    'class' => $class,
-                );
-            }
-
-            $Block = array(
-                'char' => $Line['text'][0],
-                'element' => array(
-                    'name' => 'pre',
-                    'handler' => 'element',
-                    'text' => $Element,
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockFencedCodeContinue($Line, $Block)
-    {
-        if (isset($Block['complete']))
-        {
-            return;
-        }
-
-        if (isset($Block['interrupted']))
-        {
-            $Block['element']['text']['text'] .= "\n";
-
-            unset($Block['interrupted']);
-        }
-
-        if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
-        {
-            $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
-
-            $Block['complete'] = true;
-
-            return $Block;
-        }
-
-        $Block['element']['text']['text'] .= "\n".$Line['body'];;
-
-        return $Block;
-    }
-
-    protected function blockFencedCodeComplete($Block)
-    {
-        $text = $Block['element']['text']['text'];
-
-        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
-
-        $Block['element']['text']['text'] = $text;
-
-        return $Block;
-    }
-
-    #
-    # Header
-
-    protected function blockHeader($Line)
-    {
-        if (isset($Line['text'][1]))
-        {
-            $level = 1;
-
-            while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
-            {
-                $level ++;
-            }
-
-            if ($level > 6)
-            {
-                return;
-            }
-
-            $text = trim($Line['text'], '# ');
-
-            $Block = array(
-                'element' => array(
-                    'name' => 'h' . min(6, $level),
-                    'text' => $text,
-                    'handler' => 'line',
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    #
-    # List
-
-    protected function blockList($Line)
-    {
-        list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
-
-        if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
-        {
-            $Block = array(
-                'indent' => $Line['indent'],
-                'pattern' => $pattern,
-                'element' => array(
-                    'name' => $name,
-                    'handler' => 'elements',
-                ),
-            );
-
-            $Block['li'] = array(
-                'name' => 'li',
-                'handler' => 'li',
-                'text' => array(
-                    $matches[2],
-                ),
-            );
-
-            $Block['element']['text'] []= & $Block['li'];
-
-            return $Block;
-        }
-    }
-
-    protected function blockListContinue($Line, array $Block)
-    {
-        if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
-        {
-            if (isset($Block['interrupted']))
-            {
-                $Block['li']['text'] []= '';
-
-                unset($Block['interrupted']);
-            }
-
-            unset($Block['li']);
-
-            $text = isset($matches[1]) ? $matches[1] : '';
-
-            $Block['li'] = array(
-                'name' => 'li',
-                'handler' => 'li',
-                'text' => array(
-                    $text,
-                ),
-            );
-
-            $Block['element']['text'] []= & $Block['li'];
-
-            return $Block;
-        }
-
-        if ($Line['text'][0] === '[' and $this->blockReference($Line))
-        {
-            return $Block;
-        }
-
-        if ( ! isset($Block['interrupted']))
-        {
-            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
-
-            $Block['li']['text'] []= $text;
-
-            return $Block;
-        }
-
-        if ($Line['indent'] > 0)
-        {
-            $Block['li']['text'] []= '';
-
-            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
-
-            $Block['li']['text'] []= $text;
-
-            unset($Block['interrupted']);
-
-            return $Block;
-        }
-    }
-
-    #
-    # Quote
-
-    protected function blockQuote($Line)
-    {
-        if (preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
-        {
-            $Block = array(
-                'element' => array(
-                    'name' => 'blockquote',
-                    'handler' => 'lines',
-                    'text' => (array) $matches[1],
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockQuoteContinue($Line, array $Block)
-    {
-        if ($Line['text'][0] === '>' and preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
-        {
-            if (isset($Block['interrupted']))
-            {
-                $Block['element']['text'] []= '';
-
-                unset($Block['interrupted']);
-            }
-
-            $Block['element']['text'] []= $matches[1];
-
-            return $Block;
-        }
-
-        if ( ! isset($Block['interrupted']))
-        {
-            $Block['element']['text'] []= $Line['text'];
-
-            return $Block;
-        }
-    }
-
-    #
-    # Rule
-
-    protected function blockRule($Line)
-    {
-        if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
-        {
-            $Block = array(
-                'element' => array(
-                    'name' => 'hr'
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    #
-    # Setext
-
-    protected function blockSetextHeader($Line, array $Block = null)
-    {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
-        {
-            return;
-        }
-
-        if (chop($Line['text'], $Line['text'][0]) === '')
-        {
-            $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
-
-            return $Block;
-        }
-    }
-
-    #
-    # Markup
-
-    protected function blockMarkup($Line)
-    {
-        if ($this->markupEscaped)
-        {
-            return;
-        }
-
-        if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
-        {
-            $element = strtolower($matches[1]);
-
-            if (in_array($element, $this->textLevelElements))
-            {
-                return;
-            }
-
-            $Block = array(
-                'name' => $matches[1],
-                'depth' => 0,
-                'markup' => $Line['text'],
-            );
-
-            $length = strlen($matches[0]);
-
-            $remainder = substr($Line['text'], $length);
-
-            if (trim($remainder) === '')
-            {
-                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
-                {
-                    $Block['closed'] = true;
-
-                    $Block['void'] = true;
-                }
-            }
-            else
-            {
-                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
-                {
-                    return;
-                }
-
-                if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
-                {
-                    $Block['closed'] = true;
-                }
-            }
-
-            return $Block;
-        }
-    }
-
-    protected function blockMarkupContinue($Line, array $Block)
-    {
-        if (isset($Block['closed']))
-        {
-            return;
-        }
-
-        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
-        {
-            $Block['depth'] ++;
-        }
-
-        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
-        {
-            if ($Block['depth'] > 0)
-            {
-                $Block['depth'] --;
-            }
-            else
-            {
-                $Block['closed'] = true;
-            }
-        }
-
-        if (isset($Block['interrupted']))
-        {
-            $Block['markup'] .= "\n";
-
-            unset($Block['interrupted']);
-        }
-
-        $Block['markup'] .= "\n".$Line['body'];
-
-        return $Block;
-    }
-
-    #
-    # Reference
-
-    protected function blockReference($Line)
-    {
-        if (preg_match('/^\[(.+?)\]:[ ]*?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
-        {
-            $id = strtolower($matches[1]);
-
-            $Data = array(
-                'url' => $matches[2],
-                'title' => null,
-            );
-
-            if (isset($matches[3]))
-            {
-                $Data['title'] = $matches[3];
-            }
-
-            $this->DefinitionData['Reference'][$id] = $Data;
-
-            $Block = array(
-                'hidden' => true,
-            );
-
-            return $Block;
-        }
-    }
-
-    #
-    # Table
-
-    protected function blockTable($Line, array $Block = null)
-    {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
-        {
-            return;
-        }
-
-        if (strpos($Block['element']['text'], '|') !== false and chop($Line['text'], ' -:|') === '')
-        {
-            $alignments = array();
-
-            $divider = $Line['text'];
-
-            $divider = trim($divider);
-            $divider = trim($divider, '|');
-
-            $dividerCells = explode('|', $divider);
-
-            foreach ($dividerCells as $dividerCell)
-            {
-                $dividerCell = trim($dividerCell);
-
-                if ($dividerCell === '')
-                {
-                    continue;
-                }
-
-                $alignment = null;
-
-                if ($dividerCell[0] === ':')
-                {
-                    $alignment = 'left';
-                }
-
-                if (substr($dividerCell, - 1) === ':')
-                {
-                    $alignment = $alignment === 'left' ? 'center' : 'right';
-                }
-
-                $alignments []= $alignment;
-            }
-
-            # ~
-
-            $HeaderElements = array();
-
-            $header = $Block['element']['text'];
-
-            $header = trim($header);
-            $header = trim($header, '|');
-
-            $headerCells = explode('|', $header);
-
-            foreach ($headerCells as $index => $headerCell)
-            {
-                $headerCell = trim($headerCell);
-
-                $HeaderElement = array(
-                    'name' => 'th',
-                    'text' => $headerCell,
-                    'handler' => 'line',
-                );
-
-                if (isset($alignments[$index]))
-                {
-                    $alignment = $alignments[$index];
-
-                    $HeaderElement['attributes'] = array(
-                        'style' => 'text-align: '.$alignment.';',
-                    );
-                }
-
-                $HeaderElements []= $HeaderElement;
-            }
-
-            # ~
-
-            $Block = array(
-                'alignments' => $alignments,
-                'identified' => true,
-                'element' => array(
-                    'name' => 'table',
-                    'handler' => 'elements',
-                ),
-            );
-
-            $Block['element']['text'] []= array(
-                'name' => 'thead',
-                'handler' => 'elements',
-            );
-
-            $Block['element']['text'] []= array(
-                'name' => 'tbody',
-                'handler' => 'elements',
-                'text' => array(),
-            );
-
-            $Block['element']['text'][0]['text'] []= array(
-                'name' => 'tr',
-                'handler' => 'elements',
-                'text' => $HeaderElements,
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockTableContinue($Line, array $Block)
-    {
-        if (isset($Block['interrupted']))
-        {
-            return;
-        }
-
-        if ($Line['text'][0] === '|' or strpos($Line['text'], '|'))
-        {
-            $Elements = array();
-
-            $row = $Line['text'];
-
-            $row = trim($row);
-            $row = trim($row, '|');
-
-            preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]+`|`)+/', $row, $matches);
-
-            foreach ($matches[0] as $index => $cell)
-            {
-                $cell = trim($cell);
-
-                $Element = array(
-                    'name' => 'td',
-                    'handler' => 'line',
-                    'text' => $cell,
-                );
-
-                if (isset($Block['alignments'][$index]))
-                {
-                    $Element['attributes'] = array(
-                        'style' => 'text-align: '.$Block['alignments'][$index].';',
-                    );
-                }
-
-                $Elements []= $Element;
-            }
-
-            $Element = array(
-                'name' => 'tr',
-                'handler' => 'elements',
-                'text' => $Elements,
-            );
-
-            $Block['element']['text'][1]['text'] []= $Element;
-
-            return $Block;
-        }
-    }
-
-    #
-    # ~
-    #
-
-    protected function paragraph($Line)
-    {
-        $Block = array(
-            'element' => array(
-                'name' => 'p',
-                'text' => $Line['text'],
-                'handler' => 'line',
-            ),
-        );
-
-        return $Block;
-    }
-
-    #
-    # Inline Elements
-    #
-
-    protected $InlineTypes = array(
-        '"' => array('SpecialCharacter'),
-        '!' => array('Image'),
-        '&' => array('SpecialCharacter'),
-        '*' => array('Emphasis'),
-        ':' => array('Url'),
-        '<' => array('UrlTag', 'EmailTag', 'Markup', 'SpecialCharacter'),
-        '>' => array('SpecialCharacter'),
-        '[' => array('Link'),
-        '_' => array('Emphasis'),
-        '`' => array('Code'),
-        '~' => array('Strikethrough'),
-        '\\' => array('EscapeSequence'),
-    );
-
-    # ~
-
-    protected $inlineMarkerList = '!"*_&[:<>`~\\';
-
-    #
-    # ~
-    #
-
-    public function line($text)
-    {
-        $markup = '';
-
-        # $excerpt is based on the first occurrence of a marker
-
-        while ($excerpt = strpbrk($text, $this->inlineMarkerList))
-        {
-            $marker = $excerpt[0];
-
-            $markerPosition = strpos($text, $marker);
-
-            $Excerpt = array('text' => $excerpt, 'context' => $text);
-
-            foreach ($this->InlineTypes[$marker] as $inlineType)
-            {
-                $Inline = $this->{'inline'.$inlineType}($Excerpt);
-
-                if ( ! isset($Inline))
-                {
-                    continue;
-                }
-
-                # makes sure that the inline belongs to "our" marker
-
-                if (isset($Inline['position']) and $Inline['position'] > $markerPosition)
-                {
-                    continue;
-                }
-
-                # sets a default inline position
-
-                if ( ! isset($Inline['position']))
-                {
-                    $Inline['position'] = $markerPosition;
-                }
-
-                # the text that comes before the inline
-                $unmarkedText = substr($text, 0, $Inline['position']);
-
-                # compile the unmarked text
-                $markup .= $this->unmarkedText($unmarkedText);
-
-                # compile the inline
-                $markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']);
-
-                # remove the examined text
-                $text = substr($text, $Inline['position'] + $Inline['extent']);
-
-                continue 2;
-            }
-
-            # the marker does not belong to an inline
-
-            $unmarkedText = substr($text, 0, $markerPosition + 1);
-
-            $markup .= $this->unmarkedText($unmarkedText);
-
-            $text = substr($text, $markerPosition + 1);
-        }
-
-        $markup .= $this->unmarkedText($text);
-
-        return $markup;
-    }
-
-    #
-    # ~
-    #
-
-    protected function inlineCode($Excerpt)
-    {
-        $marker = $Excerpt['text'][0];
-
-        if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(? strlen($matches[0]),
-                'element' => array(
-                    'name' => 'code',
-                    'text' => $text,
-                ),
-            );
-        }
-    }
-
-    protected function inlineEmailTag($Excerpt)
-    {
-        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
-        {
-            $url = $matches[1];
-
-            if ( ! isset($matches[2]))
-            {
-                $url = 'mailto:' . $url;
-            }
-
-            return array(
-                'extent' => strlen($matches[0]),
-                'element' => array(
-                    'name' => 'a',
-                    'text' => $matches[1],
-                    'attributes' => array(
-                        'href' => $url,
-                    ),
-                ),
-            );
-        }
-    }
-
-    protected function inlineEmphasis($Excerpt)
-    {
-        if ( ! isset($Excerpt['text'][1]))
-        {
-            return;
-        }
-
-        $marker = $Excerpt['text'][0];
-
-        if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
-        {
-            $emphasis = 'strong';
-        }
-        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
-        {
-            $emphasis = 'em';
-        }
-        else
-        {
-            return;
-        }
-
-        return array(
-            'extent' => strlen($matches[0]),
-            'element' => array(
-                'name' => $emphasis,
-                'handler' => 'line',
-                'text' => $matches[1],
-            ),
-        );
-    }
-
-    protected function inlineEscapeSequence($Excerpt)
-    {
-        if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
-        {
-            return array(
-                'markup' => $Excerpt['text'][1],
-                'extent' => 2,
-            );
-        }
-    }
-
-    protected function inlineImage($Excerpt)
-    {
-        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
-        {
-            return;
-        }
-
-        $Excerpt['text']= substr($Excerpt['text'], 1);
-
-        $Link = $this->inlineLink($Excerpt);
-
-        if ($Link === null)
-        {
-            return;
-        }
-
-        $Inline = array(
-            'extent' => $Link['extent'] + 1,
-            'element' => array(
-                'name' => 'img',
-                'attributes' => array(
-                    'src' => $Link['element']['attributes']['href'],
-                    'alt' => $Link['element']['text'],
-                ),
-            ),
-        );
-
-        $Inline['element']['attributes'] += $Link['element']['attributes'];
-
-        unset($Inline['element']['attributes']['href']);
-
-        return $Inline;
-    }
-
-    protected function inlineLink($Excerpt)
-    {
-        $Element = array(
-            'name' => 'a',
-            'handler' => 'line',
-            'text' => null,
-            'attributes' => array(
-                'href' => null,
-                'title' => null,
-            ),
-        );
-
-        $extent = 0;
-
-        $remainder = $Excerpt['text'];
-
-        if (preg_match('/\[((?:[^][]|(?R))*)\]/', $remainder, $matches))
-        {
-            $Element['text'] = $matches[1];
-
-            $extent += strlen($matches[0]);
-
-            $remainder = substr($remainder, $extent);
-        }
-        else
-        {
-            return;
-        }
-
-        if (preg_match('/^[(]((?:[^ ()]|[(][^ )]+[)])+)(?:[ ]+("[^"]*"|\'[^\']*\'))?[)]/', $remainder, $matches))
-        {
-            $Element['attributes']['href'] = $matches[1];
-
-            if (isset($matches[2]))
-            {
-                $Element['attributes']['title'] = substr($matches[2], 1, - 1);
-            }
-
-            $extent += strlen($matches[0]);
-        }
-        else
-        {
-            if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
-            {
-                $definition = strlen($matches[1]) ? $matches[1] : $Element['text'];
-                $definition = strtolower($definition);
-
-                $extent += strlen($matches[0]);
-            }
-            else
-            {
-                $definition = strtolower($Element['text']);
-            }
-
-            if ( ! isset($this->DefinitionData['Reference'][$definition]))
-            {
-                return;
-            }
-
-            $Definition = $this->DefinitionData['Reference'][$definition];
-
-            $Element['attributes']['href'] = $Definition['url'];
-            $Element['attributes']['title'] = $Definition['title'];
-        }
-
-        $Element['attributes']['href'] = str_replace(array('&', '<'), array('&', '<'), $Element['attributes']['href']);
-
-        return array(
-            'extent' => $extent,
-            'element' => $Element,
-        );
-    }
-
-    protected function inlineMarkup($Excerpt)
-    {
-        if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false)
-        {
-            return;
-        }
-
-        if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $Excerpt['text'], $matches))
-        {
-            return array(
-                'markup' => $matches[0],
-                'extent' => strlen($matches[0]),
-            );
-        }
-
-        if ($Excerpt['text'][1] === '!' and preg_match('/^/s', $Excerpt['text'], $matches))
-        {
-            return array(
-                'markup' => $matches[0],
-                'extent' => strlen($matches[0]),
-            );
-        }
-
-        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
-        {
-            return array(
-                'markup' => $matches[0],
-                'extent' => strlen($matches[0]),
-            );
-        }
-    }
-
-    protected function inlineSpecialCharacter($Excerpt)
-    {
-        if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
-        {
-            return array(
-                'markup' => '&',
-                'extent' => 1,
-            );
-        }
-
-        $SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
-
-        if (isset($SpecialCharacter[$Excerpt['text'][0]]))
-        {
-            return array(
-                'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
-                'extent' => 1,
-            );
-        }
-    }
-
-    protected function inlineStrikethrough($Excerpt)
-    {
-        if ( ! isset($Excerpt['text'][1]))
-        {
-            return;
-        }
-
-        if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
-        {
-            return array(
-                'extent' => strlen($matches[0]),
-                'element' => array(
-                    'name' => 'del',
-                    'text' => $matches[1],
-                    'handler' => 'line',
-                ),
-            );
-        }
-    }
-
-    protected function inlineUrl($Excerpt)
-    {
-        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
-        {
-            return;
-        }
-
-        if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
-        {
-            $Inline = array(
-                'extent' => strlen($matches[0][0]),
-                'position' => $matches[0][1],
-                'element' => array(
-                    'name' => 'a',
-                    'text' => $matches[0][0],
-                    'attributes' => array(
-                        'href' => $matches[0][0],
-                    ),
-                ),
-            );
-
-            return $Inline;
-        }
-    }
-
-    protected function inlineUrlTag($Excerpt)
-    {
-        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches))
-        {
-            $url = str_replace(array('&', '<'), array('&', '<'), $matches[1]);
-
-            return array(
-                'extent' => strlen($matches[0]),
-                'element' => array(
-                    'name' => 'a',
-                    'text' => $url,
-                    'attributes' => array(
-                        'href' => $url,
-                    ),
-                ),
-            );
-        }
-    }
-
-    # ~
-
-    protected function unmarkedText($text)
-    {
-        if ($this->breaksEnabled)
-        {
-            $text = preg_replace('/[ ]*\n/', "
\n", $text);
-        }
-        else
-        {
-            $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "
\n", $text);
-            $text = str_replace(" \n", "\n", $text);
-        }
-
-        return $text;
-    }
-
-    #
-    # Handlers
-    #
-
-    protected function element(array $Element)
-    {
-        $markup = '<'.$Element['name'];
-
-        if (isset($Element['attributes']))
-        {
-            foreach ($Element['attributes'] as $name => $value)
-            {
-                if ($value === null)
-                {
-                    continue;
-                }
-
-                $markup .= ' '.$name.'="'.$value.'"';
-            }
-        }
-
-        if (isset($Element['text']))
-        {
-            $markup .= '>';
-
-            if (isset($Element['handler']))
-            {
-                $markup .= $this->{$Element['handler']}($Element['text']);
-            }
-            else
-            {
-                $markup .= $Element['text'];
-            }
-
-            $markup .= '';
-        }
-        else
-        {
-            $markup .= ' />';
-        }
-
-        return $markup;
-    }
-
-    protected function elements(array $Elements)
-    {
-        $markup = '';
-
-        foreach ($Elements as $Element)
-        {
-            $markup .= "\n" . $this->element($Element);
-        }
-
-        $markup .= "\n";
-
-        return $markup;
-    }
-
-    # ~
-
-    protected function li($lines)
-    {
-        $markup = $this->lines($lines);
-
-        $trimmedMarkup = trim($markup);
-
-        if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '')
-        {
-            $markup = $trimmedMarkup;
-            $markup = substr($markup, 3);
-
-            $position = strpos($markup, "");
-
-            $markup = substr_replace($markup, '', $position, 4);
-        }
-
-        return $markup;
-    }
-
-    #
-    # Deprecated Methods
-    #
-
-    function parse($text)
-    {
-        $markup = $this->text($text);
-
-        return $markup;
-    }
-
-    #
-    # Static Methods
-    #
-
-    static function instance($name = 'default')
-    {
-        if (isset(self::$instances[$name]))
-        {
-            return self::$instances[$name];
-        }
-
-        $instance = new static();
-
-        self::$instances[$name] = $instance;
-
-        return $instance;
-    }
-
-    private static $instances = array();
-
-    #
-    # Fields
-    #
-
-    protected $DefinitionData;
-
-    #
-    # Read-Only
-
-    protected $specialCharacters = array(
-        '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|',
-    );
-
-    protected $StrongRegex = array(
-        '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
-        '_' => '/^__((?:\\\\_|[^_]|_[^_]*_)+?)__(?!_)/us',
-    );
-
-    protected $EmRegex = array(
-        '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
-        '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
-    );
-
-    protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*(?:\s*=\s*(?:[^"\'=<>`\s]+|"[^"]*"|\'[^\']*\'))?';
-
-    protected $voidElements = array(
-        'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
-    );
-
-    protected $textLevelElements = array(
-        'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
-        'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
-        'i', 'rp', 'del', 'code',          'strike', 'marquee',
-        'q', 'rt', 'ins', 'font',          'strong',
-        's', 'tt', 'sub', 'mark',
-        'u', 'xm', 'sup', 'nobr',
-        'var', 'ruby',
-        'wbr', 'span',
-        'time',
-    );
-}
\ No newline at end of file
diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
index 6b1c1d44..eb7bf23d 100644
--- a/plugins/markdown/markdown.php
+++ b/plugins/markdown/markdown.php
@@ -6,8 +6,6 @@
  * Shaare's descriptions are parsed with Markdown.
  */
 
-require_once 'Parsedown.php';
-
 /*
  * If this tag is used on a shaare, the description won't be processed by Parsedown.
  */
-- 
cgit v1.2.3


From c5941f316a49c94eff354b63e75b3add98ac4aea Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Fri, 21 Oct 2016 12:38:38 +0200
Subject: Fix an issue with links not being reversed in code blocks

Fixes #672

+ Markdown to HTML unit test
---
 plugins/markdown/markdown.php         | 11 ++++++-----
 tests/plugins/PluginMarkdownTest.php  | 13 +++++++++++++
 tests/plugins/resources/markdown.html | 24 ++++++++++++++++++++++++
 tests/plugins/resources/markdown.md   | 24 ++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 tests/plugins/resources/markdown.html
 create mode 100644 tests/plugins/resources/markdown.md

diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
index eb7bf23d..a764b6fa 100644
--- a/plugins/markdown/markdown.php
+++ b/plugins/markdown/markdown.php
@@ -155,8 +155,9 @@ function reverse_text2clickable($description)
     $lineCount = 0;
 
     foreach ($descriptionLines as $descriptionLine) {
-        // Detect line of code
-        $codeLineOn = preg_match('/^    /', $descriptionLine) > 0;
+        // Detect line of code: starting with 4 spaces,
+        // except lists which can start with +/*/- or `2.` after spaces.
+        $codeLineOn = preg_match('/^    +(?=[^\+\*\-])(?=(?!\d\.).)/', $descriptionLine) > 0;
         // Detect and toggle block of code
         if (!$codeBlockOn) {
             $codeBlockOn = preg_match('/^```/', $descriptionLine) > 0;
@@ -173,10 +174,10 @@ function reverse_text2clickable($description)
             $descriptionLine
         );
 
-        // Reverse hashtag links if we're in a code block.
-        $hashtagFilter = ($codeBlockOn || $codeLineOn) ? $hashtagTitle : '';
+        // Reverse all links in code blocks, only non hashtag elsewhere.
+        $hashtagFilter = (!$codeBlockOn && !$codeLineOn) ? '(?!'. $hashtagTitle .')': '(?:'. $hashtagTitle .')?';
         $descriptionLine = preg_replace(
-            '!([^<]+)!m',
+            '#([^<]+)#m',
             '$1',
             $descriptionLine
         );
diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
index 3593a556..12bdda24 100644
--- a/tests/plugins/PluginMarkdownTest.php
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -151,4 +151,17 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
         $data = hook_markdown_render_daily($data);
         $this->assertEquals($str, $data['cols'][0][0]['formatedDescription']);
     }
+
+    /**
+     * Test hashtag links processed with markdown.
+     */
+    function testMarkdownHashtagLinks()
+    {
+        $md = file_get_contents('tests/plugins/resources/markdown.md');
+        $md = format_description($md);
+        $html = file_get_contents('tests/plugins/resources/markdown.html');
+
+        $data = process_markdown($md);
+        $this->assertEquals($html, $data);
+    }
 }
diff --git a/tests/plugins/resources/markdown.html b/tests/plugins/resources/markdown.html
new file mode 100644
index 00000000..c0fbe7f4
--- /dev/null
+++ b/tests/plugins/resources/markdown.html
@@ -0,0 +1,24 @@
+
+test:
+
+zero
+two
+three
+
+
+
+zero
+
+two
+three
+four
+foo #foobar
+
+
+#foobar foo lol #foo #bar
+fsdfs http://link.tld #foobar http://link.tld
+http://link.tld #foobar
+next #foo
+Block:
+lorem ipsum #foobar http://link.tld
+#foobar http://link.tld
\ No newline at end of file
diff --git a/tests/plugins/resources/markdown.md b/tests/plugins/resources/markdown.md
new file mode 100644
index 00000000..0b8be7c5
--- /dev/null
+++ b/tests/plugins/resources/markdown.md
@@ -0,0 +1,24 @@
+* test:
+    * [zero](http://link.tld)
+    + [two](http://link.tld)
+    - [three](http://link.tld)
+
+1. [zero](http://link.tld)
+  2. [two](http://link.tld)
+   3. [three](http://link.tld)
+    4. [four](http://link.tld)
+    5. foo #foobar
+
+#foobar foo `lol #foo` #bar
+
+fsdfs http://link.tld #foobar `http://link.tld`
+
+    http://link.tld #foobar
+    next #foo
+    
+Block:
+
+```
+lorem ipsum #foobar http://link.tld
+#foobar http://link.tld
+```
\ No newline at end of file
-- 
cgit v1.2.3


From e6c7e336637f82b1073b63f3cc6c8887c37c647f Mon Sep 17 00:00:00 2001
From: Adrien Oliva 
Date: Fri, 28 Oct 2016 10:03:32 +0200
Subject: Add Piwik Plugin

[PullRequest #677] Change after Review

Fix logic, my bad!
---
 plugins/piwik/piwik.meta |  4 +++
 plugins/piwik/piwik.php  | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 plugins/piwik/piwik.meta
 create mode 100644 plugins/piwik/piwik.php

diff --git a/plugins/piwik/piwik.meta b/plugins/piwik/piwik.meta
new file mode 100644
index 00000000..20b9628e
--- /dev/null
+++ b/plugins/piwik/piwik.meta
@@ -0,0 +1,4 @@
+description="A plugin that adds Piwik tracking code to Shaarli pages."
+parameters="PIWIK_URL;PIWIK_SITEID"
+parameter.PIWIK_URL="Piwik URL"
+parameter.PIWIK_SITEID="Piwik site ID"
diff --git a/plugins/piwik/piwik.php b/plugins/piwik/piwik.php
new file mode 100644
index 00000000..7c44909c
--- /dev/null
+++ b/plugins/piwik/piwik.php
@@ -0,0 +1,71 @@
+get('plugins.PIWIK_URL');
+    $piwikSiteid = $conf->get('plugins.PIWIK_SITEID');
+    if (empty($piwikUrl) || empty($piwikSiteid)) {
+        $error = 'Piwik plugin error: ' .
+            'Please define PIWIK_URL and PIWIK_SITEID in the plugin administration page.';
+        return array($error);
+    }
+}
+
+/**
+ * Hook render_footer.
+ * Executed on every page redering.
+ *
+ * Template placeholders:
+ *   - text
+ *   - endofpage
+ *   - js_files
+ *
+ * Data:
+ *   - _PAGE_: current page
+ *   - _LOGGEDIN_: true/false
+ *
+ * @param array $data data passed to plugin
+ *
+ * @return array altered $data.
+ */
+function hook_piwik_render_footer($data, $conf)
+{
+    $piwikUrl = $conf->get('plugins.PIWIK_URL');
+    $piwikSiteid = $conf->get('plugins.PIWIK_SITEID');
+    if (empty($piwikUrl) || empty($piwikSiteid)) {
+        return $data;
+    }
+
+    // Free elements at the end of the page.
+    $data['endofpage'][] = '' .
+'' .
+'' .
+'';
+
+    return $data;
+}
+
-- 
cgit v1.2.3


From 989aa439dd813ecd1bad8717754fb60156333836 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sat, 5 Nov 2016 15:12:23 +0100
Subject: Plugins W3C compliance

Add an alt attribute to images
---
 plugins/archiveorg/archiveorg.html         | 2 +-
 plugins/qrcode/qrcode.html                 | 2 +-
 plugins/readityourself/readityourself.html | 2 +-
 plugins/wallabag/wallabag.html             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/archiveorg/archiveorg.html b/plugins/archiveorg/archiveorg.html
index 576bd46e..0781fe35 100644
--- a/plugins/archiveorg/archiveorg.html
+++ b/plugins/archiveorg/archiveorg.html
@@ -1 +1 @@
-
+
diff --git a/plugins/qrcode/qrcode.html b/plugins/qrcode/qrcode.html
index cebc5644..dc214ed1 100644
--- a/plugins/qrcode/qrcode.html
+++ b/plugins/qrcode/qrcode.html
@@ -1,5 +1,5 @@
 
     
-        
+        
     
 
diff --git a/plugins/readityourself/readityourself.html b/plugins/readityourself/readityourself.html
index e8c5f784..5e200715 100644
--- a/plugins/readityourself/readityourself.html
+++ b/plugins/readityourself/readityourself.html
@@ -1 +1 @@
-
+
diff --git a/plugins/wallabag/wallabag.html b/plugins/wallabag/wallabag.html
index c7b1d044..e861536d 100644
--- a/plugins/wallabag/wallabag.html
+++ b/plugins/wallabag/wallabag.html
@@ -1 +1 @@
-
+
-- 
cgit v1.2.3


From b7f8b874bb9f2028c29b1f22f893fabec2836de8 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Sat, 5 Nov 2016 19:51:03 +0100
Subject: Docker: set favicon location in nginx configuration

Relates to https://github.com/shaarli/Shaarli/issues/681

Fixed:
- nginx: set the favicon location

See http://serverfault.com/a/352861

Signed-off-by: VirtualTam 
---
 docker/development/nginx.conf       | 5 +++++
 docker/production/nginx.conf        | 5 +++++
 docker/production/stable/nginx.conf | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf
index cda09b56..e714ee76 100644
--- a/docker/development/nginx.conf
+++ b/docker/development/nginx.conf
@@ -49,6 +49,11 @@ http {
             add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
+        location = /favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
         location ~ (index)\.php$ {
             # filter and proxy PHP requests to PHP-FPM
             fastcgi_pass   unix:/var/run/php5-fpm.sock;
diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf
index e23c4587..f7d59fc8 100644
--- a/docker/production/nginx.conf
+++ b/docker/production/nginx.conf
@@ -41,6 +41,11 @@ http {
             add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
+        location = /favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
         location ~ (index)\.php$ {
             # filter and proxy PHP requests to PHP-FPM
             fastcgi_pass   unix:/var/run/php5-fpm.sock;
diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf
index e23c4587..f7d59fc8 100644
--- a/docker/production/stable/nginx.conf
+++ b/docker/production/stable/nginx.conf
@@ -41,6 +41,11 @@ http {
             add_header Cache-Control "public, must-revalidate, proxy-revalidate";
         }
 
+        location = /favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
         location ~ (index)\.php$ {
             # filter and proxy PHP requests to PHP-FPM
             fastcgi_pass   unix:/var/run/php5-fpm.sock;
-- 
cgit v1.2.3


From 68579ad5c4d1978366c5d2be2ef34da6a3618ef0 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Sat, 5 Nov 2016 20:42:54 +0100
Subject: Docker: increase maximum file upload size to 10 MiB

Relates to https://github.com/shaarli/Shaarli/issues/681

Changed:
- nginx+php-fpm: set maximum upload size to 10 MiB

See:
- https://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size
- https://secure.php.net/manual/en/ini.core.php#ini.post-max-size
- https://secure.php.net/manual/en/ini.core.php#ini.upload-max-filesize

Signed-off-by: VirtualTam 
---
 CHANGELOG.md                        | 2 ++
 docker/development/Dockerfile       | 2 ++
 docker/development/nginx.conf       | 2 ++
 docker/production/Dockerfile        | 2 ++
 docker/production/nginx.conf        | 2 ++
 docker/production/stable/Dockerfile | 2 ++
 docker/production/stable/nginx.conf | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d42d6a75..5eeb521a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - archives contain a `Shaarli` directory, itself containing sources + dependencies
     - the tarball is now gzipped
 - Minor code cleanup: PHPDoc, spelling, unused variables, etc.
+- Docker: explicitly set the maximum file upload size to 10 MiB
 
 ### Fixed
 - Fix the server `` value in Atom/RSS feeds
@@ -27,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - Tools: only display parameter description when it exists
     - archive.org: do not propose archival of private notes
 - Use absolute URL for hashtags in RSS and ATOM feeds
+- Docker: specify the location of the favicon
 
 ### Security
 - Allow whitelisting trusted IPs, else continue banning clients upon login failure
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 0c19b085..d9ef8da7 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -15,6 +15,8 @@ RUN apt-get update \
        nano \
     && apt-get clean
 
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
 
diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf
index e714ee76..ac0c6c61 100644
--- a/docker/development/nginx.conf
+++ b/docker/development/nginx.conf
@@ -11,6 +11,8 @@ http {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index d93ed262..d0509115 100644
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -14,6 +14,8 @@ RUN apt-get update \
        supervisor \
     && apt-get clean
 
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
 
diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf
index f7d59fc8..5ffa02d0 100644
--- a/docker/production/nginx.conf
+++ b/docker/production/nginx.conf
@@ -11,6 +11,8 @@ http {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {
diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile
index a509fda6..fc9588b0 100644
--- a/docker/production/stable/Dockerfile
+++ b/docker/production/stable/Dockerfile
@@ -14,6 +14,8 @@ RUN apt-get update \
        supervisor \
     && apt-get clean
 
+RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini
+RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
 
diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf
index f7d59fc8..5ffa02d0 100644
--- a/docker/production/stable/nginx.conf
+++ b/docker/production/stable/nginx.conf
@@ -11,6 +11,8 @@ http {
     default_type       application/octet-stream;
     keepalive_timeout  20;
 
+    client_max_body_size 10m;
+
     index index.html index.php;
 
     server {
-- 
cgit v1.2.3


From 5ebc1d504bc8a8f29f49a8a4fc1c421f78677b2a Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Thu, 3 Nov 2016 13:59:18 +0100
Subject: .htaccess files: support Apache 2.4+ syntax

If `mod_version` is enabled, the previous syntax will apply for Apache <2.4.
If not, the new syntax is used by default.

Fixes #676

`mod_version` identifier is `version_module` across all Apache versions. See:

  * https://httpd.apache.org/docs/current/mod/mod_version.html
  * https://httpd.apache.org/docs/2.2/mod/mod_version.html
  * https://serverfault.com/questions/733910/how-do-i-load-mod-version-only-if-it-isnt-built-in-to-apache

Note that version_module comes built-in with Debian (and derivatives) Apache2 packages, see https://wiki.debian.org/Apache/PackagingFor24
---
 application/.htaccess | 15 +++++++++++++--
 cache/.htaccess       | 15 +++++++++++++--
 data/.htaccess        | 15 +++++++++++++--
 docker/.htaccess      | 15 +++++++++++++--
 pagecache/.htaccess   | 15 +++++++++++++--
 tests/.htaccess       | 15 +++++++++++++--
 tmp/.htaccess         | 15 +++++++++++++--
 7 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/application/.htaccess b/application/.htaccess
index b584d98c..f601c1ee 100644
--- a/application/.htaccess
+++ b/application/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+
+  = 2.4>
+     Require all denied
+  
+  
+     Allow from none
+     Deny from all
+  
+
+
+
+    Require all denied
+
diff --git a/cache/.htaccess b/cache/.htaccess
index b584d98c..f601c1ee 100644
--- a/cache/.htaccess
+++ b/cache/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+
+  = 2.4>
+     Require all denied
+  
+  
+     Allow from none
+     Deny from all
+  
+
+
+
+    Require all denied
+
diff --git a/data/.htaccess b/data/.htaccess
index b584d98c..f601c1ee 100644
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+
+  = 2.4>
+     Require all denied
+  
+  
+     Allow from none
+     Deny from all
+  
+
+
+
+    Require all denied
+
diff --git a/docker/.htaccess b/docker/.htaccess
index b584d98c..f601c1ee 100644
--- a/docker/.htaccess
+++ b/docker/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+
+  = 2.4>
+     Require all denied
+  
+  
+     Allow from none
+     Deny from all
+  
+
+
+
+    Require all denied
+
diff --git a/pagecache/.htaccess b/pagecache/.htaccess
index b584d98c..f601c1ee 100644
--- a/pagecache/.htaccess
+++ b/pagecache/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+
+  = 2.4>
+     Require all denied
+  
+  
+     Allow from none
+     Deny from all
+  
+
+
+
+    Require all denied
+
diff --git a/tests/.htaccess b/tests/.htaccess
index b584d98c..f601c1ee 100644
--- a/tests/.htaccess
+++ b/tests/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+
+  = 2.4>
+     Require all denied
+  
+  
+     Allow from none
+     Deny from all
+  
+
+
+
+    Require all denied
+
diff --git a/tmp/.htaccess b/tmp/.htaccess
index b584d98c..f601c1ee 100644
--- a/tmp/.htaccess
+++ b/tmp/.htaccess
@@ -1,2 +1,13 @@
-Allow from none
-Deny from all
+
+  = 2.4>
+     Require all denied
+  
+  
+     Allow from none
+     Deny from all
+  
+
+
+
+    Require all denied
+
-- 
cgit v1.2.3


From 1ef05d3601e942eba74bd66554d629be2fa05efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20K=C3=A4stner?= 
Date: Wed, 16 Nov 2016 14:57:44 +0100
Subject: Add meta tag to block sending the referrer

Add a meta tag that tells the browser not to send the referrer header to
external sites.
---
 tpl/includes.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tpl/includes.html b/tpl/includes.html
index f94ce1be..7b2997ce 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -11,4 +12,4 @@
 {loop="$plugins_includes.css_files"}
 
 {/loop}
-
\ No newline at end of file
+
-- 
cgit v1.2.3


From 266e3fe5c8961aaf089bad16b9e4c54de1aaff40 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sun, 13 Nov 2016 16:51:21 +0100
Subject: Markdown: fixes feed rendering with nomarkdown tag

 * make sure we match exactly `nomarkdown` tag
 * pass the whole link data to stripNoMarkdownTag() to:
   * strip the noMD tag in taglist (array)
   * strip the tag in tags (string)

Fixes #689

tmp
---
 plugins/markdown/README.md           | 21 +++++++++++++++------
 plugins/markdown/markdown.php        | 27 +++++++++++++++++++--------
 tests/plugins/PluginMarkdownTest.php | 29 +++++++++++++++++++++++++----
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/plugins/markdown/README.md b/plugins/markdown/README.md
index 4f021871..196005e7 100644
--- a/plugins/markdown/README.md
+++ b/plugins/markdown/README.md
@@ -20,26 +20,35 @@ The directory structure should look like:
      |--- markdown.css
      |--- markdown.meta
      |--- markdown.php
-     |--- Parsedown.php
      |--- README.md
 ```
 
 To enable the plugin, just check it in the plugin administration page.
 
-You can also add `markdown` to your list of enabled plugins in `data/config.php`
-(`ENABLED_PLUGINS` array).
+You can also add `markdown` to your list of enabled plugins in `data/config.json.php`
+(`general.enabled_plugins` list).
 
 This should look like:
 
 ```
-$GLOBALS['config']['ENABLED_PLUGINS'] = array('qrcode', 'any_other_plugin', 'markdown')
+"general": {
+  "enabled_plugins": [
+    "markdown",
+    [...]
+  ],
+}
 ```
 
+Parsedown parsing library is imported using Composer. If you installed Shaarli using `git`,
+or the `master` branch, run
+
+    composer update --no-dev --prefer-dist
+
 ### No Markdown tag
 
-If the tag `.nomarkdown` is set for a shaare, it won't be converted to Markdown syntax.
+If the tag `nomarkdown` is set for a shaare, it won't be converted to Markdown syntax.
  
-> Note: it's a private tag (leading dot), so it won't be displayed to visitors.
+> Note: this is a special tag, so it won't be displayed in link list.
 
 ### Known issue
 
diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
index a764b6fa..0cf6e6e2 100644
--- a/plugins/markdown/markdown.php
+++ b/plugins/markdown/markdown.php
@@ -22,7 +22,7 @@ function hook_markdown_render_linklist($data)
 {
     foreach ($data['links'] as &$value) {
         if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
-            $value['taglist'] = stripNoMarkdownTag($value['taglist']);
+            $value = stripNoMarkdownTag($value);
             continue;
         }
         $value['description'] = process_markdown($value['description']);
@@ -41,7 +41,7 @@ function hook_markdown_render_feed($data)
 {
     foreach ($data['links'] as &$value) {
         if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
-            $value['tags'] = stripNoMarkdownTag($value['tags']);
+            $value = stripNoMarkdownTag($value);
             continue;
         }
         $value['description'] = process_markdown($value['description']);
@@ -63,6 +63,7 @@ function hook_markdown_render_daily($data)
     foreach ($data['cols'] as &$value) {
         foreach ($value as &$value2) {
             if (!empty($value2['tags']) && noMarkdownTag($value2['tags'])) {
+                $value2 = stripNoMarkdownTag($value2);
                 continue;
             }
             $value2['formatedDescription'] = process_markdown($value2['formatedDescription']);
@@ -81,20 +82,30 @@ function hook_markdown_render_daily($data)
  */
 function noMarkdownTag($tags)
 {
-    return strpos($tags, NO_MD_TAG) !== false;
+    return preg_match('/(^|\s)'. NO_MD_TAG .'(\s|$)/', $tags);
 }
 
 /**
  * Remove the no-markdown meta tag so it won't be displayed.
  *
- * @param string $tags Tag list.
+ * @param array $link Link data.
  *
- * @return string tag list without no markdown tag.
+ * @return array Updated link without no markdown tag.
  */
-function stripNoMarkdownTag($tags)
+function stripNoMarkdownTag($link)
 {
-    unset($tags[array_search(NO_MD_TAG, $tags)]);
-    return array_values($tags);
+    if (! empty($link['taglist'])) {
+        $offset = array_search(NO_MD_TAG, $link['taglist']);
+        if ($offset !== false) {
+            unset($link['taglist'][$offset]);
+        }
+    }
+
+    if (!empty($link['tags'])) {
+        str_replace(NO_MD_TAG, '', $link['tags']);
+    }
+
+    return $link;
 }
 
 /**
diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
index 12bdda24..17ef2280 100644
--- a/tests/plugins/PluginMarkdownTest.php
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -8,8 +8,8 @@ require_once 'application/Utils.php';
 require_once 'plugins/markdown/markdown.php';
 
 /**
- * Class PlugQrcodeTest
- * Unit test for the QR-Code plugin
+ * Class PluginMarkdownTest
+ * Unit test for the Markdown plugin
  */
 class PluginMarkdownTest extends PHPUnit_Framework_TestCase
 {
@@ -130,8 +130,11 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
             ))
         );
 
-        $data = hook_markdown_render_linklist($data);
-        $this->assertEquals($str, $data['links'][0]['description']);
+        $processed = hook_markdown_render_linklist($data);
+        $this->assertEquals($str, $processed['links'][0]['description']);
+
+        $processed = hook_markdown_render_feed($data);
+        $this->assertEquals($str, $processed['links'][0]['description']);
 
         $data = array(
             // Columns data
@@ -152,6 +155,24 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($str, $data['cols'][0][0]['formatedDescription']);
     }
 
+    /**
+     * Test that a close value to nomarkdown is not understand as nomarkdown (previous value `.nomarkdown`).
+     */
+    function testNoMarkdownNotExcactlyMatching()
+    {
+        $str = 'All _work_ and `no play` makes Jack a *dull* boy.';
+        $data = array(
+            'links' => array(array(
+                'description' => $str,
+                'tags' => '.' . NO_MD_TAG,
+                'taglist' => array('.'. NO_MD_TAG),
+            ))
+        );
+
+        $data = hook_markdown_render_feed($data);
+        $this->assertContains('', $data['links'][0]['description']);
+    }
+
     /**
      * Test hashtag links processed with markdown.
      */
-- 
cgit v1.2.3


From caa382dd55c285306a3f48bb54678cf787d842e1 Mon Sep 17 00:00:00 2001
From: Teromene 
Date: Tue, 29 Nov 2016 11:06:31 +0000
Subject: Disable Firefox Social in the tools section if the page is not loaded
 using HTTPS, as Firefox will deny the request.

---
 index.php      | 1 +
 tpl/tools.html | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 84282b8d..5366cb0e 100644
--- a/index.php
+++ b/index.php
@@ -1078,6 +1078,7 @@ function renderPage($conf, $pluginManager)
     {
         $data = array(
             'pageabsaddr' => index_url($_SERVER),
+            'sslenabled' => !empty($_SERVER['HTTPS'])
         );
         $pluginManager->executeHooks('render_tools', $data);
 
diff --git a/tpl/tools.html b/tpl/tools.html
index 8e285f44..e06d239d 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -50,12 +50,15 @@
 				    Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli.
 			
 		


+
+		{if="$sslenabled"}
 		
 			✚Add to Firefox social
 		
 		
 			⇐ Click on this button to add Shaarli to the "Share this page" button in Firefox.
 		


+		{/if}
 
 		{loop="$tools_plugin"}
             {$value}
@@ -64,6 +67,7 @@
 		
 
 		'; exit; }
+        $link = $LINKSDB[(int) escape($_POST['lf_id'])];
         $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
-        $returnurl .= '#'.smallHash($_POST['lf_linkdate']);  // Scroll to the link which has been edited.
+        // Scroll to the link which has been edited.
+        $returnurl .= '#'.smallHash($link['created']->format('Ymd_His'));
         $returnurl = generateLocation($returnurl, $_SERVER['HTTP_HOST'], array('addlink', 'post', 'edit_link'));
         header('Location: '.$returnurl); // After canceling, redirect to the page the user was on.
         exit;
@@ -1318,14 +1335,17 @@ function renderPage($conf, $pluginManager)
     if (isset($_POST['delete_link']))
     {
         if (!tokenOk($_POST['token'])) die('Wrong token.');
+
         // We do not need to ask for confirmation:
         // - confirmation is handled by JavaScript
         // - we are protected from XSRF by the token.
-        $linkdate=$_POST['lf_linkdate'];
 
-        $pluginManager->executeHooks('delete_link', $LINKSDB[$linkdate]);
+        // FIXME! We keep `lf_linkdate` for consistency before a proper API. To be removed.
+        $id = isset($_POST['lf_id']) ? (int) escape($_POST['lf_id']) : (int) escape($_POST['lf_linkdate']);
 
-        unset($LINKSDB[$linkdate]);
+        $pluginManager->executeHooks('delete_link', $LINKSDB[$id]);
+
+        unset($LINKSDB[$id]);
         $LINKSDB->save('resource.page_cache'); // save to disk
 
         // If we are called from the bookmarklet, we must close the popup:
@@ -1364,8 +1384,10 @@ function renderPage($conf, $pluginManager)
     // -------- User clicked the "EDIT" button on a link: Display link edit form.
     if (isset($_GET['edit_link']))
     {
-        $link = $LINKSDB[$_GET['edit_link']];  // Read database
+        $id = (int) escape($_GET['edit_link']);
+        $link = $LINKSDB[$id];  // Read database
         if (!$link) { header('Location: ?'); exit; } // Link not found in database.
+        $link['linkdate'] = $link['created']->format('Ymd_His');
         $data = array(
             'link' => $link,
             'link_is_new' => false,
@@ -1389,7 +1411,7 @@ function renderPage($conf, $pluginManager)
         $link_is_new = false;
         // Check if URL is not already in database (in this case, we will edit the existing link)
         $link = $LINKSDB->getLinkFromUrl($url);
-        if (!$link)
+        if (! $link)
         {
             $link_is_new = true;
             $linkdate = strval(date('Ymd_His'));
@@ -1430,6 +1452,8 @@ function renderPage($conf, $pluginManager)
                 'tags' => $tags,
                 'private' => $private
             );
+        } else {
+            $link['linkdate'] = $link['created']->format('Ymd_His');
         }
 
         $data = array(
@@ -1635,18 +1659,16 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager)
         $link['description'] = format_description($link['description'], $conf->get('redirector.url'));
         $classLi =  ($i % 2) != 0 ? '' : 'publicLinkHightLight';
         $link['class'] = $link['private'] == 0 ? $classLi : 'private';
-        $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
-        $link['timestamp'] = $date->getTimestamp();
+        $link['timestamp'] = $link['created']->getTimestamp();
         if (! empty($link['updated'])) {
-            $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['updated']);
-            $link['updated_timestamp'] = $date->getTimestamp();
+            $link['updated_timestamp'] = $link['updated']->getTimestamp();
         } else {
             $link['updated_timestamp'] = '';
         }
         $taglist = explode(' ', $link['tags']);
         uasort($taglist, 'strcasecmp');
         $link['taglist'] = $taglist;
-        $link['shorturl'] = smallHash($link['linkdate']);
+        $link['shorturl'] = smallHash($link['created']->format('Ymd_His'));
         // Check for both signs of a note: starting with ? and 7 chars long.
         if ($link['url'][0] === '?' &&
             strlen($link['url']) === 7) {
diff --git a/plugins/isso/isso.php b/plugins/isso/isso.php
index ffb7cfac..c44f3c09 100644
--- a/plugins/isso/isso.php
+++ b/plugins/isso/isso.php
@@ -41,9 +41,11 @@ function hook_isso_render_linklist($data, $conf)
     // Only display comments for permalinks.
     if (count($data['links']) == 1 && empty($data['search_tags']) && empty($data['search_term'])) {
         $link = reset($data['links']);
-        $isso_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/isso/isso.html');
+        $issoHtml = file_get_contents(PluginManager::$PLUGINS_PATH . '/isso/isso.html');
 
-        $isso = sprintf($isso_html, $issoUrl, $issoUrl, $link['linkdate'], $link['linkdate']);
+        // FIXME! KO thread unique si même date
+        $linkDate = $link['created']->format('Ymd_His');
+        $isso = sprintf($issoHtml, $issoUrl, $issoUrl, $linkDate, $linkDate);
         $data['plugin_end_zone'][] = $isso;
 
         // Hackish way to include this CSS file only when necessary.
diff --git a/tpl/daily.html b/tpl/daily.html
index b82ad483..eba0af3b 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -49,13 +49,13 @@
                     {$link=$value}
                     
                         
-                            
+                            
                                 
                             
                         
                         {if="!$hide_timestamps || isLoggedIn()"}
                             
-                                {function="strftime('%c', $link.timestamp)"}
+                                {function="strftime('%c', $link.timestamp)"}
                             
                         {/if}
                         {if="$link.tags"}
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 9e7621db..870cc168 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -16,6 +16,9 @@
     
         
             
+          {if="isset($link.id)"}
+	          
+          {/if}
             URL


             Title


             Description
{$link.description}

diff --git a/tpl/linklist.html b/tpl/linklist.html
index ddfd729a..de9586c6 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -71,11 +71,11 @@
                 {if="isLoggedIn()"}
                     
                         
-                            
+                            
                             
                         

                         
-                            
+                            
                             
                             
                             
-                        
+                        
                             
                                 {function="strftime('%c', $value.timestamp)"}
                                 {if="$value.updated_timestamp"}*{/if}
-- 
cgit v1.2.3


From c3dfd8995921083ff7250c25d0b6ab1184b91aff Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 28 Nov 2016 16:17:25 +0100
Subject: Unit Test for the new ID system

---
 tests/FeedBuilderTest.php                          |  31 +++--
 tests/LinkDBTest.php                               |  39 +++++-
 tests/LinkFilterTest.php                           |   6 +-
 tests/NetscapeBookmarkUtils/BookmarkExportTest.php |   6 +-
 tests/NetscapeBookmarkUtils/BookmarkImportTest.php | 146 ++++++++++++++-------
 tests/Updater/UpdaterTest.php                      |  98 ++++++++++++++
 tests/plugins/PluginIssoTest.php                   |  14 +-
 tests/utils/ReferenceLinkDB.php                    |  61 +++++++--
 8 files changed, 306 insertions(+), 95 deletions(-)

diff --git a/tests/FeedBuilderTest.php b/tests/FeedBuilderTest.php
index d7839402..ea1dde25 100644
--- a/tests/FeedBuilderTest.php
+++ b/tests/FeedBuilderTest.php
@@ -84,8 +84,9 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(ReferenceLinkDB::$NB_LINKS_TOTAL, count($data['links']));
 
         // Test first link (note link)
-        $link = array_shift($data['links']);
-        $this->assertEquals('20150310_114651', $link['linkdate']);
+        $link = reset($data['links']);
+        $this->assertEquals(41, $link['id']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['guid']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['url']);
         $this->assertRegExp('/Tue, 10 Mar 2015 11:46:51 \+\d{4}/', $link['pub_iso_date']);
@@ -99,14 +100,14 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('sTuff', $link['taglist'][0]);
 
         // Test URL with external link.
-        $this->assertEquals('https://static.fsf.org/nosvn/faif-2.0.pdf', $data['links']['20150310_114633']['url']);
+        $this->assertEquals('https://static.fsf.org/nosvn/faif-2.0.pdf', $data['links'][8]['url']);
 
         // Test multitags.
-        $this->assertEquals(5, count($data['links']['20141125_084734']['taglist']));
-        $this->assertEquals('css', $data['links']['20141125_084734']['taglist'][0]);
+        $this->assertEquals(5, count($data['links'][6]['taglist']));
+        $this->assertEquals('css', $data['links'][6]['taglist'][0]);
 
         // Test update date
-        $this->assertRegExp('/2016-08-03T09:30:33\+\d{2}:\d{2}/', $data['links']['20150310_114633']['up_iso_date']);
+        $this->assertRegExp('/2016-08-03T09:30:33\+\d{2}:\d{2}/', $data['links'][8]['up_iso_date']);
     }
 
     /**
@@ -119,9 +120,9 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $data = $feedBuilder->buildData();
         $this->assertEquals(ReferenceLinkDB::$NB_LINKS_TOTAL, count($data['links']));
         $this->assertRegExp('/2016-08-03T09:30:33\+\d{2}:\d{2}/', $data['last_update']);
-        $link = array_shift($data['links']);
+        $link = reset($data['links']);
         $this->assertRegExp('/2015-03-10T11:46:51\+\d{2}:\d{2}/', $link['pub_iso_date']);
-        $this->assertRegExp('/2016-08-03T09:30:33\+\d{2}:\d{2}/', $data['links']['20150310_114633']['up_iso_date']);
+        $this->assertRegExp('/2016-08-03T09:30:33\+\d{2}:\d{2}/', $data['links'][8]['up_iso_date']);
     }
 
     /**
@@ -138,7 +139,8 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $data = $feedBuilder->buildData();
         $this->assertEquals(1, count($data['links']));
         $link = array_shift($data['links']);
-        $this->assertEquals('20150310_114651', $link['linkdate']);
+        $this->assertEquals(41, $link['id']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
     }
 
     /**
@@ -154,7 +156,8 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $data = $feedBuilder->buildData();
         $this->assertEquals(1, count($data['links']));
         $link = array_shift($data['links']);
-        $this->assertEquals('20150310_114651', $link['linkdate']);
+        $this->assertEquals(41, $link['id']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
     }
 
     /**
@@ -170,15 +173,17 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($data['usepermalinks']);
         // First link is a permalink
         $link = array_shift($data['links']);
-        $this->assertEquals('20150310_114651', $link['linkdate']);
+        $this->assertEquals(41, $link['id']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['guid']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['url']);
         $this->assertContains('Direct link', $link['description']);
         $this->assertContains('http://host.tld/?WDWyig', $link['description']);
         // Second link is a direct link
         $link = array_shift($data['links']);
-        $this->assertEquals('20150310_114633', $link['linkdate']);
-        $this->assertEquals('http://host.tld/?kLHmZg', $link['guid']);
+        $this->assertEquals(8, $link['id']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114633'), $link['created']);
+        $this->assertEquals('http://host.tld/?RttfEw', $link['guid']);
         $this->assertEquals('https://static.fsf.org/nosvn/faif-2.0.pdf', $link['url']);
         $this->assertContains('Direct link', $link['description']);
         $this->assertContains('https://static.fsf.org/nosvn/faif-2.0.pdf', $link['description']);
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 9d79386c..bedc680e 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -186,14 +186,15 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
         $dbSize = sizeof($testDB);
 
         $link = array(
+            'id' => 42,
             'title'=>'an additional link',
             'url'=>'http://dum.my',
             'description'=>'One more',
             'private'=>0,
-            'linkdate'=>'20150518_190000',
+            'created'=> DateTime::createFromFormat('Ymd_His', '20150518_190000'),
             'tags'=>'unit test'
         );
-        $testDB[$link['linkdate']] = $link;
+        $testDB[$link['id']] = $link;
         $testDB->save('tests');
 
         $testDB = new LinkDB(self::$testDatastore, true, false);
@@ -238,12 +239,12 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
     public function testDays()
     {
         $this->assertEquals(
-            array('20121206', '20130614', '20150310'),
+            array('20100310', '20121206', '20130614', '20150310'),
             self::$publicLinkDB->days()
         );
 
         $this->assertEquals(
-            array('20121206', '20130614', '20141125', '20150310'),
+            array('20100310', '20121206', '20130614', '20141125', '20150310'),
             self::$privateLinkDB->days()
         );
     }
@@ -290,10 +291,11 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
                 'stallman' => 1,
                 'free' => 1,
                 '-exclude' => 1,
+                'hashtag' => 2,
                 // The DB contains a link with `sTuff` and another one with `stuff` tag.
-                // They need to be grouped with the first case found (`sTuff`).
+                // They need to be grouped with the first case found - order by date DESC: `sTuff`.
                 'sTuff' => 2,
-                'hashtag' => 2,
+                'ut' => 1,
             ),
             self::$publicLinkDB->allTags()
         );
@@ -321,6 +323,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
                 'tag2' => 1,
                 'tag3' => 1,
                 'tag4' => 1,
+                'ut' => 1,
             ),
             self::$privateLinkDB->allTags()
         );
@@ -411,6 +414,11 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
             1,
             count(self::$publicLinkDB->filterHash($request))
         );
+        $request = smallHash('20150310_114633' . 8);
+        $this->assertEquals(
+            1,
+            count(self::$publicLinkDB->filterHash($request))
+        );
     }
 
     /**
@@ -433,4 +441,23 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
     {
         self::$publicLinkDB->filterHash('');
     }
+
+    /**
+     * Test reorder with asc/desc parameter.
+     */
+    public function testReorderLinksDesc()
+    {
+        self::$publicLinkDB->reorder('ASC');
+        $linkIdToTest = 42;
+        foreach (self::$publicLinkDB as $key => $value) {
+            $this->assertEquals($linkIdToTest, $key);
+            break;
+        }
+        self::$publicLinkDB->reorder('DESC');
+        $linkIdToTest = 41;
+        foreach (self::$publicLinkDB as $key => $value) {
+            $this->assertEquals($linkIdToTest, $key);
+            break;
+        }
+    }
 }
diff --git a/tests/LinkFilterTest.php b/tests/LinkFilterTest.php
index 7d45fc59..21d680a5 100644
--- a/tests/LinkFilterTest.php
+++ b/tests/LinkFilterTest.php
@@ -159,7 +159,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             'MediaGoblin',
-            $links['20130614_184135']['title']
+            $links[7]['title']
         );
     }
 
@@ -286,7 +286,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            6,
+            7,
             count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '-revolution'))
         );
     }
@@ -346,7 +346,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            6,
+            7,
             count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, '-free'))
         );
     }
diff --git a/tests/NetscapeBookmarkUtils/BookmarkExportTest.php b/tests/NetscapeBookmarkUtils/BookmarkExportTest.php
index cc54ab9f..6a47bbb9 100644
--- a/tests/NetscapeBookmarkUtils/BookmarkExportTest.php
+++ b/tests/NetscapeBookmarkUtils/BookmarkExportTest.php
@@ -50,7 +50,7 @@ class BookmarkExportTest extends PHPUnit_Framework_TestCase
         $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'all', false, '');
         $this->assertEquals(self::$refDb->countLinks(), sizeof($links));
         foreach ($links as $link) {
-            $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
+            $date = $link['created'];
             $this->assertEquals(
                 $date->getTimestamp(),
                 $link['timestamp']
@@ -70,7 +70,7 @@ class BookmarkExportTest extends PHPUnit_Framework_TestCase
         $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'private', false, '');
         $this->assertEquals(self::$refDb->countPrivateLinks(), sizeof($links));
         foreach ($links as $link) {
-            $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
+            $date = $link['created'];
             $this->assertEquals(
                 $date->getTimestamp(),
                 $link['timestamp']
@@ -90,7 +90,7 @@ class BookmarkExportTest extends PHPUnit_Framework_TestCase
         $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public', false, '');
         $this->assertEquals(self::$refDb->countPublicLinks(), sizeof($links));
         foreach ($links as $link) {
-            $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
+            $date = $link['created'];
             $this->assertEquals(
                 $date->getTimestamp(),
                 $link['timestamp']
diff --git a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php
index f0ad500f..96895b00 100644
--- a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php
+++ b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php
@@ -42,6 +42,18 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
      */
     protected $pagecache = 'tests';
 
+    /**
+     * @var string Save the current timezone.
+     */
+    protected static $defaultTimeZone;
+
+    public static function setUpBeforeClass()
+    {
+        self::$defaultTimeZone = date_default_timezone_get();
+        // Timezone without DST for test consistency
+        date_default_timezone_set('Africa/Nairobi');
+    }
+
     /**
      * Resets test data before each test
      */
@@ -55,6 +67,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->linkDb = new LinkDB(self::$testDatastore, true, false);
     }
 
+    public static function tearDownAfterClass()
+    {
+        date_default_timezone_set(self::$defaultTimeZone);
+    }
+
     /**
      * Attempt to import bookmarks from an empty file
      */
@@ -98,18 +115,19 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             array(
-                'linkdate' => '20160618_173944',
+                'id' => 0,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160618_203944'),
                 'title' => 'Hg Init a Mercurial tutorial by Joel Spolsky',
                 'url' => 'http://hginit.com/',
                 'description' => '',
                 'private' => 0,
-                'tags' => ''
+                'tags' => '',
+                'shorturl' => 'La37cg',
             ),
             $this->linkDb->getLinkFromUrl('http://hginit.com/')
         );
     }
 
-
     /**
      * Import bookmarks nested in a folder hierarchy
      */
@@ -126,89 +144,105 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             array(
-                'linkdate' => '20160225_205541',
+                'id' => 0,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235541'),
                 'title' => 'Nested 1',
                 'url' => 'http://nest.ed/1',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'tag1 tag2'
+                'tags' => 'tag1 tag2',
+                'shorturl' => 'KyDNKA',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/1')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160225_205542',
+                'id' => 1,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235542'),
                 'title' => 'Nested 1-1',
                 'url' => 'http://nest.ed/1-1',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'folder1 tag1 tag2'
+                'tags' => 'folder1 tag1 tag2',
+                'shorturl' => 'T2LnXg',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/1-1')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160225_205547',
+                'id' => 2,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235547'),
                 'title' => 'Nested 1-2',
                 'url' => 'http://nest.ed/1-2',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'folder1 tag3 tag4'
+                'tags' => 'folder1 tag3 tag4',
+                'shorturl' => '46SZxA',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/1-2')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160202_172222',
+                'id' => 3,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160202_202222'),
                 'title' => 'Nested 2-1',
                 'url' => 'http://nest.ed/2-1',
                 'description' => 'First link of the second section',
                 'private' => 1,
-                'tags' => 'folder2'
+                'tags' => 'folder2',
+                'shorturl' => '4UHOSw',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/2-1')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160119_200227',
+                'id' => 4,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160119_230227'),
                 'title' => 'Nested 2-2',
                 'url' => 'http://nest.ed/2-2',
                 'description' => 'Second link of the second section',
                 'private' => 1,
-                'tags' => 'folder2'
+                'tags' => 'folder2',
+                'shorturl' => 'yfzwbw',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/2-2')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160202_172223',
+                'id' => 5,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160202_202222'),
                 'title' => 'Nested 3-1',
                 'url' => 'http://nest.ed/3-1',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'folder3 folder3-1 tag3'
+                'tags' => 'folder3 folder3-1 tag3',
+                'shorturl' => 'UwxIUQ',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/3-1')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160119_200228',
+                'id' => 6,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160119_230227'),
                 'title' => 'Nested 3-2',
                 'url' => 'http://nest.ed/3-2',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'folder3 folder3-1'
+                'tags' => 'folder3 folder3-1',
+                'shorturl' => 'p8dyZg',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/3-2')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160229_081541',
+                'id' => 7,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160229_111541'),
                 'title' => 'Nested 2',
                 'url' => 'http://nest.ed/2',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'tag4'
+                'tags' => 'tag4',
+                'shorturl' => 'Gt3Uug',
             ),
             $this->linkDb->getLinkFromUrl('http://nest.ed/2')
         );
@@ -227,28 +261,34 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
             .' 2 links imported, 0 links overwritten, 0 links skipped.',
             NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache)
         );
+
         $this->assertEquals(2, count($this->linkDb));
         $this->assertEquals(1, count_private($this->linkDb));
 
         $this->assertEquals(
             array(
-                'linkdate' => '20001010_105536',
+                'id' => 0,
+                // Old link - UTC+4 (note that TZ in the import file is ignored).
+                'created' => DateTime::createFromFormat('Ymd_His', '20001010_135536'),
                 'title' => 'Secret stuff',
                 'url' => 'https://private.tld',
                 'description' => "Super-secret stuff you're not supposed to know about",
                 'private' => 1,
-                'tags' => 'private secret'
+                'tags' => 'private secret',
+                'shorturl' => 'EokDtA',
             ),
             $this->linkDb->getLinkFromUrl('https://private.tld')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160225_205548',
+                'id' => 1,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235548'),
                 'title' => 'Public stuff',
                 'url' => 'http://public.tld',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'public hello world'
+                'tags' => 'public hello world',
+                'shorturl' => 'Er9ddA',
             ),
             $this->linkDb->getLinkFromUrl('http://public.tld')
         );
@@ -271,23 +311,28 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             array(
-                'linkdate' => '20001010_105536',
+                'id' => 0,
+                // Note that TZ in the import file is ignored.
+                'created' => DateTime::createFromFormat('Ymd_His', '20001010_135536'),
                 'title' => 'Secret stuff',
                 'url' => 'https://private.tld',
                 'description' => "Super-secret stuff you're not supposed to know about",
                 'private' => 1,
-                'tags' => 'private secret'
+                'tags' => 'private secret',
+                'shorturl' => 'EokDtA',
             ),
             $this->linkDb->getLinkFromUrl('https://private.tld')
         );
         $this->assertEquals(
             array(
-                'linkdate' => '20160225_205548',
+                'id' => 1,
+                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235548'),
                 'title' => 'Public stuff',
                 'url' => 'http://public.tld',
                 'description' => '',
                 'private' => 0,
-                'tags' => 'public hello world'
+                'tags' => 'public hello world',
+                'shorturl' => 'Er9ddA',
             ),
             $this->linkDb->getLinkFromUrl('http://public.tld')
         );
@@ -309,11 +354,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(0, count_private($this->linkDb));
         $this->assertEquals(
             0,
-            $this->linkDb['20001010_105536']['private']
+            $this->linkDb[0]['private']
         );
         $this->assertEquals(
             0,
-            $this->linkDb['20160225_205548']['private']
+            $this->linkDb[1]['private']
         );
     }
 
@@ -333,11 +378,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(2, count_private($this->linkDb));
         $this->assertEquals(
             1,
-            $this->linkDb['20001010_105536']['private']
+            $this->linkDb['0']['private']
         );
         $this->assertEquals(
             1,
-            $this->linkDb['20160225_205548']['private']
+            $this->linkDb['1']['private']
         );
     }
 
@@ -359,13 +404,12 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(2, count_private($this->linkDb));
         $this->assertEquals(
             1,
-            $this->linkDb['20001010_105536']['private']
+            $this->linkDb[0]['private']
         );
         $this->assertEquals(
             1,
-            $this->linkDb['20160225_205548']['private']
+            $this->linkDb[1]['private']
         );
-
         // re-import as public, enable overwriting
         $post = array(
             'privacy' => 'public',
@@ -380,11 +424,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(0, count_private($this->linkDb));
         $this->assertEquals(
             0,
-            $this->linkDb['20001010_105536']['private']
+            $this->linkDb[0]['private']
         );
         $this->assertEquals(
             0,
-            $this->linkDb['20160225_205548']['private']
+            $this->linkDb[1]['private']
         );
     }
 
@@ -406,11 +450,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(0, count_private($this->linkDb));
         $this->assertEquals(
             0,
-            $this->linkDb['20001010_105536']['private']
+            $this->linkDb['0']['private']
         );
         $this->assertEquals(
             0,
-            $this->linkDb['20160225_205548']['private']
+            $this->linkDb['1']['private']
         );
 
         // re-import as private, enable overwriting
@@ -427,11 +471,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(2, count_private($this->linkDb));
         $this->assertEquals(
             1,
-            $this->linkDb['20001010_105536']['private']
+            $this->linkDb['0']['private']
         );
         $this->assertEquals(
             1,
-            $this->linkDb['20160225_205548']['private']
+            $this->linkDb['1']['private']
         );
     }
 
@@ -480,11 +524,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(0, count_private($this->linkDb));
         $this->assertEquals(
             'tag1 tag2 tag3 private secret',
-            $this->linkDb['20001010_105536']['tags']
+            $this->linkDb['0']['tags']
         );
         $this->assertEquals(
             'tag1 tag2 tag3 public hello world',
-            $this->linkDb['20160225_205548']['tags']
+            $this->linkDb['1']['tags']
         );
     }
 
@@ -507,16 +551,16 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(0, count_private($this->linkDb));
         $this->assertEquals(
             'tag1& tag2 "tag3" private secret',
-            $this->linkDb['20001010_105536']['tags']
+            $this->linkDb['0']['tags']
         );
         $this->assertEquals(
             'tag1& tag2 "tag3" public hello world',
-            $this->linkDb['20160225_205548']['tags']
+            $this->linkDb['1']['tags']
         );
     }
 
     /**
-     * Ensure each imported bookmark has a unique linkdate
+     * Ensure each imported bookmark has a unique id
      *
      * See https://github.com/shaarli/Shaarli/issues/351
      */
@@ -531,16 +575,16 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(3, count($this->linkDb));
         $this->assertEquals(0, count_private($this->linkDb));
         $this->assertEquals(
-            '20160225_205548',
-            $this->linkDb['20160225_205548']['linkdate']
+            0,
+            $this->linkDb[0]['id']
         );
         $this->assertEquals(
-            '20160225_205549',
-            $this->linkDb['20160225_205549']['linkdate']
+            1,
+            $this->linkDb[1]['id']
         );
         $this->assertEquals(
-            '20160225_205550',
-            $this->linkDb['20160225_205550']['linkdate']
+            2,
+            $this->linkDb[2]['id']
         );
     }
 }
diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php
index 0d0ad922..b8a050b0 100644
--- a/tests/Updater/UpdaterTest.php
+++ b/tests/Updater/UpdaterTest.php
@@ -214,6 +214,7 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
         $refDB = new ReferenceLinkDB();
         $refDB->write(self::$testDatastore);
         $linkDB = new LinkDB(self::$testDatastore, true, false);
+
         $this->assertEmpty($linkDB->filterSearch(array('searchtags' => 'exclude')));
         $updater = new Updater(array(), $linkDB, $this->conf, true);
         $updater->updateMethodRenameDashTags();
@@ -287,4 +288,101 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
         $this->assertEquals(escape($redirectorUrl), $this->conf->get('redirector.url'));
         unlink($sandbox .'.json.php');
     }
+
+    /**
+     * Test updateMethodDatastoreIds().
+     */
+    public function testDatastoreIds()
+    {
+        $links = array(
+            '20121206_182539' => array(
+                'linkdate' => '20121206_182539',
+                'title' => 'Geek and Poke',
+                'url' => 'http://geek-and-poke.com/',
+                'description' => 'desc',
+                'tags' => 'dev cartoon tag1  tag2   tag3  tag4   ',
+                'updated' => '20121206_190301',
+                'private' => false,
+            ),
+            '20121206_172539' => array(
+                'linkdate' => '20121206_172539',
+                'title' => 'UserFriendly - Samba',
+                'url' => 'http://ars.userfriendly.org/cartoons/?id=20010306',
+                'description' => '',
+                'tags' => 'samba cartoon web',
+                'private' => false,
+            ),
+            '20121206_142300' => array(
+                'linkdate' => '20121206_142300',
+                'title' => 'UserFriendly - Web Designer',
+                'url' => 'http://ars.userfriendly.org/cartoons/?id=20121206',
+                'description' => 'Naming conventions... #private',
+                'tags' => 'samba cartoon web',
+                'private' => true,
+            ),
+        );
+        $refDB = new ReferenceLinkDB();
+        $refDB->setLinks($links);
+        $refDB->write(self::$testDatastore);
+        $linkDB = new LinkDB(self::$testDatastore, true, false);
+
+        $checksum = hash_file('sha1', self::$testDatastore);
+
+        $this->conf->set('resource.data_dir', 'sandbox');
+        $this->conf->set('resource.datastore', self::$testDatastore);
+
+        $updater = new Updater(array(), $linkDB, $this->conf, true);
+        $this->assertTrue($updater->updateMethodDatastoreIds());
+
+        $linkDB = new LinkDB(self::$testDatastore, true, false);
+
+        $backup = glob($this->conf->get('resource.data_dir') . '/datastore.'. date('YmdH') .'*.php');
+        $backup = $backup[0];
+
+        $this->assertFileExists($backup);
+        $this->assertEquals($checksum, hash_file('sha1', $backup));
+        unlink($backup);
+
+        $this->assertEquals(3, count($linkDB));
+        $this->assertTrue(isset($linkDB[0]));
+        $this->assertFalse(isset($linkDB[0]['linkdate']));
+        $this->assertEquals(0, $linkDB[0]['id']);
+        $this->assertEquals('UserFriendly - Web Designer', $linkDB[0]['title']);
+        $this->assertEquals('http://ars.userfriendly.org/cartoons/?id=20121206', $linkDB[0]['url']);
+        $this->assertEquals('Naming conventions... #private', $linkDB[0]['description']);
+        $this->assertEquals('samba cartoon web', $linkDB[0]['tags']);
+        $this->assertTrue($linkDB[0]['private']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_142300'), $linkDB[0]['created']);
+
+        $this->assertTrue(isset($linkDB[1]));
+        $this->assertFalse(isset($linkDB[1]['linkdate']));
+        $this->assertEquals(1, $linkDB[1]['id']);
+        $this->assertEquals('UserFriendly - Samba', $linkDB[1]['title']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_172539'), $linkDB[1]['created']);
+
+        $this->assertTrue(isset($linkDB[2]));
+        $this->assertFalse(isset($linkDB[2]['linkdate']));
+        $this->assertEquals(2, $linkDB[2]['id']);
+        $this->assertEquals('Geek and Poke', $linkDB[2]['title']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_182539'), $linkDB[2]['created']);
+        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_190301'), $linkDB[2]['updated']);
+    }
+
+    /**
+     * Test updateMethodDatastoreIds() with the update already applied: nothing to do.
+     */
+    public function testDatastoreIdsNothingToDo()
+    {
+        $refDB = new ReferenceLinkDB();
+        $refDB->write(self::$testDatastore);
+        $linkDB = new LinkDB(self::$testDatastore, true, false);
+
+        $this->conf->set('resource.data_dir', 'sandbox');
+        $this->conf->set('resource.datastore', self::$testDatastore);
+
+        $checksum = hash_file('sha1', self::$testDatastore);
+        $updater = new Updater(array(), $linkDB, $this->conf, true);
+        $this->assertTrue($updater->updateMethodDatastoreIds());
+        $this->assertEquals($checksum, hash_file('sha1', self::$testDatastore));
+    }
 }
diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php
index 1f545c7d..ea86a05c 100644
--- a/tests/plugins/PluginIssoTest.php
+++ b/tests/plugins/PluginIssoTest.php
@@ -47,12 +47,13 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
         $conf->set('plugins.ISSO_SERVER', 'value');
 
         $str = 'http://randomstr.com/test';
+        $date = '20161118_100001';
         $data = array(
             'title' => $str,
             'links' => array(
                 array(
                     'url' => $str,
-                    'linkdate' => 'abc',
+                    'created' => DateTime::createFromFormat('Ymd_His', $date),
                 )
             )
         );
@@ -65,7 +66,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
 
         // plugin data
         $this->assertEquals(1, count($data['plugin_end_zone']));
-        $this->assertNotFalse(strpos($data['plugin_end_zone'][0], 'abc'));
+        $this->assertNotFalse(strpos($data['plugin_end_zone'][0], $date));
         $this->assertNotFalse(strpos($data['plugin_end_zone'][0], 'embed.min.js'));
     }
 
@@ -78,16 +79,18 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
         $conf->set('plugins.ISSO_SERVER', 'value');
 
         $str = 'http://randomstr.com/test';
+        $date1 = '20161118_100001';
+        $date2 = '20161118_100002';
         $data = array(
             'title' => $str,
             'links' => array(
                 array(
                     'url' => $str,
-                    'linkdate' => 'abc',
+                    'created' => DateTime::createFromFormat('Ymd_His', $date1),
                 ),
                 array(
                     'url' => $str . '2',
-                    'linkdate' => 'abc2',
+                    'created' => DateTime::createFromFormat('Ymd_His', $date2),
                 ),
             )
         );
@@ -106,12 +109,13 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
         $conf->set('plugins.ISSO_SERVER', 'value');
 
         $str = 'http://randomstr.com/test';
+        $date = '20161118_100001';
         $data = array(
             'title' => $str,
             'links' => array(
                 array(
                     'url' => $str,
-                    'linkdate' => 'abc',
+                    'created' => DateTime::createFromFormat('Ymd_His', $date),
                 )
             ),
             'search_term' => $str
diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php
index abca4656..6b16c9e8 100644
--- a/tests/utils/ReferenceLinkDB.php
+++ b/tests/utils/ReferenceLinkDB.php
@@ -4,7 +4,7 @@
  */
 class ReferenceLinkDB
 {
-    public static $NB_LINKS_TOTAL = 7;
+    public static $NB_LINKS_TOTAL = 8;
 
     private $_links = array();
     private $_publicCount = 0;
@@ -16,66 +16,87 @@ class ReferenceLinkDB
     public function __construct()
     {
         $this->addLink(
+            41,
             'Link title: @website',
             '?WDWyig',
             'Stallman has a beard and is part of the Free Software Foundation (or not). Seriously, read this. #hashtag',
             0,
-            '20150310_114651',
-            'sTuff'
+            DateTime::createFromFormat('Ymd_His', '20150310_114651'),
+            'sTuff',
+            null,
+            'WDWyig'
         );
 
         $this->addLink(
+            42,
+            'Note: I have a big ID but an old date',
+            '?WDWyig',
+            'Used to test links reordering.',
+            0,
+            DateTime::createFromFormat('Ymd_His', '20100310_101010'),
+            'ut'
+        );
+
+        $this->addLink(
+            8,
             'Free as in Freedom 2.0 @website',
             'https://static.fsf.org/nosvn/faif-2.0.pdf',
             'Richard Stallman and the Free Software Revolution. Read this. #hashtag',
             0,
-            '20150310_114633',
+            DateTime::createFromFormat('Ymd_His', '20150310_114633'),
             'free gnu software stallman -exclude stuff hashtag',
-            '20160803_093033'
+            DateTime::createFromFormat('Ymd_His', '20160803_093033')
         );
 
         $this->addLink(
+            7,
             'MediaGoblin',
             'http://mediagoblin.org/',
             'A free software media publishing platform #hashtagOther',
             0,
-            '20130614_184135',
-            'gnu media web .hidden hashtag'
+            DateTime::createFromFormat('Ymd_His', '20130614_184135'),
+            'gnu media web .hidden hashtag',
+            null,
+            'IuWvgA'
         );
 
         $this->addLink(
+            6,
             'w3c-markup-validator',
             'https://dvcs.w3.org/hg/markup-validator/summary',
             'Mercurial repository for the W3C Validator #private',
             1,
-            '20141125_084734',
+            DateTime::createFromFormat('Ymd_His', '20141125_084734'),
             'css html w3c web Mercurial'
         );
 
         $this->addLink(
+            4,
             'UserFriendly - Web Designer',
             'http://ars.userfriendly.org/cartoons/?id=20121206',
             'Naming conventions... #private',
             0,
-            '20121206_142300',
+            DateTime::createFromFormat('Ymd_His', '20121206_142300'),
             'dev cartoon web'
         );
 
         $this->addLink(
+            1,
             'UserFriendly - Samba',
             'http://ars.userfriendly.org/cartoons/?id=20010306',
             'Tropical printing',
             0,
-            '20121206_172539',
+            DateTime::createFromFormat('Ymd_His', '20121206_172539'),
             'samba cartoon web'
         );
 
         $this->addLink(
+            0,
             'Geek and Poke',
             'http://geek-and-poke.com/',
             '',
             1,
-            '20121206_182539',
+            DateTime::createFromFormat('Ymd_His', '20121206_182539'),
             'dev cartoon tag1  tag2   tag3  tag4   '
         );
     }
@@ -83,18 +104,20 @@ class ReferenceLinkDB
     /**
      * Adds a new link
      */
-    protected function addLink($title, $url, $description, $private, $date, $tags, $updated = '')
+    protected function addLink($id, $title, $url, $description, $private, $date, $tags, $updated = '', $shorturl = '')
     {
         $link = array(
+            'id' => $id,
             'title' => $title,
             'url' => $url,
             'description' => $description,
             'private' => $private,
-            'linkdate' => $date,
             'tags' => $tags,
+            'created' => $date,
             'updated' => $updated,
+            'shorturl' => $shorturl ? $shorturl : smallHash($date->format('Ymd_His') . $id),
         );
-        $this->_links[$date] = $link;
+        $this->_links[$id] = $link;
 
         if ($private) {
             $this->_privateCount++;
@@ -142,4 +165,14 @@ class ReferenceLinkDB
     {
         return $this->_links;
     }
+
+    /**
+     * Setter to override link creation.
+     *
+     * @param array $links List of links.
+     */
+    public function setLinks($links)
+    {
+        $this->_links = $links;
+    }
 }
-- 
cgit v1.2.3


From d592daea8343bb4dfecff5d97e93699581ccc58c Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 28 Nov 2016 18:24:15 +0100
Subject: Add a persistent 'shorturl' key to all links

All existing link will keep their permalinks.
New links will have smallhash generated with date+id.

The purpose of this is to avoid collision between links due to their creation date.
---
 application/FeedBuilder.php                        |  2 +-
 application/LinkDB.php                             | 12 +++--
 application/LinkFilter.php                         |  2 +-
 application/LinkUtils.php                          | 13 +++++
 application/NetscapeBookmarkUtils.php              |  1 +
 application/Updater.php                            |  3 ++
 application/Utils.php                              |  6 ++-
 index.php                                          | 56 +++++++++-------------
 plugins/isso/isso.php                              |  4 +-
 tests/FeedBuilderTest.php                          | 10 ++--
 tests/LinkDBTest.php                               | 22 ++++-----
 tests/NetscapeBookmarkUtils/BookmarkImportTest.php | 26 +++++-----
 tests/Updater/UpdaterTest.php                      |  8 ++--
 tests/plugins/PluginIssoTest.php                   | 21 ++++++--
 tests/utils/ReferenceLinkDB.php                    | 20 ++++----
 15 files changed, 115 insertions(+), 91 deletions(-)

diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index bfdf2fd3..fedd90e6 100644
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -143,7 +143,7 @@ class FeedBuilder
      */
     protected function buildItem($link, $pageaddr)
     {
-        $link['guid'] = $pageaddr .'?'. smallHash($link['created']->format('Ymd_His'));
+        $link['guid'] = $pageaddr .'?'. $link['shorturl'];
         // Check for both signs of a note: starting with ? and 7 chars long.
         if ($link['url'][0] === '?' && strlen($link['url']) === 7) {
             $link['url'] = $pageaddr . $link['url'];
diff --git a/application/LinkDB.php b/application/LinkDB.php
index e429ab4f..1e13286a 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -22,6 +22,7 @@
  *              Can be absolute or relative.
  *              Relative URLs are permalinks (e.g.'?m-ukcw')
  *  - real_url  Absolute processed URL.
+ *  - shorturl  Permalink smallhash
  *
  * Implements 3 interfaces:
  *  - ArrayAccess: behaves like an associative array;
@@ -264,6 +265,7 @@ You use the community supported version of the original Shaarli project, by Seba
             'created'=> new DateTime(),
             'tags'=>'opensource software'
         );
+        $link['shorturl'] = link_small_hash($link['created'], $link['id']);
         $this->links[1] = $link;
 
         $link = array(
@@ -273,8 +275,9 @@ You use the community supported version of the original Shaarli project, by Seba
             'description'=>'Shhhh! I\'m a private link only YOU can see. You can delete me too.',
             'private'=>1,
             'created'=> new DateTime('1 minute ago'),
-            'tags'=>'secretstuff'
+            'tags'=>'secretstuff',
         );
+        $link['shorturl'] = link_small_hash($link['created'], $link['id']);
         $this->links[0] = $link;
 
         // Write database to disk
@@ -335,10 +338,11 @@ You use the community supported version of the original Shaarli project, by Seba
             // To be able to load links before running the update, and prepare the update
             if (! isset($link['created'])) {
                 $link['id'] = $link['linkdate'];
-                $link['created'] = DateTime::createFromFormat('Ymd_His', $link['linkdate']);
+                $link['created'] = DateTime::createFromFormat(self::LINK_DATE_FORMAT, $link['linkdate']);
                 if (! empty($link['updated'])) {
-                    $link['updated'] = DateTime::createFromFormat('Ymd_His', $link['updated']);
+                    $link['updated'] = DateTime::createFromFormat(self::LINK_DATE_FORMAT, $link['updated']);
                 }
+                $link['shorturl'] = smallHash($link['linkdate']);
             }
         }
 
@@ -558,7 +562,7 @@ You use the community supported version of the original Shaarli project, by Seba
      *
      * @param int $id Persistent ID of a link.
      *
-     * @return int Real offset in local array, or null if doesn't exists.
+     * @return int Real offset in local array, or null if doesn't exist.
      */
     protected function getLinkOffset($id)
     {
diff --git a/application/LinkFilter.php b/application/LinkFilter.php
index 7bab46ba..daa6d9cc 100644
--- a/application/LinkFilter.php
+++ b/application/LinkFilter.php
@@ -120,7 +120,7 @@ class LinkFilter
     {
         $filtered = array();
         foreach ($this->links as $key => $l) {
-            if ($smallHash == smallHash($l['created']->format('Ymd_His'))) {
+            if ($smallHash == $l['shorturl']) {
                 // Yes, this is ugly and slow
                 $filtered[$key] = $l;
                 return $filtered;
diff --git a/application/LinkUtils.php b/application/LinkUtils.php
index 9d9ae3cb..cf58f808 100644
--- a/application/LinkUtils.php
+++ b/application/LinkUtils.php
@@ -169,3 +169,16 @@ function space2nbsp($text)
 function format_description($description, $redirector = '', $indexUrl = '') {
     return nl2br(space2nbsp(hashtag_autolink(text2clickable($description, $redirector), $indexUrl)));
 }
+
+/**
+ * Generate a small hash for a link.
+ *
+ * @param DateTime $date Link creation date.
+ * @param int      $id   Link ID.
+ *
+ * @return string the small hash generated from link data.
+ */
+function link_small_hash($date, $id)
+{
+    return smallHash($date->format(LinkDB::LINK_DATE_FORMAT) . $id);
+}
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php
index 8a939adb..e7148d00 100644
--- a/application/NetscapeBookmarkUtils.php
+++ b/application/NetscapeBookmarkUtils.php
@@ -174,6 +174,7 @@ class NetscapeBookmarkUtils
             $newLinkDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
             $newLink['created'] = $newLinkDate;
             $newLink['id'] = $linkDb->getNextId();
+            $newLink['shorturl'] = link_small_hash($newLink['created'], $newLink['id']);
             $linkDb[$newLink['id']] = $newLink;
             $importCount++;
         }
diff --git a/application/Updater.php b/application/Updater.php
index 16c8c376..f0d02814 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -223,6 +223,9 @@ class Updater
      * Since this update is very sensitve (changing the whole database), the datastore will be
      * automatically backed up into the file datastore..php.
      *
+     * LinkDB also adds the field 'shorturl' with the precedent format (linkdate smallhash),
+     * which will be saved by this method.
+     *
      * @return bool true if the update is successful, false otherwise.
      */
     public function updateMethodDatastoreIds()
diff --git a/application/Utils.php b/application/Utils.php
index 0166ee2a..0a5b476e 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -31,7 +31,11 @@ function logm($logFile, $clientIp, $message)
  *   - are NOT cryptographically secure (they CAN be forged)
  *
  *  In Shaarli, they are used as a tinyurl-like link to individual entries,
- *  e.g. smallHash('20111006_131924') --> yZH23w
+ *  built once with the combination of the date and item ID.
+ *  e.g. smallHash('20111006_131924' . 142) --> eaWxtQ
+ *
+ * @warning before v0.8.1, smallhashes were built only with the date,
+ *          and their value has been preserved.
  *
  * @param string $text Create a hash from this text.
  *
diff --git a/index.php b/index.php
index 05f06452..fdbdfaa2 100644
--- a/index.php
+++ b/index.php
@@ -566,21 +566,17 @@ function showDailyRSS($conf) {
     /* Some Shaarlies may have very few links, so we need to look
        back in time until we have enough days ($nb_of_days).
     */
-    $ids = array();
-    foreach ($LINKSDB as $id => $value) {
-        $ids[] = $id;
-    }
     $nb_of_days = 7; // We take 7 days.
     $today = date('Ymd');
     $days = array();
 
-    foreach ($ids as $id) {
-        $day = $LINKSDB[$id]['created']->format('Ymd'); // Extract day (without time)
+    foreach ($LINKSDB as $link) {
+        $day = $link['created']->format('Ymd'); // Extract day (without time)
         if (strcmp($day, $today) < 0) {
             if (empty($days[$day])) {
                 $days[$day] = array();
             }
-            $days[$day][] = $id;
+            $days[$day][] = $link;
         }
 
         if (count($days) > $nb_of_days) {
@@ -600,23 +596,18 @@ function showDailyRSS($conf) {
     echo ''. $pageaddr .''. PHP_EOL;
 
     // For each day.
-    foreach ($days as $day => $ids) {
+    foreach ($days as $day => $links) {
         $dayDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $day.'_000000');
         $absurl = escape(index_url($_SERVER).'?do=daily&day='.$day);  // Absolute URL of the corresponding "Daily" page.
 
-        // Build the HTML body of this RSS entry.
-        $links = array();
-
         // We pre-format some fields for proper output.
-        foreach ($ids as $id) {
-            $l = $LINKSDB[$id];
-            $l['formatedDescription'] = format_description($l['description'], $conf->get('redirector.url'));
-            $l['thumbnail'] = thumbnail($conf, $l['url']);
-            $l['timestamp'] = $l['created']->getTimestamp();
-            if (startsWith($l['url'], '?')) {
-                $l['url'] = index_url($_SERVER) . $l['url'];  // make permalink URL absolute
+        foreach ($links as &$link) {
+            $link['formatedDescription'] = format_description($link['description'], $conf->get('redirector.url'));
+            $link['thumbnail'] = thumbnail($conf, $link['url']);
+            $link['timestamp'] = $link['created']->getTimestamp();
+            if (startsWith($link['url'], '?')) {
+                $link['url'] = index_url($_SERVER) . $link['url'];  // make permalink URL absolute
             }
-            $links[$id] = $l;
         }
 
         // Then build the HTML for this day:
@@ -675,7 +666,6 @@ function showDaily($pageBuilder, $LINKSDB, $conf, $pluginManager)
 
         $taglist = explode(' ',$link['tags']);
         uasort($taglist, 'strcasecmp');
-        $linksToDisplay[$key]['shorturl'] = smallHash($link['created']->format('Ymd_His'));
         $linksToDisplay[$key]['taglist']=$taglist;
         $linksToDisplay[$key]['formatedDescription'] = format_description($link['description'], $conf->get('redirector.url'));
         $linksToDisplay[$key]['thumbnail'] = thumbnail($conf, $link['url']);
@@ -829,7 +819,7 @@ function renderPage($conf, $pluginManager)
         // Get only links which have a thumbnail.
         foreach($links as $link)
         {
-            $permalink='?'.escape(smallHash($link['created']->format('Ymd_His')));
+            $permalink='?'.$link['shorturl'];
             $thumb=lazyThumbnail($conf, $link['url'],$permalink);
             if ($thumb!='') // Only output links which have a thumbnail.
             {
@@ -1249,7 +1239,7 @@ function renderPage($conf, $pluginManager)
         }
 
         // lf_id should only be present if the link exists.
-        $id = !empty($_POST['lf_id']) ? (int) escape($_POST['lf_id']) : $LINKSDB->getNextId();
+        $id = !empty($_POST['lf_id']) ? intval(escape($_POST['lf_id'])) : $LINKSDB->getNextId();
         // Linkdate is kept here to:
         //   - use the same permalink for notes as they're displayed when creating them
         //   - let users hack creation date of their posts
@@ -1257,11 +1247,11 @@ function renderPage($conf, $pluginManager)
         $linkdate = escape($_POST['lf_linkdate']);
         if (isset($LINKSDB[$id])) {
             // Edit
-            $created = DateTime::createFromFormat('Ymd_His', $linkdate);
+            $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate);
             $updated = new DateTime();
         } else {
             // New link
-            $created = DateTime::createFromFormat('Ymd_His', $linkdate);
+            $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate);
             $updated = null;
         }
 
@@ -1288,7 +1278,8 @@ function renderPage($conf, $pluginManager)
             'private' => (isset($_POST['lf_private']) ? 1 : 0),
             'created' => $created,
             'updated' => $updated,
-            'tags' => str_replace(',', ' ', $tags)
+            'tags' => str_replace(',', ' ', $tags),
+            'shorturl' => link_small_hash($created, $id),
         );
 
         // If title is empty, use the URL as title.
@@ -1311,7 +1302,7 @@ function renderPage($conf, $pluginManager)
         $returnurl = !empty($_POST['returnurl']) ? $_POST['returnurl'] : '?';
         $location = generateLocation($returnurl, $_SERVER['HTTP_HOST'], array('addlink', 'post', 'edit_link'));
         // Scroll to the link which has been edited.
-        $location .= '#' . smallHash($created->format('Ymd_His'));
+        $location .= '#' . $link['shorturl'];
         // After saving the link, redirect to the page the user was on.
         header('Location: '. $location);
         exit;
@@ -1325,7 +1316,7 @@ function renderPage($conf, $pluginManager)
         $link = $LINKSDB[(int) escape($_POST['lf_id'])];
         $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
         // Scroll to the link which has been edited.
-        $returnurl .= '#'.smallHash($link['created']->format('Ymd_His'));
+        $returnurl .= '#'. $link['shorturl'];
         $returnurl = generateLocation($returnurl, $_SERVER['HTTP_HOST'], array('addlink', 'post', 'edit_link'));
         header('Location: '.$returnurl); // After canceling, redirect to the page the user was on.
         exit;
@@ -1341,7 +1332,7 @@ function renderPage($conf, $pluginManager)
         // - we are protected from XSRF by the token.
 
         // FIXME! We keep `lf_linkdate` for consistency before a proper API. To be removed.
-        $id = isset($_POST['lf_id']) ? (int) escape($_POST['lf_id']) : (int) escape($_POST['lf_linkdate']);
+        $id = isset($_POST['lf_id']) ? intval(escape($_POST['lf_id'])) : intval(escape($_POST['lf_linkdate']));
 
         $pluginManager->executeHooks('delete_link', $LINKSDB[$id]);
 
@@ -1387,7 +1378,7 @@ function renderPage($conf, $pluginManager)
         $id = (int) escape($_GET['edit_link']);
         $link = $LINKSDB[$id];  // Read database
         if (!$link) { header('Location: ?'); exit; } // Link not found in database.
-        $link['linkdate'] = $link['created']->format('Ymd_His');
+        $link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT);
         $data = array(
             'link' => $link,
             'link_is_new' => false,
@@ -1414,7 +1405,7 @@ function renderPage($conf, $pluginManager)
         if (! $link)
         {
             $link_is_new = true;
-            $linkdate = strval(date('Ymd_His'));
+            $linkdate = strval(date(LinkDB::LINK_DATE_FORMAT));
             // Get title if it was provided in URL (by the bookmarklet).
             $title = empty($_GET['title']) ? '' : escape($_GET['title']);
             // Get description if it was provided in URL (by the bookmarklet). [Bronco added that]
@@ -1438,7 +1429,7 @@ function renderPage($conf, $pluginManager)
             }
 
             if ($url == '') {
-                $url = '?' . smallHash($linkdate);
+                $url = '?' . smallHash($linkdate . $LINKSDB->getNextId());
                 $title = 'Note: ';
             }
             $url = escape($url);
@@ -1453,7 +1444,7 @@ function renderPage($conf, $pluginManager)
                 'private' => $private
             );
         } else {
-            $link['linkdate'] = $link['created']->format('Ymd_His');
+            $link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT);
         }
 
         $data = array(
@@ -1668,7 +1659,6 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager)
         $taglist = explode(' ', $link['tags']);
         uasort($taglist, 'strcasecmp');
         $link['taglist'] = $taglist;
-        $link['shorturl'] = smallHash($link['created']->format('Ymd_His'));
         // Check for both signs of a note: starting with ? and 7 chars long.
         if ($link['url'][0] === '?' &&
             strlen($link['url']) === 7) {
diff --git a/plugins/isso/isso.php b/plugins/isso/isso.php
index c44f3c09..ce16645f 100644
--- a/plugins/isso/isso.php
+++ b/plugins/isso/isso.php
@@ -43,9 +43,7 @@ function hook_isso_render_linklist($data, $conf)
         $link = reset($data['links']);
         $issoHtml = file_get_contents(PluginManager::$PLUGINS_PATH . '/isso/isso.html');
 
-        // FIXME! KO thread unique si même date
-        $linkDate = $link['created']->format('Ymd_His');
-        $isso = sprintf($issoHtml, $issoUrl, $issoUrl, $linkDate, $linkDate);
+        $isso = sprintf($issoHtml, $issoUrl, $issoUrl, $link['id'], $link['id']);
         $data['plugin_end_zone'][] = $isso;
 
         // Hackish way to include this CSS file only when necessary.
diff --git a/tests/FeedBuilderTest.php b/tests/FeedBuilderTest.php
index ea1dde25..06a44506 100644
--- a/tests/FeedBuilderTest.php
+++ b/tests/FeedBuilderTest.php
@@ -86,7 +86,7 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         // Test first link (note link)
         $link = reset($data['links']);
         $this->assertEquals(41, $link['id']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114651'), $link['created']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['guid']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['url']);
         $this->assertRegExp('/Tue, 10 Mar 2015 11:46:51 \+\d{4}/', $link['pub_iso_date']);
@@ -140,7 +140,7 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(1, count($data['links']));
         $link = array_shift($data['links']);
         $this->assertEquals(41, $link['id']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114651'), $link['created']);
     }
 
     /**
@@ -157,7 +157,7 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(1, count($data['links']));
         $link = array_shift($data['links']);
         $this->assertEquals(41, $link['id']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114651'), $link['created']);
     }
 
     /**
@@ -174,7 +174,7 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         // First link is a permalink
         $link = array_shift($data['links']);
         $this->assertEquals(41, $link['id']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114651'), $link['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114651'), $link['created']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['guid']);
         $this->assertEquals('http://host.tld/?WDWyig', $link['url']);
         $this->assertContains('Direct link', $link['description']);
@@ -182,7 +182,7 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         // Second link is a direct link
         $link = array_shift($data['links']);
         $this->assertEquals(8, $link['id']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20150310_114633'), $link['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114633'), $link['created']);
         $this->assertEquals('http://host.tld/?RttfEw', $link['guid']);
         $this->assertEquals('https://static.fsf.org/nosvn/faif-2.0.pdf', $link['url']);
         $this->assertContains('Direct link', $link['description']);
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index bedc680e..1f62a34a 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -191,7 +191,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
             'url'=>'http://dum.my',
             'description'=>'One more',
             'private'=>0,
-            'created'=> DateTime::createFromFormat('Ymd_His', '20150518_190000'),
+            'created'=> DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150518_190000'),
             'tags'=>'unit test'
         );
         $testDB[$link['id']] = $link;
@@ -447,17 +447,17 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
      */
     public function testReorderLinksDesc()
     {
-        self::$publicLinkDB->reorder('ASC');
-        $linkIdToTest = 42;
-        foreach (self::$publicLinkDB as $key => $value) {
-            $this->assertEquals($linkIdToTest, $key);
-            break;
+        self::$privateLinkDB->reorder('ASC');
+        $linkIds = array(42, 4, 1, 0, 7, 6, 8, 41);
+        $cpt = 0;
+        foreach (self::$privateLinkDB as $key => $value) {
+            $this->assertEquals($linkIds[$cpt++], $key);
         }
-        self::$publicLinkDB->reorder('DESC');
-        $linkIdToTest = 41;
-        foreach (self::$publicLinkDB as $key => $value) {
-            $this->assertEquals($linkIdToTest, $key);
-            break;
+        self::$privateLinkDB->reorder('DESC');
+        $linkIds = array_reverse($linkIds);
+        $cpt = 0;
+        foreach (self::$privateLinkDB as $key => $value) {
+            $this->assertEquals($linkIds[$cpt++], $key);
         }
     }
 }
diff --git a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php
index 96895b00..0ca07eac 100644
--- a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php
+++ b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php
@@ -116,7 +116,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 0,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160618_203944'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160618_203944'),
                 'title' => 'Hg Init a Mercurial tutorial by Joel Spolsky',
                 'url' => 'http://hginit.com/',
                 'description' => '',
@@ -145,7 +145,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 0,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235541'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160225_235541'),
                 'title' => 'Nested 1',
                 'url' => 'http://nest.ed/1',
                 'description' => '',
@@ -158,7 +158,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 1,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235542'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160225_235542'),
                 'title' => 'Nested 1-1',
                 'url' => 'http://nest.ed/1-1',
                 'description' => '',
@@ -171,7 +171,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 2,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235547'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160225_235547'),
                 'title' => 'Nested 1-2',
                 'url' => 'http://nest.ed/1-2',
                 'description' => '',
@@ -184,7 +184,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 3,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160202_202222'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160202_202222'),
                 'title' => 'Nested 2-1',
                 'url' => 'http://nest.ed/2-1',
                 'description' => 'First link of the second section',
@@ -197,7 +197,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 4,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160119_230227'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160119_230227'),
                 'title' => 'Nested 2-2',
                 'url' => 'http://nest.ed/2-2',
                 'description' => 'Second link of the second section',
@@ -210,7 +210,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 5,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160202_202222'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160202_202222'),
                 'title' => 'Nested 3-1',
                 'url' => 'http://nest.ed/3-1',
                 'description' => '',
@@ -223,7 +223,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 6,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160119_230227'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160119_230227'),
                 'title' => 'Nested 3-2',
                 'url' => 'http://nest.ed/3-2',
                 'description' => '',
@@ -236,7 +236,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 7,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160229_111541'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160229_111541'),
                 'title' => 'Nested 2',
                 'url' => 'http://nest.ed/2',
                 'description' => '',
@@ -269,7 +269,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
             array(
                 'id' => 0,
                 // Old link - UTC+4 (note that TZ in the import file is ignored).
-                'created' => DateTime::createFromFormat('Ymd_His', '20001010_135536'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20001010_135536'),
                 'title' => 'Secret stuff',
                 'url' => 'https://private.tld',
                 'description' => "Super-secret stuff you're not supposed to know about",
@@ -282,7 +282,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 1,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235548'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160225_235548'),
                 'title' => 'Public stuff',
                 'url' => 'http://public.tld',
                 'description' => '',
@@ -313,7 +313,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
             array(
                 'id' => 0,
                 // Note that TZ in the import file is ignored.
-                'created' => DateTime::createFromFormat('Ymd_His', '20001010_135536'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20001010_135536'),
                 'title' => 'Secret stuff',
                 'url' => 'https://private.tld',
                 'description' => "Super-secret stuff you're not supposed to know about",
@@ -326,7 +326,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(
             array(
                 'id' => 1,
-                'created' => DateTime::createFromFormat('Ymd_His', '20160225_235548'),
+                'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160225_235548'),
                 'title' => 'Public stuff',
                 'url' => 'http://public.tld',
                 'description' => '',
diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php
index b8a050b0..4948fe52 100644
--- a/tests/Updater/UpdaterTest.php
+++ b/tests/Updater/UpdaterTest.php
@@ -352,20 +352,20 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
         $this->assertEquals('Naming conventions... #private', $linkDB[0]['description']);
         $this->assertEquals('samba cartoon web', $linkDB[0]['tags']);
         $this->assertTrue($linkDB[0]['private']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_142300'), $linkDB[0]['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_142300'), $linkDB[0]['created']);
 
         $this->assertTrue(isset($linkDB[1]));
         $this->assertFalse(isset($linkDB[1]['linkdate']));
         $this->assertEquals(1, $linkDB[1]['id']);
         $this->assertEquals('UserFriendly - Samba', $linkDB[1]['title']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_172539'), $linkDB[1]['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_172539'), $linkDB[1]['created']);
 
         $this->assertTrue(isset($linkDB[2]));
         $this->assertFalse(isset($linkDB[2]['linkdate']));
         $this->assertEquals(2, $linkDB[2]['id']);
         $this->assertEquals('Geek and Poke', $linkDB[2]['title']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_182539'), $linkDB[2]['created']);
-        $this->assertEquals(DateTime::createFromFormat('Ymd_His', '20121206_190301'), $linkDB[2]['updated']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_182539'), $linkDB[2]['created']);
+        $this->assertEquals(DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_190301'), $linkDB[2]['updated']);
     }
 
     /**
diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php
index ea86a05c..6b7904dd 100644
--- a/tests/plugins/PluginIssoTest.php
+++ b/tests/plugins/PluginIssoTest.php
@@ -52,8 +52,9 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
             'title' => $str,
             'links' => array(
                 array(
+                    'id' => 12,
                     'url' => $str,
-                    'created' => DateTime::createFromFormat('Ymd_His', $date),
+                    'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date),
                 )
             )
         );
@@ -66,7 +67,14 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
 
         // plugin data
         $this->assertEquals(1, count($data['plugin_end_zone']));
-        $this->assertNotFalse(strpos($data['plugin_end_zone'][0], $date));
+        $this->assertNotFalse(strpos(
+            $data['plugin_end_zone'][0],
+            'data-isso-id="'. $data['links'][0]['id'] .'"'
+        ));
+        $this->assertNotFalse(strpos(
+            $data['plugin_end_zone'][0],
+            'data-title="'. $data['links'][0]['id'] .'"'
+        ));
         $this->assertNotFalse(strpos($data['plugin_end_zone'][0], 'embed.min.js'));
     }
 
@@ -85,12 +93,14 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
             'title' => $str,
             'links' => array(
                 array(
+                    'id' => 12,
                     'url' => $str,
-                    'created' => DateTime::createFromFormat('Ymd_His', $date1),
+                    'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date1),
                 ),
                 array(
+                    'id' => 13,
                     'url' => $str . '2',
-                    'created' => DateTime::createFromFormat('Ymd_His', $date2),
+                    'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date2),
                 ),
             )
         );
@@ -114,8 +124,9 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase
             'title' => $str,
             'links' => array(
                 array(
+                    'id' => 12,
                     'url' => $str,
-                    'created' => DateTime::createFromFormat('Ymd_His', $date),
+                    'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date),
                 )
             ),
             'search_term' => $str
diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php
index 6b16c9e8..36d58c68 100644
--- a/tests/utils/ReferenceLinkDB.php
+++ b/tests/utils/ReferenceLinkDB.php
@@ -21,7 +21,7 @@ class ReferenceLinkDB
             '?WDWyig',
             'Stallman has a beard and is part of the Free Software Foundation (or not). Seriously, read this. #hashtag',
             0,
-            DateTime::createFromFormat('Ymd_His', '20150310_114651'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114651'),
             'sTuff',
             null,
             'WDWyig'
@@ -33,7 +33,7 @@ class ReferenceLinkDB
             '?WDWyig',
             'Used to test links reordering.',
             0,
-            DateTime::createFromFormat('Ymd_His', '20100310_101010'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20100310_101010'),
             'ut'
         );
 
@@ -43,9 +43,9 @@ class ReferenceLinkDB
             'https://static.fsf.org/nosvn/faif-2.0.pdf',
             'Richard Stallman and the Free Software Revolution. Read this. #hashtag',
             0,
-            DateTime::createFromFormat('Ymd_His', '20150310_114633'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114633'),
             'free gnu software stallman -exclude stuff hashtag',
-            DateTime::createFromFormat('Ymd_His', '20160803_093033')
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160803_093033')
         );
 
         $this->addLink(
@@ -54,7 +54,7 @@ class ReferenceLinkDB
             'http://mediagoblin.org/',
             'A free software media publishing platform #hashtagOther',
             0,
-            DateTime::createFromFormat('Ymd_His', '20130614_184135'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20130614_184135'),
             'gnu media web .hidden hashtag',
             null,
             'IuWvgA'
@@ -66,7 +66,7 @@ class ReferenceLinkDB
             'https://dvcs.w3.org/hg/markup-validator/summary',
             'Mercurial repository for the W3C Validator #private',
             1,
-            DateTime::createFromFormat('Ymd_His', '20141125_084734'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20141125_084734'),
             'css html w3c web Mercurial'
         );
 
@@ -76,7 +76,7 @@ class ReferenceLinkDB
             'http://ars.userfriendly.org/cartoons/?id=20121206',
             'Naming conventions... #private',
             0,
-            DateTime::createFromFormat('Ymd_His', '20121206_142300'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_142300'),
             'dev cartoon web'
         );
 
@@ -86,7 +86,7 @@ class ReferenceLinkDB
             'http://ars.userfriendly.org/cartoons/?id=20010306',
             'Tropical printing',
             0,
-            DateTime::createFromFormat('Ymd_His', '20121206_172539'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_172539'),
             'samba cartoon web'
         );
 
@@ -96,7 +96,7 @@ class ReferenceLinkDB
             'http://geek-and-poke.com/',
             '',
             1,
-            DateTime::createFromFormat('Ymd_His', '20121206_182539'),
+            DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_182539'),
             'dev cartoon tag1  tag2   tag3  tag4   '
         );
     }
@@ -115,7 +115,7 @@ class ReferenceLinkDB
             'tags' => $tags,
             'created' => $date,
             'updated' => $updated,
-            'shorturl' => $shorturl ? $shorturl : smallHash($date->format('Ymd_His') . $id),
+            'shorturl' => $shorturl ? $shorturl : smallHash($date->format(LinkDB::LINK_DATE_FORMAT) . $id),
         );
         $this->_links[$id] = $link;
 
-- 
cgit v1.2.3


From 6c1be5bcec2ba1ef1363b8a1144d6397a4a8f1cd Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 12 Dec 2016 03:26:56 +0100
Subject: changelog update

---
 CHANGELOG.md | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffda8a1b..29575426 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - UNPUBLISHED
+## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1)
+
+> Note: this version will create an automatic backup of your database if anything goes wrong. 
+
 ### Added
 - Add CHANGELOG.md to track the whole project's history
 - Enable Composer cache for Travis builds
@@ -18,7 +21,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Meta tag to *not* send the referrer to external resources.
 
 ### Changed
-- Cleanup `{loop}` declarations in templates
+- Link ID complete refactoring:
+    - Links now have a numeric ID instead of dates
+    - Short URLs are now created once and can't change over time (previous URL are kept)
+- Templates: 
+    - Changed placeholder behaviour for: `buttons_toolbar`, `fields_toolbar` and `action_plugin`
+    - Cleanup `{loop}` declarations in templates
+    - Tools: hide Firefox Social button when not in HTTPS
+    - Firefox Social: show Shaarli's title when shaaring using Firefox Social
 - Release archives now have the same structure as GitHub-generated archives:
     - archives contain a `Shaarli` directory, itself containing sources + dependencies
     - the tarball is now gzipped
@@ -26,8 +36,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - Markdown: Parsedown library is now imported through Composer
 - Minor code cleanup: PHPDoc, spelling, unused variables, etc.
 - Docker: explicitly set the maximum file upload size to 10 MiB
-- Tools: hide Firefox Social button when not in HTTPS
-- Firefox Social: show Shaarli's title when shaaring using Firefox Social 
 
 ### Fixed
 - Fix the server `` value in Atom/RSS feeds
@@ -40,6 +48,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - W3C compliance
 - Use absolute URL for hashtags in RSS and ATOM feeds
 - Docker: specify the location of the favicon
+- ATOM feed: remove new line between content tag and data
 
 ### Security
 - Allow whitelisting trusted IPs, else continue banning clients upon login failure
-- 
cgit v1.2.3


From 00670b2071b1b73cdb27c706c8ecd3467e96261c Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 12 Dec 2016 03:30:54 +0100
Subject: changelog: add release date for v0.8.1 and add section v0.9.0

---
 CHANGELOG.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29575426..21d5436c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1)
+## [v0.9.0](https://github.com/shaarli/Shaarli/releases/tag/v0.9.0) - UNPUBLISHED
+
+### Added
+
+### Changed
+
+### Fixed
+
+
+## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12
 
 > Note: this version will create an automatic backup of your database if anything goes wrong. 
 
-- 
cgit v1.2.3


From 3cc8c898307ad53507a128db2b11238be2641c32 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 12 Dec 2016 03:38:12 +0100
Subject: Bump version to v0.8.1

Signed-off-by: ArthurHoaro 
---
 doc/Community-&-Related-software.html |  8 ++++---
 doc/Community-&-Related-software.md   |  8 ++++---
 doc/Download-and-Installation.html    | 17 +++++++++-----
 doc/Download-and-Installation.md      | 21 ++++++++++-------
 doc/Release-Shaarli.html              | 39 +++++++++++++++++++++++++++++--
 doc/Release-Shaarli.md                | 42 +++++++++++++++++++++++++++++++--
 doc/Server-configuration.html         | 33 +++++++++++++++++++++++++-
 doc/Server-configuration.md           | 44 ++++++++++++++++++++++++++++++++++-
 doc/Theming.html                      |  7 +++---
 doc/Theming.md                        |  9 +++----
 index.php                             |  4 ++--
 shaarli_version.php                   |  2 +-
 12 files changed, 198 insertions(+), 36 deletions(-)

diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html
index accbacdc..cbc73d54 100644
--- a/doc/Community-&-Related-software.html
+++ b/doc/Community-&-Related-software.html
@@ -81,10 +81,11 @@
 
 autosave by @kalvn: Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.
 Code Coloration by @ArthurHoaro: client side code syntax highlighter.
-social by @alexisju: share links to social networks.
+Disqus by @kalvn: Adds Disqus comment system to your Shaarli.
 emojione by @NerosTie: Add colorful emojis to your Shaarli.
 launch - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli.
-Disqus by @kalvn: Adds Disqus comment system to your Shaarli.
+social by @alexisju: share links to social networks.
+shaarli2twitter by @ArthurHoaro - Automatically tweet your shared links from Shaarli
 
 Themes
 See Theming for the list of community-contributed themes, and an installation guide.
@@ -95,7 +96,7 @@
 Shaarlo - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: shaarli.fr)
 Shaarlimages - An image-oriented aggregator for Shaarlis
 mknexen/shaarli-api - A REST API for Shaarli
-Self dead link - Detect dead links on shaarli. This version use the database of shaarli. An another version, can be used for others shaarli (but use most ressources).
+Self dead link - Detect dead links on shaarli. This version use the database of shaarli. Another version, can be used for other shaarli instances (but is more resource consuming).


 Mobile Apps
 
@@ -107,6 +108,7 @@
 
 tt-rss-shaarli - TinyTiny RSS plugin that adds support for sharing articles with Shaarli
 octopress-shaarli - Octopress plugin to retrieve Shaarli links on the sidebar
+Scuttle to Shaarli - Import bookmarks from Scuttle
 
 Alternatives to Shaarli
 
diff --git a/doc/Community-&-Related-software.md b/doc/Community-&-Related-software.md
index 3945d005..291bf643 100644
--- a/doc/Community-&-Related-software.md
+++ b/doc/Community-&-Related-software.md
@@ -20,10 +20,11 @@ _TODO: contact repos owners to see if they'd like to standardize their work with
 
   * [autosave](https://github.com/kalvn/shaarli-plugin-autosave) by [@kalvn](https://github.com/kalvn): Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.[](.html)
   * [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter.[](.html)
-  * [social](https://github.com/alexisju/social) by [@alexisju](https://github.com/alexisju): share links to social networks.[](.html)
+  * [Disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli.[](.html)
   * [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli.[](.html)
   * [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli.[](.html)
-  * [Disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli.[](.html)
+  * [social](https://github.com/alexisju/social) by [@alexisju](https://github.com/alexisju): share links to social networks.[](.html)
+  * [shaarli2twitter](https://github.com/ArthurHoaro/shaarli2twitter) by [@ArthurHoaro](https://github.com/ArthurHoaro) - Automatically tweet your shared links from Shaarli[](.html)
 
 
 ### Themes
@@ -35,7 +36,7 @@ See [Theming](Theming.html) for the list of community-contributed themes, and an
 - [Shaarlo](https://github.com/DMeloni/shaarlo) - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: [shaarli.fr](http://shaarli.fr/))[](.html)
 - [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html)
 - [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html)
-- [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. An [another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for others shaarli (but use most ressources).[](.html)
+- [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. [Another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for other shaarli instances (but is more resource consuming).[](.html)
 
 ### Mobile Apps
 - [Shaarli💫](http://app.mro.name/Shaarli💫) iOS share extension - see [#308](https://github.com/shaarli/Shaarli/issues/308#issuecomment-184592070) for some promo codes,[](.html)
@@ -45,6 +46,7 @@ See [Theming](Theming.html) for the list of community-contributed themes, and an
 ## Integration with other platforms 
 - [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli[](.html)
 - [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebar[](.html)
+- [Scuttle to Shaarli](https://github.com/q2apro/scuttle-to-shaarli) - Import bookmarks from Scuttle[](.html)
 
 ## Alternatives to Shaarli
 - [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html)
diff --git a/doc/Download-and-Installation.html b/doc/Download-and-Installation.html
index 17c7b69e..b9cac360 100644
--- a/doc/Download-and-Installation.html
+++ b/doc/Download-and-Installation.html
@@ -105,13 +105,14 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 Several releases are available:
 
 Latest release (recommended)
-Get the latest released version from the releases page.
-The current latest released version is v0.7.0.
 Download as an archive
-As a .zip archive:
-$ wget https://github.com/shaarli/Shaarli/archive/v0.7.0.zip
-$ unzip Shaarli-v0.7.0.zip
-$ mv Shaarli-v0.7.0 /path/to/shaarli/
+Get the latest released version from the releases page.
+Download our shaarli-full archive to include dependencies.
+The current latest released version is v0.8.0
+Or in command lines:
+$ wget https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.zip
+$ unzip shaarli-v0.8.0-full.zip
+$ mv Shaarli /path/to/shaarli/
 @@ -126,6 +127,10 @@ $ mv Shaarli-v0.7.0 /path/to/shaarli/
 
 

 
 
 
+Using git
+mkdir -p /path/to/shaarli && cd /path/to/shaarli/
+git clone -b v0.8.0 https://github.com/shaarli/Shaarli.git .
+composer update --no-dev
 
 Stable version
 The stable version has been experienced by Shaarli users, and will receive security updates.
diff --git a/doc/Download-and-Installation.md b/doc/Download-and-Installation.md
index 77af25eb..32df8984 100644
--- a/doc/Download-and-Installation.md
+++ b/doc/Download-and-Installation.md
@@ -8,26 +8,31 @@ Several releases are available:
 --------------------------------------------------------
 
 ## Latest release (recommended)
-
+### Download as an archive
 Get the latest released version from the [releases](https://github.com/shaarli/Shaarli/releases) page.[](.html)
 
-The current latest released version is `v0.7.0`.
+**Download our *shaarli-full* archive** to include dependencies.
 
-### Download as an archive
+The current latest released version is `v0.8.0`
 
-As a .zip archive:
+Or in command lines:
 
 ```bash
-$ wget https://github.com/shaarli/Shaarli/archive/v0.7.0.zip
-$ unzip Shaarli-v0.7.0.zip
-$ mv Shaarli-v0.7.0 /path/to/shaarli/
+$ wget https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.zip
+$ unzip shaarli-v0.8.0-full.zip
+$ mv Shaarli /path/to/shaarli/
 ```
 
-
 |  !  |In most cases, download Shaarli from the [releases](https://github.com/shaarli/Shaarli/releases) page. Cloning using `git` or downloading Github branches as zip files requires additional steps (see below).|[](.html)
 |-----|--------------------------|
 
+### Using git
 
+```
+mkdir -p /path/to/shaarli && cd /path/to/shaarli/
+git clone -b v0.8.0 https://github.com/shaarli/Shaarli.git .
+composer update --no-dev
+```
 
 --------------------------------------------------------
 
diff --git a/doc/Release-Shaarli.html b/doc/Release-Shaarli.html
index cdefd3d6..0d9fa3e1 100644
--- a/doc/Release-Shaarli.html
+++ b/doc/Release-Shaarli.html
@@ -115,9 +115,35 @@ releases.
 origin pointing to your GitHub fork
 upstream pointing to the main Shaarli repository
 
-maintainer permissions on the main Shaarli repository (to push the signed tag)
+maintainer permissions on the main Shaarli repository, to:
+
+push the signed tag
+create a new release
+
 Composer and Pandoc need to be installed
 
+GitHub release draft and CHANGELOG.md
+See http://keepachangelog.com/en/0.3.0/ for changelog formatting.
+GitHub release draft
+GitHub allows drafting the release note for the upcoming release, from the Releases page. This way, the release note can be drafted while contributions are merged to master.
+CHANGELOG.md
+This file should contain the same information as the release note draft for the upcoming version.
+Update it to:
+
+add new entries (additions, fixes, etc.)
+mark the current version as released by setting its date and link
+add a new section for the future unreleased version
+
+$ cd /path/to/shaarli
+
+$ nano CHANGELOG.md
+
+[...][](.html)
+## vA.B.C - UNRELEASED
+TBA
+
+## [vX.Y.Z](https://github.com/shaarli/Shaarli/releases/tag/vX.Y.Z) - YYYY-MM-DD[](.html)
+[...][](.html)
 Increment the version code, create and push a signed tag
 Bump Shaarli's version
 $ cd /path/to/shaarli
@@ -165,7 +191,16 @@ $ git show-ref tags/v0.5.0
 $ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1
 gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F
 gpg: Good signature from "VirtualTam <virtualtam@flibidi.net>" [ultimate][](.html)
-Generate and upload all-in-one release archives
+Publish the GitHub release
+Create a GitHub release from a Git tag
+From the previously drafted release:
+
+edit the release notes (if needed)
+specify the appropriate Git tag
+publish the release
+profit!
+
+Generate and upload all-in-one release archives
 Users with a shared hosting may have:

no SSH access diff --git a/doc/Release-Shaarli.md b/doc/Release-Shaarli.md index 5cbcd79a..556a96ee 100644 --- a/doc/Release-Shaarli.md +++ b/doc/Release-Shaarli.md @@ -10,9 +10,39 @@ This guide assumes that you have: - a local clone of your Shaarli fork, with the following remotes: - `origin` pointing to your GitHub fork - `upstream` pointing to the main Shaarli repository -- maintainer permissions on the main Shaarli repository (to push the signed tag) +- maintainer permissions on the main Shaarli repository, to: + - push the signed tag + - create a new release - [Composer](https://getcomposer.org/) and [Pandoc](http://pandoc.org/) need to be installed[](.html) +## GitHub release draft and `CHANGELOG.md` +See http://keepachangelog.com/en/0.3.0/ for changelog formatting. + +### GitHub release draft +GitHub allows drafting the release note for the upcoming release, from the [Releases](https://github.com/shaarli/Shaarli/releases) page. This way, the release note can be drafted while contributions are merged to `master`.[](.html) + +### `CHANGELOG.md` +This file should contain the same information as the release note draft for the upcoming version. + +Update it to: +- add new entries (additions, fixes, etc.) +- mark the current version as released by setting its date and link +- add a new section for the future unreleased version + +```bash +$ cd /path/to/shaarli + +$ nano CHANGELOG.md + +[...][](.html) +## vA.B.C - UNRELEASED +TBA + +## [vX.Y.Z](https://github.com/shaarli/Shaarli/releases/tag/vX.Y.Z) - YYYY-MM-DD[](.html) +[...][](.html) +``` + + ## Increment the version code, create and push a signed tag ### Bump Shaarli's version ```bash @@ -72,7 +102,15 @@ gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F gpg: Good signature from "VirtualTam " [ultimate][](.html) ``` -## Generate and upload all-in-one release archives +## Publish the GitHub release +### Create a GitHub release from a Git tag +From the previously drafted release: +- edit the release notes (if needed) +- specify the appropriate Git tag +- publish the release +- profit! + +### Generate and upload all-in-one release archives Users with a shared hosting may have: - no SSH access - no possibility to install PHP packages or server extensions diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html index 068900b8..2f1c25b5 100644 --- a/doc/Server-configuration.html +++ b/doc/Server-configuration.html @@ -193,6 +193,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf ErrorLog /var/log/apache2/shaarli-error.log CustomLog /var/log/apache2/shaarli-access.log combined </VirtualHost>

+
.htaccess
+
Shaarli use .htaccess Apache files to deny access to files that shouldn't be directly accessed (datastore, config, etc.). You need the directive AllowOverride All in your virtual host configuration for them to work.
+
Warning: If you use Apache 2.2 or lower, you need mod_version to be installed and enabled.

LightHttpd

Nginx

Foreword
@@ -233,7 +236,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf

`php-gd`	-	optional	thumbnail resizing
`php-intl`	Optional	Tag cloud intelligent sorting (eg. `e->è->f`)	`php-intl`	optional	localized text sorting (e.g. `e->è->f`)
`php-curl`	optional	using cURL for fetching webpages and thumbnails in a more robust way

Bookmarks

Bookmarks

Folder1

Folder2

Folder3

Folder3-1

Bookmarks

Bookmarks

Bookmarks

PHP

Backup, restore, import and export

Backup and restore the datastore file

Export links as...

Import links from...

Diigo

SemanticScuttle

Scuttle

Import Shaarli links to Firefox

Themes

Create and serve multiple Shaarlis (farm)

Directory structure

Search an image on DockerHub

Show available tags for a repository

Pull an image from DockerHub

Get and run a Shaarli image

DockerHub repository

Download from DockerHub

Create and start a new container from the image

Stop and destroy a container

Resources

Docker

Download and Installation

Get Shaarli!

Latest release (recommended)

Download as an archive

Stable version

Download as an archive

Clone with Git

Development version (mainline)

Finish Installation

Updating Shaarli

Download

Get Shaarli!

Latest stable revision

Clone with Git (recommended)

Download as an archive

Development (mainline)

gpg - provide identity information

gpg - entropy interlude

gpg - key creation confirmation

gpg - submit your public key to a PGP server (Optional)

Create and push a GPG-signed tag

Release Shaarli

Prerequisites

Prerequisites

Increment the version code, create and push a signed tag

Bump Shaarli's version

Create and merge a Pull Request

Create and push a signed tag

Verify a signed tag

Generate and upload all-in-one release archives

Apache

Minimal

Standard - Keep access and error logs

Paranoid - Redirect HTTP (:80) to HTTPS (:443)

Restricting search engines and web crawler traffic

Dependency management

Extensions

Locate .ini files

Console environment

Server environment

Robots - Restricting search engines and web crawler traffic

Shaarli configuration

Shaarli configuration

Foreword

File and directory permissions

Example data/config.php

Configuration

Credentials

General

Example `data/config.php`

_Footer
-Shaarli, the personal, minimalist, super-fast, no-database delicious clone

_Footer
+Shaarli, the personal, minimalist, super-fast, database-free bookmarking service

GitHub release draft and `CHANGELOG.md`

`CHANGELOG.md`