beagle r4847 - trunk/beagle/firefox-extension/chrome/content

[dbera svn gnome org]

Author: dbera
Date: Wed Jul 23 15:22:53 2008
New Revision: 4847
URL: http://svn.gnome.org/viewvc/beagle?rev=4847&view=rev

Log:
Revert the special javascript:// ignoring patch in r4803; instead simply disable indexing any page which is not http[s]://.


Modified:
   trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js

Modified: trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js
==============================================================================
--- trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js	(original)
+++ trunk/beagle/firefox-extension/chrome/content/beagleOverlay.js	Wed Jul 23 15:22:53 2008
@@ -254,12 +254,19 @@
     {
 
         var prefObject = this.pref.load();
-        
+
+	// Don't index any of the custom URLs; only http[s]:// is good for browsing history
+	if (page.location.protocol != "http:" && page.location.protocol != "https:")
+	{
+	    return false;
+	}
+
         //check https
         if (page.location.protocol == "https:" && !prefObject['beagle.security.active'])
         {
             return false;
         }
+
         var lists = ['beagle.exclude.list','beagle.include.list'];
         var flags = [false,false];
         for(var j = 0; j < 2; j++)
@@ -427,10 +434,6 @@
 
 	// Tokenize the url
 	var loc = page.location;
-	if (loc.protocol == "javascript:") {
-		log("skipping javascript..");
-		return;
-	}
 	var url_tokenized = loc.host + " " + loc.port + " " + loc.pathname + " " + loc.hash + " " + loc.search;
 	url_tokenized = url_tokenized.replace(/\./g, " ").replace(/\//g, " ").replace(/&/g, " ").replace (/\+/g, " ").replace (/=/g, " ").replace(/%../g, " ");
 	meta.push("t:beagle:inuri=" + url_tokenized);