From 09cbb64c829e8e4a413a90cb5a753c27b901a050 Mon Sep 17 00:00:00 2001
From: mensonge
Date: Fri, 18 Apr 2008 07:10:13 +0000
Subject: Interface design: improve export

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@113 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 api/.htaccess                         |   4 +--
 api/export_all.php                    |  57 ----------------------------------
 locales/fr_FR/LC_MESSAGES/messages.mo | Bin 19476 -> 19568 bytes
 locales/fr_FR/LC_MESSAGES/messages.po |  13 ++++----
 locales/messages.po                   |   6 ++--
 5 files changed, 11 insertions(+), 69 deletions(-)
 delete mode 100644 api/export_all.php

diff --git a/api/.htaccess b/api/.htaccess
index 01114be..510143c 100644
--- a/api/.htaccess
+++ b/api/.htaccess
@@ -8,11 +8,11 @@ RewriteRule ^posts/update posts_update.php
 RewriteRule ^posts/add posts_add.php
 RewriteRule ^posts/delete posts_delete.php
 RewriteRule ^tags/rename tags_rename.php
-RewriteRule ^export/all export_all.php
+RewriteRule ^export/html export_html.php
 
 
 # Allow PHP_AUTH_USER with CGI script
-# (Sinpired by http://www.yetanothercommunitysystem.com/article-321-regle-comment-utiliser-l-authentification-http-en-php-chez-ovh )
+# (Inspired by http://www.yetanothercommunitysystem.com/article-321-regle-comment-utiliser-l-authentification-http-en-php-chez-ovh )
 
 <IfModule mod_rewrite.c>
 RewriteEngine on
diff --git a/api/export_all.php b/api/export_all.php
deleted file mode 100644
index b422b4b..0000000
--- a/api/export_all.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-// Implements the del.icio.us API request for all a user's posts, optionally filtered by tag.
-
-// del.icio.us behavior:
-// - doesn't include the filtered tag as an attribute on the root element (we do)
-
-// Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
-
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
-
-// 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());
-
-$currentuser = $userservice->getCurrentUser();
-$currentusername = $currentuser[$userservice->getFieldName('username')];
-
-// Set up the XML file and output all the posts.
-header('Content-Type: text/html');
-echo '<!DOCTYPE NETSCAPE-Bookmark-file-1>'."\r\n";
-echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">';
-echo '<!-- This is an automatically generated file. -->'."\r\n";
-echo '<TITLE>Bookmarks</TITLE>'."\r\n";
-echo '<H1 LAST_MODIFIED="'. date('U') .'">Bookmarks for '. htmlspecialchars($currentusername) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."</H1>\r\n";
-echo '<DL><p>'."\r\n";
-
-
-
-foreach($bookmarks['bookmarks'] as $row) {
-    if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
-        $description = '';
-    else
-        $description = 'description="'. filter($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 "\t<dt><a href=\"". filter($row['bAddress'], 'xml') .'" '. $description .' hash="'. md5($row['bAddress']) .'" tags="'. filter($taglist, 'xml') .'" ADD_DATE="'. date('U', strtotime($row['bDatetime'])) ."\" >" . filter($row['bTitle'], 'xml') ."</a>\r\n";
-}
-
-
-echo '</DL><p>';
-?>
diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo
index ad1ca3a..fb6404f 100644
Binary files a/locales/fr_FR/LC_MESSAGES/messages.mo and b/locales/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/locales/fr_FR/LC_MESSAGES/messages.po
index cad1158..0207223 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/locales/fr_FR/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-17 11:29+0200\n"
-"PO-Revision-Date: 2008-04-17 11:29+0100\n"
+"POT-Creation-Date: 2008-04-18 09:06+0200\n"
+"PO-Revision-Date: 2008-04-18 09:07+0100\n"
 "Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n"
 "Language-Team: fr-FR <toony.sf@chezouam.net>\n"
 "MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Bookmark imported."
 msgstr "Signet importé."
 
 #: ../../../importNetscape.php:81
-#, fuzzy
 msgid "Import Bookmarks from Browser File"
 msgstr "Importer les signets depuis un fichier"
 
@@ -835,13 +834,13 @@ msgid "Export bookmarks"
 msgstr "Exporter les signets"
 
 #: ../../../templates/editprofile.tpl.php:59
-msgid "XML file (for del.icio.us)"
-msgstr "Fichier XML (pour del.icio.us)"
-
-#: ../../../templates/editprofile.tpl.php:60
 msgid "HTML file (for browsers)"
 msgstr "Fichier HTML (pour navigateurs)"
 
+#: ../../../templates/editprofile.tpl.php:60
+msgid "XML file (like del.icio.us)"
+msgstr "Fichier XML (comme del.icio.us)"
+
 #: ../../../templates/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Non trouvé"
diff --git a/locales/messages.po b/locales/messages.po
index e932292..248d1e1 100644
--- a/locales/messages.po
+++ b/locales/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-17 11:29+0200\n"
+"POT-Creation-Date: 2008-04-18 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,11 +816,11 @@ msgid "Export bookmarks"
 msgstr ""
 
 #: ../../../templates/editprofile.tpl.php:59
-msgid "XML file (for del.icio.us)"
+msgid "HTML file (for browsers)"
 msgstr ""
 
 #: ../../../templates/editprofile.tpl.php:60
-msgid "HTML file (for browsers)"
+msgid "XML file (like del.icio.us)"
 msgstr ""
 
 #: ../../../templates/error.404.tpl.php:5
-- 
cgit v1.2.3-54-g00ecf