more work for #169638. implementing spam UI. get the "enable logging" checkbox to work and persisting in prefs. r/sr=bienvenu.

git-svn-id: svn://10.0.0.236/trunk@130486 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/base/resources/content/junkMail.js

@@ -17,7 +17,7 @@ function onServerClick(event)
 
   // before we set the UI for the new server,
   // save off the old one
-  storeSettings(gSpamSettings[gCurrentServer.key].settings);
+  storeSettings(gSpamSettings[gCurrentServer.key].settings, gCurrentServer.spamSettings.loggingEnabled);
 
   // set up the UI for the server
   setupForAccountFromFolder(event.target.id);
@@ -102,8 +102,10 @@ function onAccept()
   return true;
 }
 
-function storeSettings(aSettings)
+function storeSettings(aSettings, aLoggingEnabled)
 {
+  dump("XXX aLoggingEnabled " + aLoggingEnabled + "\n");
+
   aSettings.level = document.getElementById("level").selectedItem.getAttribute("value");
 
   aSettings.moveOnSpam = document.getElementById("moveOnSpam").checked;
@@ -116,10 +118,11 @@ function storeSettings(aSettings)
 
   aSettings.useWhiteList = document.getElementById("useWhiteList").checked;
   aSettings.whiteListAbURI = document.getElementById("whiteListAbURI").selectedItem.getAttribute("id");
+  aSettings.loggingEnabled = aLoggingEnabled;
 }
 
 function doHelpButton()
 {
   // until we have help, I use this for testing
-  dump("XXX " + gSpamSettings[gCurrentServer.key].settings.spamFolderURI + "\n");
+  dump("XXX " + gSpamSettings[gCurrentServer.key].settings.loggingEnabled + "\n");
 }

mozilla/mailnews/base/src/nsSpamSettings.cpp

@@ -313,6 +313,10 @@ NS_IMETHODIMP nsSpamSettings::Clone(nsISpamSettings *aSpamSettings)
   NS_ENSURE_SUCCESS(rv,rv);
   mWhiteListAbURI = whiteListAbURI;
   
+  PRBool loggingEnabled;
+  rv = aSpamSettings->GetLoggingEnabled(&loggingEnabled);
+  NS_ENSURE_SUCCESS(rv,rv);
+  mLoggingEnabled = loggingEnabled;
   return rv;
 }
 

mozilla/mailnews/base/util/nsMsgIncomingServer.cpp

@@ -1865,6 +1865,16 @@ nsMsgIncomingServer::SetSpamSettings(nsISpamSettings *aSpamSettings)
   NS_ENSURE_SUCCESS(rv,rv);
   rv = SetIntValue("purgeSpamInterval", purgeSpamInterval);
   NS_ENSURE_SUCCESS(rv,rv);
+
+  PRInt32 loggingEnabled;
+  rv = mSpamSettings->GetLoggingEnabled(&loggingEnabled);
+  NS_ENSURE_SUCCESS(rv,rv);
+  rv = SetBoolValue("spamLoggingEnabled", loggingEnabled);
+  NS_ENSURE_SUCCESS(rv,rv);
+
+  // flush these pref changes to disk
+  rv = m_prefs->SavePrefFile(nsnull);
+  NS_ENSURE_SUCCESS(rv,rv);
   return NS_OK;
 }
 
@@ -1936,6 +1946,12 @@ nsMsgIncomingServer::GetSpamSettings(nsISpamSettings **aSpamSettings)
     NS_ENSURE_SUCCESS(rv,rv);
     rv = mSpamSettings->SetPurgeInterval(purgeSpamInterval);
     NS_ENSURE_SUCCESS(rv,rv);
+    
+    PRInt32 loggingEnabled;
+    rv = GetBoolValue("spamLoggingEnabled", &loggingEnabled);
+    NS_ENSURE_SUCCESS(rv,rv);
+    rv = mSpamSettings->SetLoggingEnabled(loggingEnabled);
+    NS_ENSURE_SUCCESS(rv,rv);
   }
 
   NS_ADDREF(*aSpamSettings = mSpamSettings);

mozilla/mailnews/mailnews.js

@@ -341,6 +341,7 @@ pref("mail.server.default.useWhiteList",true);
 pref("mail.server.default.whiteListAbURI","moz-abmdbdirectory://abook.mab");  // the Personal addressbook.
 pref("mail.server.default.purgeSpam",false);
 pref("mail.server.default.purgeSpamInterval",14); // 14 days
+pref("mail.server.default.spamLoggingEnabled",false);
 
 pref("mail.smtpserver.default.auth_method", 1); // auth any
 pref("mail.smtpserver.default.try_ssl", 0);

mozilla/modules/libpref/src/init/mailnews.js

@@ -341,6 +341,7 @@ pref("mail.server.default.useWhiteList",true);
 pref("mail.server.default.whiteListAbURI","moz-abmdbdirectory://abook.mab");  // the Personal addressbook.
 pref("mail.server.default.purgeSpam",false);
 pref("mail.server.default.purgeSpamInterval",14); // 14 days
+pref("mail.server.default.spamLoggingEnabled",false);
 
 pref("mail.smtpserver.default.auth_method", 1); // auth any
 pref("mail.smtpserver.default.try_ssl", 0);