Merge pull request #562 from ArthurHoaro/hotfix/561

[github/shaarli/Shaarli.git] / index.php

diff --git a/index.php b/index.php
index 47bae6e87a943a1b26d5af2d1558053e2909f2fb..93e897098b869d2c592ca5a8edbd74b95a3fc9e8 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1199,12 +1199,6 @@ function renderPage()
             exit;
         }
 
-               // Same case as above except that user tried to access ?do=addlink without being logged in
-               // Note: passing empty parameters makes Shaarli generate default URLs and descriptions.
-               if (isset($_GET['do']) && $_GET['do'] === 'addlink') {
-                       header('Location: ?do=login&post=');
-                       exit;
-               }
         showLinkList($PAGE, $LINKSDB);
         if (isset($_GET['edit_link'])) {
             header('Location: ?do=login&edit_link='. escape($_GET['edit_link']));
@@ -1590,8 +1584,9 @@ function renderPage()
         exit;
     }
 
-    // -------- Export as Netscape Bookmarks HTML file.
     if ($targetPage == Router::$PAGE_EXPORT) {
+        // Export links as a Netscape Bookmarks file
+
         if (empty($_GET['selection'])) {
             $PAGE->assign('linkcount',count($LINKSDB));
             $PAGE->renderPage('export');
@@ -1600,10 +1595,21 @@ function renderPage()
 
         // export as bookmarks_(all|private|public)_YYYYmmdd_HHMMSS.html
         $selection = $_GET['selection'];
+        if (isset($_GET['prepend_note_url'])) {
+            $prependNoteUrl = $_GET['prepend_note_url'];
+        } else {
+            $prependNoteUrl = false;
+        }
+
         try {
             $PAGE->assign(
                 'links',
-                NetscapeBookmarkUtils::filterAndFormat($LINKSDB, $selection)
+                NetscapeBookmarkUtils::filterAndFormat(
+                    $LINKSDB,
+                    $selection,
+                    $prependNoteUrl,
+                    index_url($_SERVER)
+                )
             );
         } catch (Exception $exc) {
             header('Content-Type: text/plain; charset=utf-8');