]> gitweb.fluxo.info Git - semanticscuttle.git/commitdiff
Big fix: for import local bookmarks like place: or javascript: (firefox 3 case)
authormensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>
Thu, 11 Sep 2008 14:08:58 +0000 (14:08 +0000)
committermensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>
Thu, 11 Sep 2008 14:08:58 +0000 (14:08 +0000)
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@143 b3834d28-1941-0410-a4f8-b48e95affb8f

importNetscape.php

index 6682ec050a13276ebbe87cb30903e6e4a42fac4b..97f458f84b84dac79ba37fcb5e5acb80fc4a8659 100644 (file)
@@ -63,16 +63,20 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
         if ($bookmarkservice->bookmarkExists($bAddress, $userservice->getCurrentUserId())) {
             $tplVars['error'] = T_('You have already submitted this bookmark.');
         } else {
-            // If bookmark claims to be from the future, set it to be now instead
-            if (strtotime($bDatetime) > time()) {
-                $bDatetime = gmdate('Y-m-d H:i:s');
-            }
+           // If bookmark is local (like javascript: or place: in Firefox3), do nothing
+           if(substr($bAddress, 0, 7) == "http://") {
 
-            if ($bookmarkservice->addBookmark($bAddress, $bTitle, NULL, $status, NULL, $bDatetime, false, true)) {
-                $tplVars['msg'] = T_('Bookmark imported.');
-            } else {
-                $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
-            }
+                // If bookmark claims to be from the future, set it to be now instead
+                if (strtotime($bDatetime) > time()) {
+                    $bDatetime = gmdate('Y-m-d H:i:s');
+                }
+
+                if ($bookmarkservice->addBookmark($bAddress, $bTitle, NULL, $status, NULL, $bDatetime, false, true)) {
+                    $tplVars['msg'] = T_('Bookmark imported.');
+                } else {
+                    $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
+                }
+           }
         }
     }
     header('Location: '. createURL('bookmarks', $userinfo[$userservice->getFieldName('username')]));