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.033/source/chrome/content/common.js
135c135
< version : 2.032,
---
> version : 2.033,
139c139
< revision : 201008291635,
---
> revision : 201009080130,
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.033/source/chrome/content/display/pop/pop.js
178c178
< if (old_result.certainty > result.certainty) {
---
> if (old_result.details.certainty < result.details.certainty) {
180c180
< UnPlug2SearchPage.results[uid].details = result.description;
---
> UnPlug2SearchPage.results[uid].details = result.details;
299c299
< reselem.className].join(" ")
---
> "unplug-result" ].join(" ")
419,420c419,420
< // replace non-letter characters with "_"
< name = name.replace(RegExp("[^\\w\\s_\\-\\(\\)]+", "g"), "_");
---
> // replace bad characters with "_"
> name = name.replace(RegExp("[\\*\\\\/\\?\\<\\>~#\\|`\\$\\&;:%\"'\x00-\x1f]+", "g"), "_");
464c464,468
< UnPlug2SearchPage.send_nothing_found_msg_noask();
---
> try {
> UnPlug2SearchPage.send_nothing_found_msg_noask();
> } catch (e) {
> UnPlug2.log("Error sending nothing found msg " + e);
> }
468,469d471
< var post_data = "url=" + escape(UnPlug2SearchPage._win.location) + "&version=" + escape(UnPlug2.version) + "&revision=" + escape(UnPlug2.revision);
<
479,484c481,486
< null, // id
< "http://unplug.dbatley.com/ajax/notfound.php",
< post_data,
< UnPlug2SearchPage.done_nothing_found_msg,
< UnPlug2SearchPage.failed_nothing_found_msg,
< 60000)
---
> null, // ref
> "http://unplug.dbatley.com/popularity_contest/submit.cgi",
> "problem=yes&useragent=" + escape(window.navigator.userAgent) + "&url=" + escape(UnPlug2SearchPage._win.location.href) + "&version=" + UnPlug2.version + "&revision=" + UnPlug2.revision + "&codename=" + UnPlug2.codename,
> null, null, // callbacks
> 10000);
> dl.start()
535c537,538
< || res.download.url.indexOf("https://") == 0);
---
> || res.download.url.indexOf("https://") == 0
> || res.download.url.indexOf("ftp://") == 0);
541a545
> // keep this here
569c573
< if (!window.opener.DTA_AddingFunctions) {
---
> if (!window.opener.DTA_AddingFunctions && !window.DTA) {
601c605,611
< window.opener.DTA_AddingFunctions.sendToDown(true, [link]);
---
> if (window.DTA) {
> // DTA 2.0
> DTA.sendLinksToManager(window, true, [link]);
> } else {
> // DTA 1.0
> window.opener.DTA_AddingFunctions.sendToDown(true, [link]);
> }
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.033/source/chrome/content/display/pop/pop.xul
63c63
<
---
>
64a65,66
>
>
83c85
<
---
>
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.033/source/chrome/content/rules.xml
32,42c32,56
< youtube.com
< addthis.com
< xtendmedia.com
< doubleclick.net
< googlesyndication.com
< yieldmanager.com
< admeld.com
< invitemedia.com
< quantserve.com
< cpro.baidu.com
< contentabc.com
---
> 247realmedia.com
> addtoany.com
> addthis.com
> adjug.com
> admeld.com
> adxpansion.com
> adultfriendfinder.com
> alleliteads.com
> contentabc.com
> cpro.baidu.com
> doubleclick.net
> ebay.com
> facebook.com
> fbcdn.net
> googlesyndication.com
> invitemedia.com
> mediagra.com
> mediaplex.com
> mookie1.com
> quantserve.com
> reliablebanners.com
> whaleads.com
> xtendmedia.com
> yieldmanager.com
> youtube.com
54a69,74
>
>
>
>
>
>
162c182
<
---
>
353,355c373,379
<
<
<
---
>
>
>
>
>
>
>
409c433
<
---
>
411,412c435,437
<
<
---
>
>
>
437a463,467
>
>
>
>
>
454,476c484,508
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
---
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
488,489d519
<
<
490a521
>
491a523,530
>
>
>
>
>
>
>
>
494c533
<
---
>
495a535
>
496a537,547
>
>
>
>
>
>
>
>
>
>
>
586a638,643
>
>
>
>
>
>
593,630c650
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
---
>
634,636c654,658
<
<
<
---
>
>
>
>
640d661
<
644d664
< * xhamster.com
648c668
< (addParam|addVariable)\s*\(\s*["'](image|thumbnail)["']\s*,\s*["'](.*?)["']\s*\)
---
> (addParam|addVariable)\s*\(\s*["'](image|thumbnail|preview)["']\s*,\s*["'](.*?)["']\s*\)
652,657c672,688
<
<
<
<
< addVariable\('srv','([^']+)'\)
<
---
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
725a757,773
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
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.033/source/chrome/content/search/rules.js
572a573
> "3gp",
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.033/source/chrome/content/search/search.js
857,858c857,858
< if (UnPlug2.get_pref("popularity_contest"))
< new UnPlug2Download(
---
> if (UnPlug2.get_pref("popularity_contest")) {
> var dl = new UnPlug2Download(
863a864,865
> dl.start()
> }
1124c1126
< download_method.referer = updated_variables.subst_optional(node.getAttribute("referer")) || undefined;
---
> download_method.referer = updated_variables.subst_optional(node.getAttribute("referer"));
1125a1128
> download_method.referer = download_method.referer || String(UnPlug2SearchPage._win.location);
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.033/source/chrome/locale/de-DE/common.dtd
31c31
<
---
>
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.033/source/chrome/locale/de-DE/overlay.dtd
12c12
<
---
>
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.033/source/chrome/locale/de-DE/searchpage.dtd
31c31
<
---
>
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.033/source/chrome/locale/de-DE/strings.txt
20c20
< cannot_download_this_kind=Cannot download this kind of file
---
> cannot_download_this_kind=Kann diese Datei nicht herunterladen Typ
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.033/source/chrome/locale/de-DE/unplug_result.dtd
59,64c59,62
<
<
<
<
<
<
---
>
>
>
>
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.032/source/install.rdf releases/unplug-2.033/source/install.rdf
11c11
< em:version="2.032"
---
> em:version="2.033"
Binary files releases/unplug-2.032/unplug.xpi and releases/unplug-2.033/unplug.xpi differ