Merge branch 'dev'

[github/wallabag/wallabag.git] / import.php

diff --git a/import.php b/import.php
index 497e32fb81e32be6bf80214d2bdef5dfbf0e7016..72e3eac7696974177e765211d3aadfee25c5c282 100644 (file)
--- a/import.php
+++ b/import.php
@@ -20,7 +20,7 @@ else {
     $html = new simple_html_dom();
     $html->load_file('ril_export.html');
 
-    $read = '0';
+    $read = 0;
     $errors = array();
     foreach($html->find('ul') as $ul)
     {
@@ -29,31 +29,20 @@ else {
             $a = $li->find('a');
             $url = $a[0]->href;
 
-            # FIXME corriger cette génération d'ID
-            $req = $db->getHandle()->query("SELECT id FROM entries ORDER BY id DESC");
-            $id = $req->fetchColumn()+1;
 
-            $parametres_url = prepare_url($url, $id);
-            $sql_action     = 'INSERT INTO entries ( url, title, content, is_read ) VALUES (?, ?, ?, ?)';
-            $params_action  = array($url, $parametres_url['title'], $parametres_url['content'], $read);
-            try
-            {
-                # action query
-                if (isset($sql_action))
-                {
-                    $query = $db->getHandle()->prepare($sql_action);
-                    $query->execute($params_action);
-                }
-            }
-            catch (Exception $e)
-            {
-                logm('error during pocket import : ' . $e->getMessage());
+            action_to_do('add', $url);
+            if ($read == '1') {
+                $last_id = $db->getHandle()->lastInsertId();
+                $sql_update     = "UPDATE entries SET is_read=~is_read WHERE id=?";
+                $params_update  = array($last_id);
+                $query_update   = $db->getHandle()->prepare($sql_update);
+                $query_update->execute($params_update);
             }
         }
         # Pocket génère un fichier HTML avec deux <ul>
         # Le premier concerne les éléments non lus
         # Le second concerne les éléments archivés
-        $read = '-1';
+        $read = 1;
     }
 
     echo 'Import from Pocket completed. <a href="index.php">Welcome to #poche !</a>';