diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/common.js releases/unplug-2.03/source/chrome/content/common.js
1,149d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< /**
<  * Common things which need to be loaded everywhere,
<  * such as getting settings.
<  */
< UnPlug2 = {
< 	UnPlug2 : function () {
< 		var prefs_service = Components.classes["@mozilla.org/preferences-service;1"]
< 			.getService(Components.interfaces.nsIPrefService)
< 		this._prefs = prefs_service.getBranch("extensions.unplug2.");
< 		this._root_prefs = prefs_service.getBranch("");
< 		this._locale = Components.classes["@mozilla.org/intl/stringbundle;1"]
< 			.getService(Components.interfaces.nsIStringBundleService)
< 			.createBundle("chrome://unplug/locale/strings.txt");
< 		this._js_console = Components.classes["@mozilla.org/consoleservice;1"]
< 			.getService(Components.interfaces.nsIConsoleService);
< 		this._re_trim = /^\s*(.*?)\s*$/m;
< 	},
< 	
< 	/**
< 	 * get_pref
< 	 * return value of an unplug setting (or def if it doesn't exist)
< 	 */
< 	get_pref : function (name, def) {
< 		return UnPlug2._get_pref(name, def, UnPlug2._prefs);
< 	},
< 	
< 	/**
< 	 * return value of a pref (or def if it doesn't exist
< 	 */
< 	get_root_pref : function (name, def) {
< 		return UnPlug2._get_pref(name, def, UnPlug2._root_prefs);
< 	},
< 	
< 	_get_pref : function (name, def, prefs) {
< 		switch (prefs.getPrefType(name)) {
< 			case prefs.PREF_STRING:
< 				return prefs.getCharPref(name);
< 			case prefs.PREF_INT:
< 				return prefs.getIntPref(name);
< 			case prefs.PREF_BOOL:
< 				return prefs.getBoolPref(name);
< 			default:
< 				return def;
< 		}
< 	},
< 	
< 	/**
< 	 * set_pref
< 	 * set value of an unplug setting
< 	 */
< 	set_pref : function (name, value) {
< 		switch (typeof(value)) {
< 			case "number":
< 				this._prefs.setIntPref(name, value);
< 				break
< 			case "boolean":
< 				this._prefs.setBoolPref(name, value);
< 				break
< 			case "string":
< 				this._prefs.setCharPref(name, value);
< 				break
< 			default:
< 				throw "Cannot set pref of type" + typeof(value);
< 		}
< 	},
< 	
< 	/**
< 	 * return a translated version of the string
< 	 */
< 	str : function (name) {
< 		try {
< 			return this._locale.GetStringFromName(name)
< 		} catch(e) {
< 			return "#{" + name + "}";
< 		}
< 	},
< 	
< 	/**
< 	 * Print to js console log
< 	 */
< 	log : function (msg) {
< 		this._js_console.logStringMessage("UnPlug2: " + msg);
< 	},
< 	
< 	/**
< 	 * document.getElelementById for xml files
< 	 */
< 	get_element : function (node, tagname, idname) {
< 		var ellist = node.getElementsByTagName(tagname);
< 		for (var i=0; i < ellist.length; i++) {
< 			if (ellist[i].getAttribute("id") == idname) {
< 				return ellist[i]
< 			}
< 		}
< 		return null;
< 	},
< 	
< 	trim : function (x) {
< 		if (!x)
< 			return "";
< 		return UnPlug2._re_trim.exec(x)[1];
< 	},
< 	
< 	toString : function () {
< 		return "<js:UnPlug2>";
< 	},
< 	
< 	// these should be updated by hand:
< 	version  : 2.032,
< 	codename : "sprawl",
< 	
< 	// the following line is auto-generated by upload.sh:
< 	revision : 201008291635,
< 	
< 	// do one-time setup stuff:
< 	setup_number : 1,
< 	
< 	end_of_object : 1 }
< 
< // init
< UnPlug2.UnPlug2();
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/config/config.js releases/unplug-2.03/source/chrome/content/config/config.js
1,159d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< function do_load() {
< 	if (window.arguments && window.arguments.length >= 1) {
< 		if (window.arguments[0] == "setup") {
< 			setup_unplug();
< 		}
< 	}
< 	populate_configs();
< 	detect_toolbarbutton();
< 	goto_tab_requested()
< }
< 
< function populate_configs() {
< 	var elemlist = document.getElementsByTagName("configwrapper");
< 	for (var i = 0; i < elemlist.length; i++) {
< 		var el = elemlist[i];
< 		var value = UnPlug2.get_pref(el.getAttribute("name"), el.getAttribute("default"));
< 		el.setValue(value);
< 	}
< 	document.getElementById("version").setAttribute("value", "Version: " + UnPlug2.version.toFixed(3) + " (" + UnPlug2.codename + ") " + UnPlug2.revision);
< }
< 
< function browser_window() {
< 	var w = window;
< 	while (!w.getBrowser) {
< 		w = w.opener;
< 		if (!w)
< 			return null;
< 	}
< 	return w;
< }
< 
< function detect_toolbarbutton() {
< 	var w = browser_window()
< 	if (!w)
< 		return;
< 	var toolbarbutton = w.document.getElementById("unplug2_toolbarbutton");
< 	var checkbox = document.getElementById("add_toolbar_button");
< 	checkbox.checked = (toolbarbutton != null) ? true : false;
< 	checkbox.disabled = false;
< }
< 
< function toggle_toolbarbutton() {
< 	var w = browser_window()
< 	if (!w)
< 		return;
< 	var toolbarbutton = w.document.getElementById("unplug2_toolbarbutton");
< 	if (toolbarbutton) {
< 		var navtoolbar = w.document.getElementById("nav-bar");
< 		// do persist thing (applies next restart)
< 		var curSet = navtoolbar.currentSet;
< 		if (curSet) {
< 			if (curSet.indexOf("urlbar-container") < 0 && curSet.indexOf("search-container") < 0) {
< 				alert("There's a problem removing the toolbar button\n\n" + curSet);
< 			} else {
< 				navtoolbar.setAttribute("currentset", curSet.replace(",unplug2_toolbarbutton", ""));
< 				w.document.persist("nav-bar","currentset");
< 			}
< 		} else {
< 			alert("Persist failed - cannot remove toolbar button");
< 		}
< 		// remove button (applies this session)
< 		navtoolbar.removeChild(toolbarbutton);
< 	} else {
< 		var navtoolbar = w.document.getElementById("nav-bar");
< 		// do persist thing (applies next restart)
< 		var curSet = navtoolbar.currentSet;
< 		if (curSet) {
< 			if (curSet.indexOf("urlbar-container") < 0 && curSet.indexOf("search-container") < 0) {
< 				alert("There's a problem adding the toolbar button\n\n" + curSet);
< 			} else {
< 				navtoolbar.setAttribute("currentset", curSet + ",unplug2_toolbarbutton");
< 				w.document.persist("nav-bar","currentset");
< 			}
< 		} else {
< 			alert("Persist failed - cannot add toolbar button");
< 		}
< 		// add button (applies this session)
< 		navtoolbar.insertItem("unplug2_toolbarbutton", null, null, false);
< 	}
< }
< 
< 
< function save_configs() {
< 	var elemlist = document.getElementsByTagName("configwrapper");
< 	for (var i = 0; i < elemlist.length; i++) {
< 		var el = elemlist[i];
< 		var value = UnPlug2.set_pref(el.getAttribute("name"), el.getValue());
< 	}
< }
< 
< function goto_tab_requested() {
< 	if (window.arguments && window.arguments.length >= 1)
< 		goto_tab(window.arguments[0]);
< }
< 
< function goto_tab(tabname) {
< 	var tb = document.getElementById("tabbox");
< 	switch (tabname) {
< 		case "welcome":
< 		case "setup":
< 			tb.selectedIndex = 3;
< 			break;
< 		case "main":
< 			tb.selectedIndex = 0;
< 			break;
< 		case "downloader":
< 			tb.selectedIndex = 1;
< 			break;
< 	}
< }
< 
< /*
<  * This function is called once, to set up unplug
<  */
< function setup_unplug() {
< 	// check if we've set up everthing we need to (eg: installed toolbar button, etc)
< 	switch (UnPlug2.get_pref("setup_number", 0)) {
< 		case 0:
< 			if (!detect_toolbarbutton())
< 				toggle_toolbarbutton();
< 			UnPlug2.set_pref("setup_number", 1);
< 			break;
< 		default:
< 			UnPlug2.log("Unknown setup_number " + UnPlug2.get_pref("setup_number", 0));
< 			break;
< 	}
< 	
< 	// show setup complete message
< 	document.getElementById("setup_complete").style.display = "block";
< }
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/config/config.xul releases/unplug-2.03/source/chrome/content/config/config.xul
1,138d0
< <?xml version="1.0" encoding="UTF-8"?>
< <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
< <?xml-stylesheet href="chrome://unplug/content/config/configwrapper.css" type="text/css"?>
< <!DOCTYPE dialog [
< 	<!ENTITY % dtdcommon SYSTEM "chrome://unplug/locale/common.dtd">
< 	%dtdcommon;
< 	<!ENTITY % dtdlocal SYSTEM "chrome://unplug/locale/config.dtd">
< 	%dtdlocal;
< 	<!ENTITY % dtdunplugresult SYSTEM "chrome://unplug/locale/unplug_result.dtd">
< 	%dtdunplugresult;
< 	]>
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< <dialog id="cn_unplug2_config"
<   title="&dialog.title; - &configheader.subtitle;"
<   flex="1"
<   buttons="cancel,accept"
<   defaultButton="accept"
< 
<   width="500"
<   height="500"
<   
<   onload="do_load();"
<   ondialogaccept="save_configs()"
<   ondialogcancel=""
<   
<   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
< 	<script type="application/javascript" src="chrome://unplug/content/common.js" />
< 	<script type="application/javascript" src="chrome://unplug/content/config/config.js" />
< 	<dialogheader title="&header.title;" description="&configheader.subtitle;"/>
< 	<tabbox id="tabbox">
< 		<tabs>
< 			<tab label="&tab.title.general;" />
< 			<tab label="&tab.title.downloader;" />
< 			<tab label="&tab.title.advanced;" />
< 			<tab label="&tab.title.about;" />
< 		</tabs>
< 		<tabpanels>
< 			<tabpanel id="tabgeneral" orient="vertical">
< 				<groupbox>
< 					<caption label="&interface.title;" />
< 					<configwrapper name="add_to_toolsmenu">
< 						<checkbox label="&interface.toolsmenu;" accesskey="&interface.toolsmenu.a;" />
< 					</configwrapper>
< 					<configwrapper name="add_to_contextmenu">
< 						<checkbox label="&interface.contextmenu;" accesskey="&interface.contextmenu.a;" />
< 					</configwrapper>
< 					<checkbox id="add_toolbar_button" label="&interface.toolbarbtn;" accesskey="&interface.toolbarbtn.a;" disabled="true" oncommand="toggle_toolbarbutton();" />
< 				</groupbox>
< 				<groupbox>
< 					<caption label="&privacy.title;" />
< 					<configwrapper name="popularity_contest">
< 						<checkbox label="&privacy.popcontest;" accesskey="&privacy.popcontest.a;" />
< 					</configwrapper>
< 					<label onclick="window.open(&quot;http://unplug.dbatley.com/popularity_contest/&quot;);" class="text-link" value="&privacy.infolink;" accesskey="&privacy.infolink.a;" />
< 				</groupbox>
< 				<groupbox>
< 					<caption label="&rulesxml.title;" />
< 					<description> &rulesxml.description; </description>
< 					<textbox value="chrome://unplug/content/rules.xml" disabled="true" />
< 					<hbox>
< 						<spacer flex="1" />
< 						<button label="&rulesxml.default;" accesskey="&rulesxml.default.a;" disabled="true" />
< 					</hbox>
< 				</groupbox>
< 				<spacer flex="1" />
< 			</tabpanel>
< 			<tabpanel id="tabdownload" orient="vertical">
< 				<configwrapper name="downloader" id="downloader_config">
< 					<menulist>
< 						<menupopup>
< 							<menuitem label="&downloader.auto;" value="auto"/>
< 							<menuitem label="&dl.saveas.label;" value="saveas"/>
< 							<menuitem label="&open.over.label;" value="openover"/>
< 						</menupopup>
< 					</menulist>
< 				</configwrapper>
< 				<groupbox>
< 					<caption label="&downloader.addons;" />
< 					<label onclick="window.open(&quot;https://addons.mozilla.org/en-US/firefox/addon/201&quot;);" class="text-link" value="&downloader.dta;" />
< 					<label onclick="window.open(&quot;https://addons.mozilla.org/en-US/firefox/addon/220&quot;);" class="text-link" value="&downloader.flashgot;" />
< 				</groupbox>
< 				<spacer flex="1" />
< 			</tabpanel>
< 			<tabpanel id="tabadvanced" orient="vertical">
< 				<groupbox>
< 					<caption label="&showall.title;" />
< 					<configwrapper name="show_all">
< 						<checkbox label="&showall.label;" accesskey="&showall.label.a;" />
< 					</configwrapper>
< 				</groupbox>
< 				<spacer flex="1" />
< 			</tabpanel>
< 			<tabpanel id="tababout" orient="vertical">
< 				<groupbox>
< 					<caption label="&about.title;" />
< 					<description> &about.description; </description>
< 					<label class="text-link" onclick="window.open(&quot;http://www.gnu.org/licenses/agpl-3.0.html&quot;);" value="&about.agpl;" tabindex="2"/>
< 
< 				</groupbox>
< 				<groupbox>
< 					<vbox id="setup_complete" style="display: none;">
< 						<description>&about.updated;</description>
< 					</vbox>
< 					<button label="&configure;" accesskey="&configure.a;" oncommand="goto_tab('main');" style="height: 3em;" tabindex="1" />
< 				</groupbox>
< 				<spacer flex="1" />
< 				<label id="version" />
< 			</tabpanel>
< 		</tabpanels>
< 	</tabbox>
< </dialog>
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/config/configwrapper.css releases/unplug-2.03/source/chrome/content/config/configwrapper.css
1,32d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< /*
<  * assign <configwrapper> as an configwrapper.xbl widget
<  */
< configwrapper {
< 	-moz-binding: url(chrome://unplug/content/config/configwrapper.xbl#configwrapper);
< }
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/config/configwrapper.xbl releases/unplug-2.03/source/chrome/content/config/configwrapper.xbl
1,88d0
< <?xml version="1.0"?>
< <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
< <!DOCTYPE bindings SYSTEM "chrome://unplug/locale/unplug_result.dtd" >
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< This binding accepts a single child element and provides two methods .setValue and .getValue which can set its value in the same way (regardless of what the child element actually is)
< 
< -->
< <bindings xmlns="http://www.mozilla.org/xbl" xmlns:xbl="http://www.mozilla.org/xbl" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
< 	<binding id="configwrapper">
< 		<implementation>
< 			<!-- name of config option -->
< 			<field name="name" readonly="false" />
< 			<!-- default value of option -->
< 			<field name="default" readonly="false" />
< 			<!-- set this config item's value -->
< 			<method name="setValue">
< 				<parameter name="value"/>
< 				<body>
< 					// search child nodes and set value
< 					var target = this.firstChild;
< 					switch (target.tagName) {
< 						case "checkbox":
< 							target.setAttribute("checked", value ? "true" : "false");
< 							break;
< 						case "menulist":
< 							// Firefox 3.0+
< 							// TODO - broke this too :)
< 							for (var i=0; i &lt; target.itemCount; i++) {
< 								if (target.getItemAtIndex(i).value == value)
< 									target.selectedIndex = i;
< 							}
< 							break;
< 						default:
< 							alert(target.tagName + " is not an XUL element which can be configwrappered");
< 							break;
< 					}
< 				</body>
< 			</method>
< 			<!-- get this config item's value -->
< 			<method name="getValue">
< 				<body>
< 					// search child nodes and get value
< 					var target = this.firstChild;
< 					switch (target.tagName) {
< 						case "checkbox":
< 							return target.getAttribute("checked") == "true";
< 						case "menulist":
< 							return String(target.selectedItem.value);
< 						default:
< 							alert(target.tagName + " is not an XUL element which can be configwrappered");
< 							return null;
< 					}
< 				</body>
< 			</method>
< 		</implementation>
< 		<content>
< 			<children />
< 		</content>
< 	</binding>
< 
< </bindings>
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/display/pop/pop.js releases/unplug-2.03/source/chrome/content/display/pop/pop.js
1,663d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< UnPlug2SearchPage = {
< 	UnPlug2SearchPage : function (args) {
< 		// parent window (the one we want to search)
< 		this._win = args.tgt_window;
< 		
< 		// parent window's getBrowser() and global window namespace
< 		this._gbrowser = args.gbrowser;
< 		this._flashgot = args.flashgotserv;
< 		
< 		// firefox 
< 		this._download_mgr = Components.classes["@mozilla.org/download-manager;1"]
< 			.getService(Components.interfaces.nsIDownloadManager);
< 		
< 		// io service
< 		this._io_service = Components.classes["@mozilla.org/network/io-service;1"]
< 			.getService(Components.interfaces.nsIIOService)
< 		
< 		// clipboard
< 		this._clipboard = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
< 			.getService(Components.interfaces.nsIClipboardHelper);  
< 		
< 		// preferered downloaders from config
< 		switch (UnPlug2.get_pref("downloader")) {
< 			case "saveas":
< 				this.preferred_downloaders = ["saveas"];
< 				break;
< 			case "openover":
< 				this.preferred_downloaders = ["openover"];
< 				break;
< 			default:
< 				this.preferred_downloaders = ["dta", "flashgot", "saveas"];
< 				break;
< 		}
< 		// fallbacks (if the default fails)
< 		this.preferred_downloaders.push("special");
< 		this.preferred_downloaders.push("saveas");
< 		// this.preferred_downloaders.push("openover");
< 		this.preferred_downloaders.push("fallback");
< 		
< 		// set this to true to stop everything
< 		this._stopped = false;
< 		
< 		// results array to be populated when a callback occurs
< 		this.download_to_uid = {}; // { result.download.toSource() : 1 }
< 		this.results = []; // { 1 : result }  ... or rather [ ..., result, ... ]
< 		this.media_id_lookup = {}; // { "youtube-324121" : [1, ...] }
< 		this.playlist_id_lookup = {}; // { "youtube-uploader-1213" : [1, ...] }
< 	},
< 	
< 	/**
< 	 * search the parent window for media, returning search result objects
< 	 */
< 	do_search : function () {
< 		document.getElementById("dynamic_download").value = UnPlug2.str("search_busy");
< 		document.getElementById("dynamic_results").value = UnPlug2.str("search_no_results_yet");
< 		
< 		try {
< 			UnPlug2Search._reset(); // this may not be needed because we always start from a fresh window
< 			UnPlug2Search.search(this._win, this._search_callback)
< 			this.poll()
< 		} catch (e) {
< 			UnPlug2.log(e);
< 		}
< 	},
< 	
< 	/**
< 	 * See if we've finished looking for suff yet
< 	 */
< 	poll : function () {
< 		try {
< 			var statusinfo = UnPlug2Search.statusinfo();
< 			document.getElementById("dynamic_download").value = statusinfo.text;
< 			var searchbar = document.getElementById("search_progress");
< 			if (statusinfo.finished) {
< 				searchbar.mode = "determined";
< 				searchbar.value = "100";
< 				
< 				var num_results = UnPlug2SearchPage.results.length;
< 				document.getElementById("stop_button").disabled = true;
< 				if (num_results == 0) {
< 					document.getElementById("dynamic_results").value = UnPlug2.str("search_no_results");
< 					document.getElementById("dynamic_results").className = "failed";
< 				} else if (num_results == 1) {
< 					document.getElementById("dynamic_results").value = UnPlug2.str("search_1_result");
< 				} else {
< 					document.getElementById("dynamic_results").value = UnPlug2.str("search_n_results").replace("#", num_results);
< 				}
< 			} else {
< 				if (statusinfo.percent == 0 || statusinfo.percent == 100) {
< 					searchbar.mode = "undetermined";
< 				} else {
< 					searchbar.mode = "determined";
< 					searchbar.value = statusinfo.percent;
< 				}
< 				window.setTimeout(UnPlug2SearchPage.poll, 500);
< 			}
< 		} catch (e) {
< 			UnPlug2.log(e);
< 			var e = document.getElementById("dynamic_results");
< 			e.value = "Have errors";
< 		}
< 	},
< 	
< 	/**
< 	 * Callback for UnPlug2Rules.search
< 	 * Called for each result found. This may be asynchromous (ie, after additional files are downloaded).
< 	 */
< 	_search_callback : function (result) {
< 		if (result.type != "result") {
< 			UnPlug2.log("Callback function got a " + result.type + " (not a result)!");
< 			return;
< 		}
< 		
< 		/*
< 		 * detect if it's an exact duplicate
< 		 * In JavaScript, asking if {"X" : "Y"} == {"X" : "Y"} -> false
< 		 *  So convert to source strings and compare to give the correct answer!
< 		*/
< 		var download_tosource = result.download.toSource();
< 		var uid = UnPlug2SearchPage.download_to_uid[download_tosource]; // TODO -- also need to check this key is not a "native object" like "length", "toString", etc!
< 		
< 		UnPlug2.log("FOUND: " + result.toSource() + " as " + (uid || "new result"));
< 		
< 		if (uid === undefined) {
< 			try {
< 				// we need to add a new object
< 				var uid = UnPlug2SearchPage.results.length;
< 				UnPlug2SearchPage.download_to_uid[download_tosource] = uid;
< 				UnPlug2SearchPage.results[uid] = result;
< 				result.uid = uid;
< 				
< 				var reselem = UnPlug2SearchPage.result_e_create();
< 				reselem.setAttribute("id", "result_" + uid);
< 				reselem.setAttribute("tooltiptext", "uid=" + uid + "\n\ndownload=" + result.download.toSource() + "\n\noriginal = " + result.details.toSource());
< 				
< 				// sets download callbacks, etc
< 				UnPlug2SearchPage.result_e_set_download(reselem, result);
< 				
< 				// this sets labels, icons, descripions, css, etc
< 				// but wont ever move the element
< 				UnPlug2SearchPage.result_e_set_description(reselem, result);
< 				
< 				// container for the group, eg the mediaid and/or playlistid
< 				UnPlug2SearchPage.set_container(uid, reselem, result.details);
< 				
< 			} catch(e) {
< 				UnPlug2.log("ERROR displaying result " + e);
< 			}
< 		} else {
< 			var reselem = document.getElementById("result_" + uid);
< 			var old_result = UnPlug2SearchPage.results[uid];
< 			if (old_result.certainty > result.certainty) {
< 				// Update
< 				UnPlug2SearchPage.results[uid].details = result.description;
< 				
< 				// we need to update this.results and the widget displayed on the page with our better data
< 				reselem.setAttribute("tooltiptext", reselem.getAttribute("tooltiptext") + "\n\nupdated = " + result.details.toSource());
< 				UnPlug2SearchPage.result_e_set_description(reselem, result);
< 				
< 				// it can attach/detach from the parent element as needed
< 				UnPlug2SearchPage.update_container(uid, reselem, old_result.details, result.description);
< 			} else {
< 				reselem.setAttribute("tooltiptext", reselem.getAttribute("tooltiptext") + "\n\nignored = " + result.details.toSource());
< 			}
< 		}
< 	},
< 	
< 	result_e_create : function () {
< 		var orig = document.getElementById("unplug_result_template");
< 		var dupe = orig.cloneNode(true);
< 		dupe.collapsed = false;
< 		return dupe;
< 	},
< 	
< 	result_e_set_download : function (reselem, result) {
< 		// variables for use in the callbaks (closures)
< 		var uid = result.uid;
< 		var download = result.download;
< 		var that = UnPlug2SearchPage;
< 		
< 		var getwidget = (function (wname) {
< 			var l = reselem.getElementsByTagName("menuitem")
< 			for (var i = 0; i < l.length; ++i) {
< 				if (l[i].className && l[i].className.split(" ").indexOf(wname) >= 0) {
< 					return l[i];
< 				}
< 			}
< 			var l = reselem.getElementsByTagName("toolbarbutton")
< 			for (var i = 0; i < l.length; ++i) {
< 				if (l[i].className && l[i].className.split(" ").indexOf(wname) >= 0) {
< 					return l[i];
< 				}
< 			}
< 			return null;
< 		});
< 		
< 		var buttons = ["copyurl", "saveas", "dta", "flashgot", "special", "opentab", "opennew", "openover", "config", "fallback"]
< 		// what's available
< 		var available_buttons = [];
< 		for (var i = 0; i < buttons.length; ++i) {
< 			var wname = buttons[i];
< 			if (that.widgets[wname].avail(result)) {
< 				available_buttons.push(wname);
< 			}
< 		}
< 		// what's best of those available (for main button action)
< 		var best_downloader = null;
< 		for (var i = 0; i < that.preferred_downloaders.length; ++i) {
< 			var wname = that.preferred_downloaders[i];
< 			if (available_buttons.indexOf(wname) >= 0) {
< 				best_downloader = wname;
< 				break;
< 			}
< 		}
< 		// hook up events and enable
< 		for (var i = 0; i < available_buttons.length; ++i) {
< 			var wname = available_buttons[i];
< 			var w = getwidget(wname);
< 			// use closure to get correct scoping
< 			var function_function = (function (that, uid, wname) {
< 				return (function (evt) {
< 					that.widgetresponse(uid, wname, wname == "config" ? "downloader" : null);
< 					evt.stopPropagation();
< 				});
< 			});
< 			if (w) {
< 				w.addEventListener("command", function_function(that, uid, wname), false);
< 				w.setAttribute("disabled", false);
< 			}
< 			if (best_downloader == wname) {
< 				// also hook up main button
< 				var main = getwidget("big-download-button");
< 				main.addEventListener("command", function_function(that, uid, wname), false);
< 				main.className = "big-download-button menuitem-iconic " + wname;
< 			}
< 		}
< 		
< 		// setup drag and drop
< 		if (result.download.url) { // make draggable if simple url only
< 			var image = reselem.getElementsByTagName("image")[0]; // ur-thumbnail
< 			reselem.setAttribute("draggable", true);
< 			reselem.addEventListener("dragstart", (function (url, image) {
< 				return (function (event) {
< 					event.dataTransfer.setData('text/uri-list', url);
< 					event.dataTransfer.setData('text/plain', url);
< 					event.dataTransfer.effectAllowed = "link";
< 					event.dataTransfer.setDragImage(image, 25, 25);
< 				});
< 			})(result.download.url, image), true);
< 		}
< 	},
< 	
< 	result_e_set_description : function (reselem, result) {
< 		// variables for use in the callbaks (closures)
< 		var uid = result.uid;
< 		var details = result.details;
< 		var that = UnPlug2SearchPage;
< 		
< 		var name_label = reselem.getElementsByTagName("label")[0];
< 		name_label.setAttribute("value", details.name);
< 		var desc_label = reselem.getElementsByTagName("label")[1];
< 		desc_label.setAttribute("value", details.description);
< 		var protocol_label = reselem.getElementsByTagName("label")[2];
< 		protocol_label.setAttribute("value", details.protocol);
< 		var host_label = reselem.getElementsByTagName("label")[3];
< 		host_label.setAttribute("value", details.host);
< 		var thumbnail = reselem.getElementsByTagName("image")[0];
< 		thumbnail.setAttribute("src", details.thumbnail);
< 		
< 		reselem.className = [
< 			"file-ext-" + (details.file_ext || "unknown"),
< 			"certainty-" + (details.certainty < 0 ? "low" : "high"),
< 			reselem.className].join(" ")
< 	},
< 	
< 	set_container : function (uid, reselem, details) {
< 		if (!details.mediaid) {
< 			document.getElementById("results").appendChild(reselem);
< 			return;
< 		}
< 		
< 		var minfo = this.media_id_lookup[details.mediaid];
< 		// escape used here because could have all sorts of special characters in mediaid
< 		var eid = "mediaid_" + escape(details.mediaid || "none");
< 		var container = document.getElementById(eid);
< 		if (! container) {
< 			container = document.createElement("vbox");
< 			container.className = "container";
< 			container.id = eid;
< 			document.getElementById("results").appendChild(container);
< 		}
< 		if (minfo === undefined) {
< 			this.media_id_lookup[details.mediaid] = {
< 				certainty : details.certainty,
< 				quality : details.quality,
< 				best : uid };
< 			reselem.className += " mediaid-best";
< 			container.appendChild(reselem);
< 		} else {
< 			if (minfo.certainty < details.certainty || (minfo.certainty == details.certainty && minfo.quality < details.quality)) {
< 				var old_best = document.getElementById("result_" + minfo["best"]);
< 				old_best.className = old_best.className.replace("mediaid-best", "mediaid-collapse");
< 				// this media info is the main one
< 				this.media_id_lookup[details.mediaid] = {
< 					certainty : details.certainty,
< 					quality : details.quality,
< 					best : uid };
< 				reselem.className += " mediaid-best";
< 				container.insertBefore(reselem, container.firstChild);
< 			} else {
< 				reselem.className += " mediaid-collapse";
< 				container.appendChild(reselem);
< 			}
< 		}
< 		container.appendChild(reselem);
< 	},
< 	
< 	update_container : function (uid, reselem, old_details, new_details) {
< 		if ((old_details.mediaid || "none") != (new_descripton.mediaid || "none")) {
< 			// remove from current container
< 			reselem.parentNode.removeChild(reselem);
< 			// and add to the new one
< 			UnPlug2SearchPage.set_container(uid, reselem, new_details);
< 		}
< 	},
< 	
< 	toString : function () {
< 		return '<UnPlug2SearchPage>';
< 	},
< 	
< 	_download_ff2_version : function (url, file) {
< 		var nsiurl = Components.classes["@mozilla.org/network/io-service;1"].
< 			getService(Components.interfaces.nsIIOService).
< 			newURI(url, null, null);
< 		var nsireferer = nsiurl;
< 		try {
< 			// TODO - fix this to use the referer from result.download.referer, if avail
< 			nsireferer = Components.classes["@mozilla.org/network/io-service;1"].
< 				getService(Components.interfaces.nsIIOService).
< 				newURI(String(UnPlug2SearchPage._win.location), null, null);
< 		} catch(e) {
< 			// pass
< 		}
< 		
< 		var persistArgs = {
< 			source      : nsiurl,
< 			contentType : "application/octet-stream",
< 			target      : file,
< 			postData    : null,
< 			bypassCache : false
< 		};
< 
< 		// var persist = makeWebBrowserPersist();
< 		var persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].
< 			createInstance(Components.interfaces.nsIWebBrowserPersist);
< 
< 		// Calculate persist flags.
< 		const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
< 		persist.persistFlags = (
< 			nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
< 			nsIWBP.PERSIST_FLAGS_FROM_CACHE |
< 			nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION );
< 
< 		// Create download and initiate it (below)
< 		var tr = Components.classes["@mozilla.org/transfer;1"].createInstance(Components.interfaces.nsITransfer);
< 
< 		tr.init(persistArgs.source, persistArgs.target, "", null, null, null, persist);
< 
< 		persist.progressListener = tr;
< 		persist.saveURI(persistArgs.source, null, nsireferer, persistArgs.postData, null, persistArgs.target);
< 	},
< 	
< 	/**
< 	 * return file or null.
< 	 */
< 	_save_as_box : function (name, ext) {
< 		// make string, strip whitespace
< 		name = (name || "no name").replace(RegExp("(^\\s|\\s$)", "g"), "");
< 		ext = (ext || "").replace(RegExp("(^\\s+|\\s+$)", "g"), "");
< 		
< 		// look for .ext in name
< 		if (!ext) {
< 			var ext_re = RegExp("\\.(\\w{1,5})$");
< 			var ext_match = ext_re.exec(name);
< 			if (ext_match) {
< 				ext = ext_match[1];
< 				name = name.replace(ext_re, "");
< 			} else {
< 				ext = "flv"; // fallback
< 			}
< 		}
< 		
< 		// replace non-letter characters with "_"
< 		name = name.replace(RegExp("[^\\w\\s_\\-\\(\\)]+", "g"), "_");
< 		ext = ext.replace(RegExp("[^\\w\\s]+", "g"), "_");
< 		
< 		var nsIFilePicker = Components.interfaces.nsIFilePicker;
< 		var filepicker = Components.classes["@mozilla.org/filepicker;1"]
< 			.createInstance(nsIFilePicker);
< 		
< 		filepicker.defaultString = name + "." + ext;
< 		//filepicker.defaultExtention = ext;
< 		filepicker.init(window, "Save as", nsIFilePicker.modeSave);
< 		var ret = filepicker.show();
< 		
< 		if (ret != nsIFilePicker.returnOK && ret != nsIFilePicker.returnReplace)
< 			return null; // cancelled
< 		
< 		return { "file" : filepicker.file, "fileURL" : filepicker.fileURL };
< 	},
< 	
< 	/*
< 	 * save String url into a nsIFile file
< 	 */
< 	_download_with_downloadmgr : function (source_url, file) {
< 		var persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
< 			.createInstance(Components.interfaces.nsIWebBrowserPersist);
< 		
< 		var ioFile = this._io_service.newFileURI(file);   
< 		var obj_URI = this._io_service.newURI(source_url, null, null);
< 		
< 		persist.progressListener = this._download_mgr.addDownload(
< 			0, // aDownloadType
< 			obj_URI, // source
< 			ioFile, // target
< 			"", // aDisplayName
< 			null, //aMIMEInfo
< 			Date.now(), // aStartTim
< 			null, // aTempFile,
< 			persist); // aCancelable
< 		
< 		persist.saveURI(obj_URI, null, null, null, "", ioFile);
< 	},
< 	
< 	send_nothing_found_msg : function () {
< 		if (!confirm(UnPlug2.str("nothing_found_send_data")))
< 			return;
< 		UnPlug2SearchPage.send_nothing_found_msg_noask();
< 	},
< 	
< 	send_nothing_found_msg_noask : function () {
< 		var post_data = "url=" + escape(UnPlug2SearchPage._win.location) + "&version=" + escape(UnPlug2.version) + "&revision=" + escape(UnPlug2.revision);
< 		
< 		var el = document.getElementById("notfound_button");
< 		if (!el) {
< 			UnPlug2.log("No element in xul called notfound");
< 			return;
< 		}
< 		el.disabled = "true";
< 		el.label = UnPlug2.str("nothing_found_sending");
< 		
< 		var dl = new UnPlug2Download(
< 			null, // id
< 			"http://unplug.dbatley.com/ajax/notfound.php",
< 			post_data,
< 			UnPlug2SearchPage.done_nothing_found_msg,
< 			UnPlug2SearchPage.failed_nothing_found_msg,
< 			60000)
< 	},
< 	
< 	done_nothing_found_msg : function () {
< 		var el = document.getElementById("notfound_button");
< 		el.label = UnPlug2.str("nothing_found_done");
< 	},
< 	
< 	failed_nothing_found_msg : function () {
< 		var el = document.getElementById("notfound_button");
< 		el.label = UnPlug2.str("nothing_found_failed");
< 		el.disabled = "false";
< 	},
< 	
< 	/*
< 	 * Stop downloading/searching pages!
< 	 */
< 	abort : function () {
< 		UnPlug2Search._stopped = true;
< 		UnPlug2Search.abort();
< 	},
< 	
< 	/**
< 	 * When someone clicks the configure button on unplug_result
< 	 */
< 	configure : function (tabname) {
< 		window.openDialog("chrome://unplug/content/config/config.xul", "", "", tabname);
< 	},
< 	
< 	/*
< 	 * For callbacks from unplug_result button presses
< 	 */
< 	widgets : {
< 		"special" : {
< 			avail : function (res) { return res.download.url && (
< 				res.download.url.indexOf("rtmp://") == 0
< 				|| res.download.url.indexOf("rtmpe://") == 0);
< 			},
< 			exec : function (res, data) {
< 				alert("Sorry, this feature is not available yet");
< 			}
< 		},
< 		"copyurl" : {
< 			avail : function (res) { return (res.download.url ? true : false); },
< 			exec  : function (res, data) {
< 				UnPlug2SearchPage._clipboard.copyString(res.download.url);
< 			}
< 		},
< 		"saveas" : {
< 			avail : function (res) { return res.download.url && (
< 				res.download.url.indexOf("http://") == 0
< 				|| res.download.url.indexOf("https://") == 0);
< 			},
< 			exec  : function (res, data) {
< 				var file = UnPlug2SearchPage._save_as_box(res.details.name, res.details.file_ext);
< 				if (!file)
< 					return;
< 				
< 				if (false)
< 					UnPlug2SearchPage._download_with_downloadmgr(res.download.url, file.file);
< 				
< 				UnPlug2SearchPage._download_ff2_version(res.download.url, file.fileURL);
< 			}
< 		},
< 		"opentab" : {
< 			avail : function (res) { return (res.download.url ? true : false); },
< 			exec  : function (res, data) {
< 				var t = UnPlug2SearchPage._gbrowser.addTab(res.download.url);
< 				UnPlug2SearchPage._gbrowser.selectedTab = t;
< 			}
< 		},
< 		"opennew" : {
< 			avail : function (res) { return (res.download.url ? true : false); },
< 			exec  : function (res, data) {
< 				window.open(res.download.url);
< 			}
< 		},
< 		"openover" : {
< 			avail : function (res) { return (res.download.url ? true : false); },
< 			exec  : function (res, data) {
< 				UnPlug2SearchPage._win.location = res.download.url;
< 			}
< 		},
< 		"dta" : {
< 			avail : function (res) {
< 				if (!window.opener.DTA_AddingFunctions) {
< 					return false;
< 				}
< 				if (!res.download.url) {
< 					return false;
< 				}
< 				if (res.download.url.indexOf("http://") != 0 && res.download.url.indexOf("https://") != 0) {
< 					return false;
< 				}
< 				return true;
< 			},
< 			exec  : function (res, data) {
< 				var fileobj = UnPlug2SearchPage._save_as_box(res.details.name, res.details.file_ext);
< 				if (!fileobj) {
< 					return;
< 				}
< 				
< 				var file = fileobj.file;
< 				if (file.leafName.indexOf("*") >= 0) {
< 					// we use the renaming mask, which treats *name*, etc as special.
< 					throw "Filename contains star";
< 				}
< 				
< 				// call String() explicitly as DTA alters string
< 				link = {
< 					"url" : res.download.url, // string
< 					"postData" : null,
< 					"referrer" : String(res.download.referer || ""), // an object with toURL
< 					"dirSave" : String(file.parent.path), // an object with addFinalSlash
< 					"fileName" : String(file.leafName), // string
< 					"description" : String(file.leafName) } // string
< 				UnPlug2.log("Hello DTA, I'm sending you: " + link.toSource());
< 				window.opener.DTA_AddingFunctions.sendToDown(true, [link]);
< 			}
< 		},
< 		"flashgot" : {
< 			avail : function (res) {
< 				if (UnPlug2SearchPage._flashgot) {
< 					// flashgot installed
< 					return (res.download.url && (
< 						res.download.url.indexOf("http://") == 0
< 						|| res.download.url.indexOf("https://") == 0))
< 				} else {
< 					// flashgot not installed
< 					return false;
< 				}
< 			},
< 			exec  : function (res, data) {
< 				var fg = UnPlug2SearchPage._flashgot;
< 				fg.download([res.download.url], fg.OP_ONE);
< 			}
< 		},
< 		"fallback" : {
< 			avail : function (res) { return true; },
< 			exec  : function (res, data) {
< 				alert(UnPlug2.str("cannot_download_this_kind"));
< 			}
< 		},
< 		"config" : {
< 			avail : function (res) { return true; },
< 			exec  : function (res, data) {
< 				UnPlug2SearchPage.configure(data);
< 			}
< 		}
< 	},
< 	
< 	widgetresponse : function (reference, widgetname, widgetdata) {
< 		try {
< 			var result = this.results[reference];
< 			if (!UnPlug2SearchPage.widgets[widgetname].avail(result)) {
< 				throw ("Widget " + widgetname + " not available for result " + result.toSource());
< 			}
< 			UnPlug2SearchPage.widgets[widgetname].exec(result, widgetdata);
< 		} catch(e) {
< 			UnPlug2.log("widgetresponse: " + e);
< 		}
< 	},
< 	
< 	widgetavailable : function (result, widgetname) {
< 		try {
< 			return UnPlug2SearchPage.widgets[widgetname].avail(result);
< 		} catch(e) {
< 			UnPlug2.log("widgetavailable: " + e);
< 		}
< 	},
< 	
< 	endofobject : 1 }
< 
< //init
< UnPlug2SearchPage.UnPlug2SearchPage(window.arguments[0])
< 
< 
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/display/pop/pop.xul releases/unplug-2.03/source/chrome/content/display/pop/pop.xul
1,182d0
< <?xml version="1.0" encoding="UTF-8"?>
< <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
< <?xml-stylesheet href="chrome://unplug/skin/searchpage.css" type="text/css"?>
< <!DOCTYPE dialog [
< 	<!ENTITY % dtdcommon SYSTEM "chrome://unplug/locale/common.dtd">
< 	%dtdcommon;
< 	<!ENTITY % dtdlocal SYSTEM "chrome://unplug/locale/searchpage.dtd">
< 	%dtdlocal;
< 	<!ENTITY % dtdresult SYSTEM "chrome://unplug/locale/unplug_result.dtd">
< 	%dtdresult;
< 	]>
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< <dialog id="cn_unplug2_search"
<   title="&dialog.title;"
<   flex="1"
<   buttons="extra1,accept"
<   defaultButton="accept"
< 
<   width="600"
<   height="500"
<   
<   buttonlabelextra1="&configure;"
<   buttonaccesskeyextra1="&configure.a;"
<   
<   onload="UnPlug2SearchPage.do_search();"
<   ondialogaccept=""
<   ondialogextra1="window.openDialog(&quot;chrome://unplug/content/config/config.xul&quot;)"
<   onbeforeunload="UnPlug2SearchPage.abort();"
<   
<   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
< 	
< 	<script type="application/javascript" src="chrome://unplug/content/common.js" />
< 	<script type="application/javascript" src="chrome://unplug/content/search/search.js" />
< 	<script type="application/javascript" src="chrome://unplug/content/search/rules.js" />
< 	<script type="application/javascript" src="chrome://unplug/content/display/pop/pop.js" />
< 	
< 	<!-- DTA extends String -->
< 	<script type="application/javascript" src="chrome://dta/content/common/overlayFunctions.js"/>
< 	
< 	<dialogheader title="&header.title;" description="&header.subtitle;"/>
< 	<vbox id="results" style="overflow: -moz-scrollbars-vertical; border: 1px #666666 solid;" flex="1" />
< 	<spacer height="0.5em;" />
< 	<hbox>
< 		<label id="dynamic_download" value="" />
< 		<spacer flex="1" />
< 		<label id="dynamic_results" value="" />
< 	</hbox>
< 	<hbox>
< 		<button oncommand="UnPlug2SearchPage.abort();" id="stop_button" label="&stop.label;"  accesskey="&stop.accesskey;" />
< 		<spacer flex="1" />
< 		<button oncommand="UnPlug2SearchPage.send_nothing_found_msg();" id="notfound_button" label="&notfound.label;"  accesskey="&notfound.accesskey;" />
< 	</hbox>
< 	<spacer height="0.5em;" />
< 	<progressmeter id="search_progress" mode="determined" value="0"/>
< 	
< 	<!-- this is the form of the result itself. We'll clone this to use in our display -->
< 	<vbox id="unplug_result_template" class="unplug-result" flex="0" collapsed="true">
< 		<toolbar flex="1">
< 			<image class="ur-thumbnail" />
< 			<vbox flex="1" style="overflow: hidden;">
< 				<label class="ur-name" />
< 				<label class="ur-description" />
< 				<hbox>
< 					<label class="ur-protocol" />
< 					<label class="ur-host" />
< 				</hbox>
< 			</vbox>
< 			<!--
< 				we want these to be drop-down buttons
< 				ie Open / Open in a new window
< 				and Download / Dowload with dTa / download with foo
< 				and Play / Play in vlc / Play in totem / Look for media players
< 			-->
< 			<!-- aternative is type="menu" -->
< 			<toolbarbutton
< 				accesskey="&copyurl.accesskey;"
< 				label="&copyurl.label;"
< 				tooltiptext="&copyurl.tooltip;"
< 				class="menuitem-iconic copyurl"
< 				type="button"
< 				disabled="true"
< 				tabindex="1"
< 				/>
< 			<toolbarbutton
< 				accesskey="&dl.accesskey;"
< 				label="&dl.label;"
< 				type="menu-button"
< 				tabindex="1"
< 				onkeydown="if (event.keyCode == 32) { this.open = true; }"
< 				class="big-download-button"
< 				>
< 				<menupopup>
< 					<menuitem
< 						accesskey="&dl.saveas.accesskey;"
< 						label="&dl.saveas.label;"
< 						tooltiptext="&dl.saveas.tooltip;"
< 						class="menuitem-iconic saveas"
< 						disabled="true"
< 						/>
< 					<menuitem
< 						accesskey="&dl.dta.accesskey;"
< 						label="&dl.dta.label;"
< 						tooltiptext="&dl.dta.tooltip;"
< 						class="menuitem-iconic dta"
< 						disabled="true"
< 						/>
< 					<menuitem
< 						accesskey="&dl.flashgot.accesskey;"
< 						label="&dl.flashgot.label;"
< 						tooltiptext="&dl.flashgot.tooltip;"
< 						class="menuitem-iconic flashgot"
< 						disabled="true"
< 						/>
< 					<menuitem
< 						accesskey="&dl.special.accesskey;"
< 						label="&dl.special.label;"
< 						tooltiptext="&dl.special.tooltip;"
< 						class="menuitem-iconic special"
< 						disabled="true"
< 						/>
< 					<menuseparator />
< 					<menuitem
< 						accesskey="&open.tab.accesskey;"
< 						label="&open.tab.label;"
< 						tooltiptext="&open.tab.tooltip;"
< 						class="menuitem-iconic opentab"
< 						disabled="true"
< 						/>
< 					<menuitem
< 						accesskey="&open.new.accesskey;"
< 						label="&open.new.label;"
< 						tooltiptext="&open.new.tooltip;"
< 						class="menuitem-iconic opennew"
< 						disabled="true"
< 						/>
< 					<menuitem
< 						accesskey="&open.over.accesskey;"
< 						label="&open.over.label;"
< 						tooltiptext="&open.over.tooltip;"
< 						class="menuitem-iconic openover"
< 						disabled="true"
< 						/>
< 					<menuseparator />
< 					<menuitem
< 						accesskey="&config.accesskey;"
< 						label="&config.label;"
< 						tooltiptext="&config.tooltip;"
< 						class="menuitem-iconic config"
< 						disabled="true"
< 						/>
< 				</menupopup>
< 			</toolbarbutton>
< 		</toolbar>
< 	</vbox>
< </dialog>
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/overlay/all.js releases/unplug-2.03/source/chrome/content/overlay/all.js
1,120d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< 
< /**
<  * Things the overlay needs, such as opening the popup window.
<  */
< UnPlug2Overlay = {
< 	UnPlug2Overlay : function () {
< 		// TODO - don't use a flag, just use:
< 		//    window.removeEventListener("load", Flashblock.onInstall, true);
< 		this._have_loaded_browser = false;
< 		
< 		// popup window (if not closed) from last button click
< 		this._popup_window_ref = null;
< 	},
< 	
< 	/**
< 	 * Run a search (by opening a popup window and giving it the page to work with)
< 	 */
< 	run : function () {
< 		try {
< 			var data = {
< 				// window of document to examine
< 				"tgt_window"     : this.get_current_window(),
< 				// gBrowser element
< 				"gbrowser"       : getBrowser(),
< 				// gFlashGotService, if installed
< 				"flashgotserv" : window.gFlashGotService };
< 			try {
< 				UnPlug2Overlay._popup_win_ref.close();
< 			} catch(e) {
< 				// pass
< 			}
< 			UnPlug2Overlay._popup_win_ref = window.openDialog("chrome://unplug/content/display/pop/pop.xul", "unplug_window", "chrome,centerscreen", data );
< 			UnPlug2Overlay._popup_win_ref.focus();
< 		} catch (e) {
< 			UnPlug2.log(e);
< 		}
< 	},
< 	
< 	/**
< 	 * Function which is called once, when chrome://browser has finished loading.
< 	 * This removes the items from menus which we don't care about.
< 	 */
< 	browser_loaded : function () {
< 		var menus = [ "toolsmenu", "contextmenu" ];
< 		for (var i = 0 ; i < menus.length; i++) {
< 			var name = menus[i];
< 			try {
< 				if ( ! UnPlug2.get_pref("add_to_" + name, true) ) {
< 					var el = window.document.getElementById("unplug2_" + name)
< 					el.parentNode.removeChild(el);
< 				}
< 			} catch(e) {
< 				UnPlug2.log("Error removing " + name + " because " + e);
< 			}
< 		}
< 		
< 		// check if we've set up everthing we need to (eg: installed toolbar button, etc)
< 		if (UnPlug2.get_pref("setup_number", 0) < UnPlug2.setup_number) {
< 			window.setTimeout((function () {
< 				window.openDialog("chrome://unplug/content/config/config.xul", "", "", "setup");
< 				}), 1000);
< 		}
< 	},
< 	
< 	/**
< 	 * Function which is called each time a page is loaded
< 	 */
< 	page_loaded : function () {
< 		if ( !this._have_loaded_browser ) {
< 			this.browser_loaded();
< 			this._have_loaded_browser = true;
< 		}
< 	},
< 	
< 	/**
< 	 * Returns the window in the curently open tab
< 	 */
< 	get_current_window : function () {
< 		var br = getBrowser();
< 		var br_tab = br.getBrowserAtIndex(br.mTabContainer.selectedIndex);
< 		return br_tab.contentWindow;
< 	},
< 	
< 	toString : function () {
< 		return "<js:UnPlug2Overlay>";
< 	},
< 	
< 	version : 2.0 };
< 
< // init
< UnPlug2Overlay.UnPlug2Overlay();
< 
< window.addEventListener("load", function () { UnPlug2Overlay.page_loaded(); }, false);
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/overlay/firefox.js releases/unplug-2.03/source/chrome/content/overlay/firefox.js
1,28d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/overlay/firefox.xul releases/unplug-2.03/source/chrome/content/overlay/firefox.xul
1,48d0
< <?xml version="1.0" encoding="UTF-8"?>
< <?xml-stylesheet href="chrome://unplug/skin/overlay_firefox.css" type="text/css"?>
< <!DOCTYPE overlay SYSTEM "chrome://unplug/locale/overlay.dtd" >
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< <overlay id="unplug2_overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
< 	<script type="application/javascript" src="chrome://unplug/content/common.js" />
< 	<script type="application/javascript" src="chrome://unplug/content/overlay/all.js" />
< 	<script type="application/javascript" src="chrome://unplug/content/overlay/firefox.js" />
< 	
< 	<popup id="contentAreaContextMenu">
< 		<menuitem id="unplug2_contextmenu" label="&menuitem.unplug;" accesskey="&menuitem.u;" insertbefore="context-viewpartialsource-selection" oncommand="UnPlug2Overlay.run();" class="menuitem-iconic" />
< 	</popup>
< 	
< 	<menupopup id="menu_ToolsPopup">
< 		<menuitem id="unplug2_toolsmenu" label="&menuitem.unplug;" accesskey="&menuitem.u;" insertafter="javascriptConsole" oncommand="UnPlug2Overlay.run();" class="menuitem-iconic" />
< 	</menupopup>
< 	
< 	<toolbarpalette id="BrowserToolbarPalette">
< 		<toolbarbutton id="unplug2_toolbarbutton" class="toolbarbutton" name="unplug2_toolbarbutton" tooltiptext="&toolbarbutton.unplug.tip;" oncommand="UnPlug2Overlay.run();" label="&toolbarbutton.unplug;" />
< 	</toolbarpalette> 
< </overlay>
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/rules.xml releases/unplug-2.03/source/chrome/content/rules.xml
1,769d0
< <?xml version="1.0"?>
< <!DOCTYPE unplug>
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< <unplug>
< 	<hook for="download-priority">
< 		<priority level="high">youtube.com</priority>
< 		<priority level="low">addthis.com</priority>
< 		<priority level="low">xtendmedia.com</priority>
< 		<priority level="very-low">doubleclick.net</priority>
< 		<priority level="very-low">googlesyndication.com</priority>
< 		<priority level="very-low">yieldmanager.com</priority>
< 		<priority level="very-low">admeld.com</priority>
< 		<priority level="very-low">invitemedia.com</priority>
< 		<priority level="very-low">quantserve.com</priority>
< 		<priority level="low">cpro.baidu.com</priority>
< 		<priority level="very-low">contentabc.com</priority>
< 	</hook>
< 	<!--
< 		First, grab the original page title, so we know what to save it as
< 	-->
< 	<optional_element ref="origtitle" tagname="title" require_attrs="innerHTML" />
< 	<!--
< 		Now the actual rules
< 	-->
< 	<rule id="generic_flv_string">
< 		<!-- possible alternative? <each_re ref="flvre" re="(https?://[a-z0-9_/\.\-]+\.flv(?:\?[a-z0-9_/\.%=&amp;\-]*)?)" flags="i"> -->
< 		<each_re ref="flvre" re="[&quot;']((?:http|/)[^&quot;']+\.flv(?:\?[^&quot;']+)?)[&quot;']">
< 			<media url="${flvre.1}" certainty="low" title="${origtitle.innerHTML}" type="flv" />
< 		</each_re>
< 	</rule>
< 	<rule id="clipfish.de">
< 		<if_url host="clipfish.de" ref="url" />
< 		<rule>
< 			<if_re ref="videoid" string="${url.path}"> /video/(\d+)/ </if_re>
< 			<download url="http://www.clipfish.de/video_n.php?p=0|DE&amp;vid=${videoid.1}">
< 				<if_re ref="flvurl"> url=(.*?)&amp; </if_re>
< 				<media url="${flvurl.1}" title="${origtitle.innerHTML}" type="flv" />
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="joy69.com">
< 		<if_url host="joy69.com" ref="url" />
< 		<rule>
< 			<if_re ref="videoid" string="${url.path}"> id=(\d+) </if_re>
< 			<download url="http://www.joy69.com/getmedia/?id=${videoid.1}&amp;limit=15">
< 				<!-- this actually has links to several different files with the tags below repeated in different <item> tags. Plus its poorly formatted xml -->
< 				<!-- content like: <media:content url="[filename]?start=[seek],http://media.joy69.com/.....flv" duration="185" lang="en"> -->
< 				<if_re ref="content" re="(http://[^&quot;]+\.flv[^&quot;]*)&quot;" />
< 				<optional_element ref="poster" tagname="media:thumbnail" require_attrs="innerHTML" />
< 				<optional_element ref="media_title" tagname="media:title" require_attrs="innerHTML" />
< 				<media url="${content.1}" thumbnail="${poster.innerHTML}" title="${either:media_title.innerHTML:origtitle.innerHTML}" type="flv" />
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="veoh.com">
< 		<!-- TODO veoh support is broken -->
< 		<if_false />
< 		<if_url host="veoh.com" />
< 		<if_re ref="videoid" tagname="textarea"> "videoId":"([^"]+)" </if_re>
< 		<rule id="veoh" target="veoh">
< 			<download url="http://www.veoh.com/rest/video/${videoid.1}/details">
< 				<each_element ref="video" tagname="video" attrs="fullPreviewHashLowPath,fullPreviewHashPath,ipodLink,fullMedResImagePath,description">
< 					<!-- TODO this ipod one doesn't seem to work -->
< 					<!-- NOTE - the final urls are at content.veoh.com, but the referers must not be from content.veoh.com (can be anywhere else) -->
< 					<media url="${video.ipodLink}" description="mp4" thumbnail="${video.fullMedResImagePath}" typy="mp4" />
< 					<media url="${video.fullPreviewHashLowPath}" description="${translate:low_quality}" thumbnail="${video.fullMedResImagePath}" type="flv" />
< 					<media url="${video.fullPreviewHashPath}" description="${translate:mid_quality}" thumbnail="${video.fullMedResImagePath}" type="flv" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>	
< 	<rule id="tudou.com">
< 		<if_url ref="url" host="tudou.com" />
< 		<optional_re ref="vc_title" re="&lt;span id=&quot;vcate_title&quot;&gt;(.*)&lt;/span&gt;" />
< 		<optional_re ref="thumb" re="&lt;div class=&quot;summary&quot;&gt;&lt;span class=&quot;s_pic&quot;&gt;(http://[^&lt;&gt;]+jpg)&lt;/span&gt;" />
< 		<rule id="tudou-single">
< 			<if_re ref="iid" tagname="script"> iid\s*=\s*(\d+) </if_re>
< 			<!-- nocatch is a random number, i think. xml gives a list of the same flv file on different mirrors. -->
< 			<download url="http://v2.tudou.com/v2/cdn?id=${iid.1}&amp;noCatch=0000&amp;safekey=IAlsoNeverKnow">
< 				<each_element ref="f" tagname="f" require_attrs="innerHTML">
< 					<media url="${f.innerHTML}" type="flv" mediaid="toudu-${iid.1}" quality="mid" title="${either:vc_title.1:origtitle.innerHTML}" thumbnail="${thumb.1}" />
< 				</each_element>
< 			</download>
< 		</rule>
< 		<rule id="tudou.com-playlist">
< 			<download url="http://v2.tudou.com/v2/cdn?id=${qparam:iid:url.url}&amp;noCatch=0000&amp;safekey=IAlsoNeverKnow">
< 				<each_element ref="f" tagname="f" require_attrs="innerHTML">
< 					<media url="${f.innerHTML}" type="flv" mediaid="toudu-${qparam:iid:url.url}" quality="mid" title="${either:vc_title.1:origtitle.innerHTML}" thumbnail="${thumb.1}" />
< 				</each_element>
< 			</download>
< 		</rule>
< 		<rule id="hd.tudou.com">
< 			<if_url host="hd.tudou.com" />
< 			<if_re ref="iid" tagname="script"> iid\s*:\s*&quot;(\d+)&quot; </if_re>
< 			<optional_re ref="title" tagname="script"> title\s*:\s*&quot;(.*?)&quot; </optional_re>
< 			<download url="http://v2.tudou.com/v2/kili?id=${iid.1}&amp;safekey=YouNeverKnowThat&amp;noCatch=0000">
< 				<each_element ref="f" tagname="f" require_attrs="innerHTML">
< 					<media url="${f.innerHTML}" type="flv" description="${translate:hd_quality} ${optional:title.1}" title="${title.1}" quality="very-high" mediaid="${iid.1}" thumbnail="${thumb.1}" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="movies.apple.com">
< 		<!-- TODO movies.apple.com site dead? -->
< 		<!-- when we have binary downloads, we can treat the orignial .mov file as a playlist element -->
< 		<if_url host="apple.com" />
< 		<each_re ref="movredirect" re="(http://[^&quot;']*?apple\.com/[^&quot;']+?_)(\d+p\.mov)">
< 			<media url="${movredirect.1}h${movredirect.2}" type="mov" description="${translate:hd_quality}" />
< 		</each_re>
< 		<each_re ref="movredirect" re="(http://[^&quot;']*?apple\.com/[^&quot;']+?_h)\.(\d+\.mov)">
< 			<media url="${movredirect.1}${movredirect.2}" type="mov" />
< 		</each_re>
< 	</rule>
< 	<rule id="wat.tv">
< 		<if_false />
< 		<!-- TODO does not work -->
< 		<!--
< 		url to grab some json data:
< 		http://www.wat.tv/interface/contentv3/5039961
< 		
< 		minimal url for getting download url
< 		http://www.wat.tv/get/web/5039961?token=0b6c33af021d74d8e8c122cbfaf61ecf/4c54c602&domain=www.wat.tv&getURL=1
< 		-->
< 		<download url="http://www.wat.tv/interface/contentv2/${videoid.1}">
< 			<if_re ref="videourl" re="&quot;url&quot;:&quot;(http[^&quot;]*wat\.tv[^&quot;]*get[^&quot;]*flv)&quot;" />
< 			<media url="${jsdecode:videourl.1}" />
< 		</download>
< 	</rule>
< 	<rule id="megavideo.com" target="megavideo.com">
< 		<if_url host="megavideo.com" />
< 		<optional_re ref="title" re="flashvars\.title = &quot;([^&quot;]+)&quot;" />
< 		<if_re ref="un" re="flashvars\.un = &quot;([0-9a-f]+)&quot;" />
< 		<if_re ref="k1" re="flashvars\.k1 = &quot;(\d+)&quot;" />
< 		<if_re ref="k2" re="flashvars\.k2 = &quot;(\d+)&quot;" />
< 		<if_re ref="s" re="flashvars\.s = &quot;(\d+)&quot;" />
< 		<media type="flv" description="${title.1}" url="http://www${s.1}.megavideo.com/files/${megavideo:un.1:k1.1:k2.1}/" title="${either:title.1:origtitle.innerHTML}" />
< 	</rule>
< 	<rule id="videosz.com">
< 		<!-- just the clips -->
< 		<rule id="videosz_movie">
< 			<if_url host="videosz.com" ref="url" />
< 			<rule>
< 				<if_re string="${url.url}" re="dvd_id=(\d+)" ref="dvd_id" />
< 				<each_re ref="vzinfo" re="var scene = new Array([\s\S]*?)scenesInfo\[(\d+)\] = scene;">
< 					<if_re string="${vzinfo.1}" ref="scene" re="scene\['scene'\] = &quot;([^&quot;]+)&quot;;" />
< 					<optional_re ref="place" string="${vzinfo.1}" re="scene\['place'\] = &quot;(\d+)&quot;;" />
< 					<rule>
< 						<optional_re ref="thumb" re="&quot;(http://ss\d+\.videosz\.com/${dvd_id.1}/.*/${place.1}/thumbs\d+/\d+\.jpg)&quot;" />
< 						<rule>
< 							<if_re string="${vzinfo.1}" re="scene\['host'\] = &quot;flv1&quot;;" />
< 							<media url="http://galleries.videosz.com/${scene.1}_1/videosz-${scene.1}-1${place.1}.flv"  thumbnail="${thumb.1}" type="flv" description="flv ${scene.1}" title="${origtitle.innerHTML}-${scene.1}" />
< 						</rule>
< 						<rule>
< 							<if_re string="${vzinfo.1}" re="scene\['host'\] = &quot;flv2&quot;;" />
< 							<media url="http://largesamples.videosz.com/${dvd_id.1}/videosz-${scene.1}.flv"  thumbnail="${thumb.1}" type="flv" description="flv ${scene.1}" title="${origtitle.innerHTML}-${scene.1}" />
< 							<media url="http://largesamples.videosz.com/${dvd_id.1}/videosz-${scene.1}.avi"  thumbnail="${thumb.1}" type="avi" description="avi ${scene.1}" title="${origtitle.innerHTML}-${scene.1}" />
< 						</rule>
< 					</rule>
< 				</each_re>
< 			</rule>
< 		</rule>
< 		<rule id="videosz_img">
< 			<ifnot_url host="videosz.com" />
< 			<if_re ref="vzimgurl" re="ss\d+\.videosz\.com/(\d+)/movie/\d+/\d+.jpg" />
< 			<download url="http://videosz.com/movie.php?dvd_id=${vzimgurl.1}">
< 				<rule goto="videosz_movie" />
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="vimeo.com">
< 		<!-- TODO unchecked -->
< 		<if_url host="vimeo.com" />
< 		<if_re ref="vimeoscript" elem="script">
< 			clip_id: '(\d+)',
< 		</if_re>
< 		<rule id="vimeodownload" target="vimeodownload">
< 			<!-- download url should end in &amp;param_context=user:${user_id}&amp;context=user:${user_id} -->
< 			<download url="http://vimeo.com/moogaloop/load/clip:${vimeoscript.1}/local?param_md5=0&amp;param_context_id=&amp;param_force_embed=0&amp;param_clip_id=${vimeoscript.1}&amp;param_show_portrait=0&amp;param_multimoog=&amp;param_server=vimeo.com&amp;param_show_title=0&amp;param_color=00ADEF&amp;param_autoplay=0&amp;param_show_byline=0&amp;param_fullscreen=1">
< 				<each_element tagname="request_signature" ref="sig" attrs="innerHTML">
< 					<each_element tagname="request_signature_expires" ref="expires" attrs="innerHTML">
< 						<!-- <if_element tagname="clip_id" ref="clipid" attrs="innerHTML" /> -->
< 						<optional_element tagname="thumbnail" ref="thumb" attrs="innerHTML" />
< 						<optional_element tagname="caption" ref="caption" attrs="innerHTML" />
< 						<media url="http://vimeo.com/moogaloop/play/clip:${vimeoscript.1}/${sig.innerHTML}/${expires.innerHTML}/?q=sd&amp;type=local" type="flv" thumbnail="${thumb.innerHTML}" description="${optional:caption.innerHTML}" />
< 					</each_element>
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="html5">
< 		<each_element ref="vid" tagname="video" require_attrs="src" attrs="poster">
< 			<media url="${vid.src}" thumbnail="${vid.poster}" certainty="mid" title="${origtitle.innerHTML}" />
< 		</each_element>
< 		<each_element ref="aud" tagname="audio" require_attrs="src">
< 			<media url="${aud.src}" certainty="mid" title="${origtitle.innerHTML}" description="Audio file" />
< 		</each_element>
< 		<each_element ref="sou" tagname="source" require_attrs="src">
< 			<media url="${sou.src}" certainty="mid" title="${origtitle.innerHTML}" />
< 		</each_element>
< 	</rule>
< 	<rule id="spiegel.de">
< 		<!-- TODO broken -->
< 		<if_url host="spiegel.de" path="/video/" ref="url" />
< 		<rule>
< 			<if_re string="${url.path}" ref="videoid"> /video/video\-(\d+)\.html </if_re>
< 			<download url="http://video.spiegel.de/flash/${videoid.1}.xml">
< 				<each_element tagname="filename" ref="filename" require_attrs="innerHTML">
< 					<media url="http://video.spiegel.de/flash/${filename.innerHTML}" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="search.googlevideo">
< 		<!-- TODO unchecked -->
< 		<!-- for google video search, grab the link to the page the video is really on -->
< 		<if_url inhost="google" />
< 		<rule id="video.google.com">
< 			<if_re ref="div" flags="mi"> &lt;div\s+id=[&quot;']current\-title[&quot;']\s*&gt;([\s\S]*?)&lt;/div\s*&gt; </if_re>
< 			<rule>
< 				<if_re ref="url" string="${div.1}"> href=[&quot;'](http://[^&quot;']+)[&quot;'] </if_re>
< 				<download url="${url.1}">
< 					<rule goto="*" />
< 				</download>
< 			</rule>
< 		</rule>
< 		<rule id="video.google.de">
< 			<each_element ref="alink" tagname="a" require_attrs="id,href">
< 				<if_equal a="${alink.id}" b="hs_title_link" />
< 				<download url="${alink.href}">
< 					<rule goto="*" />
< 				</download>
< 			</each_element>
< 		</rule>
< 	</rule>
< 	<rule id="keezmovies.com">
< 		<if_url ref="url" host="keezmovies.com"/>
< 		<rule>
< 			<if_re ref="vidid" string="${url.path}" re="\-(\d+)$" />
< 			<download url="http://www.keezmovies.com/watch_player.php?id=${vidid.1}">
< 				<each_element ref="flvurl" tagname="flv_url" require_attrs="innerHTML">
< 					<media url="${flvurl.innerHTML}" type="flv" title="${origtitle.innerHTML}" thumbnail="http://km-pics.phncdn.com/thumbs/${substring:-9:-6:leftpad:0:10:vidid.1}/${substring:-6:-3:leftpad:0:10:vidid.1}/${substring:-3:end:leftpad:0:10:vidid.1}/small.jpg" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
< 	<rule id="rutube.ru-2010">
< 		<if_url host="rutube.ru" ref="url" />
< 		<rule>
< 			<if_re ref="v" re="^(.*)$" string="${qparam:v:url.url}" />
< 			<optional_elem tagname="h1" require_attrs="innerHTML" />
< 			<rule id="rutube-from-id" target="rutube-from-id">
< 				<download url="http://bl.rutube.ru/${v.1}.xml?schema=rtmp">
< 					<if_re ref="final" re="&lt;finalAddress&gt;&lt;!\[CDATA\[(http.*?)\]\]&gt;&lt;/finalAddress&gt;" />
< 					<media url="${final.1}" thumbnail="http://img.rutube.ru/thumbs/${substring:0:2:v.1}/${substring:2:4:v.1}/${v.1}-1.jpg" title="${either:h1.innerHTML:origtitle.innerHTML}" type="flv" mediaid="rutube-${v.1}" />
< 				</download>
< 			</rule>
< 		</rule>
< 	</rule>
< 	<rule id="revver.com">
< 		<if_url ref="url" host="revver.com" path="/video" />
< 		<rule>
< 			<if_re ref="videoid" string="${url.url}" re="/video/(\d+)" />
< 			<rule id="revver.com.downloadmov">
< 				<optional_re ref="title" re="&lt;h1 id=&quot;video-title&quot;&gt;Megaman Battle Network - vs Woodman &lt;/h1&gt;" />
< 				<media url="http://media.revver.com/qt;download/${videoid.1}.mov" title="${either:title.1:origtitle.innerHTML}" type="mov" thumbnail="http://frame.revver.com/frame/120x90/${videoid.1}.jpg" />
< 			</rule>
< 		</rule>
< 	</rule>
< 	<rule id="mtv.de">
< 		<!-- TODO unchecked -->
< 		<!-- <if_url host="mtv.de" inpath="videos" /> -->
< 		<if_re> intl\.esperanto\.mtvi\.com </if_re>
< 		<if_re tagname="script" ref="videoid"> var uri\s*=\s*&quot;(.*?)&quot; </if_re>
< 		<download url="http://intl.esperanto.mtvi.com/www/xml/video.jhtml?uri=${urlencode:videoid.1}" >
< 			<optional_element ref="image" tagname="media:thumbnail" attrs="url" />
< 			<each_element ref="content" tagname="media:content" require_attrs="url">
< 				<download url="${content.url}">
< 					<if_element ref="src" tagname="src" require_attrs="innerHTML" />
< 					<media url="${src.innerHTML}" thumbnail="${image.url}" />
< 				</download>
< 			</each_element>
< 		</download>
< 	</rule>
< 	<rule id="noembed.video.google.com">
< 		<if_url inhost="google" />
< 		<if_re ref="playerurl" tagname="script" re="(googleplayer\.swf\?[^&quot;']+)[&quot;']" />
< 		<media url="${qparam:videoUrl:jsdecode:playerurl.1}" thumbnail="${qparam:thumbnailUrl:jsdecode:playerurl.1}" title="${origtitle.innerHTML}" type="flv" />
< 	</rule>
< 	<rule id="vbox7.com">
< 		<if_url ref="url" host="vbox7.com" />
< 		<rule>
< 			<if_re ref="vidid" re="vbox7\.com/play:([a-fA-F0-9]+)" string="${url.url}" />
< 			<download url="http://www.vbox7.com/play/magare.do" post="onLoad=%5Btype%20Function%5D&amp;vid=${vidid.1}">
< 				<if_re ref="vid" re="&amp;videoFile=(http[^&amp;]+)&amp;" />
< 				<media url="${vid.1}" title="${origtitle.innerHTML}" thumbnail="http://i.vbox7.com/p/${vidid.1}1.jpg" type="flv" />
< 			</download>
< 		</rule>
< 	</rule>
< 	<!--
< 		The current flashblock workaround is to:
< 		 * re-download page
< 			 * This is just a GET of the url, so POSTed pages dont work (not that we'd want to refetch them anyway
< 			 * Dynamically made changes are lost
< 			 * it's slower!
< 		 * Run <each_element> on it
< 			 * Each_element runs slowly in this situation because it's a regular expression
< 			 * ${embedelem.innerHTML} won't work
< 		This also work around scripts
< 	-->
< 	<download id="flashblock_workaround" url="${.url}">
< 		<rule id="each_embed">
< 			<each_element ref="embedelem" tagname="embed" require_attrs="src" attrs="flashvars">
< 				<rule>
< 					<!-- guesses applicable anywhere -->
< 					<rule id="all_embed">
< 						<!-- normally swf files, can be any embed -->
< 						<!-- lets not use page title (origtitle.innerHTML) because we're not too certain of this one -->
< 						<media url="${embedelem.src}" certainty="low" description="${translate:embedplayer}" />
< 					</rule>
< 					<rule id="embed_with_media_ext">
< 						<!-- this is an embedded media file, PROBABLY with a sane filename already, so we won't set title to origtitle.innerHTML -->
< 						<if_ext is_media="yes" filename="${embedelem.src}" />
< 						<media url="${embedelem.src}" certainty="mid" />
< 					</rule>
< 					<rule id="generic_flashvars">
< 						<each_re ref="queryparam" string="${embed.flashvars}" re="([^&amp;]+)=([^&amp;]+)">
< 							<rule>
< 								<if_re string="${queryparam.2}" re="\.flv(?:\?|#|;|$)" />
< 								<media url="${queryparam.2}" type="flv" certainty="mid" title="${origtitle.innerHTML}" />
< 							</rule>
< 						</each_re>
< 					</rule>
< 				</rule>
< 				<rule id="magnatune.com.embed">
< 					<if_re ref="playlisturl" string="${embedelem.src}"> magnatune\.com.*[&amp;\?]playlist_url=([^&amp;]+) </if_re>
< 					<playlist url="${playlisturl.1}">
< 						<rule id="xspf">
< 							<each_re ref="track" re="&lt;track&gt;([\s\S]*?)&lt;/track&gt;" flags="m">
< 								<if_re ref="loc" string="${track.1}"> &lt;location&gt;(.*?)&lt;/location&gt; </if_re>
< 								<optional_re ref="image" string="${track.1}"> &lt;image&gt;(.*?)&lt;/image&gt; </optional_re>
< 								<optional_re ref="ann" string="${track.1}"> &lt;annotation&gt;(.*?)&lt;/annotation&gt; </optional_re>
< 								<media url="${loc.1}" description="${ann.1}" thumbnail="${image.1}" />
< 							</each_re>
< 						</rule>
< 					</playlist>
< 				</rule>
< 				<rule id="embed.metacafe">
< 					<!-- TODO unchecked -->
< 					<if_url ref="url" host="metacafe.com" />
< 					<media
< 						url="${qparam:mediaURL:embedelem.flashvars}?__gda__=${urlencode:qparam:gdaKey:embedelem.flashvars}"
< 						description="${qparam:description:embedelem.flashvars}"
< 						thumbnail="${qparam:staticURL:embedelem.flashvars}/thumb/${qparam:itemID:embedelem.flashvars}.jpg"
< 						/>
< 				</rule>
< 				<rule id="embed.video.google.com-2010">
< 					<if_re ref="docid" string="${embedelem.src}" re="video\.google\.com.*docid=(\d+)(&amp;|$)" />
< 					<download url="http://video.google.com/videoplay?docid=${docid.1}">
< 						<optional_element ref="origtitle" tagname="title" require_attrs="innerHTML" />
< 						<rule goto="noembed.video.google.com" />
< 					</download>
< 				</rule>
< 				<rule id="embed.vimeo.com" >
< 					<if_re ref="vimeoscript" string="${embedelem.src}" re="vimeo\.com/moogaloop\.swf\?clip_id=(\d+)&amp;" />
< 					<rule goto="vimeodownload" />
< 				</rule>
< 				<rule id="embed.megavideo.com">
< 					<if_re ref="videoid" string="${embedelem.src}" re="megavideo\.com/(?:.*/)?mv_player\.swf\?(?:.*&amp;)?v=([^&amp;]+)(?:&amp;|$)" />
< 					<download url="http://www.megavideo.com/?v=${videoid.1}">
< 						<rule goto="megavideo.com" />
< 					</download>
< 				</rule>
< 				<rule id="embed.adultmult.ru">
< 					<!-- TODO unchecked -->
< 					<if_url host="adultmult.ru" />
< 					<media url="${qparam:file:embedelem.flashvars}" thumbnail="${qparam:image:embedelem.flashvars}" type="flv" />
< 				</rule>
< 				<rule id="rutube.ru-embed-2010">
< 					<if_re ref="v" string="${embedelem.src}" re="^http://video\.rutube\.ru/([0-9a-fA-F]+)" />
< 					<rule goto="rutube-from-id" />
< 				</rule>
< 				<rule id="embed.xvidoes">
< 					<!-- also normal site -->
< 					<if_re re="xvideos\.com" string="${embedelem.src}" />
< 					<optional_re ref="title" re="&lt;strong&gt;([^&lt;&gt;]+)&lt;/strong&gt;&lt;strong&gt; \- &lt;/strong&gt;\s*\d+ min" />
< 					<media url="${qparam:flv_url:htmldecode:embedelem.flashvars}" thumbnail="${qparam:url_bigthumb:htmldecode:embedelem.flashvars}" type="flv" title="${either:title.1:origtitle.innerHTML}" />
< 				</rule>
< 				<rule id="embed.videmo">
< 					<!-- TODO unchecked -->
< 					<!-- for embedded players and the site iself -->
< 					<if_re ref="vid" re="embed\.vidoemo\.com\/video\d+\/([A-Za-z0-9_-]+)$" string="${embedelem.src}" />
< 					<download url="http://embed.vidoemo.com/player/vidoemo4.php?id=${vid.1}">
< 						<if_re ref="flvpath" re="Name=&quot;FLVPath&quot;\s+Value=&quot;(https?://[^&quot;]+)&quot;" />
< 						<media url="${flvpath.1}" type="flv" />
< 					</download>
< 				</rule>
< 				<rule id="embed.myspace-2010-lads">
< 					<if_re string="${embedelem.src}" re="lads\.myspace\.com/videos/c\.swf.*m=(\d+)&amp;" ref="m" />
< 					<rule goto="embed.myspace" />
< 				</rule>
< 				<rule id="embed.myspace-2010-mservice">
< 					<if_re string="${embedelem.src}" re="mediaservices\.myspace\.com/services/media/embed.aspx/m=(\d+)," ref="m" />
< 					<rule id="embed.myspace">
< 						<download url="http://mediaservices.myspace.com/services/rss.ashx?videoID=${m.1}&amp;type=video">
< 							<optional_element ref="title" tagname="myspace:videodescription" attrs="innerHTML" />
< 							<optional_element ref="thumb" tagname="media:thumbnail" attrs="url" />
< 							<if_element ref="content" tagname="media:content" require_attrs="url" />
< 							<media url="${content.url}" thumbnail="${thumb.url}" type="flv" title="${title.innerHTML}" />
< 						</download>
< 					</rule>
< 				</rule>
< 			</each_element>
< 		</rule>
< 		<rule id="each_param">
< 			<each_element tagname="param" ref="p" require_attrs="name,value">
< 				<rule id="generic_param">
< 					<if_re string="${p.name}" flags="i" re="(?:filename|url|movie)" />
< 					<rule id="all_param">
< 						<media url="${p.value}" certainty="low" />
< 					</rule>
< 					<rule id="media_param">
< 						<if_ext is_media="yes" filename="${p.value}" />
< 						<media url="${p.value}" certainty="mid" />
< 					</rule>
< 					<rule id="dailyshow">
< 						<!-- name=movie -->
< 						<if_re ref="mgid" re="^http://media\.mtvnservices\.com/(mgid:.*)$" string="${p.value}" />
< 						<download url="http://media.mtvnservices.com/player/config.jhtml?uri=${urlencode:mgid.1}" geolocate="US">
< 							<each_re ref="item" re="&lt;item&gt;([\s\S]*?)&lt;/item&gt;">
< 								<optional_re ref="title" string="${item.1}" re="&lt;title&gt;\s*(.*?)\s*&lt;/title&gt;" />
< 								<if_element ref="xmlurl" require_attrs="url" tagname="media:content" string="${item.1}" />
< 								<download url="${xmlurl.url}">
< 									<each_re ref="rend" re="&lt;rendition[^&lt;&gt;]*?bitrate=&quot;(\d+)&quot;[\s\S]*?&lt;src&gt;\s*(rtmpe?|http)://(.*?)\s*&lt;/src&gt;">
< 										<!-- this gives an rtmpe link -->
< 										<rule>
< 											<if_re re="^(1720)$" string="${rend.1}" />
< 											<media url="${rend.2}://${rend.3}" description="${optional:title.1} (${rend.1} bits/sec)" title="${either:title.1:origtitle.innerHTML}" type="flv" quality="high" />
< 										</rule>
< 										<rule>
< 											<if_re re="^(450)$" string="${rend.1}" />
< 											<media url="${rend.2}://${rend.3}" description="${optional:title.1} (${rend.1} bits/sec)" title="${either:title.1:origtitle.innerHTML}" type="flv" quality="low" />
< 										</rule>
< 										<rule>
< 											<ifnot_re re="^(1720|450)$" string="${rend.1}" />
< 											<media url="${rend.2}://${rend.3}" description="${optional:title.1} (${rend.1} bits/sec)" title="${either:title.1:origtitle.innerHTML}" type="flv" />
< 										</rule>
< 									</each_re>
< 								</download>
< 							</each_re>
< 						</download>
< 					</rule>
< 				</rule>
< 				<rule id="metacafe-param-2010">
< 					<if_url host="metacafe.com" />
< 					<if_equal a="${p.name}" b="flashvars" />
< 					<media url="${qparam:mediaURL:p.value}?__gda__=${qparam:gdaKey:p.value}" mediaid="metacafe-${qparam:itemID:p.value}" title="${urldecode:qparam:title:p.value}" type="flv" />
< 				</rule>
< 			</each_element>
< 		</rule><!-- each param -->
< 		<!-- other rules which need re-download -->
< 		<rule id="generic-flv-urlencoded">
< 			<!-- eg: redtube.com -->
< 			<if_re ref="loc" re="[&amp;\?&quot;](?:[a-z0-9_-]+=)?(http%3A%2F%2F[a-z0-9%_\.-]+\.flv(?:%3F[a-z0-9%_\.-]*)?)[&amp;&quot;']" flags="i" />
< 			<ifnot_url host="metacafe.com" />
< 			<media url="${urldecode:loc.1}" type="flv" title="${origtitle.innerHTML}" certainty="mid" />
< 		</rule>
< 		<rule id="generic-flv-quot">
< 			<if_re ref="loc" re="[&quot;']((?:[a-z0-9]+://[^&quot;']+)?/[^&quot;']+\.(flv|mp4|mp3)(?:\?[^&quot;']+)?)[&quot;']" flags="i" />
< 			<ifnot_url host="metacafe.com" />
< 			<media url="${loc.1}" type="${loc.2}" title="${origtitle.innerHTML}" certainty="mid" />
< 		</rule>
< 		<rule id="youtube.com">
< 			<if_url ref="url" host="youtube.com" />
< 			<rule id="youtube-single" target="youtube-single">
< 				<if_re ref="fmt_stream_map" re="&amp;fmt_stream_map=([^&amp;]+)" />
< 				<optional_re ref="title" re="&lt;title&gt;\s*YouTube\s+\-\s+(.*)\s*&lt;/title&gt;" />
< 				<optional_re ref="video_id" re="&lt;input type=&quot;hidden&quot; name=&quot;video_id&quot; value=&quot;([^&quot;]+)&quot; /&gt;" />
< 				<each_re ref="fmt_part" string="${urldecode:fmt_stream_map.1}" re="([^,]+)">
< 					<if_re ref="fmt_url" re="^(\d+)\|(http[^\|]+)(?:\|.*)?$" string="${fmt_part.1}" />
< 					<rule>
< 						<if_re string="${fmt_url.1}" re="^(22)$" />
< 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 							quality="very-high" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
< 							description="${translate:hd_quality} - ${optional:title.1}" type="mp4" />
< 					</rule>
< 					<rule>
< 						<if_re string="${fmt_url.1}" re="^(5)$" />
< 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 							quality="low" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
< 							description="${translate:low_quality} - ${optional:title.1}" type="flv" />
< 					</rule>
< 					<rule>
< 						<if_re string="${fmt_url.1}" re="^(34|4)$" />
< 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 							quality="mid" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
< 							description="${translate:mid_quality} - ${optional:title.1}" type="flv" />
< 					</rule>
< 					<rule>
< 						<if_re string="${fmt_url.1}" re="^(18)$" />
< 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 							quality="mid" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
< 							description="${translate:mid_quality} (mp4) - ${optional:title.1}" type="mp4" />
< 					</rule>
< 					<rule>
< 						<if_re string="${fmt_url.1}" re="^(35)$" />
< 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 							quality="mid" title="${either:title.1:origtitle.innerHTML}" mediaid="${video_id.1}"
< 							description="${translate:high_quality} - ${optional:title.1}" type="flv" />
< 					</rule>
< 					<rule>
< 						<ifnot_re string="${fmt_url.1}" re="^(4|5|18|22|34|35)$" />
< 						<media url="${fmt_url.2}" thumbnail="http://i4.ytimg.com/vi/${video_id.1}/default.jpg"
< 							description="Unknown quality code ${fmt_url.1} - ${optional:title.1}" type="flv" />
< 					</rule>
< 				</each_re>
< 			</rule>
< 			<rule id="youtube-channel">
< 				<!-- click the "see all uploads" link -->
< 				<if_re string="${url.path}" ref="username" re="^/user/([^#\?]+)" />
< 				<optional_re ref="session" re="window.ajax_session_info = 'session_token=(.*?)';" />
< 				<download url="http://www.youtube.com/profile_ajax?action_ajax=1&amp;user=${urlencode:username.1}&amp;new=1&amp;box_method=load_playlist&amp;box_name=user_playlist_navigator&amp;playlistName=uploads&amp;sort=default" post="session_token=${optional:urlencode:session.1}&amp;messages=%5B%7B%22type%22%3A%22box_method%22%2C%22request%22%3A%7B%22name%22%3A%22user_playlist_navigator%22%2C%22x_position%22%3A1%2C%22y_position%22%3A-2%2C%22palette%22%3A%22default%22%2C%22method%22%3A%22load_playlist%22%2C%22params%22%3A%7B%22playlist_name%22%3A%22uploads%22%2C%22view%22%3A%22play%22%2C%22playlist_sort%22%3A%22default%22%7D%7D%7D%5D">
< 					<each_re re="&lt;div id=\\&quot;playnav\-play\-uploads\-page\-(\d+)\\&quot;" ref="pagenum">
< 						<!-- lets limit this to top few pages so we don't get an insane (or unlimited!) number of results (although we hit our download limit eventually...) -->
< 						<if_re string="_${pagenum.1}_" re="_[0-3]_" />
< 						<download url="http://www.youtube.com/profile_ajax?action_ajax=1&amp;user=${urlencode:username.1}&amp;new=1&amp;box_method=load_playlist_page&amp;box_name=user_playlist_navigator" post="session_token=${optional:session.1}&amp;messages=%5B%7B%22type%22%3A%22box_method%22%2C%22request%22%3A%7B%22name%22%3A%22user_playlist_navigator%22%2C%22x_position%22%3A1%2C%22y_position%22%3A-2%2C%22palette%22%3A%22default%22%2C%22method%22%3A%22load_playlist_page%22%2C%22params%22%3A%7B%22playlist_name%22%3A%22uploads%22%2C%22encrypted_playlist_id%22%3A%22uploads%22%2C%22query%22%3A%22%22%2C%22encrypted_shmoovie_id%22%3A%22uploads%22%2C%22page_num%22%3A${pagenum.1}%2C%22view%22%3A%22play%22%2C%22playlist_sort%22%3A%22default%22%7D%7D%7D%5D">
< 							<each_re ref="link" re="&lt;a href=\\&quot;\\/(watch\?v=[^&quot;]+)\\&quot; class=\\&quot;playnav-item-title">
< 								<download url="http://www.youtube.com/${jsdecode:link.1}">
< 									<rule goto="youtube-single" />
< 								</download>
< 							</each_re>
< 						</download>
< 					</each_re>
< 				</download>
< 			</rule>
< 		</rule>
< 		<rule id="embed-youtube-2010">
< 			<each_re ref="video_id" re="http://(?:www\.)?youtube\.com/v/([a-zA-Z0-9_\-]+)">
< 				<download url="http://www.youtube.com/watch?v=${video_id.1}">
< 					<rule goto="youtube-single" />
< 				</download>
< 			</each_re>
< 		</rule>
< 		<rule id="alluc.org">
< 			<if_url ref="url" host="alluc.org" />
< 			<rule>
< 				<if_re string="${url.path}" re="^(/.*/)[^/]+$" ref="firstpath" />
< 				<each_re ref="hcvalue" re="&lt;a href=&quot;([^/&quot;][^&quot;]+/watch\d+\.html\?hc=[^&quot;]+)&quot; target=&quot;_blank&quot; title=">
< 					<download url="http://${url.host}${firstpath.1}${htmldecode:hcvalue.1}">
< 						<rule goto="*" />
< 					</download>
< 				</each_re>
< 			</rule>
< 		</rule>
< 		<rule id="darktube.com">
< 			<!-- TODO unchecked -->
< 			<if_url host="darktube.com" />
< 			<if_re ref="vid"> addVariable\(&quot;content_video&quot;,\s*&quot;([^&quot;]+)&quot;\) </if_re>
< 			<optional_re ref="thumb"> &quot;unit_long(\d+)&quot; </optional_re>
< 			<media url="http://media.darktube.com/${vid.1}" thumbnail="http://ss.darktube.com/thumbs/${thumb.1}.jpg" />
< 		</rule>
< 		<rule id="itsyourporn">
< 			<!-- TODO unchecked -->
< 			<if_url inhost="playah." />
< 			<if_re ref="loc" re="autoStart=true&amp;phpPath=(playah.*?com)&amp;movieName=(movies/.*?\.flv)" />
< 			<media url="http://${loc.1}/flvstream.php?file=${loc.2}&amp;position=0" type="flv" description="Flash video stream" />
< 		</rule>
< 		<rule id="2.dailymotion.com">
< 			<!-- TODO unchecked -->
< 			<if_url host="dailymotion.com"/>
< 			<if_re ref="urllist" re="addVariable\(&quot;video&quot;,\s*&quot;([^&quot;]+?)&quot;\)" />
< 			<optional_re ref="thumb" re="addVariable\(&quot;preview&quot;,\s*&quot;([^&quot;]+?)&quot;\)" />
< 			<each_re ref="urlitem" string="${urldecode:urllist.1}" re="(?:^|\|)(.*?)@@(.*?)(?:$|\|)">
< 				<rule id="2.dailymotion.com.spark">
< 					<if_equal a="${urlitem.2}" b="spark" />
< 					<media url="${urlitem.1}" description="${translate:mid_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="flv" />
< 				</rule>
< 				<rule id="2.dailymotion.com.spak-mini">
< 					<if_equal a="${urlitem.2}" b="spak-mini" />
< 					<media url="${urlitem.1}" description="${translate:low_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="flv" />
< 				</rule>
< 				<rule id="2.dailymotion.com.v6-hd">
< 					<if_equal a="${urlitem.2}" b="vp6-hd" />
< 					<media url="${urlitem.1}" description="${translate:hd_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="vp6" />
< 				</rule>
< 				<rule id="2.dailymotion.com.vp6-hq">
< 					<if_equal a="${urlitem.2}" b="vp6-hq" />
< 					<media url="${urlitem.1}" description="${translate:high_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="vp6" />
< 				</rule>
< 				<rule id="2.dailymotion.com.vp6">
< 					<if_equal a="${urlitem.2}" b="vp6" />
< 					<media url="${urlitem.1}" description="${translate:mid_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="vp6" />
< 				</rule>
< 				<rule id="2.dailymotion.com.h264">
< 					<if_equal a="${urlitem.2}" b="h264" />
< 					<media url="${urlitem.1}" description="${translate:mid_quality} - ${urlitem.2}" thumbnail="${urldecode:thumb.1}" type="h264" />
< 				</rule>
< 				<rule id="2.dailymotion.com.default">
< 					<!-- catch-all which duplicates all of those above -->
< 					<media url="${urlitem.1}" description="${urlitem.2}" thumbnail="${urldecode:thumb.1}" />
< 				</rule>
< 			</each_re>
< 		</rule>
< 		<rule>
< 			<!-- TODO unchecked -->
< 			<if_url host="sevenload.com" />
< 			<if_re ref="configpath" re="&lt;param name=&quot;flashVars&quot; value=&quot;configPath=(http%3A%2F%2Fflash.sevenload.com[^&quot;]+)&quot;" />
< 			<download url="${urldecode:configpath.1}">
< 				<each_re ref="loc" re="&lt;location[^&gt;]*&gt;\s*([^&lt;]+)\s*&lt;/location&gt;">
< 					<media url="${loc.1}" />
< 				</each_re>
< 			</download>
< 		</rule>
< 		<rule id="addvariable">
< 			<!-- TODO unchecked -->
< 			<!--
< 			Applies to many sites:
< 				* xn-/-hentaienespaol-1nb.com
< 				* xhamster.com
< 				* www.movshare.net
< 			-->
< 			<each_re ref="video" re="(addParam|addVariable)\s*\(\s*[&quot;'](file|content_video|video)[&quot;']\s*,\s*[&quot;'](.*?)[&quot;']\s*\)">
< 				<optional_re ref="thumbnail">(addParam|addVariable)\s*\(\s*[&quot;'](image|thumbnail)[&quot;']\s*,\s*[&quot;'](.*?)[&quot;']\s*\) </optional_re>
< 				<rule>
< 					<!-- same server == default -->
< 					<ifnot_url host="xhamster.com" />
< 					<media url="${video.3}" thumbnail="${thumbnail.3}" />
< 				</rule>
< 				<rule>
< 					<if_url host="xhamster.com" />
< 					<if_re ref="srv"> addVariable\('srv','([^']+)'\) </if_re>
< 					<media url="http://dl${srv.1}.xhamster.com/flv2/${video.3}" thumbnail="${thumbnail.3}" />
< 				</rule>
< 			</each_re>
< 		</rule>
< 		<rule id="vidz-sample">
< 			<!-- TODO unchecked -->
< 			<if_url host="vidz.com" />
< 			<if_re ref="vid" re="&quot;http://phone\.vidz\.com/(.*?)\.3gp&quot;" />
< 			<media url="http://phone.vidz.com/${vid.1}.3gp" description="${translate:low_quality} (3gp / phone)" type="3gp" />
< 			<media url="http://streaming.vidz.com/${vid.1}.flv" description="${translate:mid_quality}" type="flv" />
< 		</rule>
< 		<rule id="pornhub.com">
< 			<!-- TODO unchecked -->
< 			<!-- pornhub, extremetube, etc -->
< 			<if_re ref="vidid" re="&lt;param name=&quot;FlashVars&quot; value=&quot;options=(http://[^/]+/embed_player\.php\?id=\d+)&quot;/&gt;" />
< 			<!--<if_re ref="vidid" re="&lt;input type=&quot;hidden&quot; id=&quot;video_0&quot; value=&quot;(\d+)&quot;/>" />-->
< 			<optional_element tagname="h1" require_attrs="innerHTML" ref="h1" />
< 			<download url="${vidid.1}">
< 				<if_element ref="flv_url" tagname="flv_url" require_attrs="innerHTML" />
< 				<rule>
< 					<optional_re string="${flv_url.innerHTML}" ref="thumbpart" re="/videos/(\d+/\d+/\d+)/\d+\.flv$" />
< 					<media url="${flv_url.innerHTML}" type="flv" thumbnail="http://ph-pics.phncdn.com/thumbs/${thumbpart.1}/small.jpg" title="${either:h1.innerHTML:origtitle.innerHTML}" />
< 				</rule>
< 			</download>
< 		</rule>
< 		<rule id="youku.com.2010">
< 			<if_url ref="url" inhost="youku.com" />
< 			<if_re ref="videoid" re="var videoId\s*=\s*'([^']+)';" />
< 			<if_re ref="videoid2" re="var videoId2\s*=\s*'([^']+)';" />
< 			<optional_re ref="title" re="&lt;span class=&quot;name&quot;&gt;([^&lt;&gt;]+)&lt;/span&gt;\s*&lt;/h1&gt;" />
< 			<download url="http://v.youku.com/player/getPlayList/VideoIDS/${videoid2.1}/timezone/+01/version/5/source/video?password=&amp;ran=${randomint:4}&amp;n=3">
< 				<optional_re ref="thumbnail" re="&quot;logo&quot;:&quot;(http[^&quot;]+)&quot;" />
< 				<if_re ref="seed" re="&quot;seed&quot;:(\d+)," />
< 				<if_re ref="key1" re="&quot;key1&quot;:&quot;([^&quot;]+)&quot;," />
< 				<if_re ref="key2" re="&quot;key2&quot;:&quot;([^&quot;]+)&quot;," />
< 				<rule>
< 					<if_re ref="flvstreamid" re="&quot;flv&quot;:&quot;([\d\*]+\*)&quot;" />
< 					<if_re ref="flvarray" re="&quot;flv&quot;:\[(\{&quot;no&quot;:[^\]]+)\]" />
< 					<each_re ref="piece" re="\{&quot;no&quot;:&quot;?(\d+)&quot;?," string="${flvarray.1}">
< 						<media url="${youku:flv:key1.1:key2.1:seed.1:flvstreamid.1:piece.1}" thumbnail="${jsdecode:thumbnail.1}" description="Part ${piece.1} (flv)" type="flv" title="${either:title.1:origtitle.innerHTML}-${piece.1}" />
< 					</each_re>
< 				</rule>
< 				<rule>
< 					<if_re ref="mp4streamid" re="&quot;mp4&quot;:&quot;([\d\*]+\*)&quot;" />
< 					<if_re ref="mp4array" re="&quot;mp4&quot;:\[(\{&quot;no&quot;:[^\]]+)\]" />
< 					<each_re ref="piece" re="\{&quot;no&quot;:&quot;?(\d+)&quot;?," string="${mp4array.1}">
< 						<media url="${youku:mp4:key1.1:key2.1:seed.1:mp4streamid.1:piece.1}" thumbnail="${jsdecode:thumbnail.1}" description="Part ${piece.1} (mp4)" type="mp4" title="${either:title.1:origtitle.innerHTML}-${piece.1}" />
< 
< 					</each_re>
< 				</rule>
< 			</download>
< 		</rule>
< 		<rule id="supernovatube.com">
< 			<!-- TODO unchecked -->
< 			<if_url host="supernovatube.com" />
< 			<if_re ref="param" tagname="script"> so\.addVariable\("file",\s*"(http://[^"]+)"\) </if_re>
< 			<media url="${param.1}" type="flv" />
< 		</rule>
< 		<rule id="spankwire.com">
< 			<if_url host="spankwire.com" ref="loc" />
< 			<rule>
< 				<if_re ref="playlist" re="videoPath: &quot;\.\./(PlaylistXml\.aspx%3Fid=[^&quot;]+)&quot;" />
< 				<download url="http://static.spankwire.com/Controls/UserControls/Players/v3/${urldecode:playlist.1}">
< 					<each_element ref="xmlurl" tagname="url" require_attrs="innerHTML">
< 						<media url="${xmlurl.innerHTML}" title="${origtitle.1}" />
< 					</each_element>
< 				</download>
< 			</rule>
< 		</rule>
< 	</download><!-- flashblock workaround -->
< 	<!--
< 	Lower priority
< 	-->
< 	<!-- TODO
< 	this rule really slows down the search - can cause page to freeze for a moment.
< 	the each_element has slow="yes" which limits this to pages with a DOM (ie the start page only).
< 	it's also marked as defer, in case that is supported
< 	-->
< 	<rule id="generic_link" defer="yes">
< 		<each_element ref="alink" tagname="a" require_attrs="href" attrs="innerHTML" slow="yes">
< 			<rule id="generic_media_link">
< 				<if_ext is_media="yes" filename="${alink.href}" />
< 				<media url="${alink.href}" description="${alink.innerHTML}" certainty="mid" />
< 			</rule>
< 			<rule id="wikipedia.org-link">
< 				<if_re ref="wplink" string="${alink.href}" re="^/(wiki)/(Media|Image|File|Fichier|Datei|ファイル|Archivo|Файл|Ficheiro|Plik):(.*)\.(ogg|mp3|ogv|oga)$" />
< 				<media url="/${wplink.1}/Special:FilePath/${wplink.3}.${wplink.4}" title="${wplink.3}" type="${wplink.4}" description="Download ${wplink.3}" />
< 			</rule>
< 			<rule id="a.multiply.com">
< 				<!-- replace this with flash player one. -->
< 				<if_url host="multiply.com" />
< 				<if_re string="${qparam:xurl:alink.href}"> /playlist/ </if_re>
< 				<playlist url="${qparam:xurl:alink.href}" type="m3u">
< 					<each_re ref="m3u" re="(.+)">
< 						<media url="${m3u.1}" />
< 					</each_re>
< 				</playlist>
< 			</rule>
< 		</each_element>
< 	</rule>
< 	<!--
< 	=====================================================================
< 	NOTICE: rules below this line are for testing only
< 	=====================================================================
< 	-->
< 	<rule id="show_all">
< 		<if_config name="show_all" value="true" />
< 		<rule id="test_only">
< 			<media url="http://example.com/example_result" description="You have enabled showing additional results." post="NODOWNLOAD" />
< 		</rule>
< 	</rule>
< </unplug>
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/search/rules.js releases/unplug-2.03/source/chrome/content/search/rules.js
1,615d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< 
< UnPlug2Rules = {
< 	/*
< 	 * Executes an if_* statement.
< 	 * statement_name should not begin with "if_"
< 	 * If there isn't a suitable if_* statement, one will be made by returning the result from appropriate each_* functions
< 	 */
< 	exec_if : function (statement_name, node, variables, url, text, doc) {
< 		var rule = UnPlug2Rules.get_rule("if_" + statement_name);
< 		
< 		// if no <if...>, try and return the first part of the <each...> statement.
< 		if (!rule) {
< 			// response list is already prefixed variables with ref
< 			var response_list = UnPlug2Rules.exec_each(statement_name, node, variables, url, text, doc);
< 			if (response_list.length < 1)
< 				throw statement_name + " returned empty list"
< 			return response_list[0];
< 		}
< 		
< 		// exec the <if...>
< 		var response = UnPlug2Rules.exec_statement(rule, node, variables, url, text, doc);
< 		
< 		// valid responses: true, false, object_of_new_variables_without_prefixes
< 		if (response == false)
< 			// throw statement_name + " returned false";
< 			return false;
< 		if (response == true)
< 			return {};
< 		if (rule.apply_ref) {
< 			var ref = node.getAttribute("ref");
< 			return UnPlug2Rules._prefix_variables(ref, response);
< 		}
< 		// without apply_ref set this responds by exporting variables without the prefix!
< 		// TODO - is this right behaviour?
< 		return response;
< 	},
< 	
< 	/*
< 	 * Executes an ifnot_* statement.
< 	 * statement_name should not begin with "ifnot_"
< 	 * An ifnot_* statement is executes.
< 	 * If there's no if_* statement, the if_* (or each_*) statement is executed, and the opposite is returned. If <if_*> throws an exception, <ifnot_*> treats this as being true.
< 	 */
< 	exec_ifnot : function (statement_name, node, variables, url, text, doc) {
< 		var rule = UnPlug2Rules.get_rule("ifnot_" + statement_name);
< 		if (rule) {
< 			return (UnPlug2Rules.exec_statement(rule, node, variables, url, text, doc) !== false);
< 		}
< 		
< 		try {
< 			return (!UnPlug2Rules.exec_if(statement_name, node, variables, url, text, doc));
< 		} catch (e) {
< 			return true;
< 		}
< 	},
< 	
< 	/*
< 	 * Executes an optional_* statement.
< 	 * statement_name should not begin with "optional_"
< 	 * This is actually just a wrapper for if_* statements.
< 	 */
< 	exec_optional : function (statement_name, node, variables, url, text, doc) {
< 		try {
< 			return UnPlug2Rules.exec_if(statement_name, node, variables, url, text, doc);
< 		} catch (e) {
< 			// it's optional, we don't care about failure.
< 		}
< 	},
< 	
< 	/*
< 	 * Executes an each_* statement.
< 	 * statement_name should not begin with "each_"
< 	 */
< 	exec_each : function (statement_name, node, variables, url, text, doc) {
< 		var rule = UnPlug2Rules.get_rule("each_" + statement_name);
< 		var response_list = UnPlug2Rules.exec_statement(rule, node, variables, url, text, doc);
< 		var ref = node.getAttribute("ref");
< 		for (var i=0; i < response_list.length; i++) {
< 			if (!rule.apply_ref) {
< 				// without apply_ref set this responds by exporting variables without the prefix!
< 				// TODO - is this right behaviour?
< 				// pass -- just leave as is
< 			} else  {
< 				response_list[i] = UnPlug2Rules._prefix_variables(ref, response_list[i]);
< 			}
< 		}
< 		return response_list;
< 	},
< 	
< 	/*
< 	 * Return an object describing the rule
< 	 */
< 	get_rule : function (rulename) {
< 		return UnPlug2Rules[rulename];
< 	},
< 	
< 	/*
< 	 * Private.
< 	 * puts "ref" in front of results
< 	 */
< 	_prefix_variables : function (ref, response) {
< 		if (!ref)
< 			return {};
< 		var response_with_ref = {};
< 		for (k in response) {
< 			response_with_ref[ref + "." + k] = response[k];
< 		}
< 		return response_with_ref;
< 	},
< 	
< 	/**
< 	 * Execute a statement.
< 	 * 
< 	 * IMPORTANT: You should not normally call this function - instead you should call the exec_if(), exec_optional() or exec_each() functions as appropriate.
< 	 * 
< 	 * This will return an object containing new variables which are not prefixed by $ref, or throw on failure.
< 	 * Rule is one of the rules, which you can get with get_rule().
< 	 * node is the dom element of the statement from rules.xml (so we can get attributes)
< 	 * variables is the variables available to this scope
< 	 */
< 	exec_statement : function (rule, node, variables, url, text, doc) {
< 		if (!rule)
< 			throw "Rule " + rule + " is not a rule which has been implemented in " + UnPlug2.version + " " + UnPlug2.revision;
< 		if (node.hasAttribute("debug")) {
< 			alert("Rule: " + rule + " Node: " + node + "\nVar: " + variables.toSource() + "\nUrl: " + url + "\nDoc: " + doc + "\n\n" + text);
< 		}
< 		
< 		// use rule.required and rule.optional to make a data object to feed to rule.execute
< 		var data = {}
< 		if (rule.required) {
< 			for (var i=0; i < rule.required.length; i++) {
< 				var attrname = rule.required[i];
< 				var value = null;
< 				if (attrname == "innerHTML") {
< 					value = UnPlug2.trim(node.textContent);
< 				} else {
< 					value = node.getAttribute(attrname);
< 				}
< 				if (!value)
< 					throw "Attribute " + attrname + " required";
< 				data[attrname] = variables.subst(value);
< 			}
< 		}
< 		if (rule.optional) {
< 			for (var i=0; i < rule.optional.length; i++) {
< 				var attrname = rule.optional[i];
< 				var value = null;
< 				if (attrname == "innerHTML") {
< 					value = UnPlug2.trim(node.textContent);
< 				} else {
< 					value = node.getAttribute(attrname);
< 				}
< 				try {
< 					data[attrname] = variables.subst(value ? value : "");
< 				} catch (e) {
< 					// problems substing variables is fine as it's optional
< 					// eg <media thumbnail="..."> - errors substing thumbnail won't take down rule.
< 					data[attrname] = "";
< 				}
< 			}
< 		}
< 		// exec function - may throw, return true or false, or return an object
< 		return rule.execute(data, url, text, doc);
< 	},
< 	
< 	/**
< 	 * Reurns true if name is not an empty string
< 	 */
< 	if_isset : {
< 		order     : 0,
< 		optional  : ["name"],
< 		execute   : function (data, url, text, doc) {
< 			if (data.name)
< 				return true;
< 			return false;
< 		}
< 	},
< 	
< 	/*
< 	 * Returns true if min <= unplug_version < max
< 	 * Also returns true if unplug_version is null.
< 	 */
< 	if_version : {
< 		order     : 10,
< 		optional  : ["min", "max"],
< 		execute   : function (data, url, text, doc) {
< 			if (data.min && UnPlug2.version < parseFloat(data.min))
< 				return false;
< 			if (data.max && UnPlug2.version >= parseFloat(data.max))
< 				return false;
< 			return true;
< 		}
< 	},
< 	
< 	/*
< 	 * Returns true if min <= unplug_revision < max
< 	 */
< 	if_revision : {
< 		// order decides which rule is done first. if_ is done 0..100; download/media/etc 500...600
< 		order     : 10,
< 		optional  : ["min", "max"],
< 		execute   : function (data, url, text, doc) {
< 			if (UnPlug2.revision == null)
< 				return true;
< 			if (data.min && UnPlug2.revision < parseFloat(data.min))
< 				return false;
< 			if (data.max && UnPlug2.revision >= parseFloat(data.max))
< 				return false;
< 			return true;
< 		}
< 	},
< 	
< 	/*
< 	 * Returns if config variable "name" is set to "value"
< 	 */
< 	if_config : {
< 		order     : 10,
< 		optional  : ["name", "value"],
< 		execute   : function (data, url, text, doc) {
< 			var prefvalue = String(UnPlug2.get_pref(data.name, ""))
< 			if (prefvalue == data.value)
< 				return true;
< 			return false;
< 		}
< 	},
< 
< 	/*
< 	 * Private.
< 	 * Takes the response to a RegExp.exec (or String.match) and creates an object containing {"1" : "subexpression 1 result", "2" : ... };
< 	 */
< 	_re_resp : function (re_resp) {
< 		if (!re_resp)
< 			return false; // no matches
< 		var result = {};
< 		for (var i=1; i < re_resp.length; i++)
< 			if (re_resp[i])
< 				result[i] = re_resp[i];			
< 		return result;
< 	},
< 	
< 	/*
< 	 * Matches a regular expression contained in innerHTML
< 	 */
< 	if_re : {
< 		order     : 90,
< 		optional  : ["string", "flags", "tagname", "innerHTML", "re"],
< 		apply_ref : true,
< 		execute   : function (data, url, text, doc) {
< 			if (!data.innerHTML && !data.re) {
< 				throw "Needs innerHTML or re in if_re";
< 			}
< 			
< 			var re = RegExp(data.re || data.innerHTML, data.flags);
< 			
< 			if (data.tagname && !doc)
< 				UnPlug2.log("No document for if_re with elemname - searching page");
< 			
< 			if (data.tagname && doc) {
< 				for each (elem in doc.getElementsByTagName(data.tagname)) {
< 					var r = UnPlug2Rules._re_resp(re.exec(elem.textContent));
< 					if (r) {
< 						return r;
< 					}
< 				}
< 				return false;
< 			} else {
< 				return UnPlug2Rules._re_resp(re.exec(data.string || text))
< 			}
< 		}
< 	},
< 	
< 	each_re : {
< 		order     : 90,
< 		required  : ["re"],
< 		optional  : ["string", "flags", "tagname"],
< 		apply_ref : true,
< 		execute   : function (data, url, text, doc) {
< 			var re = RegExp(data.re, data.flags + "g");
< 			var response = [];
< 			var texts = [];
< 			if (data.tagname && doc) {
< 				var elemlist = doc.getElementsByTagName(data.tagname);
< 				for each (elem in elemlist) {
< 					texts[texts.length] = elem.textContent;
< 				}
< 			} else {
< 				texts = [ data.string || text ];
< 			}
< 			for (var i = 0; i < texts.length; i++) {
< 				var rr;
< 				while (rr = re.exec(texts[i])) {
< 					response[response.length] = UnPlug2Rules._re_resp(rr);
< 				}
< 			}
< 			return response;
< 		}
< 	},
< 	
< 	/*
< 	 * Returns false
< 	 */
< 	if_false : {
< 		order     : 0,
< 		apply_ref : false,
< 		execute   : function (data, url, text, doc) {
< 			return false;
< 		}
< 	},
< 	if_true : {
< 		order     : 0,
< 		apply_ref : false,
< 		execute   : function (data, url, text, doc) {
< 			return true;
< 		}
< 	},
< 	
< 	/*
< 	 * Checks for equality
< 	 */
< 	if_equal : {
< 		order     : 1,
< 		required  : ["a", "b"],
< 		apply_ref : false,
< 		execute   : function (data, url, text, doc) {
< 			return ( data.a == data.b ) ? true : false;
< 		}
< 	},
< 	
< 	/*
< 	 * Checks the url.
< 	 */
< 	if_url : {
< 		order     : 20,
< 		optional  : [
< 			"inhost", // substring is in host
< 			"inurl",  // substring is in spec
< 			"inpath", // substring is in path
< 			"path",   // matches start of path
< 			"port",   // matches port exactly
< 			"host"],   // matches end of host in whole words
< 		apply_ref : true, // populate $ref = url.spec, $ref.host = url.host, etc....
< 		execute   : function (data, url, text, doc) {
< 			if (data.inhost) {
< 				if (url.host.indexOf(data.inhost) < 0)
< 					return false;
< 			}
< 			if (data.inurl) {
< 				if (url.spec.indexOf(data.inurl) < 0)
< 					return false;
< 			}
< 			if (data.inpath) {
< 				if (url.path.indexOf(data.inpath) < 0)
< 					return false;
< 			}
< 			if (data.port) {
< 				if (url.port != data.port)
< 					return false;
< 			}
< 			if (data.protocol) {
< 				if (url.scheme != data.protocol)
< 					return false;
< 			}
< 			if (data.path) {
< 				if (url.path.indexOf(data.path) != 0)
< 					return false;
< 			}
< 			if (data.host) {
< 				/*
< 				 * TODO - this isn't implemented properly
< 				 * examle of host
< 				 * eg: foo.com
< 				 * matches foo.com
< 				 * matches www.yay.foo.com
< 				 * doesn't match foo.com.nyud.net
< 				 * doesn't match xyay.com
< 				 * possibly matches yay.com.
< 				 */
< 				if (url.host.indexOf(data.host) < 0)
< 					return false;
< 			}
< 			var rtn = {
< 				"url"      : url.spec,
< 				"post"     : url.port,
< 				"path"     : url.path,
< 				"protocol" : url.scheme,
< 				"host"     : url.host }
< 			return rtn;
< 		}
< 	},
< 	
< 	/**
< 	 * When docs are not availaible, each_element calls this function
< 	 */
< 	_get_attrib_from_tagname_string : function (tag, attrib) {
< 		// attrib="value"
< 		// attrib='value'
< 		// var m = RegExp("\\b" + attrib + "=([\"\'])([^\\1]+)", "i").exec(tag); -- TODO why didn;t this work?
< 		var m = RegExp("\\b" + attrib + "=([\"\'])(.*?)\\1", "i").exec(tag);
< 		if (m)
< 			return m[2];
< 		// attrib=value
< 		var m = RegExp("\\b" + attrib + "=([^\\s]+)", "i").exec(tag);
< 		if (m)
< 			return m[1];
< 		return null;
< 	},
< 	
< 	/*
< 	 * Iterates over the dom elements in doc which match the specified pattern
< 	 */
< 	each_element : {
< 		order     : 70,
< 		optional  : [
< 			"tagname",
< 			"elemid",
< 			"require_attrs",
< 			"attrs",
< 			"string",
< 			"slow"],
< 		apply_ref : true,
< 		execute   : function (data, url, text, doc) {
< 			var search_with_dom = true;
< 			if (data.string || !doc)
< 				search_with_dom = false;
< 			// TODO - this next line should be configurable for flashblock/no flashblock and for about:config settings too!
< 			// TODO - and this is only really useful where we can get original source from cache
< 			if ((data.tagname == "embed" || data.tagname == "object") && false)
< 				search_with_dom = false;
< 			if (!search_with_dom) {
< 				UnPlug2.log("each_element works slowly when not given a document!");
< 				if (!data.tagname)
< 					throw "each_element requires a document or a tagname";
< 				// "slow" <each_element> tags, like searching all <a> anchors, is skipped because this is likely to be significantly worse performance than using the dom.
< 				if (data.slow)
< 					return false;
< 				var rtn = [];
< 				var reg = RegExp("<" + data.tagname + "([^>]*)>", "gi");
< 				while (true) {
< 					var regresult = reg.exec(data.string || text);
< 					if (!regresult)
< 						break;
< 					var tag = regresult[1];
< 					var single_rtn = {};
< 					
< 					var require_attrs = data.require_attrs.split(",");
< 					if (require_attrs.indexOf("innerHTML") > -1)
< 						throw "innerHTML not supported by <each_element> without a doc.";
< 					var got_all_req = true;
< 					for (var i = 0; i < require_attrs.length; i++) {
< 						var x = UnPlug2Rules._get_attrib_from_tagname_string(tag, require_attrs[i]);
< 						// x = (x || "").replace(RegExp("^\\s+|\\s+$", "g"), "") // strip whitespace
< 						if (!x) {
< 							got_all_req = false;
< 							break;
< 						}
< 						single_rtn[require_attrs[i]] = x;
< 					}
< 					if (!got_all_req)
< 						continue
< 					
< 					var attrs = data.attrs.split(",");
< 					for (var i = 0; i < attrs.length; i++) {
< 						var x = UnPlug2Rules._get_attrib_from_tagname_string(tag, attrs[i]);
< 						if (x)
< 							single_rtn[attrs[i]] = x;
< 					}
< 					rtn[rtn.length] = single_rtn;
< 				}
< 				return rtn;
< 			}
< 			// above this line is the slow regexp version for no document
< 			// below this line is the fast dom version for those with a document
< 			
< 			// apply elemid and tagname
< 			if (data.elemid) {
< 				var elem = doc.getElementById(data.elemid);
< 				if (!elem)
< 					return false;
< 				if (data.tagname && data.tagname != elem.tagName)
< 					throw "Element with id did not match tagname";
< 				var elem_list = [elem];
< 			} else if (data.tagname) {
< 				var elem_list = doc.getElementsByTagName(data.tagname);
< 			} else {
< 				throw "each_element has no tagname and no elemid";
< 			}
< 			
< 			// elem_list is populated with a list of possible elements
< 			var result_list = [];
< 			for (var i=0; i < elem_list.length; i++) {
< 				var elem = elem_list[i];
< 				
< 				// get the variables that are in response of this one element
< 				var result = {};
< 				var got_all_required = true;
< 				for each (req_attr in data.require_attrs.split(",")) {
< 					switch (req_attr) {
< 						case "innerHTML" : 
< 							result.innerHTML = elem.textContent;
< 							if (!result.innerHTML) {
< 								got_all_required = false;
< 							}
< 							break;
< 						case "":
< 							break;
< 						default:
< 							var attrvalue = elem.getAttribute(req_attr);
< 							if (attrvalue)
< 								result[req_attr] = attrvalue;
< 							else
< 								got_all_required = false;
< 							break;
< 					}
< 				}
< 				if (!got_all_required) {
< 					continue;
< 				}
< 				for each (attr in data.attrs.split(",")) {
< 					switch (attr) {
< 						case "innerHTML" : 
< 							result.innerHTML = elem.textContent;
< 							break;
< 						case "":
< 							break;
< 						default:
< 							var attrvalue = elem.getAttribute(attr);
< 							if (attrvalue)
< 								result[attr] = attrvalue;
< 							break;
< 					}
< 				}
< 				
< 				// add this one element's response to the list
< 				result_list[result_list.length] = result;
< 			}
< 			
< 			return result_list;
< 		}
< 	},
< 	
< 	_media_ext : [
< 		"wma", "wmv",
< 		"mpg", "mpeg", "mp3", "mp2", "mp4",
< 		"divx", "avi",
< 		"ogg", "ogv", "flac", "speex",
< 		"mkv",
< 		"flv" ],
< 	
< 	if_ext : {
< 		order     : 70,
< 		required  : ["filename"],
< 		optional  : [
< 			"ext",
< 			"is_media"],
< 		apply_ref : true,
< 		execute   : function (data, url, text, doc) {
< 			var fullname = data.filename.toLowerCase();
< 			
< 			// strip gubbinns from end of url
< 			var lasthash = fullname.lastIndexOf("#");
< 			if (lasthash > 0)
< 				fullname = fullname.substring(0, lasthash);
< 			var lastquestion = fullname.lastIndexOf("?");
< 			if (lastquestion > 0)
< 				fullname = fullname.substring(0, lastquestion);
< 			var lastsemi = fullname.lastIndexOf(";");
< 			if (lastsemi > 0)
< 				fullname = fullname.substring(0, lastsemi);
< 		
< 			// get ext
< 			var lastdot = fullname.lastIndexOf(".");
< 			if (lastdot < 0)
< 				return false;
< 		
< 			var ext = fullname.substring(lastdot+1).toLowerCase();
< 			if (ext.length < 1 || ext.length > 5)
< 				return false;
< 		
< 			if (data.is_media) {
< 				if (UnPlug2Rules._media_ext.indexOf(ext) < 0)
< 					return false;
< 			}
< 		
< 			// return true
< 			return { ref : ext };
< 		}
< 	},
< 	
< 	end_of_object : 1 };
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/content/search/search.js releases/unplug-2.03/source/chrome/content/search/search.js
1,1333d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< /**
<  * A download. Don't forget to make this with "new", ie:
<  * 	var foo = new UnPlug2Download(url, UnPlug2Search._download_callback_ok, UnPlug2Search._download_callback_fail, 5000);
<  * This should normally be created by calling a function in UnPlug2Search (so it gets registered in the "busy" list.
<  * The download will timeout after timeout miliseconds (so we don't download all of a massive file, if we've got it wrong.
<  * Reference is a way of working out what download is what.
<  */
< UnPlug2Download = function (reference, url, post_data, callback_ok, callback_fail, timeout) {
< 	this.url = url;
< 	this._post_data = post_data;
< 	this.reference = reference;
< 	this._extern_callback_ok = callback_ok;
< 	this._extern_callback_fail = callback_fail;
< 	this._done = false;
< 	this._percent = 0;
< 	this._xmlhttp = new XMLHttpRequest();
< 	this._timeout_delay = timeout;
< 	this.text = null;
< 	this.xmldoc = null;
< 	this._started = false;
< 	
< 	// this in these callbacks are xhttprequests.
< 	// which is dumb
< 	var realthis = this;
< 	try {
< 		this._xmlhttp.addEventListener("progress", function (evt) { realthis._internal_callback_progress(evt); }, false);
< 	} catch (e) {
< 		// pass -- fails for ff 2.0
< 	}
< 	this._xmlhttp.addEventListener("load", function () { realthis._internal_callback_ok(); }, false);
< 	this._xmlhttp.addEventListener("error", function () { realthis._internal_callback_fail(); }, false);
< 	
< 	// abort isn't in 3.0.5
< 	// this._xmlhttp.addEventListener("abort", this._internal_callback_fail, false); 
< 	
< 	return this;
< }
< UnPlug2Download.prototype = {
< 	/**
< 	 * Returns true if the download has started
< 	 */
< 	is_started : function () {
< 		return this._started || this._done;
< 	},
< 	
< 	/**
< 	 * Starts the download
< 	 */
< 	start : function () {
< 		if (this._started) {
< 			return;
< 		}
< 		this._started = true;
< 		if (this._done) {
< 			return; // this is set on cancel.
< 		}
< 		var realthis = this;
< 		this._timeout = window.setTimeout(function () { realthis._timeout_callback(); }, this._timeout_delay);
< 		
< 		if (this._post_data) {
< 			this._xmlhttp.open('POST', this.url, true);  
< 			this._xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
< 			this._xmlhttp.send(this._post_data);
< 		} else {
< 			this._xmlhttp.open('GET', this.url, true);  
< 			this._xmlhttp.send(null); 
< 		}
< 	},
< 	
< 	/**
< 	 * Returns true if the download has completed (or failed)
< 	 */
< 	is_complete : function () {
< 		return this._done;
< 	},
< 	
< 	/**
< 	 * Return the percetage of the file which has been downloaded.
< 	 */
< 	percent_complete : function () {
< 		if (this._done)
< 			return 100;
< 		return this._percent;
< 	},
< 	
< 	/**
< 	 * Aboarts the download, if possible
< 	 */
< 	cancel : function () {
< 		try {
< 			this._xmlhttp.abort();
< 		} catch (e) {
< 			UnPlug2.log("Cancel download error " + e);
< 		}
< 		if (!this._done) {
< 			this._internal_callback_fail();
< 		}
< 	},
< 	
< 	_internal_callback_ok : function () {
< 		if (this._done) {
< 			UnPlug2.log("Duplicate callback: ok " + this)
< 			return
< 		}
< 		this.clear_timeout()
< 		this._done = true;
< 		this.text = this._xmlhttp.responseText;
< 		this.xmldoc = this._xmlhttp.responseXML;
< 		this._extern_callback_ok(this);
< 	},
< 	
< 	_internal_callback_fail : function () {
< 		if (this._done) {
< 			UnPlug2.log("Duplicate callback: fail " + this)
< 			return
< 		}
< 		this.clear_timeout()
< 		this._done = true;
< 		this._extern_callback_fail(this);
< 	},
< 	
< 	_internal_callback_progress : function (evt) {
< 		if (evt.lengthComputable) {
< 			p = 100 * evt.loaded / evt.total;
< 			if (p >= 0 && p <= 100)
< 				this._percent = p;
< 		}
< 	},
< 	
< 	_timeout_callback : function () {
< 		UnPlug2.log("Timeout " + String(this));
< 		this._timeout = null;
< 		this.cancel();
< 	},
< 	
< 	clear_timeout : function () {
< 		if (this._timeout) {
< 			window.clearTimeout(this._timeout);
< 			this._timeout = null;
< 		}
< 	},
< 	
< 	toString : function () {
< 		return "<Download " + this.reference + " = " + this.url + " stage=" + this._xmlhttp.readyState + ">";
< 	},
< 	
< 	version: 2.0 }
< 
< 
< 
< /**
<  * An object to keep track of variable scopes
<  * init with a parent UnPlug2Variables object (or null), and an object containing variable names to update
<  * don't forget to use "new" - new UnPlug2Variables(pnt, {foo : "bar"})
<  */
< function UnPlug2Variables(p, updates) {
< 	this._parent = p;
< 	this._vars = updates;
< }
< UnPlug2Variables.prototype = {
< 	/**
< 	 * Get a variable
< 	 */
< 	get : function (name) {
< 		var value = this._vars[name];
< 		if (typeof(value) != "undefined")
< 			return value;
< 		if (this._parent)
< 			return this._parent.get(name);
< 		return undefined;
< 	},
< 	
< 	/**
< 	 * Set a variable
< 	 */
< 	set : function (name, value) {
< 		this._vars[name] = value;
< 	},
< 	
< 	/**
< 	 * Set varaibles from an objecy
< 	 */
< 	update : function (updates) {
< 		for (k in updates)
< 			this._vars[k] = updates[k];
< 	},
< 	
< 	toString : function () {
< 		return "var(" + this._vars.toSource() + "+" + String(this._parent) + ")";
< 	},
< 	
< 	/**
< 	 * Return traceback as a string
< 	 */
< 	trace : function () {
< 		return "<Trace " + this.traceback().join("/") + ">";
< 	},
< 	
< 	/**
< 	 * Returns an array of .traceback strings.
< 	 */
< 	traceback : function (partial_list) {
< 		if (!partial_list)
< 			partial_list = Array("");
< 		if (this._parent)
< 			this._parent.traceback(partial_list);
< 		if (this._vars[".trace"])
< 			partial_list[partial_list.length] = this._vars[".trace"];
< 		return partial_list;
< 	},
< 	
< 	/**
< 	 * return "text" with the variables substituted into the ${...} placeholders.
< 	 * throws if invalid variable or other errors
< 	 */
< 	subst : function (text) {
< 		var variables = this;
< 		if (!text)
< 			return "";
< 		return text.replace(
< 			/\$\{([^\}]+)\}/g,
< 			function (wholematch, varfullname, offset, origstring) {
< 				// ${func3:func2:func1:varname}
< 				var parts = varfullname.split(":");
< 				parts.reverse() // reverse so we can .pop() in _subst_apply_functions()
< 				return variables._subst_apply_functions(parts);
< 			});
< 	},
< 	
< 	subst_optional : function (text) {
< 		try {
< 			return this.subst(text);
< 		} catch (e) {
< 			return "";
< 		} 
< 	},
< 	
< 	// parts here is in REVERSE ORDER
< 	_subst_apply_functions : function (parts) {
< 		// is last element, so get variable name
< 		if (parts.length == 1) {
< 			var value = this.get(parts[0]);
< 			if (!value)
< 				throw "Variable is undefined: " + parts[0] + " at " + this.trace() + " in " + this;
< 			return value;
< 		}
< 		
< 		// is not last element so first part is a function:
< 		var funcname = parts.pop()
< 		switch (funcname) {
< 			/**
< 			 * Decodes url %nn escape codes in variable
< 			 */
< 			case "urldecode":
< 				return unescape(this._subst_apply_functions(parts)).replace("+", " ", "g");
< 			/**
< 			 * Encodes url %nn escape codes in variable
< 			 */
< 			case "urlencode":
< 				return escape(this._subst_apply_functions(parts));
< 			/**
< 			 * decode html entities TODO
< 			 */
< 			case "htmldecode":
< 				return this._subst_apply_functions(parts).replace(
< 					/&(.*?);/g,
< 					function (str, m, offset, s) {
< 						switch (m) {
< 							case "amp": return "&";
< 							case "quot": return "\"";
< 						}
< 						if (m[0] == "#")
< 							return String.fromCharCode(m.substr(1));
< 						throw "Unknown htmldecode: entity " + m;
< 					});
< 			/**
< 			 * Decodes \xNN javascript escape sequences
< 			 */
< 			case "jsdecode":
< 				return this._subst_apply_functions(parts).replace(
< 					/\\(b|f|n|r|t|v|\'|\"|\\|\/|[0-7]{3}|x[0-9a-fA-F]{2}|u[0-9a-fA-f]{4})/g, function (wholematch, esc, offset, origstring) {
< 						switch (esc.charAt(0)) {
< 							case "b" : return "\b";
< 							case "f" : return "\f";
< 							case "n" : return "\n";
< 							case "r" : return "\r";
< 							case "t" : return "\t";
< 							case "v" : return "\v";
< 							case "\'" : return "\'";
< 							case "\"" : return "\"";
< 							case "/" : return "/";
< 							case "x": return String.fromCharCode(parseInt(esc.substring(1), 16));
< 							case "u": return String.fromCharCode(parseInt(esc.substring(1), 16));
< 							case "0": case "1": case "2": case "3": case "4": case "5": case "6": case "7": return String.fromCharCode(parseInt(esc, 8));
< 						}
< 						throw "Unknown escape in jsdecode " + esc;
< 					});
< 			/**
< 			 * ${randomfloat}
< 			 */
< 			case "randomfloat":
< 				if (parts.length != 0)
< 					throw "Cannot parse ${randomfloat}";
< 				return Math.random();
< 			/**
< 			 * ${randomint:numchars}
< 			 */
< 			case "randomint":
< 				if (parts.length != 1)
< 					throw "Cannot parse ${randomint:...}";
< 				var r = "";
< 				for (var i = 0; i < parseInt(parts[0]); ++i) {
< 					r += "0123456789"[Math.floor(Math.random() * 10)];
< 				}
< 				return r
< 			/**
< 			 * ${optional:varname}
< 			 */
< 			case "optional":
< 				try {
< 					return this._subst_apply_functions(parts);
< 				} catch (e) {
< 					return "";
< 				}
< 			/**
< 			 * ${required:varname}
< 			 */
< 			case "required":
< 				var r = this._subst_apply_functions(parts);
< 				if (r) {
< 					return r;
< 				} else {
< 					throw "Variable gave empty string: " + parts.toSource()
< 				}
< 			/**
< 			 * ${either:var1:var2:....}
< 			 */
< 			case "either":
< 				while (parts) {
< 					var p = parts.pop()
< 					var z = "";
< 					try {
< 						z = this._subst_apply_functions([p]);
< 					} catch (e) {
< 						continue;
< 					}
< 					if (z) {
< 						return z;
< 					}
< 				}
< 				return "";
< 			/**
< 			 * ${translate:name_in_locale_file}
< 			 */
< 			case "translate":
< 				if (parts.length != 1)
< 					throw "Invalid length for ${translate:...}";
< 				return UnPlug2.str(parts[0]);
< 			/*
< 			 * ${substring:start:variablename}
< 			 * ${substring:start:end:variablename}
< 			 * can be -ve numbers (like python)
< 			 */
< 			case "substring":
< 				var n1 = Number(parts.pop())
< 				var n2 = Number(parts[parts.length-1]);
< 				if (parts[parts.length-1] == "end") {
< 					n2 = null;
< 					parts.pop();
< 				} else if (isNaN(n2)) {
< 					// ${substring:start:var}
< 					n2 = null;
< 				} else {
< 					// ${substring:start:end:var}
< 					parts.pop() // pop n2
< 				}
< 				var fullstring = String(this._subst_apply_functions(parts));
< 				if (n1 < 0) {
< 					n1 += fullstring.length;
< 				}
< 				if (!n2) {
< 					n2 = fullstring.length;
< 				} else if (n2 < 0) {
< 					n2 += fullstring.length;
< 				}
< 				return fullstring.substring(n1, n2);
< 			case "reversed":
< 				var value = this._subst_apply_functions(parts);
< 				return value.split("").reverse().join("")
< 			/**
< 			 * ${padprefix:pad_char:boundary_size:variable}
< 			 * Pads variabe with pad_char until length divisible by boundary_size.
< 			 */
< 			case "padprefix":
< 				var prefixvalue = parts.pop()
< 				var prefixboundary = Number(parts.pop())
< 				var value = this._subst_apply_functions(parts);
< 				if (prefixvalue.length != 1)
< 					throw "char must be length 1 in ${padprefix}";
< 				if (!prefixboundary)
< 					throw "Invalid boundary size in ${padprefix}";
< 				while (value.length % prefixboundary)
< 					value = prefixvalue + value;
< 				return value;
< 			/**
< 			 * ${padprefix:pad_char:size:variable}
< 			 * Adds pad_char to the left of variable until it is at least size long
< 			 */
< 			case "leftpad":
< 				var prefixvalue = parts.pop()
< 				var len = Number(parts.pop())
< 				var value = this._subst_apply_functions(parts);
< 				if (prefixvalue.length != 1)
< 					throw "char must be length 1 in ${padleft}";
< 				if (!len)
< 					throw "Invalid size in ${padleft}";
< 				while (value.length < len)
< 					value = prefixvalue + value;
< 				return value;
< 			/**
< 			 * ${hextostr:varname}
< 			 */
< 			case "hextostr":
< 				var hex = this._subst_apply_functions(parts);
< 				if (hex.length % 2) {
< 					hex = "0" + hex;
< 				}
< 				var twohexes = Array();
< 				for (var i = 0; i < hex.length; i+= 2) {
< 					twohexes[twohexes.length] = hex.substring(i, i+2);
< 				}
< 				return twohexes.map(function (x) { return String.fromCharCode(Number("0x" + x)); }).join("");
< 			/**
< 			 * ${qparam:paramname:urlvarname}
< 			 */
< 			case "qparam":
< 				var qname = parts.pop();
< 				var urlstring = this._subst_apply_functions(parts);
< 				urlstring = urlstring.substring(urlstring.indexOf("?")+1);
< 				urlstring = "&" + urlstring + "&";
< 				var r = RegExp("&" + qname + "=([^&]+)");
< 				var m = r.exec(urlstring);
< 				if (!m) {
< 					throw "qparam:" + qname + " is not in " + urlstring;
< 				}
< 				return unescape(m[1]);
< 			/**
< 			 * ${megavideo:un:key1:key2}
< 			 */
< 			case "megavideo":
< 				if (parts.length != 3) {
< 					throw "wrong number of args for magavideo";
< 				}
< 				var un = this._subst_apply_functions([parts[2]]);
< 				var key1 = this._subst_apply_functions([parts[1]]);
< 				var key2 = this._subst_apply_functions([parts[0]]);
< 				return this.megavideo_hash(un, key1, key2);
< 			/**
< 			 * ${youku:....}
< 			 */
< 			case "youku":
< 				if (parts.length != 6) {
< 					throw "wrong number of args for youku";
< 				}
< 				var mediatype = parts[5];
< 				var key1 = this._subst_apply_functions([parts[4]]);
< 				var key2 = this._subst_apply_functions([parts[3]]);
< 				var seed = this._subst_apply_functions([parts[2]]);
< 				var streamid = this._subst_apply_functions([parts[1]]);
< 				var pieceid = this._subst_apply_functions([parts[0]]);
< 				return this.youku_url(mediatype, key1, key2, seed, streamid, pieceid);
< 			default:
< 				throw "Undefined function for variables: " + funcname;
< 		}
< 	},
< 
< 	megavideo_hash : (function (un, key1, key2) {
< 		var hex2bin = {
< 			"0" : "0000", "1" : "0001", "2" : "0010", "3" : "0011",
< 			"4" : "0100", "5" : "0101", "6" : "0110", "7" : "0111",
< 			"8" : "1000", "9" : "1001", "a" : "1010", "b" : "1011",
< 			"c" : "1100", "d" : "1101", "e" : "1110", "f" : "1111" };
< 		var bin2hex = {
< 			"0000" : "0", "0001" : "1", "0010" : "2", "0011" : "3",
< 			"0100" : "4", "0101" : "5", "0110" : "6", "0111" : "7",
< 			"1000" : "8", "1001" : "9", "1010" : "a", "1011" : "b",
< 			"1100" : "c", "1101" : "d", "1110" : "e", "1111" : "f" };
< 		
< 		var donkey = Array();
< 		key1 = parseInt(key1);
< 		key2 = parseInt(key2);
< 		for (var i = 0; i < 384; ++i) {
< 			key1 = ((key1 * 11) + 77213) % 81371
< 			key2 = ((key2 * 17) + 92717) % 192811
< 			donkey[i] = (key1 + key2) % 128
< 		}
< 		
< 		var bin = Array();
< 		for (var i = 0; i < un.length; ++i) {
< 			bin.push(hex2bin[un[i]]);
< 		}
< 		bin = bin.join("").split("")
< 		
< 		if (bin.length != 128) {
< 			throw "bin is the wrong length";
< 		}
< 		
< 		for (var i = 256; i >= 0; --i) {
< 			var j = donkey[i];
< 			var k = i % 128;
< 			var tmp = bin[k];
< 			bin[k] = bin[j];
< 			bin[j] = tmp;
< 		}
< 		
< 		for (var i = 0; i < 128; ++i) {
< 			if (donkey[i + 256] & 0x01) {
< 				if (bin[i] == "0") {
< 					bin[i] = "1";
< 				} else if (bin[i] == "1") {
< 					bin[i] = "0";
< 				} else {
< 					throw "unexpected value";
< 				}
< 			}
< 		}
< 		
< 		var result = Array();
< 		bin = bin.join("");
< 		for (var i = 0; i < bin.length; i += 4) {
< 			result.push(bin2hex[bin.substring(i, i+4)]);
< 		}
< 		
< 		return result.join("");
< 	}),
< 
< 	youku_url : (function (mediatype, key1, key2, randomseed, streamid, piece_num) {
< 		var r = (function () { return "0123456789"[Math.floor(Math.random() * 10)] });
< 		
< 		piece_num = ((parseInt(piece_num) < 10) ? "0" : "") + piece_num;
< 		
< 		// get the codebook like in cg_hun()
< 		var codebook = ""
< 		var t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/\\:._-1234567890"
< 		randomseed = parseInt(randomseed)
< 		while (t.length > 0) {
< 			randomseed = ((randomseed * 211) + 30031) % 65536;
< 			var idx = Math.floor(randomseed * t.length / 65536);
< 			var c = t.charAt(idx);
< 			if (!c) { throw "Youku: infinite loop of doom at " + idx.toSource() + " of " + t.toSource() + " => " + c.toSource() ; }
< 			codebook += c;
< 			t = t.replace(c, "");
< 		}
< 		
< 		// decode the uuid like in cg_fun()
< 		var fileid = "";
< 		var fileid_stars = streamid.split("*");
< 		fileid_stars.pop();
< 		for (var i = 0; i < fileid_stars.length; ++i) {
< 			fileid += codebook[parseInt(fileid_stars[i])];
< 		}
< 		
< 		// make the url
< 		var url = [];
< 		url.push("http://f.youku.com/player/getFlvPath/sid/");
< 		url.push(Math.floor((new Date()).getTime()))
< 		for (var i = 0; i < 8; ++i) {
< 			url.push(r());
< 		}
< 		url.push("_");
< 		url.push(piece_num);
< 		url.push("/st/");
< 		url.push(mediatype);
< 		url.push("/fileid/");
< 		url.push(fileid.substring(0, 8));
< 		url.push(piece_num);
< 		url.push(fileid.substring(10, fileid.length));
< 		url.push("?K=");
< 		url.push(key2);
< 		url.push((parseInt(key1, 16) ^ 0xa55aa5a5).toString(16).toLowerCase()); // xor
< 		url.push("&myp=0&ts=" + r() + r() + r());
< 		return url.join("");
< 	}),
< 	
< 	endofobject : 1 }
< 
< UnPlug2Search = {
< 	UnPlug2Search : function () {
< 		this._reset();
< 		
< 		this.blank_variables = new UnPlug2Variables(null, {
< 			'.version'  : UnPlug2.version,
< 			'.revision' : UnPlug2.revision,
< 			'$'         : '$' })
< 		
< 		this._io_service = Components.classes["@mozilla.org/network/io-service;1"]
< 			.getService(Components.interfaces.nsIIOService)
< 	},
< 	
< 	/**
< 	 * Default timeout to downloads, in ms.
< 	 */
< 	default_timeout : 30000,
< 	
< 	/**
< 	 * Ask for a file to be downloaded
< 	 * url must be an nsIURI object
< 	 */
< 	_queue_download : function (url, post_data, rules_to_apply, variables, timeout) {
< 		if (UnPlug2Search._stopped)
< 			return
< 		
< 		var dl_id = UnPlug2Search._downloads.length;
< 		if (dl_id > 100) {
< 			UnPlug2.log("Not queuing download: too many downloads " + url);
< 			return
< 		}
< 		
< 		// set priority from download-priority hook
< 		priority = 50;
< 		for each (node in UnPlug2Search.get_hooks("download-priority")) {
< 			for each (child in node.getElementsByTagName("priority")) {
< 				if (url.host.indexOf(child.textContent) < 0) {
< 					continue;
< 				}
< 				switch (child.getAttribute("level")) {
< 					case "very-high": priority -= 20; break;
< 					case "high": priority -= 10; break;
< 					case "normal": break;
< 					case "low": priority += 10; break;
< 					case "very-low": priority += 20; break;
< 					case "never":
< 						UnPlug2.log("Not downloading " + url.spec + " because forbidden in download-priority hook");
< 						return;
< 					default:
< 						UnPlug2.log("Invalid priority for download-priority hook " + child.getAttribute("level"));
< 						break;
< 				}
< 			}
< 		}
< 		
< 		UnPlug2Search._downloads[dl_id] = {
< 			rules_to_apply: rules_to_apply,
< 			variables : variables,
< 			download: null,
< 			nsiuri: url,
< 			priority : priority };
< 		// start download after setting everything else up
< 		try {
< 			UnPlug2Search._downloads[dl_id].download = new UnPlug2Download(
< 				dl_id,
< 				url.spec,
< 				post_data,
< 				UnPlug2Search._download_callback_ok,
< 				UnPlug2Search._download_callback_fail,
< 				timeout);
< 			UnPlug2.log("Download queued " + UnPlug2Search._downloads[dl_id].download + " priority " + UnPlug2Search._downloads[dl_id].priority);
< 		} catch (e) {
< 			UnPlug2.log("Download failed to be queued for " + UnPlug2Search._downloads[dl_id].download + " because " + e);
< 			// .download not assigned
< 			UnPlug2Search._downloads[dl_id].download = null;
< 		}
< 		UnPlug2Search._do_download_poll = true;
< 	},
< 	
< 	poll : function () {
< 		if (UnPlug2Search._stopped) {
< 			return;
< 		}
< 		
< 		if (UnPlug2Search._do_download_poll) {
< 			UnPlug2Search._do_download_poll = false;
< 			UnPlug2Search._download_poll();
< 		}
< 	},
< 	
< 	/**
< 	 * Should be called regularly to start queued downloads
< 	 */
< 	_download_poll : function () {
< 		var concurrent_downloads = 5; // XXX CONFIGURABLE
< 		for (var i = 0; i < UnPlug2Search._downloads.length; i++) {
< 			if (UnPlug2Search._downloads[i]
< 				&& UnPlug2Search._downloads[i].download
< 				&& UnPlug2Search._downloads[i].download.is_started() == true
< 				&& UnPlug2Search._downloads[i].download.is_complete() == false) {
< 					--concurrent_downloads;
< 			}
< 		}
< 		if (concurrent_downloads <= 0) {
< 			return;
< 		}
< 		var startable_downloads = [];
< 		for (var i = 0; i < UnPlug2Search._downloads.length; i++) {
< 			if (UnPlug2Search._downloads[i]
< 				&& UnPlug2Search._downloads[i].download
< 				&& UnPlug2Search._downloads[i].download.is_started() == false) {
< 					startable_downloads[startable_downloads.length] = i;
< 			}
< 		}
< 		startable_downloads.sort(function (a, b) {
< 			return UnPlug2Search._downloads[a].priority - UnPlug2Search._downloads[b].priority;
< 		});
< 		for (var i = 0; i < startable_downloads.length && i < concurrent_downloads; ++i) {
< 			var dl_id = startable_downloads[i];
< 			try {
< 				UnPlug2Search._downloads[dl_id].download.start();
< 				UnPlug2.log("Starting download id = " + dl_id);
< 			} catch (e) {
< 				UnPlug2.log("Starting Download failed for " + dl_id + " / " + UnPlug2Search._downloads[dl_id].download + " because " + e);
< 				UnPlug2Search._downloads[dl_id].download = null;
< 			}
< 		}
< 	},
< 	
< 	_download_callback_ok : function (dl) {
< 		UnPlug2.log("Downloaded " + dl);
< 		var dlinfo = UnPlug2Search._downloads[dl.reference];
< 		var dlxml = dl.xmldoc;
< 		if (dlxml && dlxml.getElementsByTagName("parsererror").length > 0) {
< 			UnPlug2.log("Document has poorly-formatted xml (consider regexp on whole text). Url=" + dl.url)  
< 			dlxml = null;
< 		}
< 		UnPlug2Search._apply_rules_to_document(dlinfo.nsiuri, dl.text, dlxml, dlinfo.rules_to_apply, dlinfo.variables);
< 		UnPlug2Search._downloads[dl.reference].download = null;
< 		UnPlug2Search._do_download_poll = true;
< 	},
< 	
< 	_download_callback_fail : function (dl) {
< 		// it really can't find UnPlug2 object in all cases!
< 		try {
< 			UnPlug2.log("Failed download " + dl);
< 		} catch(e) {
< 			// can't do alert() here either .. sheesh!
< 		}
< 		UnPlug2Search._downloads[dl.reference].download = null;
< 		UnPlug2Search._do_download_poll = true;
< 	},
< 	
< 	/**
< 	 * Cancels all downloads
< 	 */
< 	cancel_downloads : function () {
< 		for (var i = 0; i < UnPlug2Search._downloads.length; i++) {
< 			var d = UnPlug2Search._downloads[i];
< 			if (d && d.download) {
< 				d.download.cancel()
< 			}
< 		}
< 	},
< 	
< 	/**
< 	 * Stop downloading and stop search process
< 	 */
< 	abort : function () {
< 		UnPlug2Search._stopped = true;
< 		UnPlug2Search.cancel_downloads();
< 	},
< 	
< 	/**
< 	 * Get a "hooks" item from rules.xml for adjusting eg download priority
< 	 * Returns an array
< 	 */
< 	get_hooks : function (hookname) {
< 		if (UnPlug2Search._hooks === undefined) {
< 			UnPlug2Search._hooks = {};
< 			var hooknodes = UnPlug2Search.get_rules_xml().getElementsByTagName("hook");
< 			for (var i = 0; i < hooknodes.length; ++i) {
< 				var hooknode = hooknodes[i];
< 				var hookname = hooknode.getAttribute("for");
< 				if (UnPlug2Search._hooks[hookname] === undefined) {
< 					UnPlug2Search._hooks[hookname] = [];
< 				}
< 				UnPlug2Search._hooks[hookname].push(hooknode);
< 			}
< 		}
< 		return UnPlug2Search._hooks[hookname] || [];
< 	},
< 	
< 	/**
< 	 * Load the xml document containing the rules
< 	 * Returns the <unplug> element of the document (which contains a number of <rule> elements as children)
< 	 */
< 	get_rules_xml : function () {
< 		if (!UnPlug2Search._search_xml) {
< 			var req = new XMLHttpRequest();  
< 			var filename = "chrome://unplug/content/rules.xml";
< 			
< 			// this response is synchronous (not async) because it's a local file.
< 			// sync by use of false in 3rd arg
< 			req.open('GET', filename, false);   
< 			req.send(null);  
< 			if (req.status != 0) {
< 				UnPlug2.log("Cannot open " + filename);
< 				throw "Cannot open " + filename;
< 			}
< 			var xmldoc = req.responseXML;
< 			var unplugnode = null;
< 			for each (node in xmldoc.childNodes) {
< 				if (node.tagName && node.tagName.toLowerCase() == "unplug") {
< 					unplugnode = node;
< 					break;
< 				}
< 			}
< 			if (!unplugnode) {
< 				UnPlug2.log("Invalid root node for document " + xmldoc);
< 				throw "Cannot load xml rules - no root node";
< 			}
< 			UnPlug2Search._search_xml = unplugnode;
< 		}
< 		return UnPlug2Search._search_xml;
< 	},
< 	
< 	/**
< 	 * Find media in window "win", and call function "callback" for eac result found.
< 	 * Callback may be called both immediately, and after additional files are downloaded.
< 	 */
< 	search : function (win, callback) {
< 		if (!this.has_finished()) {
< 			throw "Already in search";
< 		}
< 		
< 		// assign callback func
< 		this.callback = callback;
< 		
< 		this._apply_rules_to_window(
< 			win,
< 			this.get_rules_xml(),
< 			this.blank_variables);
< 		
< 		if (UnPlug2.get_pref("popularity_contest"))
< 			new UnPlug2Download(
< 				null, // ref
< 				"http://unplug.dbatley.com/popularity_contest/submit.cgi",
< 				"useragent=" +  escape(window.navigator.userAgent) + "&url="  + escape(win.location.href) + "&version=" + UnPlug2.version + "&revision=" + UnPlug2.revision + "&codename=" + UnPlug2.codename,
< 				null, null, // callbacks
< 				10000);
< 	},
< 	
< 	/**
< 	 * apply rules in a <ruleset>-type element to a window.
< 	 */
< 	_apply_rules_to_window : function (win, rules_xml, variables) {
< 		var serializer = new XMLSerializer();
< 		var xml_text = serializer.serializeToString(win.document);
< 		//var xml_text = win.document.body.innerHTML;
< 		
< 		var url = this._io_service.newURI(String(win.location), null, null);
< 		UnPlug2Search._apply_rules_to_document(
< 			url,                   // url (a nsiURI)
< 			xml_text,              // we need to serialize the document into text
< 			win.document,          // the xml of the document
< 			rules_xml,             // a <ruleset> to apply
< 			variables);            // for ${...} substitution in the rules.
< 		
< 		// also search in frames
< 		for (var i = 0; i < win.frames.length; i++) {
< 			UnPlug2Search._apply_rules_to_window(win.frames[i], rules_xml, variables);
< 		} 
< 	},
< 	
< 	/**
< 	 * The protocols it's fine to download with a <download>
< 	 */
< 	_downloadable_protocols : [
< 		"http", "https", "ftp", "gopher",
< 		],
< 	
< 	/**
< 	 * apply rules in a <ruleset>-type element to a document and url.
< 	 * To apply the rules, we need the url of the document, the  document in text and in xml (or null).
< 	 * We also need the rules we'll be applying, and the variables for the variable substitutions - ${...} - in those rules.
< 	 * The url is a nsIURI
< 	 */
< 	_apply_rules_to_document : function (url, text, doc, rules_xml, variables) {
< 		if (UnPlug2Search._stopped)
< 			return;
< 		
< 		if (["http", "https"].indexOf(url.scheme) < 0) {
< 			UnPlug2.log("Invalid url for search " + url.spec);
< 			return;
< 		}
< 		
< 		// add special variables
< 		variables = new UnPlug2Variables(variables, {
< 			".url"              : url.spec,
< 			".url.protocol"     : url.protocol,
< 			".has_doc"          : doc ? true : false,
< 			".trace"            : rules_xml.getAttribute("id") || "" })
< 		
< 		// the if_* statements add variables, which are available to deeper levels in rules.xml
< 		var updated_variables = new UnPlug2Variables(variables, {})
< 		
< 		/*
< 		 * evaluate all the if_* statements, updating the variables in updated_variables if needed
< 		 */
< 		var node;
< 		for each (node in rules_xml.childNodes) {
< 			var nodetagname = node.tagName ? node.tagName.toLowerCase() : "";
< 			var funcname = null;
< 			var optional = null;
< 			var exectype = null;
< 			if (nodetagname.substring(0, 3) == "if_") {
< 				funcname = nodetagname.substring(3);
< 				exectype = "if";
< 				optional = false;
< 			} else if (nodetagname.substring(0, 6) == "ifnot_") {
< 				funcname = nodetagname.substring(6);
< 				exectype = "ifnot";
< 				optional = false;
< 			} else if (nodetagname.substring(0, 9) == "optional_") {
< 				funcname = nodetagname.substring(9);
< 				exectype = "optional";
< 				optional = true;
< 			} else {
< 				continue;
< 			}
< 			
< 			// exec UnPlug2Rules.if_*(...);
< 			// which returns either false or an object with additional variables
< 			// note: variables are passed to this function for use with eg <if_re string="${...}">
< 			//       but variables object should not be edited directly.
< 			var result = false;
< 			try {
< 				result = UnPlug2Rules["exec_" + exectype](funcname, node, variables, url, text, doc);
< 			} catch (e) {
< 				UnPlug2.log("Error in " + nodetagname + " because " + e + " " + variables.trace());
< 			}
< 			
< 			if (result) {
< 				// add to updated variables
< 				updated_variables.update(result);
< 			} else {
< 				// fail one if_* condition means the whole <rule> is failed
< 				if (!optional)
< 					return; // failed
< 			}	
< 		}
< 		
< 		/*
< 		 * evaluate all each_* statements
< 		 */
< 		var node;
< 		for each (node in rules_xml.childNodes) {
< 			var nodetagname = node.tagName ? node.tagName.toLowerCase() : "";
< 			if (nodetagname.substring(0, 5) == "each_") {
< 				// exec UnPlug2Rules.each_*(...);
< 				// which returns either false or an array of objects which contain updated variables
< 				// example:
< 				//    <each_element tagname="em" ref="someref"><media ... /> </each_element>
< 				// on
< 				//    <em id="hello">foo</em><em id="bar" lang="en">bar</em>
< 				// returns [{ id: "hello" }, { id: "bar", lang: "en" }]] 
< 				var result_list = false;
< 				try {
< 					result_list = UnPlug2Rules.exec_each(nodetagname.substring(5), node, updated_variables, url, text, doc);
< 				} catch (e) {
< 					UnPlug2.log("Error in " + nodetagname + " because " + e + " " + variables.trace());
< 				}
< 				if (result_list) {
< 					for (var j = 0; j < result_list.length; j++) {
< 						var result = result_list[j];
< 						var new_variables = new UnPlug2Variables(updated_variables, result)
< 						UnPlug2Search._apply_rules_to_document(
< 							url,
< 							text,
< 							doc,
< 							node, // this is the <each_*> node
< 							new_variables) // updated_variables + variables from each_* tag
< 					}
< 				}
< 			}
< 		}
< 		
< 		
< 		/*
< 		 * apply all the <media...> and <download...> nodes, etc.
< 		 */
< 		var node;
< 		for each (node in rules_xml.childNodes) {
< 			if (!node.tagName) {
< 				continue;
< 			}
< 			var nodetagname = node.tagName.toLowerCase();
< 			if (nodetagname.substring(0, 3) != "if_" && nodetagname.substring(0, 6) != "ifnot_" && nodetagname.substring(0, 9) != "optional_" && nodetagname.substring(0, 5) != "each_") {
< 				try {
< 					switch (nodetagname.toLowerCase()) {
< 						case "rule":
< 						case "then":
< 						case "ruleset":
< 							var referenced_node = node;
< 							if (node.hasAttribute("goto")) {
< 								// getElementById is broken on firefox! gah!
< 								if (node.getAttribute("goto") === "*") {
< 									referenced_node = UnPlug2Search.get_rules_xml()
< 								} else {
< 									referenced_node = UnPlug2.get_element(UnPlug2Search.get_rules_xml(), "rule", node.getAttribute("goto"));
< 								}
< 								if (!referenced_node)
< 									throw "Cannot find node to goto " + node.getAttribute("goto");
< 							}
< 							if (node.hasAttribute("defer")) {
< 								/*
< 								the code below does a good job of keeping the arguments the same
< 								ie: referenced_node does not change to the last one in the file inside the timeout
< 								but it is a rather insane
< 								*/
< 								UnPlug2Search._defered_rules_count += 1;
< 								window.setTimeout((function (args) {
< 									return (function () {
< 									UnPlug2Search._defered_rules_count -= 1;
< 									UnPlug2Search._apply_rules_to_document.apply(UnPlug2Search, args);
< 									})
< 									})([
< 										url,
< 										text,
< 										doc,
< 										referenced_node,
< 										updated_variables ])
< 									, 500)
< 							} else {
< 								UnPlug2Search._apply_rules_to_document(
< 									url,
< 									text,
< 									doc,
< 									referenced_node,
< 									updated_variables);
< 							}
< 							break;
< 						case "hook":
< 							// do nothing
< 							break
< 						case "download":
< 						case "playlist": // synonym, eg for .3mu/.asx files which we can parse
< 							var relative_url = updated_variables.subst(node.getAttribute("url"));
< 							if (!relative_url)
< 								throw "download has no url";
< 							var abs_url = this._io_service.newURI(relative_url, null, url);
< 							if (UnPlug2Search._downloadable_protocols.indexOf(abs_url.scheme) < 0) {
< 								throw "Cannot download " + abs_url.spec + " because bad protocol";
< 							}
< 							var post = "";
< 							if (node.hasAttribute("post")) {
< 								post = updated_variables.subst_optional(node.getAttribute("post"))
< 								if (!post) {
< 									throw "Post data failed";
< 								}
< 							}
< 							UnPlug2Search._queue_download(
< 								abs_url,
< 								post,
< 								node,
< 								updated_variables,
< 								UnPlug2Search.default_timeout)
< 							break;
< 						case "media":
< 							/*
< 							TODO -- new things to implement!
< 							<media
< 							url="http://...../"        # required
< 							
< 							# display options:
< 							description="low quality"  # default "" (used for display only)
< 							thumbnail="http://..../"   # default null
< 							
< 							# file naming options
< 							title="A kitten"           # default -- guess from url or "no title"
< 							type="flv"                 # default -- guess from url or "flv"
< 							certainty="low"            # default "high" (used to decide which name is "right" when merging duplicates)
< 							
< 							# grouping same media with different quality settings
< 							mediaid="foo"              # default url (used to group media which are the same but are different quality settings
< 							quality="low"              # default "mid" (used to order results)
< 							
< 							# grouping items which are in a playlist
< 							playlist="bar"
< 							
< 							/>
< 							*/
< 							
< 							// get url
< 							var relative_url = updated_variables.subst(node.getAttribute("url"));
< 							if (!relative_url)
< 								throw "Media invalid as empty url";
< 							var abs_url = this._io_service.newURI(relative_url, null, url);
< 							
< 							// get download method
< 							var download_method = {	"url" : abs_url.spec }
< 							if (node.hasAttribute("post")) {
< 								download_method = {
< 									"http_post" : [
< 										abs_url.spec,
< 										updated_variables.subst(node.getAttribute("post"))
< 										]
< 									};
< 							}
< 							if (node.hasAttribute("referer")) {
< 								download_method.referer = updated_variables.subst_optional(node.getAttribute("referer")) || undefined;
< 							}
< 							
< 							// make response
< 							var result = UnPlug2Search._make_response_object_result(
< 								abs_url,
< 								download_method,
< 								updated_variables,
< 								node,
< 								updated_variables.trace());
< 							
< 							// callback
< 							UnPlug2Search.callback(result);
< 							break;
< 						default:
< 							throw "Not implemented";
< 					} 
< 				} catch(e) {
< 					UnPlug2.log("Failed to action " + nodetagname + " because " + e + " " + variables.trace());
< 				}
< 			}
< 		}
< 	},
< 	
< 	/**
< 	 * Return an unplug result object, for passing to the callback
< 	 * The format is JSON-compatible
< 	 * (no no native objects, etc)
< 	 * 
< 	 * Download method must be a javascrit object. It's used by download components (eg "copy url", "save with firefox", "save with dta", etc) to decide how and if they work. Examples below:
< 	 * { "link" : url }
< 	 * 	for basic urls
< 	 * { "link" : url, "referer" : referer }.
< 	 * 	urls with referer. The referer attribute will be ignored by components which don't support it.
< 	 * { "http_post" : [ url, post_data ] }
< 	 * 	http post request
< 	 * 
< 	 * Download can be used to track duplicate results
< 	 */
< 	_make_response_object_result : function (nsiuri, download_method, variables, node, trace) {
< 		var levels = { "very-low" : -20, "low" : -10, "mid" : 0, "high" : +10, "very-high" : +20 };
< 		var guesses = UnPlug2Search.guess_from_uri(nsiuri);
< 		var default_quality = 0;
< 		var default_certainty = +10; // high!
< 		
< 		var title = variables.subst_optional(node.getAttribute("title"));
< 		var file_ext = variables.subst_optional(node.getAttribute("type"));
< 		var description = variables.subst_optional(node.getAttribute("description"));
< 		var thumbnailurl = variables.subst_optional(node.getAttribute("thumbnail"));
< 		var certainty = levels[variables.subst_optional(node.getAttribute("certainty"))];
< 		var quality = levels[variables.subst_optional(node.getAttribute("quality"))];
< 		
< 		var result_object = {
< 			"type"     : "result",
< 			"details"  : {
< 				"name"        : title || guesses.base_name,
< 				"mediaid"     : variables.subst_optional(node.getAttribute("mediaid")) || null,
< 				"playlistid"  : variables.subst_optional(node.getAttribute("playlistid")) || null,
< 				"certainty"   : certainty === undefined ? default_certainty : certainty,
< 				"quality"     : quality === undefined ? default_quality : quality,
< 				
< 				// IMPORTANT this is used for advice only (not used for downloading) !!
< 				"protocol"    : nsiuri.scheme,
< 				"host"        : guesses.host,
< 				
< 				// more details we may know
< 				"swf"         : ((file_ext || guesses.file_ext) == "swf"), // TODO roll this into file_ext?
< 				"file_ext"    : file_ext || guesses.file_ext || "flv",
< 				"description" : description || null,
< 				"thumbnail"   : thumbnailurl || null,
< 				"trace"       : trace },
< 			"download" : download_method };
< 		
< 		return result_object;
< 	},
< 
< 	/**
< 	 * Gets a filename from the url
< 	 */
< 	guess_from_uri : function (uri) {
< 		/* nsIRUI have scheme, host, port, and path (note: can be "")
< 		 * nsIURL also have a fileName (made of fileBaseName and fileExtension) which can be "" if uri ends in "/". In this case we want to look at the directory which won't have #ref or ?query or ;param.
< 		 */
< 		var data = {
< 			host : "",
< 			file_ext : "",
< 			base_name : "" };
< 		
< 		// the host SHOULD be available in the nsIURI,
< 		// but this raises an exception for unusual protocols!
< 		// there's no guarentee that "host" is meaningful, eg: data links
< 		try {
< 			data.host = uri.hostPort;
< 		} catch(e) {
< 			// pass
< 		}
< 		
< 		if (uri instanceof Components.interfaces.nsIURL) {
< 			// these are in nsIURL but not in nsIURI
< 			// easy! but these can be empty strings
< 			data.file_ext = uri.fileExtension;
< 			data.base_name = uri.fileBaseName;
< 		}
< 		if (!data.file_ext || !data.base_name) {
< 			var u = uri.spec;
< 			// trim endings, like #foo ;foo ?foo
< 			u = RegExp("^([^\\?;#]*)([\\?;#]|$)").exec(uri.spec)[1];
< 			// take the last meaningful segment after the final slash
< 			var r = RegExp("(^|/)([^/]+)/*$").exec(u);
< 			if (r) {
< 				u = r[2];
< 				r = RegExp("^(.*)\\.([a-zA-Z0-9]{1,5})$").exec(u);
< 				if (r) {
< 					data.base_name = r[1];
< 					data.file_ext = r[2];
< 				} else {
< 					data.base_name = u;
< 				}
< 			}
< 		}
< 		return data;
< 	},
< 	
< 	/**
< 	 * Call when it's all over
< 	 */
< 	_reset : function () {
< 		// "this" is a lie!!
< 		UnPlug2Search.callback = function ( res ) { UnPlug2.log("Cannot use callback for result " + res); };
< 		UnPlug2Search._downloads = [];
< 		UnPlug2Search._do_download_poll = false;
< 		UnPlug2Search._defered_rules_count = 0;
< 		if (!UnPlug2Search._poll_timer) {
< 			UnPlug2Search._poll_timer = window.setInterval(UnPlug2Search.poll, 100);
< 		}
< 	},
< 	
< 	/**
< 	 * Returns false if still doing stuff
< 	 * TODO - depricate this in favor of statusinfo()
< 	 */
< 	has_finished : function () {
< 		if (UnPlug2Search._defered_rules_count) {
< 			return false;
< 		}
< 		for (var i = 0; i < UnPlug2Search._downloads.length; i++) {
< 			if (UnPlug2Search._downloads[i] && UnPlug2Search._downloads[i].download)
< 				return false;
< 		}
< 		// TODO - more checks about doing stuff while not downloading stuff
< 		return true;
< 	},
< 	
< 	/**
< 	 * Returns information about the current status
< 	 */
< 	statusinfo : function () {
< 		var info = { downloads : 0, finished : false, percent : 0 };
< 		var attempted_downloads = 0;
< 		var active_downloads = 0;
< 		var completed_pct = 0;
< 		for (var i = 0; i < UnPlug2Search._downloads.length; i++) {
< 			var di = UnPlug2Search._downloads[i];
< 			if (di) {
< 				++attempted_downloads;
< 				if (di.download) {
< 					completed_pct += di.download.percent_complete();
< 					if (di.download.is_complete() == false) {
< 						++active_downloads;
< 					}
< 				} else {
< 					// we cleared the download because it was done
< 					completed_pct += 100;
< 				}
< 			}
< 		}
< 		info.downloads = active_downloads;
< 		// info.percent = 100 * (attempted_downloads - active_downloads) / (attempted_downloads || 1);
< 		info.percent = completed_pct / (attempted_downloads || 1);
< 		switch (info.downloads) {
< 			case 0:
< 				info.finished = true;
< 				info.text = UnPlug2.str("search_done");
< 				break;
< 			case 1:
< 				info.text = UnPlug2.str("search_1_active_download");
< 				break;
< 			default:
< 				info.text = UnPlug2.str("search_n_active_downloads").replace("#", info.downloads);
< 				break;
< 		}
< 		if (UnPlug2Search._defered_rules_count) {
< 			info.finished = false;
< 		}
< 		return info;
< 	},
< 	
< 	toString : function () {
< 		return '<UnPlug2Search>';
< 	},
< 	
< 	version : 2.0 }
< 
< // init
< UnPlug2Search.UnPlug2Search()
< 
< 
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/de-DE/common.dtd releases/unplug-2.03/source/chrome/locale/de-DE/common.dtd
1,35d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY dialog.title         "UnPlug">
< <!ENTITY header.title         "UnPlug">
< <!ENTITY header.subtitle      "Media download tool">
< 
< <!ENTITY configure            "Einstellungen">
< <!ENTITY configure.a          "E">
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/de-DE/config.dtd releases/unplug-2.03/source/chrome/locale/de-DE/config.dtd
1,77d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY configheader.subtitle "Einstellungen &#228;ndern">
< 
< <!-- tab headings -->
< <!ENTITY tab.title.general "Allgemein">
< <!ENTITY tab.title.opener "	&#214;ffner">
< <!ENTITY tab.title.downloader "Downloader">
< <!ENTITY tab.title.advanced "Erweitert">
< <!ENTITY tab.title.about "&#220;ber UnPlug">
< 
< <!-- general options -->
< <!ENTITY interface.title "Firefox Men&#252;s">
< <!ENTITY interface.toolsmenu "UnPlug im Men&#252; 'Extras' anzeigen">
< <!ENTITY interface.toolsmenu.a "E">
< <!ENTITY interface.contextmenu "UnPlug im Kontextmen&#252; (Rechtsklick) anzeigen">
< <!ENTITY interface.contextmenu.a "x">
< <!ENTITY interface.toolbarbtn "UnPlug in der Symbolleiste anzeigen">
< <!ENTITY interface.toolbarbtn.a "S">
< <!ENTITY privacy.title "Privatsph&#228;re">
< <!ENTITY privacy.popcontest "&#220;bermittle Informationen, auf welchen Webseiten Sie UnPlug benutzen">
< <!ENTITY privacy.popcontest.a "I">
< <!ENTITY privacy.infolink "Mehr dar&#252;ber">
< <!ENTITY privacy.infolink.a "M">
< <!ENTITY rulesxml.title "Rules.xml">
< <!ENTITY rulesxml.description "Rules.xml beinhaltet Information dar&#252;ber, wie Sie Medien auf Webseiten entdecken.">
< <!ENTITY rulesxml.default "Standard">
< <!ENTITY rulesxml.default.a "S">
< 
< <!-- opener tab -->
< 
< <!-- downloader tab -->
< <!ENTITY downloader.auto "Automatisch">
< <!ENTITY downloader.addons "Unterst&#252;tzte Add-ons">
< <!ENTITY downloader.dta "DownThemAll">
< <!ENTITY downloader.flashgot "FlashGot">
< 
< <!-- advanced tab -->
< <!ENTITY showall.title "Zeige zus&#228;tzliche Ergebnisse">
< <!ENTITY showall.label "Zeige Ergebnisse, die nicht korrekt funktionieren">
< <!ENTITY showall.label.a "f">
< 
< <!-- about tab -->
< <!ENTITY about.title "Danke, dass Sie UnPlug installiert haben">
< <!ENTITY about.description "UnPlug ist kostenlos und OpenSource.">
< <!ENTITY about.gpl "GNU General Public License">
< <!ENTITY about.agpl "GNU Affero General Public License, version 3">
< <!ENTITY about.updated "UnPlugs Einstellungen wurden ge&#228;ndert.">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/de-DE/overlay.dtd releases/unplug-2.03/source/chrome/locale/de-DE/overlay.dtd
1,12d0
< <!--
< This is the dtd file for overlay.xul
< 
< Created 03/06/06 by jb marcon
< 
< No translation needed.
< -->
< 
< <!ENTITY menuitem.unplug "UnPlug">
< <!ENTITY menuitem.u "U">
< <!ENTITY toolbarbutton.unplug "UnPlug">
< <!ENTITY toolbarbutton.unplug.tip "UnPlug - Search for media on this page">
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/de-DE/searchpage.dtd releases/unplug-2.03/source/chrome/locale/de-DE/searchpage.dtd
1,35d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY notfound.label       "Nichts gefunden?">
< <!ENTITY notfound.accesskey   "N">
< <!ENTITY stop.label           "Stop">
< <!ENTITY stop.accesskey       "S">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/de-DE/strings.txt releases/unplug-2.03/source/chrome/locale/de-DE/strings.txt
1,28d0
< extensions.{unplug@compunach}.description=Download embedded media
< 
< # Confirmation after clicking on "Nothing found" button
< nothing_found_send_data=Möchten Sie den Entwicklern von UnPlug Informationen über diese Webseite zukommen lassen?
< 
< # Short status strings during/after clicking "Nothing found" button
< nothing_found_sending=Sended...
< nothing_found_done=Danke!
< nothing_found_failed=Fehlgeschlagen
< 
< # for below the search box
< search_done=Fertig
< search_busy=Arbeitet
< search_1_active_download=1 aktiver Download
< search_n_active_downloads=# aktive Downloads
< search_no_results_yet=Keine Ergebnisse bis jetzt
< search_1_result=1 Ergebnis
< search_n_results=# Ergebnisse
< search_no_results=keine Ergebnisse
< cannot_download_this_kind=Cannot download this kind of file
< 
< # for rules.xml
< high_quality=Hohe Qualität
< low_quality= Niedrige Qualität
< mid_quality=Normale Qualität
< hd_quality=HD Qualität
< embedplayer=Eingebettetes Odjekt (vielleicht ein MediaPlayer und kein Video)
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/de-DE/unplug_result.dtd releases/unplug-2.03/source/chrome/locale/de-DE/unplug_result.dtd
1,67d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY open.label           "&#214;ffnen">
< <!ENTITY open.accesskey       "f">
< <!ENTITY open.tab.label       "In neuem Tab &#246;ffnen">
< <!ENTITY open.tab.accesskey   "T">
< <!ENTITY open.tab.tooltip     "">
< <!ENTITY open.new.label       "In neuem Fenster &#246;ffnen">
< <!ENTITY open.new.accesskey   "F">
< <!ENTITY open.new.tooltip     "">
< <!ENTITY open.over.label      "Im aktuellen Fenster &#246;ffnen">
< <!ENTITY open.over.accesskey  "a">
< <!ENTITY open.over.tooltip    "">
< <!ENTITY copyurl.label        "Kopiere Link">
< <!ENTITY copyurl.accesskey    "K">
< <!ENTITY copyurl.tooltip      "">
< 
< <!ENTITY config.label         "Einstellungen">
< <!ENTITY config.accesskey     "E">
< <!ENTITY config.tooltip       "">
< 
< <!ENTITY dl.label             "Download">
< <!ENTITY dl.accesskey         "D">
< <!ENTITY dl.saveas.label      "Speichern als">
< <!ENTITY dl.saveas.accesskey  "S">
< <!ENTITY dl.saveas.tooltip    "Benutze den Download Manager von Firefox.">
< <!ENTITY dl.dta.label         "DownThemAll">
< <!ENTITY dl.dta.accesskey     "A">
< <!ENTITY dl.dta.tooltip       "Download mit dem DownThemAll Addon.">
< <!ENTITY dl.flashgot.label    "FlashGot">
< <!ENTITY dl.flashgot.accesskey "F">
< <!ENTITY dl.flashgot.tooltip  "Download mit dem FlashGot Addon.">
< 
< <!-- translate -->
< <!ENTITY dl.special.label     "Run a downloader">
< <!ENTITY dl.special.accesskey "R">
< <!ENTITY dl.special.tooltip   "Get or run a tool to download this file.">
< <!ENTITY dl.nodefault.tooltip "No default downloader.">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/en-US/common.dtd releases/unplug-2.03/source/chrome/locale/en-US/common.dtd
1,35d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY dialog.title         "UnPlug">
< <!ENTITY header.title         "UnPlug">
< <!ENTITY header.subtitle      "Media download tool">
< 
< <!ENTITY configure            "Configure">
< <!ENTITY configure.a          "C">
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/en-US/config.dtd releases/unplug-2.03/source/chrome/locale/en-US/config.dtd
1,77d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY configheader.subtitle "Change settings">
< 
< <!-- tab headings -->
< <!ENTITY tab.title.general "General options">
< <!ENTITY tab.title.opener "Opener">
< <!ENTITY tab.title.downloader "Downloader">
< <!ENTITY tab.title.advanced "Advanced">
< <!ENTITY tab.title.about "About UnPlug">
< 
< <!-- general options -->
< <!ENTITY interface.title "Where to add UnPlug">
< <!ENTITY interface.toolsmenu "Add link in tools menu">
< <!ENTITY interface.toolsmenu.a "t">
< <!ENTITY interface.contextmenu "Add link in context (right-click) menu">
< <!ENTITY interface.contextmenu.a "x">
< <!ENTITY interface.toolbarbtn "Add toolbar button">
< <!ENTITY interface.toolbarbtn.a "b">
< <!ENTITY privacy.title "Privacy">
< <!ENTITY privacy.popcontest "Submit information on which websites you use UnPlug on">
< <!ENTITY privacy.popcontest.a "S">
< <!ENTITY privacy.infolink "About this">
< <!ENTITY privacy.infolink.a "A">
< <!ENTITY rulesxml.title "Rules.xml file">
< <!ENTITY rulesxml.description "Rules.xml holds information on how to discover media on web pages.">
< <!ENTITY rulesxml.default "Default">
< <!ENTITY rulesxml.default.a "D">
< 
< <!-- opener tab -->
< 
< <!-- downloader tab -->
< <!ENTITY downloader.auto "Automatic">
< <!ENTITY downloader.addons "Supported Add-ons">
< <!ENTITY downloader.dta "DownThemAll">
< <!ENTITY downloader.flashgot "FlashGot">
< 
< <!-- advanced tab -->
< <!ENTITY showall.title "Show additional results">
< <!ENTITY showall.label "Show results which do not work correctly">
< <!ENTITY showall.label.a "S">
< 
< <!-- about tab -->
< <!ENTITY about.title "Thanks for installing UnPlug">
< <!ENTITY about.description "UnPlug is free and open source.">
< <!ENTITY about.gpl "GNU General Public License">
< <!ENTITY about.agpl "GNU Affero General Public License, version 3">
< <!ENTITY about.updated "UnPlug's settings have been updated.">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/en-US/overlay.dtd releases/unplug-2.03/source/chrome/locale/en-US/overlay.dtd
1,12d0
< <!--
< This is the dtd file for overlay.xul
< 
< Created 03/06/06 by jb marcon
< 
< No translation needed.
< -->
< 
< <!ENTITY menuitem.unplug "UnPlug">
< <!ENTITY menuitem.u "U">
< <!ENTITY toolbarbutton.unplug "UnPlug">
< <!ENTITY toolbarbutton.unplug.tip "UnPlug - Search for media on this page">
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/en-US/searchpage.dtd releases/unplug-2.03/source/chrome/locale/en-US/searchpage.dtd
1,35d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY notfound.label       "Nothing found?">
< <!ENTITY notfound.accesskey   "N">
< <!ENTITY stop.label           "Stop">
< <!ENTITY stop.accesskey       "S">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/en-US/strings.txt releases/unplug-2.03/source/chrome/locale/en-US/strings.txt
1,29d0
< extensions.{unplug@compunach}.description=Download embedded media
< 
< # Confirmation after clicking on "Nothing found" button
< nothing_found_send_data=Would you like to send information about this webpage to the developers of UnPlug?
< 
< # Short status strings during/after clicking "Nothing found" button
< nothing_found_sending=Sending...
< nothing_found_done=Thanks!
< nothing_found_failed=Failed
< 
< # for below the search box
< search_done=Finished
< search_busy=Busy
< search_1_active_download=Searching 1 page
< search_n_active_downloads=Searching # pages
< search_no_results_yet=No results yet
< search_1_result=1 result
< search_n_results=# results
< search_no_results=No results
< cannot_download_this_kind=Cannot download this kind of file
< 
< 
< # for rules.xml
< high_quality=High quality
< low_quality=Low quality
< mid_quality=Normal quality
< hd_quality=High definition
< embedplayer=Embedded object (may be media player, not video)
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/en-US/unplug_result.dtd releases/unplug-2.03/source/chrome/locale/en-US/unplug_result.dtd
1,70d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!--
< IMPORTANT: Do not include double quotes in any of these items!!
< This should probably be fixed in unplug_results.xbl somewhere.
< -->
< 
< <!ENTITY open.label           "Open">
< <!ENTITY open.accesskey       "O">
< <!ENTITY open.tab.label       "Open in a new tab">
< <!ENTITY open.tab.accesskey   "t">
< <!ENTITY open.tab.tooltip     "Open in a new tab.">
< <!ENTITY open.new.label       "Open in a new window">
< <!ENTITY open.new.accesskey   "n">
< <!ENTITY open.new.tooltip     "Open in a new window.">
< <!ENTITY open.over.label      "Open over current window">
< <!ENTITY open.over.accesskey  "v">
< <!ENTITY open.over.tooltip    "Open over the current window.">
< <!ENTITY copyurl.label        "Copy link">
< <!ENTITY copyurl.accesskey    "y">
< <!ENTITY copyurl.tooltip      "Copy media location to the clipboard.">
< 
< <!ENTITY config.label         "Configure">
< <!ENTITY config.accesskey     "C">
< <!ENTITY config.tooltip       "Edit UnPlug's settings.">
< 
< <!ENTITY dl.label             "Download">
< <!ENTITY dl.accesskey         "D">
< <!ENTITY dl.saveas.label      "Save as">
< <!ENTITY dl.saveas.accesskey  "S">
< <!ENTITY dl.saveas.tooltip    "Use Firefox's default download manager.">
< <!ENTITY dl.dta.label         "DownThemAll">
< <!ENTITY dl.dta.accesskey     "A">
< <!ENTITY dl.dta.tooltip       "Download with the DownThemAll extension.">
< <!ENTITY dl.flashgot.label    "FlashGot">
< <!ENTITY dl.flashgot.accesskey "F">
< <!ENTITY dl.flashgot.tooltip  "Download with the FlashGot extension.">
< <!ENTITY dl.special.label     "Run a downloader">
< <!ENTITY dl.special.accesskey "R">
< <!ENTITY dl.special.tooltip   "Get or run a tool to download this file.">
< <!ENTITY dl.nodefault.tooltip "No default downloader.">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/pl-PL/common.dtd releases/unplug-2.03/source/chrome/locale/pl-PL/common.dtd
1,35d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY dialog.title         "UnPlug">
< <!ENTITY header.title         "UnPlug">
< <!ENTITY header.subtitle      "Narzędzie pobierania mediów">
< 
< <!ENTITY configure            "Konfiguruj">
< <!ENTITY configure.a          "C">
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/pl-PL/config.dtd releases/unplug-2.03/source/chrome/locale/pl-PL/config.dtd
1,77d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY configheader.subtitle "Zmieñ ustawienia">
< 
< <!-- tab headings -->
< <!ENTITY tab.title.general "Opcje ogólne">
< <!ENTITY tab.title.opener "Otwieracz">
< <!ENTITY tab.title.downloader "Pobieracz">
< <!ENTITY tab.title.advanced "Zaawansowane">
< <!ENTITY tab.title.about "O wtytczce UnPlug">
< 
< <!-- general options -->
< <!ENTITY interface.title "Gdzie dodaæ UnPlug">
< <!ENTITY interface.toolsmenu "Dodaj skrót do menu &quot;Narzêdzia&quot;">
< <!ENTITY interface.toolsmenu.a "t">
< <!ENTITY interface.contextmenu "Dodaj skrót do menu kontekstowego (prawoklik)">
< <!ENTITY interface.contextmenu.a "x">
< <!ENTITY interface.toolbarbtn "Dodaj przycisk do paska narzêdzi">
< <!ENTITY interface.toolbarbtn.a "b">
< <!ENTITY privacy.title "PrywatnoϾ">
< <!ENTITY privacy.popcontest "Wysy³aj informacje na jakich stronach u¿ywasz UnPlug">
< <!ENTITY privacy.popcontest.a "S">
< <!ENTITY privacy.infolink "O tej funkcji">
< <!ENTITY privacy.infolink.a "A">
< <!ENTITY rulesxml.title "Plik rules.xml">
< <!ENTITY rulesxml.description "Plik rules.xml posiada informacje jak odnajdywaæ media na stronie internetowej.">
< <!ENTITY rulesxml.default "Domyœlne">
< <!ENTITY rulesxml.default.a "D">
< 
< <!-- opener tab -->
< 
< <!-- downloader tab -->
< <!ENTITY downloader.auto "Automatycznie">
< <!ENTITY downloader.addons "Wspierane rozszerzenia">
< <!ENTITY downloader.dta "DownThemAll">
< <!ENTITY downloader.flashgot "FlashGot">
< 
< <!-- advanced tab -->
< <!ENTITY showall.title "Poka¿ dodatkowe rezultaty">
< <!ENTITY showall.label "Poka¿ rezultaty które mog¹ dzia³aæ Ÿle">
< <!ENTITY showall.label.a "S">
< 
< <!-- about tab -->
< <!ENTITY about.title "Dziêkujê Ci za zainstalowanie UnPlug">
< <!ENTITY about.description "UnPlug jest darmowy and open source.">
< <!ENTITY about.gpl "GNU General Public License">
< <!ENTITY about.agpl "GNU Affero General Public License, version 3">
< <!ENTITY about.updated "Zmieniono ustawienia UnPlug.">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/pl-PL/overlay.dtd releases/unplug-2.03/source/chrome/locale/pl-PL/overlay.dtd
1,12d0
< <!--
< This is the dtd file for overlay.xul
< 
< Created 03/06/06 by jb marcon
< 
< No translation needed.
< -->
< 
< <!ENTITY menuitem.unplug "UnPlug">
< <!ENTITY menuitem.u "U">
< <!ENTITY toolbarbutton.unplug "UnPlug">
< <!ENTITY toolbarbutton.unplug.tip "UnPlug - Search for media on this page">
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/pl-PL/searchpage.dtd releases/unplug-2.03/source/chrome/locale/pl-PL/searchpage.dtd
1,35d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY notfound.label       "Nic nie znaleziono ?">
< <!ENTITY notfound.accesskey   "N">
< <!ENTITY stop.label           "Stop">
< <!ENTITY stop.accesskey       "S">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/pl-PL/strings.txt releases/unplug-2.03/source/chrome/locale/pl-PL/strings.txt
1,27d0
< extensions.{unplug@compunach}.description=Download embedded media
< 
< # Confirmation after clicking on "Nothing found" button
< nothing_found_send_data=Czy chcesz wysłać informacje o tej stronie do deweloperów UnPlug?
< 
< # Short status strings during/after clicking "Nothing found" button
< nothing_found_sending=Wysyłanie...
< nothing_found_done=Dzięki !
< nothing_found_failed=Błąd
< 
< # for below the search box
< search_done=Zakończono
< search_busy=Busy
< search_1_active_download=1 aktywne pobieranie
< search_n_active_downloads=# aktywne pobierania
< search_no_results_yet=Jeszcze brak wyników
< search_1_result=1 wynik
< search_n_results=# wyników
< search_no_results=Brak wyników
< cannot_download_this_kind=Cannot download this kind of file
< 
< # for rules.xml
< high_quality=Wysoka jakość
< low_quality=Niska jakość
< mid_quality=Normalna jakość
< hd_quality=High definition
< embedplayer=Osadzony objekt (prawdopodobnie odtwarzacz, nie wideo)
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/locale/pl-PL/unplug_result.dtd releases/unplug-2.03/source/chrome/locale/pl-PL/unplug_result.dtd
1,67d0
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2009 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU General Public License as published by
<  *  the Free Software Foundation, either version 3 of the License, or
<  *  (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< -->
< 
< <!ENTITY open.label           "Otwórz">
< <!ENTITY open.accesskey       "O">
< <!ENTITY open.tab.label       "Otwórz w nowej karcie">
< <!ENTITY open.tab.accesskey   "t">
< <!ENTITY open.tab.tooltip     "">
< <!ENTITY open.new.label       "Otwórz w nowym oknie">
< <!ENTITY open.new.accesskey   "n">
< <!ENTITY open.new.tooltip     "">
< <!ENTITY open.over.label      "Otwórz w tym oknie">
< <!ENTITY open.over.accesskey  "v">
< <!ENTITY open.over.tooltip    "">
< <!ENTITY copyurl.label        "Kopiuj link">
< <!ENTITY copyurl.accesskey    "y">
< <!ENTITY copyurl.tooltip      "">
< 
< <!ENTITY config.label         "Konfiguruj">
< <!ENTITY config.accesskey     "C">
< <!ENTITY config.tooltip       "">
< 
< <!ENTITY dl.label             "Pobierz">
< <!ENTITY dl.accesskey         "D">
< <!ENTITY dl.saveas.label      "Zapisz jako">
< <!ENTITY dl.saveas.accesskey  "S">
< <!ENTITY dl.saveas.tooltip    "Użyj wbudowanego menedżera pobrań Firefoxa.">
< <!ENTITY dl.dta.label         "DownThemAll">
< <!ENTITY dl.dta.accesskey     "A">
< <!ENTITY dl.dta.tooltip       "Pobierz rozszerzeniem DownThemAll.">
< <!ENTITY dl.flashgot.label    "FlashGot">
< <!ENTITY dl.flashgot.accesskey "F">
< <!ENTITY dl.flashgot.tooltip  "Pobierz rozszerzeniem FlashGot.">
< 
< <!-- translate -->
< <!ENTITY dl.special.label     "Run a downloader">
< <!ENTITY dl.special.accesskey "R">
< <!ENTITY dl.special.tooltip   "Get or run a tool to download this file.">
< <!ENTITY dl.nodefault.tooltip "No default downloader.">
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/skin/overlay_firefox.css releases/unplug-2.03/source/chrome/skin/overlay_firefox.css
1,13d0
< toolbarbutton#unplug2_toolbarbutton {
< 	list-style-image : url(chrome://unplug/skin/unplug-24.png);
< }
< 
< toolbar[iconsize="small"] toolbarbutton#unplug2_toolbarbutton {
< 	list-style-image : url(chrome://unplug/skin/unplug-16.png);
< }
< 
< menuitem#unplug2_toolsmenu ,
< menuitem#unplug2_contextmenu {
< 	list-style-image : url(chrome://unplug/skin/unplug-16.png);
< }
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome/skin/searchpage.css releases/unplug-2.03/source/chrome/skin/searchpage.css
1,118d0
< .unplug-result {
< }
< 
< .unplug-result image.ur-thumbnail {
< 	width: 4.8em;
< 	height: 2.8em;
< 	border: 1px black solid;
< 	margin: 0.2em;
< 	background: #000000;
< }
< 
< .unplug-result label.ur-name {
< 	font-weight: bold;
< }
< 
< .unplug-result label.ur-protocol,
< .unplug-result label.ur-host {
< 	font-size: smaller;
< 	color: #008000;
< }
< 
< .unplug-result label.ur-protocol {
< }
< 
< .unplug-result label.ur-description {
< }
< 
< .unplug-result.file-ext-swf,
< .unplug-result.certainty-low {
< 	opacity: 0.5;
< }
< 
< .unplug-result .menuitem-iconic.config {
< 	list-style-image: url("chrome://unplug/skin/tango-16/preferences-system.png");
< }
< 
< .unplug-result .menuitem-iconic.saveas {
< 	list-style-image: url("chrome://unplug/skin/tango-16/document-save-as.png");
< }
< 
< .unplug-result .menuitem-iconic.dta {
< 	list-style-image: url("chrome://dta/skin/common/dta.png");
< }
< 
< .unplug-result .menuitem-iconic.flashgot {
< 	list-style-image: url("chrome://flashgot/skin/fg1.png");
< }
< 
< .unplug-result .menuitem-iconic.fallback {
< 	list-style-image: url("chrome://unplug/skin/tango-16/dialog-error.png");
< }
< 
< .unplug-result .menuitem-iconic.special {
< 	list-style-image: url("chrome://unplug/skin/star-in-circle-16.png");
< }
< 
< .unplug-result .menuitem-iconic.copyurl {
< 	list-style-image: url("chrome://unplug/skin/tango-16/edit-copy.png");
< }
< 
< .unplug-result .menuitem-iconic.opentab {
< 	list-style-image: url("chrome://unplug/skin/tango-16/tab-new.png");
< }
< 
< .unplug-result .menuitem-iconic.opennew {
< 	list-style-image: url("chrome://unplug/skin/tango-16/window-new.png");
< }
< 
< .unplug-result .menuitem-iconic.openover {
< 	list-style-image: url("chrome://unplug/skin/tango-16/window.png");
< }
< 
< .unplug-result toolbarbutton > toolbarbutton > label {
< 	/* this aligns the label on the drop-down buttons correctly (ie: not just on the top) */
< 	max-height : 1em;
< }
< 
< #dynamic_results.failed {
< 	color: #cc0000;
< 	font-weight: bold;
< }
< 
< #stop_button {
< 	list-style-image: url("chrome://unplug/skin/tango-16/process-stop.png");
< }
< 
< #stop_button[disabled] {
< 	/* greyscale; brightness + 100% */
< 	list-style-image: url("chrome://unplug/skin/tango-16/process-stop-disabled.png");
< }
< 
< vbox.container {
< 	border: 1px black solid;
< 	margin: 0;
< 	padding; 0;
< }
< 
< vbox.container#mediaid_none {
< 	/* TODO -  not used */
< }
< 
< .unplug-result.mediaid-best {
< }
< .unplug-result.mediaid-collapse {
< }
< 
< .unplug-result.mediaid-collapse label.ur-name {
< 	opacity: 0.8;
< 	display: none;
< }
< .unplug-result.mediaid-collapse image.ur-thumbnail {
< 	visibility: hidden;
< }
< .unplug-result.mediaid-collapse label.ur-protocol,
< .unplug-result.mediaid-collapse label.ur-host {
< 	/* display: none; */
< }
< 
Binary files releases/unplug-2.032/source/chrome/skin/star-in-circle-16.png and releases/unplug-2.03/source/chrome/skin/star-in-circle-16.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/dialog-error.png and releases/unplug-2.03/source/chrome/skin/tango-16/dialog-error.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/document-save-as.png and releases/unplug-2.03/source/chrome/skin/tango-16/document-save-as.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/edit-copy.png and releases/unplug-2.03/source/chrome/skin/tango-16/edit-copy.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/preferences-system.png and releases/unplug-2.03/source/chrome/skin/tango-16/preferences-system.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/process-stop-disabled.png and releases/unplug-2.03/source/chrome/skin/tango-16/process-stop-disabled.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/process-stop.png and releases/unplug-2.03/source/chrome/skin/tango-16/process-stop.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/tab-new.png and releases/unplug-2.03/source/chrome/skin/tango-16/tab-new.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/window-new.png and releases/unplug-2.03/source/chrome/skin/tango-16/window-new.png differ
Binary files releases/unplug-2.032/source/chrome/skin/tango-16/window.png and releases/unplug-2.03/source/chrome/skin/tango-16/window.png differ
Binary files releases/unplug-2.032/source/chrome/skin/unplug-16.png and releases/unplug-2.03/source/chrome/skin/unplug-16.png differ
Binary files releases/unplug-2.032/source/chrome/skin/unplug-24.png and releases/unplug-2.03/source/chrome/skin/unplug-24.png differ
Binary files releases/unplug-2.032/source/chrome/skin/unplug-32.png and releases/unplug-2.03/source/chrome/skin/unplug-32.png differ
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/chrome.manifest releases/unplug-2.03/source/chrome.manifest
1,15d0
< content     unplug                chrome/content/
< # application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
< overlay chrome://browser/content/browser.xul chrome://unplug/content/overlay/firefox.xul
< 
< skin        unplug     default    chrome/skin/
< 
< #testing
< #locale      unplug     en-US      chrome/locale/pl-PL/
< 
< locale      unplug     en-US      chrome/locale/en-US/
< locale      unplug     de-DE      chrome/locale/de-DE/
< locale      unplug     pl-PL      chrome/locale/pl-PL/
< 
< 
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/defaults/preferences/unplug2.js releases/unplug-2.03/source/defaults/preferences/unplug2.js
1,8d0
< pref("extensions.unplug2.setup_number", 0);
< pref("extensions.unplug2.add_to_contextmenu", true);
< pref("extensions.unplug2.add_to_toolsmenu", true);
< pref("extensions.unplug2.downloader", "auto");
< pref("extensions.unplug2.opener", "copyurl");
< pref("extensions.unplug2.popularity_contest", false);
< pref("extensions.unplug2.show_all", false);
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/install.rdf releases/unplug-2.03/source/install.rdf
1,21d0
< <?xml version="1.0"?>
< <RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
<          xmlns:NC="http://home.netscape.com/NC-rdf#"
<          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<   <RDF:Description RDF:about="rdf:#$2b9VD"
<                    em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
<                    em:minVersion="1.5"
<                    em:maxVersion="4.0b4" />
<   <RDF:Description RDF:about="urn:mozilla:install-manifest"
<                    em:id="unplug@compunach"
<                    em:version="2.032"
<                    em:type="2"
<                    em:name="UnPlug"
<                    em:description="Find and download media from websites"
<                    em:creator="h2g2bob &lt;unplug@dbatley.com&gt;"
<                    em:homepageURL="http://unplug.dbatley.com/"
<                    em:iconURL="chrome://unplug/skin/unplug-32.png"
<                    em:optionsURL="chrome://unplug/content/config/config.xul" >
<     <em:targetApplication RDF:resource="rdf:#$2b9VD"/>
<   </RDF:Description>
< </RDF:RDF>
Binary files releases/unplug-2.032/unplug.xpi and releases/unplug-2.03/unplug.xpi differ