Merge remote-tracking branch 'upstream/dev' into dev

8 files changed, 60 insertions, 19 deletions

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index d297807a..0754d659 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -732,23 +732,45 @@ class Poche
           $html->load_file($_FILES['file']['tmp_name']);
           $data = array();
           $read = 0;
-          foreach (array('ol','ul') as $list) {
-            foreach ($html->find($list) as $ul) {
-              foreach ($ul->find('li') as $li) {
-                $tmpEntry = array();
-                  $a = $li->find('a');
-                  $tmpEntry['url'] = $a[0]->href;
-                  $tmpEntry['tags'] = $a[0]->tags;
-                  $tmpEntry['is_read'] = $read;
-                  if ($tmpEntry['url']) {
-                    $data[] = $tmpEntry;
+
+          if (Tools::get_doctype($html)->innertext == "<!DOCTYPE NETSCAPE-Bookmark-file-1>") {
+            // Firefox-bookmarks HTML
+            foreach (array('DL','ul') as $list) {
+                foreach ($html->find($list) as $ul) {
+                  foreach ($ul->find('DT') as $li) {
+                    $tmpEntry = array();
+                      $a = $li->find('A');
+                      $tmpEntry['url'] = $a[0]->href;
+                      $tmpEntry['tags'] = $a[0]->tags;
+                      $tmpEntry['is_read'] = $read;
+                      if ($tmpEntry['url']) {
+                        $data[] = $tmpEntry;
+                      }
                   }
-              }
-              # the second <ol/ul> is for read links
-              $read = ((sizeof($data) && $read)?0:1);
+                  # the second <ol/ul> is for read links
+                  $read = ((sizeof($data) && $read)?0:1);
+                }
             }
-          }
-        }
+          } else {
+            // regular HTML
+            foreach (array('ol','ul') as $list) {
+                foreach ($html->find($list) as $ul) {
+                  foreach ($ul->find('li') as $li) {
+                    $tmpEntry = array();
+                      $a = $li->find('a');
+                      $tmpEntry['url'] = $a[0]->href;
+                      $tmpEntry['tags'] = $a[0]->tags;
+                      $tmpEntry['is_read'] = $read;
+                      if ($tmpEntry['url']) {
+                        $data[] = $tmpEntry;
+                      }
+                  }
+                  # the second <ol/ul> is for read links
+                  $read = ((sizeof($data) && $read)?0:1);
+                }
+              }
+                }
+        }
 
             // for readability structure
 
@@ -766,7 +788,7 @@ class Poche
             $urlsInserted = array(); //urls of articles inserted
             foreach($data as $record) {
                 $url = trim(isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : ''));
-                if ($url and !in_array($url, $urlsInserted)) {
+                if (filter_var($url, FILTER_VALIDATE_URL) and !in_array($url, $urlsInserted)) {
                     $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ') . '</a> <a href="./?import">' . _('click to finish import') . '</a><a>');
                     $body = (isset($record['content']) ? $record['content'] : '');
                     $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive']) ? intval($record['archive']) : 0));
diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 138da48d..33a81435 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -141,7 +141,7 @@ class Routing
                 $pdf->producePDF();
             } elseif (isset($_GET['import'])) {
                 $import = $this->wallabag->import();
-                $tplVars = array_merge($this->vars, $import);
+                $this->vars = array_merge($this->vars, $import);
             } elseif (isset($_GET['empty-cache'])) {
                 Tools::emptyCache();
             } elseif (isset($_GET['export'])) {
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index c8fb2e52..f3d1013f 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -420,4 +420,23 @@ final class Tools
         return str_replace('+', '', $token);
     }
 
+    /** 
+    *
+    * Returns the doctype for an HTML document (used for Mozilla Bookmarks)
+    * @param simple_html_dom $doc
+    * @return doctype $el
+    *
+    */
+
+    public static function get_doctype($doc)
+    {
+        $els = $doc->find('unknown');
+
+        foreach ($els as $e => $el) 
+            if ($el->parent()->tag == 'root') 
+                return $el;
+
+        return NULL;
+    }
+
 }
diff --git a/install/index.php b/install/index.php
index 654d21ca..bb351095 100755
--- a/install/index.php
+++ b/install/index.php
@@ -36,8 +36,6 @@ if (isset($_SERVER['HTTP_COOKIE'])) {
 if (isset($_SESSION['poche_user'])) {
         unset($_SESSION['poche_user']);
 }
-session_destroy();
-
 
 if (isset($_GET['clean'])) {
     if (is_dir('install')){
diff --git a/themes/_global/img/appicon/firefox-service-icon-16.png b/themes/_global/img/appicon/firefox-service-icon-16.png
new file mode 100644
index 00000000..cfbbf604
--- /dev/null
+++ b/themes/_global/img/appicon/firefox-service-icon-16.png
diff --git a/themes/_global/img/appicon/firefox-service-icon-32.png b/themes/_global/img/appicon/firefox-service-icon-32.png
new file mode 100644
index 00000000..0c6dcc1b
--- /dev/null
+++ b/themes/_global/img/appicon/firefox-service-icon-32.png
diff --git a/themes/_global/img/appicon/firefox-service-icon-64.png b/themes/_global/img/appicon/firefox-service-icon-64.png
new file mode 100644
index 00000000..6da3247f
--- /dev/null
+++ b/themes/_global/img/appicon/firefox-service-icon-64.png
diff --git a/themes/default/_import.twig b/themes/default/_import.twig
index c59b7a15..079203a2 100755
--- a/themes/default/_import.twig
+++ b/themes/default/_import.twig
@@ -2,11 +2,13 @@
 <!--
   $(document).ready(function() {
         $("body").css("cursor", "wait");
+        $("#content").css("display", "none");
         
     setTimeout(function(){
       window.location = './?import';
     }, {{ import.delay }} );
   });
+
 //-->
 </script>
 <div class="messages warning">