[or-cvs] [torbutton/maint-1.2 1/5] Bug 1941: Add DuckDuckGo to CAPTCHA redir option.

[mikeperry@xxxxxxxxxxxxxx]

Author: aiden tighe <f00f@xxxxx>
Date: Tue, 14 Sep 2010 09:24:02 -0400
Subject: Bug 1941: Add DuckDuckGo to CAPTCHA redir option.
Commit: bfd4b1c9cbed8aaaf08886b57d5904c4f7e93937

---
 src/chrome/content/preferences.js       |    5 ++++-
 src/chrome/content/preferences.xul      |    2 ++
 src/chrome/locale/en/torbutton.dtd      |    9 +++++----
 src/defaults/preferences/preferences.js |    9 +++++----
 website/design/design.xml               |    4 ++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 75fe16f..27f4e0d 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -486,8 +486,11 @@ function torbutton_prefs_save(doc) {
     } else if(doc.getElementById('torbutton_searchEngine').selectedItem ==
             doc.getElementById('torbutton_engine3')) {
         o_torprefs.setIntPref('google_redir_url', 3);
-    } else {
+    } else if(doc.getElementById('torbutton_searchEngine').selectedItem ==
+            doc.getElementById('torbutton_engine4')) {
         o_torprefs.setIntPref('google_redir_url', 4);
+    } else {
+        o_torprefs.setIntPref('google_redir_url', 5);
     }
 
     /*
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 7683513..93e69fc 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -353,6 +353,8 @@
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
               <radio id="torbutton_engine4" label="&torbutton.prefs.engine4;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
+              <radio id="torbutton_engine5" label="&torbutton.prefs.engine5;"
+                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
              </radiogroup>
             </hbox>
 
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 8dcfb2b..739b50d 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -99,8 +99,9 @@
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
 <!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
 <!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
-<!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine1 "duckduckgo.com">
+<!ENTITY torbutton.prefs.engine2 "ixquick.com">
+<!ENTITY torbutton.prefs.engine3 "Bing.com">
+<!ENTITY torbutton.prefs.engine4 "Yahoo.com">
+<!ENTITY torbutton.prefs.engine5 "scroogle.org">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 661c761..80d5577 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -175,10 +175,11 @@ pref("extensions.torbutton.xfer_google_cookies", true);
 pref("extensions.torbutton.google_redir_url", 1);
 pref("extensions.torbutton.dodge_google_captcha", true);
 pref("extensions.torbutton.asked_google_captcha", false);
-pref("extensions.torbutton.redir_url.1", "https://www.ixquick.com/do/metasearch.pl?query=";);
-pref("extensions.torbutton.redir_url.2", "http://www.bing.com/search?q=";);
-pref("extensions.torbutton.redir_url.3", "http://search.yahoo.com/search?p=";);
-pref("extensions.torbutton.redir_url.4", "https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=";);
+pref("extensions.torbutton.redir_url.1", "https://duckduckgo.com/?q=";);
+pref("extensions.torbutton.redir_url.2", "https://www.ixquick.com/do/metasearch.pl?query=";);
+pref("extensions.torbutton.redir_url.3", "http://www.bing.com/search?q=";);
+pref("extensions.torbutton.redir_url.4", "http://search.yahoo.com/search?p=";);
+pref("extensions.torbutton.redir_url.5", "https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=";);
 pref("extensions.torbutton.fix_google_srch", true);
 
 // User agent prefs:
diff --git a/website/design/design.xml b/website/design/design.xml
index 18c1d69..c2ae339 100644
--- a/website/design/design.xml
+++ b/website/design/design.xml
@@ -2001,9 +2001,9 @@ As a result, we've implemented this option as an <ulink
 url="https://developer.mozilla.org/en/XUL_School/Intercepting_Page_Loads#HTTP_Observers";>'http-on-modify-request'</ulink>
 http observer to optionally redirect banned or captcha-triggering Google
 queries to search engines that do not rate limit Tor users. The current
-options are ixquick.com, bing.com, yahoo.com and scroogle.org. These are
+options are duckduckgo.com, ixquick.com, bing.com, yahoo.com and scroogle.org. These are
 encoded in the preferences
-<command>extensions.torbutton.redir_url.[1-4]</command>.
+<command>extensions.torbutton.redir_url.[1-5]</command>.
 
 </para>
 </sect2>
-- 
1.7.1