fix for bug #166899. auto detect and set redirector type to based on hostname

r=cavin, sr=bienvenu, a=asa

mailnews/imap/src/nsImapIncomingServer.cpp

@@ -93,10 +93,10 @@
 
 #include "nsITimer.h"
 #include "nsMsgUtils.h"
+
 static NS_DEFINE_CID(kCImapHostSessionList, NS_IIMAPHOSTSESSIONLIST_CID);
 static NS_DEFINE_CID(kImapProtocolCID, NS_IMAPPROTOCOL_CID);
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 static NS_DEFINE_CID(kMsgLogonRedirectorServiceCID, NS_MSGLOGONREDIRECTORSERVICE_CID);
 static NS_DEFINE_CID(kImapServiceCID, NS_IMAPSERVICE_CID);
@@ -1394,16 +1394,50 @@ NS_IMETHODIMP nsImapIncomingServer::GetRedirectorType(char **redirectorType)
   rv = GetCharValue("redirector_type", redirectorType);
   m_redirectorType = *redirectorType;
   m_readRedirectorType = PR_TRUE;
-  if (*redirectorType && !nsCRT::strcasecmp(*redirectorType, "aol"))
+
+  if (*redirectorType)  
   {
-    nsXPIDLCString hostName;
-    GetHostName(getter_Copies(hostName));
+    // we used to use "aol" as the redirector type  
+    // for both aol mail and webmail
+    // this code migrates webmail accounts to use "netscape" as the
+    // redirectory type
+    if (!nsCRT::strcasecmp(*redirectorType, "aol"))  
+    {
+      nsXPIDLCString hostName;
+      GetHostName(getter_Copies(hostName));
     
-    // Change redirector_type from "aol" to "netscape" if necessary
-    if (hostName.get() && !nsCRT::strcasecmp(hostName, "imap.mail.netcenter.com"))
-      SetRedirectorType("netscape");
+      if (hostName.get() && !nsCRT::strcasecmp(hostName, "imap.mail.netcenter.com"))
+        SetRedirectorType("netscape");
+    }
   }
+  else 
+  {
+    // for people who have migrated from 4.x or outlook, or mistakenly
+    // created redirected accounts as regular imap accounts, 
+    // they won't have redirector type set properly
+    // this fixes the redirector type for them automatically
+    nsCAutoString prefName;
+    rv = CreateHostSpecificPrefName("default_redirector_type", prefName);
+    NS_ENSURE_SUCCESS(rv,rv);
+
+    nsXPIDLCString defaultRedirectorType;
   
+    nsCOMPtr <nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
+    NS_ENSURE_SUCCESS(rv,rv);
+
+    nsCOMPtr<nsIPrefBranch> prefBranch; 
+    rv = prefs->GetBranch(nsnull, getter_AddRefs(prefBranch)); 
+    NS_ENSURE_SUCCESS(rv,rv);
+
+    rv = prefBranch->GetCharPref(prefName.get(), getter_Copies(defaultRedirectorType));
+    if (NS_SUCCEEDED(rv) && !defaultRedirectorType.IsEmpty()) 
+    {
+      // only set redirectory type in memory
+      // if we call SetRedirectorType() that sets it in prefs
+      // which makes this automatic redirector type repair permanent
+      m_redirectorType = defaultRedirectorType.get();
+    }
+  }
   return NS_OK;
 }
 

mailnews/imap/src/nsImapMailFolder.cpp

@@ -2205,7 +2205,7 @@ NS_IMETHODIMP nsImapMailFolder::GetNewMessages(nsIMsgWindow *aWindow, nsIUrlList
     if (NS_SUCCEEDED(rv) && prefs)
     {
       nsCOMPtr<nsIPrefBranch> prefBranch; 
-      rv = prefs->GetBranch("", getter_AddRefs(prefBranch)); 
+      rv = prefs->GetBranch(nsnull, getter_AddRefs(prefBranch)); 
 
       // This pref might not exist, which is OK. We'll only check inbox and marked ones
       if (NS_SUCCEEDED(rv) && prefBranch)