From: Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
Date: Tue, 24 Sep 2013 09:02:33 +0000 (-0700)
Subject: Merge pull request #126 from Alkarex/Milliseconds
X-Git-Tag: v0.0.42beta~20
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=fdc3c114d1617578e388147af138e8470d7b20b3;hp=5d48d5d06e5d38933c3415890d692d4b23febe06;p=github%2Fshaarli%2FShaarli.git

Merge pull request #126 from Alkarex/Milliseconds

Import: add compatibility for milliseconds in NETSCAPE-Bookmark
---

diff --git a/index.php b/index.php
index 2154c063..b402eba9 100644
--- a/index.php
+++ b/index.php
@@ -1695,7 +1695,11 @@ function importFile()
                 {
                     $attr=$m[1]; $value=$m[2];
                     if ($attr=='HREF') $link['url']=html_entity_decode($value,ENT_QUOTES,'UTF-8');
-                    elseif ($attr=='ADD_DATE') $raw_add_date=intval($value);
+                    elseif ($attr=='ADD_DATE')
+                    {
+                        $raw_add_date=intval($value);
+                        if ($raw_add_date>30000000000) $raw_add_date/=1000;	//If larger than year 2920, then was likely stored in milliseconds instead of seconds
+                    }
                     elseif ($attr=='PRIVATE') $link['private']=($value=='0'?0:1);
                     elseif ($attr=='TAGS') $link['tags']=html_entity_decode(str_replace(',',' ',$value),ENT_QUOTES,'UTF-8');
                 }