1 files changed, 30 insertions, 35 deletions
diff --git a/index.php b/index.php
index 01122ebf..47bae6e8 100644
--- a/index.php
+++ b/index.php
@@ -161,6 +161,7 @@ require_once 'application/HttpUtils.php';
 require_once 'application/LinkDB.php';
 require_once 'application/LinkFilter.php';
 require_once 'application/LinkUtils.php';
+require_once 'application/NetscapeBookmarkUtils.php';
 require_once 'application/TimeZone.php';
 require_once 'application/Url.php';
 require_once 'application/Utils.php';
@@ -1522,7 +1523,7 @@ function renderPage()
    // -------- User want to post a new link: Display link edit form.
    if (isset($_GET['post'])) {
-        $url = cleanup_url(escape($_GET['post']));
+        $url = cleanup_url($_GET['post']);
        $link_is_new = false;
        // Check if URL is not already in database (in this case, we will edit the existing link)
@@ -1547,8 +1548,8 @@ function renderPage()
                    // Extract title.
                    $title = html_extract_title($content);
                    // Re-encode title in utf-8 if necessary.
-                    if (! empty($title) && $charset != 'utf-8') {
+                    if (! empty($title) && strtolower($charset) != 'utf-8') {
-                        $title = mb_convert_encoding($title, $charset, 'utf-8');
+                        $title = mb_convert_encoding($title, 'utf-8', $charset);
                    }
                }
            }
@@ -1557,6 +1558,8 @@ function renderPage()
                $url = '?' . smallHash($linkdate);
                $title = 'Note: ';
            }
+            $url = escape($url);
+            $title = escape($title);
            $link = array(
                'linkdate' => $linkdate,
@@ -1588,44 +1591,36 @@ function renderPage()
    }
    // -------- Export as Netscape Bookmarks HTML file.
-    if ($targetPage == Router::$PAGE_EXPORT)
+    if ($targetPage == Router::$PAGE_EXPORT) {
-    {
+        if (empty($_GET['selection'])) {
-        if (empty($_GET['what']))
-        {
            $PAGE->assign('linkcount',count($LINKSDB));
            $PAGE->renderPage('export');
            exit;
        }
-        $exportWhat=$_GET['what'];
-        if (!array_intersect(array('all','public','private'),array($exportWhat))) die('What are you trying to export???');
-        header('Content-Type: text/html; charset=utf-8');
+        // export as bookmarks_(all|private|public)_YYYYmmdd_HHMMSS.html
-        header('Content-disposition: attachment; filename=bookmarks_'.$exportWhat.'_'.strval(date('Ymd_His')).'.html');
+        $selection = $_GET['selection'];
-        $currentdate=date('Y/m/d H:i:s');
+        try {
-        echo <<<HTML
+            $PAGE->assign(
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
+                'links',
-<!-- This is an automatically generated file.
+                NetscapeBookmarkUtils::filterAndFormat($LINKSDB, $selection)
-     It will be read and overwritten.
+            );
-     DO NOT EDIT! -->
+        } catch (Exception $exc) {
-<!-- Shaarli {$exportWhat} bookmarks export on {$currentdate} -->
+            header('Content-Type: text/plain; charset=utf-8');
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+            echo $exc->getMessage();
-<TITLE>Bookmarks</TITLE>
+            exit;
-<H1>Bookmarks</H1>
-HTML;
-        foreach($LINKSDB as $link)
-        {
-            if ($exportWhat=='all' ||
-               ($exportWhat=='private' && $link['private']!=0) ||
-               ($exportWhat=='public' && $link['private']==0))
-            {
-                $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
-                echo '<DT><A HREF="'.$link['url'].'" ADD_DATE="'.$date->getTimestamp().'" PRIVATE="'.$link['private'].'"';
-                if ($link['tags']!='') echo ' TAGS="'.str_replace(' ',',',$link['tags']).'"';
-                echo '>'.$link['title']."</A>\n";
-                if ($link['description']!='') echo '<DD>'.$link['description']."\n";
-            }
        }
-                exit;
+        $now = new DateTime();
+        header('Content-Type: text/html; charset=utf-8');
+        header(
+            'Content-disposition: attachment; filename=bookmarks_'
+           .$selection.'_'.$now->format(LinkDB::LINK_DATE_FORMAT).'.html'
+        );
+        $PAGE->assign('date', $now->format(DateTime::RFC822));
+        $PAGE->assign('eol', PHP_EOL);
+        $PAGE->assign('selection', $selection);
+        $PAGE->renderPage('export.bookmarks');
+        exit;
    }
    // -------- User is uploading a file for import