fix for bug #198749

implement "Tools | Run Junk Mail Controls on Folder"
rename "Tools | Run Filters on Selected Folder" to
"Tools | Run Filters on Folder"

r/sr=bienvenu

mailnews/base/resources/content/mailCommands.js

@@ -471,7 +471,29 @@ function analyze(aMsgHdr, aNextFunction)
     gJunkmailComponent.classifyMessage(messageURI, msgWindow, listener);
 }
 
-function analyzeMessages()
+function analyzeFolderForJunk()
+{
+  var view = GetDBView();
+  var treeView = view.QueryInterface(Components.interfaces.nsITreeView);
+  var count = treeView.rowCount;
+  if (!count)
+    return;
+
+  var messages = new Array(count)
+  for (var i = 0; i < count; i++) {
+    messages[i] = view.getURIForViewIndex(i);
+  }
+  analyzeMessages(messages);
+}
+
+// not used yet, but soon
+function analyzeMessagesForJunk()
+{
+  var messages = GetSelectedMessages();
+  analyzeMessages(messages);
+}
+
+function analyzeMessages(messages)
 {
     function processNext()
     {
@@ -488,7 +510,6 @@ function analyzeMessages()
     }
 
     getJunkmailComponent();
-    var messages = GetSelectedMessages();
     var counter = 0;
     gJunkmailComponent.startBatch();
     dump('[bayesian filter message analysis begins.]\n');

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -1539,7 +1539,7 @@ Rights Reserved.
               oncommand="MsgJunkMail()"/>
     <menuitem label="&runJunkControls.label;"
 	      accesskey="&runJunkControls.accesskey;"
-	      oncommand="analyzeMessages();"/>
+	      oncommand="analyzeFolderForJunk();"/>
     <menuseparator/>
     <menuitem label="&importCmd.label;" 
               accesskey="&importCmd.accesskey;" 

mailnews/base/resources/locale/en-US/messenger.dtd

@@ -109,7 +109,7 @@ Rights Reserved.
 <!ENTITY selectInvertCmd.accesskey "I">
 <!ENTITY filtersCmd.label "Message Filters...">
 <!ENTITY filtersCmd.accesskey "F">
-<!ENTITY filtersApply.label "Run Filters on Selected Folder">
+<!ENTITY filtersApply.label "Run Filters on Folder">
 <!ENTITY filtersApply.accesskey "R">
 <!ENTITY folderPropsCmd.label "Properties...">
 <!ENTITY folderPropsFolderCmd.label "Folder Properties...">
@@ -523,7 +523,7 @@ Rights Reserved.
 <!ENTITY junkMailCmd.label "Junk Mail Controls...">
 <!ENTITY junkMailCmd.accesskey "J">
 
-<!ENTITY runJunkControls.label "Analyze Selected Messages for Junk...">
+<!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
 <!ENTITY runJunkControls.accesskey "u">
 
 <!-- junk bar -->