1 files changed, 42 insertions, 42 deletions
diff --git a/www/api/export_csv.php b/www/api/export_csv.php
index 2389642..c696001 100644
--- a/www/api/export_csv.php
+++ b/www/api/export_csv.php
@@ -1,47 +1,47 @@
-<?php
-// Export in CSV format in order to allow the import into a spreadsheet tool like Excel
-
+<?php
+// Export in CSV format in order to allow the import into a spreadsheet tool like Excel
+
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
-
-/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-
-// Check to see if a tag was specified.
-if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
-    $tag = trim($_REQUEST['tag']);
-else
-    $tag = NULL;
-
-// Get the posts relevant to the passed-in variables.
-$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder());
-
+require_once('httpauth.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
+
+/* Service creation: only useful services are created */
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+
+// Check to see if a tag was specified.
+if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
+    $tag = trim($_REQUEST['tag']);
+else
+    $tag = NULL;
+
+// Get the posts relevant to the passed-in variables.
+$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder());
+
 header("Content-Type: application/csv-tab-delimited-table;charset=UTF-8");
-header("Content-disposition: filename=exportBookmarks.csv");
-
+header("Content-disposition: filename=exportBookmarks.csv");
+
 //columns titles
 echo 'url;title;tags;description';
-echo "\n";
-
-foreach($bookmarks['bookmarks'] as $row) {
-    if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
-        $description = '';
-    else
-        $description = filter(str_replace(array("\r\n", "\n", "\r"),"", $row['bDescription']), 'xml');
-
-    $taglist = '';
-    if (count($row['tags']) > 0) {
-        foreach($row['tags'] as $tag)
-            $taglist .= convertTag($tag) .',';
-        $taglist = substr($taglist, 0, -1);
-    } else {
-        $taglist = 'system:unfiled';
-    }
-
+echo "\n";
+
+foreach($bookmarks['bookmarks'] as $row) {
+    if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
+        $description = '';
+    else
+        $description = filter(str_replace(array("\r\n", "\n", "\r"),"", $row['bDescription']), 'xml');
+
+    $taglist = '';
+    if (count($row['tags']) > 0) {
+        foreach($row['tags'] as $tag)
+            $taglist .= convertTag($tag) .',';
+        $taglist = substr($taglist, 0, -1);
+    } else {
+        $taglist = 'system:unfiled';
+    }
+
     echo '"'.filter($row['bAddress'], 'xml') .'";"'. filter($row['bTitle'], 'xml') .'";"'. filter($taglist, 'xml') .'";"'. $description .'"';
-    echo "\n";
-}
-
-
-?>
+    echo "\n";
+}
+
+
+?>