From 74677d102e74191884c9414d64158cf071220337 Mon Sep 17 00:00:00 2001
From: "rsx11m.pub@gmail.com" <rsx11m.pub@gmail.com>
Date: Wed, 4 May 2011 15:40:31 +0100
Subject: [PATCH] Bug 653103 - Scam detection generates too many false
 positives to be useful and should be easier to turn off as interim fix;
 r=Standard8 ui-review=bwinton

---
 mail/base/content/mailWindowOverlay.js            | 9 +++++++++
 mail/base/content/mailWindowOverlay.xul           | 2 ++
 mail/locales/en-US/chrome/messenger/messenger.dtd | 1 +
 3 files changed, 12 insertions(+)

diff --git a/mail/base/content/mailWindowOverlay.js b/mail/base/content/mailWindowOverlay.js
index 7b80ee3f96..d59d2d3986 100644
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -2770,6 +2770,15 @@ function IgnorePhishingWarning()
   setMsgHdrPropertyAndReload("notAPhishMessage", 1);
 }
 
+/**
+ *  Allow disabling the scam feature for all messages until lists are in place.
+ */
+function DisablePhishingWarning()
+{
+  Application.prefs.setValue("mail.phishing.detection.enabled", false);
+  ReloadMessage();
+}
+
 function setMsgHdrPropertyAndReload(aProperty, aValue)
 {
   // we want to get the msg hdr for the currently selected message
diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index d4cd3f6ea2..d5ea4535fc 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1940,6 +1940,8 @@
     <image id="phishingBarImage"/>
     <vbox flex="1">
       <description flex="1" class="msgNotificationBarText">&phishingBarMessage2.label;</description>
+      <label id="disablePhishingWarning" class="msgNotificaton-smallText text-link"
+             value="&disablePhishingWarning1.label;" onclick="DisablePhishingWarning();"/>
       <label id="reportPhishingError" value="&reportPhishingError1.label;" class="msgNotificaton-smallText text-link" collapsed="true"/>
     </vbox>
     <button label="&removePhishingBarButton1.label;" oncommand="IgnorePhishingWarning();"/>
diff --git a/mail/locales/en-US/chrome/messenger/messenger.dtd b/mail/locales/en-US/chrome/messenger/messenger.dtd
index 777ab4d182..29fc62abdb 100644
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -758,6 +758,7 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage2.label "This message may be a scam.">
 <!ENTITY removePhishingBarButton1.label "Ignore Warning">
+<!ENTITY disablePhishingWarning1.label "Disable scam detection for all messages">
 <!ENTITY reportPhishingError1.label "This message doesn't appear to be a scam.">
 
 <!-- MDN Bar -->