From ba03922cfa9b9f2283c24e5582dc4a126a5ee7f2 Mon Sep 17 00:00:00 2001
From: "gayatrib%netscape.com" <gayatrib%netscape.com>
Date: Mon, 14 Aug 2000 22:03:23 +0000
Subject: [PATCH] fix for bug 41987. r=alecf

---
 mailnews/base/prefs/resources/content/am-server.js  | 12 +++++++++++-
 mailnews/base/prefs/resources/content/am-server.xul |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mailnews/base/prefs/resources/content/am-server.js b/mailnews/base/prefs/resources/content/am-server.js
index 442bd08c9f54..4de6b21cbcbb 100644
--- a/mailnews/base/prefs/resources/content/am-server.js
+++ b/mailnews/base/prefs/resources/content/am-server.js
@@ -76,10 +76,20 @@ function hideShowControls(serverType)
 
         // hide unsupported server type
 
+        // adding support for hiding multiple server types using hideFor="server1,server2"
+        var hideForBool = false;
+        var hideForTokens = hideFor.split(",");
+        for (j = 0; j < hideForTokens.length; j++) {
+            if (hideForTokens[j] == serverType) {
+                hideForBool = true;
+                break;
+            }
+        }
+
         if ((controlType != "server" &&
              controlType != "identity" &&
              controlType != serverType) ||
-            hideFor == serverType) {
+            hideForBool) {
             box.setAttribute("hidden", "true");
         }
         else {
diff --git a/mailnews/base/prefs/resources/content/am-server.xul b/mailnews/base/prefs/resources/content/am-server.xul
index 8aa0b8607334..19d1ac703d77 100644
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@@ -59,7 +59,7 @@
     <textfield wsm_persist="true" id="server.biffMinutes" size="3"/>
     <text class="label" for="server.biffMinutes" value="&biffEnd.label;"/>
   </box>
-  <checkbox style="margin-left: 2em" hidefor="nntp"
+  <checkbox style="margin-left: 2em" hidefor="imap,nntp"
             wsm_persist="true" id="server.downloadOnBiff"
             value="&downloadOnBiff.label;"/>
   <checkbox wsm_persist="true" id="pop3.leaveMessagesOnServer"