C++ side of fix for bug 100212 - move consumers of nsIFile.URL into nsIIOService. r=dougt, sr=darin

git-svn-id: svn://10.0.0.236/branches/MAPI_NEW_DIR_TRUNK@111529 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/base/public/nsIMapiRegistry.idl

@@ -0,0 +1,70 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+interface nsIDOMWindow;
+
+/**
+ * This interface provides support for registering Mozilla as the default
+ * Mail Client. This interface can also be used to get/set the user preference
+ * for the default Mail Client.
+ * 
+ */
+[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
+interface nsIMapiRegistry: nsISupports {
+
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   attribute boolean isDefaultMailClient;
+
+   /** This is set TRUE only once per session.
+    */
+   readonly attribute boolean showDialog;
+
+   /** This will bring the dialog asking the user if he/she wants to set
+    * Mozilla as default Mail Client.
+    * Call this only if Mozilla is not the default Mail client
+    */
+   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
+   
+};
+
+%{C++
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+%}

mozilla/mailnews/mapi/makefile.win

@@ -0,0 +1,27 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Srilatha Moturi  <srilatha@netscape.com>
+#                 Krishna Mohan Khandrika <kkhandrika@netscape.com>
+
+DEPTH=..\..
+
+DIRS=mapihook resources mapiDll
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

@@ -0,0 +1,54 @@
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+;
+; The contents of this file are subject to the Mozilla Public License Version
+; 1.1 (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+; http://www.mozilla.org/MPL/
+;
+; Software distributed under the License is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+; for the specific language governing rights and limitations under the
+; License.
+;
+; The Original Code is Mozilla.
+;
+; The Initial Developer of the Original Code is
+; Netscape Communications Corp.
+; Portions created by the Initial Developer are Copyright (C) 2001
+; the Initial Developer. All Rights Reserved.
+;
+; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either the GNU General Public License Version 2 or later (the "GPL"), or
+; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+;
+; ***** END LICENSE BLOCK ***** 
+
+LIBRARY         mozMapi32.dll
+DESCRIPTION     'Mozilla Simple MAPI Support'
+
+EXPORTS
+        MAPILogon
+        MAPILogoff
+	MAPISendMail
+	MAPISendDocuments
+        MAPIFindNext
+        MAPIReadMail
+        MAPISaveMail
+        MAPIDeleteMail
+        MAPIAddress
+        MAPIDetails
+        MAPIResolveName
+        MAPIFreeBuffer
+        GetMapiDllVersion
+

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

@@ -0,0 +1,346 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <windows.h>
+#include <tchar.h>
+#include <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiMain.h"
+
+#define MAX_RECIPS  100
+#define MAX_FILES   100
+
+const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5,
+                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+const IID IID_nsIMapi = {0x6EDCD38E,0x8861,0x11d5,
+                        {0xA3,0xDD,0x00,0xB0,0xD0,0xF3,0xBA,0xA7}};
+
+DWORD tId = 0;
+
+BOOL WINAPI DllMain(HINSTANCE aInstance, DWORD aReason, LPVOID aReserved)
+{
+    switch (aReason)
+    {
+        case DLL_PROCESS_ATTACH : tId = TlsAlloc();
+                                  if (tId == 0xFFFFFFFF)
+                                      return FALSE;
+                                  break;
+
+        case DLL_PROCESS_DETACH : TlsFree(tId);
+                                  break;
+    }
+    return TRUE;
+}
+
+BOOL InitMozillaReference(nsIMapi **aRetValue)
+{
+    // Check wehther this thread has a valid Interface
+    // by looking into thread-specific-data variable
+
+    *aRetValue = (nsIMapi *)TlsGetValue(tId);
+
+    // Check whether the pointer actually resolves to
+    // a valid method call; otherwise mozilla is not running
+
+    if ((*aRetValue) && (*aRetValue)->IsValid() == S_OK)
+         return TRUE;
+
+    HRESULT hRes = ::CoInitialize(nsnull) ;
+
+    hRes = ::CoCreateInstance(CLSID_CMapiImp, NULL, CLSCTX_LOCAL_SERVER,
+                                         IID_nsIMapi, (LPVOID *)aRetValue);
+
+    if (hRes == S_OK && (*aRetValue)->Initialize() == S_OK)
+        if (TlsSetValue(tId, (LPVOID)(*aRetValue)))
+            return TRUE;
+
+    // Either CoCreate or TlsSetValue failed; so return FALSE
+
+    if ((*aRetValue))
+        (*aRetValue)->Release();
+
+            ::CoUninitialize();
+    return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////
+// The MAPILogon function begins a Simple MAPI session, loading the default message ////
+// store and address book providers                            ////
+////////////////////////////////////////////////////////////////////////////////////////
+
+ULONG FAR PASCAL MAPILogon(ULONG aUIParam, LPTSTR aProfileName,
+                            LPTSTR aPassword, FLAGS aFlags,
+                            ULONG aReserved, LPLHANDLE aSession)
+{
+    HRESULT hr = 0;
+    ULONG nSessionId = 0;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    if (!(aFlags & MAPI_UNICODE))
+    {
+        // Need to convert the parameters to Unicode.
+
+        char *pUserName = (char *) aProfileName;
+        char *pPassWord = (char *) aPassword;
+
+        TCHAR ProfileName[MAX_NAME_LEN] = {0};
+        TCHAR PassWord[MAX_PW_LEN] = {0};
+
+        if (pUserName != NULL)
+        {
+            if (!MultiByteToWideChar(CP_ACP, 0, pUserName, -1, ProfileName,
+                                                            MAX_NAME_LEN))
+                return MAPI_E_FAILURE;
+        }
+
+        if (pPassWord != NULL)
+        {
+            if (!MultiByteToWideChar(CP_ACP, 0, pPassWord, -1, PassWord,
+                                                            MAX_NAME_LEN))
+                return MAPI_E_FAILURE;
+        }
+
+        hr = pNsMapi->Login(aUIParam, ProfileName, PassWord, aFlags,
+                                                        &nSessionId);
+    }
+    else
+        hr = pNsMapi->Login(aUIParam, aProfileName, aPassword,
+                                                aFlags, &nSessionId);
+    if (hr == S_OK)
+        (*aSession) = (LHANDLE) nSessionId;
+    else
+        return nSessionId;
+
+    return SUCCESS_SUCCESS;
+}
+
+ULONG FAR PASCAL MAPILogoff (LHANDLE aSession, ULONG aUIParam,
+                                            FLAGS aFlags, ULONG aReserved)
+{
+    nsIMapi *pNsMapi = (nsIMapi *)TlsGetValue(tId);
+    if (pNsMapi != NULL)
+    {
+        if (pNsMapi->Logoff((ULONG) aSession) == S_OK)
+            pNsMapi->Release();
+        pNsMapi = NULL;
+    }
+
+    TlsSetValue(tId, NULL);
+
+    ::CoUninitialize();
+
+    return SUCCESS_SUCCESS;
+}
+
+ULONG FAR PASCAL MAPISendMail (LHANDLE lhSession, ULONG ulUIParam, lpnsMapiMessage lpMessage,
+                FLAGS flFlags, ULONG ulReserved )
+{
+    HRESULT hr = 0;
+    BOOL bTempSession = FALSE ;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    if (lpMessage->nRecipCount > MAX_RECIPS)
+        return MAPI_E_TOO_MANY_RECIPIENTS ;
+
+    if (lpMessage->nFileCount > MAX_FILES)
+        return MAPI_E_TOO_MANY_FILES ;
+
+    if ( (!(flFlags & MAPI_DIALOG)) && (lpMessage->lpRecips == NULL) )
+        return MAPI_E_UNKNOWN_RECIPIENT ;
+
+    if (!lhSession || pNsMapi->IsValidSession(lhSession) != S_OK)
+    {
+        FLAGS LoginFlag ;
+        if ( (flFlags & MAPI_LOGON_UI) && (flFlags & MAPI_NEW_SESSION) )
+            LoginFlag = MAPI_LOGON_UI | MAPI_NEW_SESSION ;
+        else if (flFlags & MAPI_LOGON_UI) 
+            LoginFlag = MAPI_LOGON_UI ;
+
+        hr = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, LoginFlag, 0, &lhSession) ;
+        if (hr != SUCCESS_SUCCESS)
+            return MAPI_E_LOGIN_FAILURE ;
+        bTempSession = TRUE ;
+    }
+
+    // we need to deal with null data passed in by MAPI clients, specially when MAPI_DIALOG is set.
+    // The MS COM type lib code generated by MIDL for the MS COM interfaces checks for these parameters
+    // to be non null, although null is a valid value for them here. 
+    nsMapiRecipDesc * lpRecips ;
+    nsMapiFileDesc * lpFiles ;
+
+    nsMapiMessage Message ;
+    memset (&Message, 0, sizeof (nsMapiMessage) ) ;
+    nsMapiRecipDesc Recipient ;
+    memset (&Recipient, 0, sizeof (nsMapiRecipDesc) );
+    nsMapiFileDesc Files ;
+    memset (&Files, 0, sizeof (nsMapiFileDesc) ) ;
+
+    if(!lpMessage)
+    {
+       lpMessage = &Message ;
+    }
+    if(!lpMessage->lpRecips)
+    {
+        lpRecips = &Recipient ;
+    }
+    else
+        lpRecips = lpMessage->lpRecips ;
+    if(!lpMessage->lpFiles)
+    {
+        lpFiles = &Files ;
+    }
+    else
+        lpFiles = lpMessage->lpFiles ;
+
+    HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
+
+    hr = pNsMapi->SendMail (lhSession, lpMessage, 
+                            (short) lpMessage->nRecipCount, lpRecips,
+                            (short) lpMessage->nFileCount, lpFiles,
+                            flFlags, ulReserved);
+
+    // we are seeing a problem when using Word, although we return success from the MAPI support
+    // MS COM interface in mozilla, we are getting this error here. This is a temporary hack !!
+    if (hr == 0x800703e6)
+        hr = SUCCESS_SUCCESS;
+    
+    if (hr == SUCCESS_SUCCESS)
+        WaitForSingleObject (hEvent, INFINITE) ;
+    CloseHandle (hEvent) ;
+    
+    if (bTempSession)
+        MAPILogoff (lhSession, ulUIParam, 0,0) ;
+
+    return hr ; 
+}
+
+
+ULONG FAR PASCAL MAPISendDocuments(ULONG ulUIParam, LPTSTR lpszDelimChar, LPTSTR lpszFilePaths,
+                                LPTSTR lpszFileNames, ULONG ulReserved)
+{
+    LHANDLE lhSession ;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    unsigned long result = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, MAPI_LOGON_UI, 0, &lhSession) ;
+    if (result != SUCCESS_SUCCESS)
+        return MAPI_E_LOGIN_FAILURE ;
+
+    HRESULT hr;
+
+    HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
+
+    hr = pNsMapi->SendDocuments(lhSession, (LPTSTR) lpszDelimChar, (LPTSTR) lpszFilePaths, 
+                                    (LPTSTR) lpszFileNames, ulReserved) ;
+
+    if (hr == SUCCESS_SUCCESS)
+        WaitForSingleObject (hEvent, INFINITE) ;
+    CloseHandle (hEvent) ;
+
+    MAPILogoff (lhSession, ulUIParam, 0,0) ;
+
+    return hr ;
+}
+
+ULONG FAR PASCAL MAPIFindNext(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageType,
+                              LPTSTR lpszSeedMessageID, FLAGS flFlags, ULONG ulReserved,
+                              LPTSTR lpszMessageID)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIReadMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
+                              FLAGS flFlags, ULONG ulReserved, lpMapiMessage FAR *lppMessage)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPISaveMail(LHANDLE lhSession, ULONG ulUIParam, lpMapiMessage lpMessage,
+                              FLAGS flFlags, ULONG ulReserved, LPTSTR lpszMessageID)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIDeleteMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
+                                FLAGS flFlags, ULONG ulReserved)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIAddress(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszCaption,
+                             ULONG nEditFields, LPTSTR lpszLabels, ULONG nRecips,
+                             lpMapiRecipDesc lpRecips, FLAGS flFlags,
+                             ULONG ulReserved, LPULONG lpnNewRecips,
+                             lpMapiRecipDesc FAR *lppNewRecips)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIDetails(LHANDLE lhSession, ULONG ulUIParam, lpMapiRecipDesc lpRecip,
+                             FLAGS flFlags, ULONG ulReserved)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIResolveName(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszName,
+                                 FLAGS flFlags, ULONG ulReserved, lpMapiRecipDesc FAR *lppRecip)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIFreeBuffer(LPVOID pv)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL GetMapiDllVersion()
+{
+    return 94;
+}
+
+
+
+

mozilla/mailnews/mapi/mapiDll/makefile.win

@@ -0,0 +1,62 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** 
+
+DEPTH=..\..\..
+
+MODULE          = mozMapi32
+EXPORT_LIBRARY  = $(MODULE)
+LIBRARY_NAME    = $(MODULE)
+DEFFILE         = Mapi32.def
+
+REQUIRES	= MapiProxy \
+                  msgMapi \
+		  xpcom \
+		  string \
+		  $(NULL)
+
+include <$(DEPTH)\config\config.mak>
+###############################################################
+
+LCFLAGS=-DUNICODE -D_UNICODE
+
+OBJS= .\$(OBJDIR)\MapiDll.obj \
+	  $(NULL)
+
+WIN_LIBS= ole32.lib \
+          $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/mapihook/build/MapiProxy.def

@@ -0,0 +1,47 @@
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+;
+; The contents of this file are subject to the Mozilla Public License Version
+; 1.1 (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+; http://www.mozilla.org/MPL/
+;
+; Software distributed under the License is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+; for the specific language governing rights and limitations under the
+; License.
+;
+; The Original Code is Mozilla.
+;
+; The Initial Developer of the Original Code is
+; Netscape Communications Corp.
+; Portions created by the Initial Developer are Copyright (C) 2001
+; the Initial Developer. All Rights Reserved.
+;
+; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either the GNU General Public License Version 2 or later (the "GPL"), or
+; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+;
+; ***** END LICENSE BLOCK ***** 
+
+LIBRARY         MapiProxy.dll
+DESCRIPTION     'Proxy/Stub DLL'
+
+EXPORTS
+                DllGetClassObject   @1  PRIVATE
+                DllCanUnloadNow     @2  PRIVATE
+                GetProxyDllInfo     @3  PRIVATE
+                DllRegisterServer   @4  PRIVATE
+                DllUnregisterServer @5  PRIVATE
+
+

mozilla/mailnews/mapi/mapihook/build/makefile.win

@@ -0,0 +1,68 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** 
+
+DEPTH=..\..\..\..
+
+MODULE           = MapiProxy
+EXPORT_LIBRARY   = $(MODULE)
+LIBRARY_NAME     = $(MODULE)
+DEFFILE          = MapiProxy.def
+
+include <$(DEPTH)\config\config.mak>
+
+##################################################################
+
+LCFLAGS=-DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
+
+OBJS= .\$(OBJDIR)\dlldata.obj   \
+    .\$(OBJDIR)\msgMapi_p.obj     \
+    .\$(OBJDIR)\msgMapi_i.obj   \
+    $(NULL)
+
+WIN_LIBS= rpcrt4.lib
+
+EXPORTS= msgMapi.h  \
+     $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c : msgMapi.idl
+    midl $(UNICODE_FLAGS) msgMapi.idl
+
+clobber::
+	rm -f dlldata.c msgMapi_i.c msgMapi_p.c msgMapi.h
+
+

mozilla/mailnews/mapi/mapihook/build/msgMapi.idl

@@ -0,0 +1,114 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This idl will be compiled by MIDL.  MS-COM is used 
+// as brdige between MAPI clients and the Mozilla.
+
+import "unknwn.idl";
+
+typedef wchar_t LOGIN_PW_TYPE[256];
+
+typedef struct
+{
+    unsigned long     ulReserved;            
+    unsigned long     flFlags;               /* Flags */
+    unsigned long     nPosition_NotUsed;     /* character in text to be replaced by attachment */
+    LPTSTR            lpszPathName;          /* Full path name including file name */
+    LPTSTR            lpszFileName;          /* Real (original) file name */
+    unsigned char *   lpFileType_NotUsed ;
+} nsMapiFileDesc, * lpnsMapiFileDesc;
+
+
+typedef struct
+{
+    unsigned long      ulReserved;           
+    unsigned long      ulRecipClass;  /* MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG    */
+    LPTSTR             lpszName;      /* Recipient name to display */
+    LPTSTR             lpszAddress;   /* Recipient email address */
+    unsigned long      ulEIDSize_NotUsed;     
+    unsigned char  *   lpEntryID_NotUsed ;
+} nsMapiRecipDesc, * lpnsMapiRecipDesc;
+
+typedef struct
+{
+    unsigned long    ulReserved;					
+    LPTSTR           lpszSubject;  /* Message Subject */
+    LPTSTR           lpszNoteText; /* Message Text */
+    LPTSTR           lpszMessageType_NotUsed;		
+    LPTSTR           lpszDateReceived_notUsed;	 /* in YYYY/MM/DD HH:MM format */
+    LPTSTR           lpszConversationID_NotUsed; /* conversation thread ID */
+    unsigned long    flFlags; /* unread,return receipt */
+    lpnsMapiRecipDesc  lpOriginator;  /* Originator descriptor  */
+    unsigned long      nRecipCount;   /* Number of recipients   */
+    lpnsMapiRecipDesc  lpRecips;      /* Recipient descriptors  */
+    unsigned long      nFileCount;    /* # of file attachments  */
+    lpnsMapiFileDesc   lpFiles;       /* Attachment descriptors */
+} nsMapiMessage, * lpnsMapiMessage;
+
+
+[
+    object,
+    uuid(6EDCD38E-8861-11d5-A3DD-00B0D0F3BAA7),
+    helpstring("nsIMapi Inteface"),
+    pointer_default(unique)
+]
+
+interface nsIMapi : IUnknown
+{
+    HRESULT Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin,
+                  LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                  [out] unsigned long *aSessionId);
+
+    HRESULT Initialize();
+    HRESULT IsValid();
+    HRESULT IsValidSession([in] unsigned long aSession);
+
+    HRESULT SendMail([in] unsigned long aSession, [in] lpnsMapiMessage aMessage,
+                  [in] short aRecipCount, [in, size_is(aRecipCount)] lpnsMapiRecipDesc aRecips, 
+                  [in] short aFileCount, [in, size_is(aFileCount)] lpnsMapiFileDesc aFiles, 
+                  [in] unsigned long aFlags, [in] unsigned long aReserved) ;
+
+    HRESULT SendDocuments( [in] unsigned long aSession, 
+                  [in] LPTSTR aDelimChar, [in] LPTSTR aFilePaths,
+                  [in] LPTSTR aFileNames, [in] ULONG aFlags ) ;
+
+    HRESULT Logoff (unsigned long aSession);
+    HRESULT CleanUp();
+};
+
+
+

mozilla/mailnews/mapi/mapihook/makefile.win

@@ -0,0 +1,41 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):  Srilatha Moturi (srilatha@netscape.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** 
+
+DEPTH=..\..\..
+
+DIRS= build public src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapihook/public/makefile.win

@@ -0,0 +1,49 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Srilatha Moturi <srilatha@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH=..\..\..\..
+
+MODULE=msgMapi
+XPIDL_MODULE=mapihook
+
+XPIDLSRCS =	\
+           .\nsIMapiRegistry.idl \
+           .\nsIMapiSupport.idl  \
+            $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/mapihook/public/nsIMapiRegistry.idl

@@ -0,0 +1,70 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+interface nsIDOMWindow;
+
+/**
+ * This interface provides support for registering Mozilla as the default
+ * Mail Client. This interface can also be used to get/set the user preference
+ * for the default Mail Client.
+ * 
+ */
+[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
+interface nsIMapiRegistry: nsISupports {
+
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   attribute boolean isDefaultMailClient;
+
+   /** This is set TRUE only once per session.
+    */
+   readonly attribute boolean showDialog;
+
+   /** This will bring the dialog asking the user if he/she wants to set
+    * Mozilla as default Mail Client.
+    * Call this only if Mozilla is not the default Mail client
+    */
+   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
+   
+};
+
+%{C++
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+%}

mozilla/mailnews/mapi/mapihook/public/nsIMapiSupport.idl

@@ -0,0 +1,64 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+/**
+ * This interface provides support for registering Mozilla as a COM component
+ * for extending the use of Mail/News through Simple MAPI.
+ * 
+ */
+
+[noscript, uuid(8967fed2-c8bb-11d5-a3e9-00b0d0f3baa7)]
+interface nsIMapiSupport : nsISupports {
+
+   /** Initiates MAPI support
+    */
+
+   void initializeMAPISupport();
+
+   /**  Shuts down the MAPI support
+    */
+
+   void shutdownMAPISupport();
+};
+
+%{C++
+#define NS_IMAPISUPPORT_CONTRACTID    "@mozilla.org/mapisupport;1"
+#define NS_IMAPISUPPORT_CLASSNAME     "Mozilla MAPI Support"
+%}
+
+

mozilla/mailnews/mapi/mapihook/src/Registry.cpp

@@ -0,0 +1,323 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika <kkhandrika@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#undef _UNICODE
+#undef UNICODE
+
+#include <objbase.h>
+#include "nsString.h"
+#include "Registry.h"
+
+#define MAPI_PROXY_DLL_NAME   "MapiProxy.dll"
+#define MAPI_STARTUP_ARG      " /MAPIStartUp"
+#define MAX_SIZE              2048
+
+// Size of a CLSID as a string
+const int CLSID_STRING_SIZE = 39;
+
+// Proxy/Stub Dll Routines
+
+typedef HRESULT (__stdcall ProxyServer)();
+
+
+// Convert a CLSID to a char string.
+
+BOOL CLSIDtochar(const CLSID& clsid, char* szCLSID,
+                 int length)
+{
+    LPOLESTR wszCLSID = NULL;
+
+    // Get CLSID
+    HRESULT hr = StringFromCLSID(clsid, &wszCLSID);
+    if (FAILED(hr))
+        return FALSE;
+
+    // Covert from wide characters to non-wide.
+    wcstombs(szCLSID, wszCLSID, length);
+
+    // Free memory.
+    CoTaskMemFree(wszCLSID);
+
+    return TRUE;
+}
+
+// Create a key and set its value.
+
+BOOL setKeyAndValue(nsCAutoString keyName, const char* subKey,
+                    const char* theValue)
+{
+    HKEY hKey;
+    BOOL retValue = TRUE;
+
+    nsCAutoString theKey(keyName);
+    if (subKey != NULL)
+    {
+        theKey += "\\";
+        theKey += subKey;
+    }
+
+    // Create and open key and subkey.
+    long lResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, theKey.get(), 
+                                  0, NULL, REG_OPTION_NON_VOLATILE,
+                                  KEY_ALL_ACCESS, NULL, &hKey, NULL);
+    if (lResult != ERROR_SUCCESS)
+        return FALSE ;
+
+    // Set the Value.
+    if (theValue != NULL)
+    {
+       lResult = RegSetValueEx(hKey, NULL, 0, REG_SZ, (BYTE *)theValue, 
+                      strlen(theValue)+1);
+       if (lResult != ERROR_SUCCESS)
+           retValue = FALSE;
+    }
+
+    RegCloseKey(hKey);
+    return TRUE;
+}
+
+// Delete a key and all of its descendents.
+
+LONG recursiveDeleteKey(HKEY hKeyParent,           // Parent of key to delete
+                        const char* lpszKeyChild)  // Key to delete
+{
+    // Open the child.
+    HKEY hKeyChild ;
+    LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyChild, 0,
+                             KEY_ALL_ACCESS, &hKeyChild) ;
+    if (lRes != ERROR_SUCCESS)
+    {
+        return lRes ;
+    }
+
+    // Enumerate all of the decendents of this child.
+    FILETIME time ;
+    char szBuffer[MAX_SIZE] ;
+    DWORD dwSize = MAX_SIZE ;
+    while (RegEnumKeyEx(hKeyChild, 0, szBuffer, &dwSize, NULL,
+                        NULL, NULL, &time) == S_OK)
+    {
+        // Delete the decendents of this child.
+        lRes = recursiveDeleteKey(hKeyChild, szBuffer) ;
+        if (lRes != ERROR_SUCCESS)
+        {
+            // Cleanup before exiting.
+            RegCloseKey(hKeyChild) ;
+            return lRes;
+        }
+        dwSize = MAX_SIZE;
+    }
+
+    // Close the child.
+    RegCloseKey(hKeyChild) ;
+
+    // Delete this child.
+    return RegDeleteKey(hKeyParent, lpszKeyChild) ;
+}
+
+void RegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *RegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    RegisterFunc = (ProxyServer *) GetProcAddress(h, "DllRegisterServer");
+    if (RegisterFunc)
+        RegisterFunc();
+
+    FreeLibrary(h);
+}
+
+void UnRegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *UnRegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    UnRegisterFunc = (ProxyServer *) GetProcAddress(h, "DllUnregisterServer");
+    if (UnRegisterFunc)
+        UnRegisterFunc();
+
+    FreeLibrary(h);
+}
+
+// Register the component in the registry.
+
+HRESULT RegisterServer(const CLSID& clsid,         // Class ID
+                       const char* szFriendlyName, // Friendly Name
+                       const char* szVerIndProgID, // Programmatic
+                       const char* szProgID)       //   IDs
+{
+    HMODULE hModule = GetModuleHandle(NULL);
+    char szModuleName[MAX_SIZE];
+    char szCLSID[CLSID_STRING_SIZE];
+
+    nsCAutoString independentProgId(szVerIndProgID);
+    nsCAutoString progId(szProgID);
+
+    DWORD dwResult = ::GetModuleFileName(hModule, szModuleName,
+                              sizeof(szModuleName)/sizeof(char));
+
+    if (dwResult == 0)
+        return S_FALSE;
+
+    nsCAutoString moduleName(szModuleName);
+    nsCAutoString registryKey("CLSID\\");
+
+    moduleName += MAPI_STARTUP_ARG;
+
+    // Convert the CLSID into a char.
+
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+    registryKey += szCLSID;
+
+    // Add the CLSID to the registry.
+    if (!setKeyAndValue(registryKey, NULL, szFriendlyName))
+        return S_FALSE;
+
+    if (!setKeyAndValue(registryKey, "LocalServer32", moduleName.get()))
+        return S_FALSE;
+
+    // Add the ProgID subkey under the CLSID key.
+    if (!setKeyAndValue(registryKey, "ProgID", szProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under CLSID key.
+    if (!setKeyAndValue(registryKey, "VersionIndependentProgID", szVerIndProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(independentProgId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(independentProgId, "CLSID", szCLSID))
+        return S_FALSE;
+    if (!setKeyAndValue(independentProgId, "CurVer", szProgID))
+        return S_FALSE;
+
+    // Add the versioned ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(progId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(progId, "CLSID", szCLSID))
+        return S_FALSE;
+
+    RegisterProxy();
+
+    return S_OK;
+}
+
+LONG UnregisterServer(const CLSID& clsid,         // Class ID
+                      const char* szVerIndProgID, // Programmatic
+                      const char* szProgID)       //   IDs
+{
+    LONG lResult = S_OK;
+
+    // Convert the CLSID into a char.
+
+    char szCLSID[CLSID_STRING_SIZE];
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+
+    UnRegisterProxy();
+
+    nsCAutoString registryKey("CLSID\\");
+    registryKey += szCLSID;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult == ERROR_SUCCESS || lResult == ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    registryKey += "\\LocalServer32";
+
+    // Delete only the path for this server.
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    // Delete the version-independent ProgID Key.
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szVerIndProgID);
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szProgID);
+
+    return lResult;
+}

mozilla/mailnews/mapi/mapihook/src/Registry.h

@@ -0,0 +1,56 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Krishna Mohan Khandrika <kkhandrika@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _REGISTRY_H_
+#define _REGISTRY_H_
+
+#include <objbase.h>
+
+// This function will register a component in the Registry.
+
+HRESULT RegisterServer(const CLSID& clsid, 
+                       const char* szFriendlyName,
+                       const char* szVerIndProgID,
+                       const char* szProgID) ;
+
+// This function will unregister a component.
+
+HRESULT UnregisterServer(const CLSID& clsid,
+                         const char* szVerIndProgID,
+                         const char* szProgID) ;
+
+#endif

mozilla/mailnews/mapi/mapihook/src/makefile.win

@@ -0,0 +1,107 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Srilatha Moturi <srilatha@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH=..\..\..\..
+
+MODULE          = msgMapi
+MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME=$(MODULE)
+MODULE_NAME	= $(MODULE)
+
+REQUIRES        = xpcom \
+                  string \
+		  MapiProxy \
+		  appshell \
+		  windowwatcher \
+		  dom \
+		  profile \
+		  msgbase \
+		  pref \
+		  msgbaseutil \
+		  msgcompo \
+		  mailnews \
+		  necko \
+		  intl \
+		  editor \
+		  msgdb \
+		  uriloader \
+ 	          appstartup \
+	$(NULL)
+
+include <$(DEPTH)\config\config.mak>
+############################################################################
+
+LCFLAGS=-DUNICODE -D_UNICODE
+
+
+
+OBJS=   \
+    ..\build\$(OBJDIR)\msgMapi_i.obj    \
+    .\$(OBJDIR)\msgMapiFactory.obj  \
+    .\$(OBJDIR)\msgMapiHook.obj \
+    .\$(OBJDIR)\msgMapiImp.obj  \
+    .\$(OBJDIR)\msgMapiMain.obj \
+    .\$(OBJDIR)\msgMapiSupport.obj  \
+	.\$(OBJDIR)\nsMapiRegistry.obj	\
+	.\$(OBJDIR)\nsMapiRegistryUtils.obj \
+    .\$(OBJDIR)\Registry.obj  \
+	$(NULL)
+
+
+
+LLIBS=                               \
+ $(DIST)\lib\xpcom.lib               \
+ $(DIST)\lib\msgbsutl.lib            \
+ $(LIBNSPR)                          \
+ $(NULL)
+
+WIN_LIBS=       \
+	ole32.lib   \
+    $(NULL)
+
+EXPORTS=	\
+    msgMapiFactory.h    \
+    msgMapiHook.h       \
+    msgMapiImp.h        \
+    msgMapiMain.h       \
+    msgMapiSupport.h    \
+	nsMapiRegistry.h		\
+	nsMapiRegistryUtils.h   \
+    Registry.h \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.cpp

@@ -0,0 +1,118 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "msgMapiFactory.h"
+#include "msgMapiImp.h"
+#include "msgMapi.h"
+
+CMapiFactory ::CMapiFactory()
+: m_cRef(1)
+{
+}
+
+CMapiFactory::~CMapiFactory()
+{
+}
+
+STDMETHODIMP CMapiFactory::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if ((aIid == IID_IUnknown) || (aIid == IID_IClassFactory))
+    {
+        *aPpv = static_cast<IClassFactory*>(this); 
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) CMapiFactory::AddRef()
+{
+    return (PR_AtomicIncrement(&m_cRef));
+}
+
+STDMETHODIMP_(ULONG) CMapiFactory::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP CMapiFactory::CreateInstance(IUnknown* aUnknownOuter,
+                                           const IID& aIid,
+                                           void** aPpv) 
+{
+    // Cannot aggregate.
+
+    if (aUnknownOuter != nsnull)
+    {
+        return CLASS_E_NOAGGREGATION ;
+    }
+
+    // Create component.
+
+    CMapiImp* pImp = new CMapiImp();
+    if (pImp == nsnull)
+    {
+        return E_OUTOFMEMORY ;
+    }
+
+    // Get the requested interface.
+    HRESULT hr = pImp->QueryInterface(aIid, aPpv);
+
+    // Release the IUnknown pointer.
+    // (If QueryInterface failed, component will delete itself.)
+
+    pImp->Release();
+    return hr;
+}
+
+STDMETHODIMP CMapiFactory::LockServer(PRBool aLock) 
+{
+    return S_OK ;
+}

mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.h

@@ -0,0 +1,69 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_FACTORY_H
+#define MSG_MAPI_FACTORY_H
+
+#include <windows.h>
+#include <objbase.h>
+#include "nspr.h"
+
+
+class CMapiFactory : public IClassFactory
+{
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface (REFIID aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef(void);
+    STDMETHODIMP_(ULONG)    Release(void);
+
+    // IClassFactory
+
+    STDMETHODIMP        CreateInstance (LPUNKNOWN aUnkOuter, REFIID aIid, void **aPpv);
+    STDMETHODIMP        LockServer (BOOL aLock);
+
+    CMapiFactory ();
+    ~CMapiFactory ();
+
+private :
+
+    PRInt32 m_cRef;
+};
+
+#endif  // MSG_MAPI_FACTORY_H
+

mozilla/mailnews/mapi/mapihook/src/msgMapiHook.cpp

@@ -0,0 +1,777 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Srilatha Moturi (srilatha@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#include <mapidefs.h>
+#include <mapi.h>
+#include <tchar.h>
+
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsISupports.h"
+#include "nsIPromptService.h"
+#include "nsAppShellCIDs.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIAppShellService.h"
+#include "nsINativeAppSupport.h"
+#include "nsICmdLineService.h"
+#include "nsIProfileInternal.h"
+#include "nsIMsgAccountManager.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsXPIDLString.h"
+#include "nsReadableUtils.h"
+#include "nsMsgBaseCID.h"
+#include "nsIStringBundle.h"
+#include "nsIPref.h"
+#include "nsString.h"
+
+#include "nsIMsgAttachment.h"
+#include "nsIMsgCompFields.h"
+#include "nsIMsgComposeParams.h"
+#include "nsIMsgCompose.h"
+#include "nsMsgCompCID.h"
+#include "nsIMsgSend.h"
+#include "nsIProxyObjectManager.h"
+#include "nsIMsgComposeService.h"
+#include "nsProxiedService.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsMsgI18N.h"
+
+#include "msgMapi.h"
+#include "msgMapiHook.h"
+#include "msgMapiSupport.h"
+#include "msgMapiMain.h"
+#include "nsNetUtil.h"
+
+static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
+
+class nsMAPISendListener : public nsIMsgSendListener
+{
+public:
+
+    virtual ~nsMAPISendListener() { }
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    /* void OnStartSending (in string aMsgID, in PRUint32 aMsgSize); */
+    NS_IMETHOD OnStartSending(const char *aMsgID, PRUint32 aMsgSize) { return NS_OK; }
+
+    /* void OnProgress (in string aMsgID, in PRUint32 aProgress, in PRUint32 aProgressMax); */
+    NS_IMETHOD OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax) { return NS_OK;}
+
+    /* void OnStatus (in string aMsgID, in wstring aMsg); */
+    NS_IMETHOD OnStatus(const char *aMsgID, const PRUnichar *aMsg) { return NS_OK;}
+
+    /* void OnStopSending (in string aMsgID, in nsresult aStatus, in wstring aMsg, in nsIFileSpec returnFileSpec); */
+    NS_IMETHOD OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, 
+                           nsIFileSpec *returnFileSpec) {
+        m_done = PR_TRUE;
+        HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
+        SetEvent (hEvent) ;
+        CloseHandle (hEvent) ;
+        return NS_OK ;
+    }
+
+ /* void OnSendNotPerformed */
+ NS_IMETHOD OnSendNotPerformed(const char *aMsgID, nsresult aStatus)
+ {
+ return OnStopSending(aMsgID, aStatus, nsnull, nsnull) ;
+ }
+ 
+    /* void OnGetDraftFolderURI (); */
+    NS_IMETHOD OnGetDraftFolderURI(const char *aFolderURI) {return NS_OK;}
+
+    static nsresult CreateMAPISendListener( nsIMsgSendListener **ppListener);
+
+    PRBool IsDone() { return m_done ; }
+
+protected :
+    nsMAPISendListener() {
+        NS_INIT_REFCNT(); 
+        m_done = PR_FALSE;
+    }
+
+    PRBool          m_done;
+};
+
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMAPISendListener, nsIMsgSendListener)
+
+nsresult nsMAPISendListener::CreateMAPISendListener( nsIMsgSendListener **ppListener)
+{
+    NS_ENSURE_ARG_POINTER(ppListener) ;
+
+    *ppListener = new nsMAPISendListener();
+    if (! *ppListener)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*ppListener);
+    return NS_OK;
+}
+
+PRBool nsMapiHook::isMapiService = PR_FALSE;
+
+PRBool nsMapiHook::Initialize()
+{
+    nsresult rv;
+    nsCOMPtr<nsINativeAppSupport> native;
+
+    nsCOMPtr<nsICmdLineService> cmdLineArgs(do_GetService(kCmdLineServiceCID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell (do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = appShell->GetNativeAppSupport( getter_AddRefs( native ));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = native->EnsureProfile(cmdLineArgs);
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    return PR_TRUE;
+}
+
+void nsMapiHook::CleanUp()
+{
+    // This routine will be fully implemented in future
+    // to cleanup mapi related stuff inside mozilla code.
+}
+
+PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, \
+                      PRUnichar **aPassword)
+{
+    nsresult rv;
+    PRBool btnResult = PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell(do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv) || !appShell) return PR_FALSE;
+   
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && dlgService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+        if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        nsXPIDLString loginTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(loginTitlePropertyTag, "loginTitle");
+        const PRUnichar *dTitlePropertyTag = loginTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlePropertyTag, brandStrings, 1,
+                                          getter_Copies(loginTitle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        if (aLogin)
+        {
+            nsXPIDLString loginText;
+            rv = bundle->GetStringFromName(NS_LITERAL_STRING("loginTextwithName").get(),
+                                           getter_Copies(loginText));
+            if (NS_FAILED(rv) || !loginText) return PR_FALSE;
+
+
+
+            rv = dlgService->PromptUsernameAndPassword(nsnull, loginTitle,
+                                                       loginText, aUsername, aPassword,
+                                                       nsnull, PR_FALSE, &btnResult);
+        }
+        else
+        {
+            //nsString loginString; 
+            nsXPIDLString loginText;
+            const PRUnichar *userNameStrings[] = { *aUsername };
+
+            NS_NAMED_LITERAL_STRING(loginTextPropertyTag, "loginText");
+            const PRUnichar *dpropertyTag = loginTextPropertyTag.get();
+            rv = bundle->FormatStringFromName(dpropertyTag, userNameStrings, 1,
+                                              getter_Copies(loginText));
+            if (NS_FAILED(rv)) return PR_FALSE;
+
+            rv = dlgService->PromptPassword(nsnull, loginTitle, loginText,
+                                            aPassword, nsnull, PR_FALSE, &btnResult);
+        }
+    }            
+
+    return btnResult;
+}
+
+PRBool nsMapiHook::VerifyUserName(const PRUnichar *aUsername, char **aIdKey)
+{
+    nsresult rv;
+
+    if (aUsername == nsnull)
+        return PR_FALSE;
+
+    nsCOMPtr<nsIMsgAccountManager> accountManager(do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    nsCOMPtr<nsISupportsArray> identities;
+    rv = accountManager->GetAllIdentities(getter_AddRefs(identities));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    PRUint32 numIndentities;
+    identities->Count(&numIndentities);
+
+    for (PRUint32 i = 0; i < numIndentities; i++)
+    {
+        // convert supports->Identity
+        nsCOMPtr<nsISupports> thisSupports;
+        rv = identities->GetElementAt(i, getter_AddRefs(thisSupports));
+        if (NS_FAILED(rv)) continue;
+        nsCOMPtr<nsIMsgIdentity> thisIdentity(do_QueryInterface(thisSupports, &rv));
+        if (NS_SUCCEEDED(rv) && thisIdentity)
+        {
+            nsXPIDLCString email;
+            rv = thisIdentity->GetEmail(getter_Copies(email));
+            if (NS_FAILED(rv)) continue;
+
+            // get the username from the email and compare with the username
+            nsCAutoString aEmail(email.get());
+            PRInt32 index = aEmail.FindChar('@');
+            if (index != -1)
+                aEmail.Truncate(index);
+
+if (nsDependentString(aUsername) == NS_ConvertASCIItoUCS2(aEmail))  // == overloaded
+                return NS_SUCCEEDED(thisIdentity->GetKey(aIdKey));
+        }
+    }
+
+    return PR_FALSE;
+}
+
+PRBool 
+nsMapiHook::IsBlindSendAllowed()
+{
+    PRBool enabled = PR_FALSE;
+    PRBool warn = PR_TRUE;
+    nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
+    if (prefs) {
+	    prefs->GetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,&warn);
+            prefs->GetBoolPref(PREF_MAPI_BLIND_SEND_ENABLED,&enabled);
+    } 
+    if (!enabled)
+        return PR_FALSE;
+
+    if (!warn)
+        return PR_TRUE; // Everything is okay.  
+
+    nsresult rv;
+    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+    nsCOMPtr<nsIStringBundle> bundle;
+    rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+    if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+    nsXPIDLString warningMsg;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendWarning").get(),
+                                        getter_Copies(warningMsg));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    
+   nsXPIDLString dontShowAgainMessage;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendDontShowAgain").get(),
+                                        getter_Copies(dontShowAgainMessage));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_FAILED(rv) || !dlgService) return PR_FALSE;
+    
+    PRBool continueToWarn = PR_TRUE;
+    PRBool okayToContinue = PR_FALSE;
+    dlgService->ConfirmCheck(nsnull, nsnull, warningMsg, dontShowAgainMessage, &continueToWarn, &okayToContinue);
+        
+    if (!continueToWarn && okayToContinue && prefs)
+        prefs->SetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,PR_FALSE);
+    
+    return okayToContinue;
+        
+}
+
+// this is used for Send without UI
+nsresult nsMapiHook::BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    if (!IsBlindSendAllowed())
+        return NS_ERROR_FAILURE;
+
+    /** create nsIMsgComposeParams obj and other fields to populate it **/    
+
+    // get parent window
+    nsCOMPtr<nsIAppShellService> appService = do_GetService( "@mozilla.org/appshell/appShellService;1", &rv);
+    if (NS_FAILED(rv)|| (!appService) ) return rv ;
+
+    nsCOMPtr<nsIDOMWindowInternal>  hiddenWindow;
+    rv = appService->GetHiddenDOMWindow(getter_AddRefs(hiddenWindow));
+
+    if ( NS_FAILED(rv) ) return rv ;
+
+    // smtp password and Logged in used IdKey from MapiConfig (session obj)
+    nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
+    if (!pMapiConfig) return NS_ERROR_FAILURE ;  // get the singelton obj
+    PRUnichar * password = pMapiConfig->GetPassword(aSession) ;
+    // password
+    nsCAutoString smtpPassword ;
+    smtpPassword.AssignWithConversion (password) ;
+    // Id key
+    char * MsgIdKey = pMapiConfig->GetIdKey(aSession) ;
+
+    // get the MsgIdentity for the above key using AccountManager
+    nsCOMPtr <nsIMsgAccountManager> accountManager = do_GetService (NS_MSGACCOUNTMANAGER_CONTRACTID) ;
+    if (NS_FAILED(rv) || (!accountManager) ) return rv ;
+
+    nsCOMPtr <nsIMsgIdentity> pMsgId ;
+    rv = accountManager->GetIdentity (MsgIdKey, getter_AddRefs(pMsgId)) ;
+    if (NS_FAILED(rv) ) return rv ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetIdentity(pMsgId);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+    pMsgComposeParams->SetSmtpPassword(smtpPassword.get());
+
+    // create the nsIMsgCompose object to send the object
+    nsCOMPtr<nsIMsgCompose> pMsgCompose (do_CreateInstance(NS_MSGCOMPOSE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgCompose) ) return rv ;
+
+    /** initialize nsIMsgCompose, Send the message, wait for send completion response **/
+
+    rv = pMsgCompose->Initialize(hiddenWindow, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    pMsgCompose->SendMsg(nsIMsgSend::nsMsgDeliverNow, pMsgId, nsnull) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    // assign to interface pointer from nsCOMPtr to facilitate typecast below
+    nsIMsgSendListener * pSendListener = sendListener ;  
+
+    // we need to wait here to make sure that we return only after send is completed
+    // so we will have a event loop here which will process the events till the Send IsDone.
+    nsCOMPtr<nsIEventQueueService> pEventQService = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
+    nsCOMPtr<nsIEventQueue> eventQueue;
+    pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,getter_AddRefs(eventQueue));
+    while ( !((nsMAPISendListener *) pSendListener)->IsDone() )
+        eventQueue->ProcessPendingEvents();
+
+    return rv ;
+}
+
+// this is used to populate comp fields with Unicode data
+nsresult nsMapiHook::PopulateCompFields(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        PRUnichar * From = aMessage->lpOriginator->lpszAddress ;
+        aCompFields->SetFrom (From) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ;
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+                }
+            }
+        }
+    }
+
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        PRUnichar * Subject = aMessage->lpszSubject ;
+        aCompFields->SetSubject(Subject) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_TRUE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        PRUnichar * Body = aMessage->lpszNoteText ;
+        rv = aCompFields->SetBody(Body) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+
+}
+
+nsresult nsMapiHook::HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode)
+{
+    nsresult rv = NS_OK ;
+
+    nsCAutoString Attachments ;
+    nsCAutoString TempFiles ;
+
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+
+    for (int i=0 ; i < aFileCount ; i++)
+    {
+        if (aFiles[i].lpszPathName)
+        {
+            // check if attachment exists
+            if (aIsUnicode)
+                pFile->InitWithUnicodePath (aFiles[i].lpszPathName) ; 
+            else
+                pFile->InitWithPath ((char *) aFiles[i].lpszPathName) ; 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            // create Msg attachment object
+            nsCOMPtr<nsIMsgAttachment> attachment = do_CreateInstance(NS_MSGATTACHMENT_CONTRACTID, &rv);
+            if (NS_FAILED(rv) || (!attachment) ) return rv ;
+
+            // set url 
+            nsXPIDLCString pURL ;
+            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
+            attachment->SetUrl(pURL) ;
+
+            if (aFiles[i].lpszFileName)
+            {
+                if (! aIsUnicode)
+                {
+                    nsAutoString realFileName ;
+                    realFileName.AssignWithConversion ((char *) aFiles[i].lpszFileName) ;
+                    attachment->SetName(realFileName.get()) ;
+                    // attachment->SetName( (nsDependentString(aFiles[i].lpszFileName)).get() );
+            }
+                else
+                    attachment->SetName(aFiles[i].lpszFileName) ;
+        }
+
+            attachment->SetTemporary(PR_FALSE) ;
+
+            rv = aCompFields->AddAttachment (attachment);
+        }
+    }
+    return rv ;
+}
+
+
+// this is used to convert non Unicode data and then populate comp fields
+nsresult nsMapiHook::PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        nsAutoString From ;
+        From.AssignWithConversion((char *) aMessage->lpOriginator->lpszAddress);
+        aCompFields->SetFrom (From.get()) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress);
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress); 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress) ; 
+                    break ;
+                }
+            }
+        }
+    }
+    
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    nsCAutoString platformCharSet;
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        nsAutoString Subject ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszSubject, Subject);
+        if (NS_FAILED(rv)) return rv ;         
+        aCompFields->SetSubject(Subject.get()) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_FALSE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        nsAutoString Body ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszNoteText, Body);
+        if (NS_FAILED(rv)) return rv ;
+        rv = aCompFields->SetBody(Body.get()) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+}
+
+// this is used to populate the docs as attachments in the Comp fields for Send Documents
+nsresult nsMapiHook::PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, ULONG aFlags, 
+                            PRUnichar * aDelimChar, PRUnichar * aFilePaths)
+{
+    nsAutoString strDelimChars ;
+    nsString strFilePaths;
+    nsresult rv = NS_OK ;
+
+    if (aFlags & MAPI_UNICODE)
+    {
+        if (aDelimChar)
+            strDelimChars.Assign (aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.Assign (aFilePaths) ;
+    }
+	else
+    {
+        if (aDelimChar)
+            strDelimChars.AssignWithConversion ((char*) aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.AssignWithConversion ((char *) aFilePaths) ;
+    }
+
+    // check for comma in filename 
+    if (strDelimChars.Find (",") == kNotFound)  // if comma is not in the delimiter specified by user
+    {
+        if (strFilePaths.Find(",") != kNotFound) // if comma found in filenames return error
+            return NS_ERROR_FILE_INVALID_PATH ;
+    }
+
+    nsCString Attachments ;
+
+    // only 1 file is to be sent, no delim specified
+    if ((!strDelimChars.Length()) && (strFilePaths.Length()>0))
+    {
+        nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+        if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+        pFile->InitWithUnicodePath (strFilePaths.get()) ;
+
+        PRBool bExist ;
+        rv = pFile->Exists(&bExist) ;
+        if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+        nsXPIDLCString pURL ;
+        NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
+        if (pURL)
+            Attachments.Assign(pURL) ;
+
+        // set attachments for comp field and return
+        rv = aCompFields->SetAttachments (Attachments.get());
+        return rv ;
+    }
+
+    // multiple files to be sent, delim specified
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+    PRInt32 offset = 0 ;
+    PRInt32 FilePathsLen = strFilePaths.Length() ;
+    if (FilePathsLen)
+    {
+        PRUnichar * newFilePaths = (PRUnichar *) strFilePaths.get() ;
+        while (offset != kNotFound)
+        {
+            nsString RemainingPaths ;
+            RemainingPaths.Assign(newFilePaths) ;
+            offset = RemainingPaths.Find (strDelimChars) ;
+            if (offset != kNotFound)
+            {
+                RemainingPaths.SetLength (offset) ;
+                if ((offset + strDelimChars.Length()) < FilePathsLen)
+                    newFilePaths += offset + strDelimChars.Length() ;
+            }
+
+            pFile->InitWithUnicodePath (RemainingPaths.get()) ;
+
+    #ifdef RAJIV_DEBUG
+            printf ("File : %S \n", RemainingPaths.get()) ; 
+    #endif 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            nsXPIDLCString pURL ;
+            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
+            if (pURL)
+            {
+				if (Attachments.Length() > 0)
+					Attachments.Append(",") ;
+                Attachments.Append(pURL) ;
+            }
+        }
+        rv = aCompFields->SetAttachments (Attachments.get());
+    }
+
+    return rv ;
+}
+
+// this used for Send with UI
+nsresult nsMapiHook::ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv ;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+
+    /** get the nsIMsgComposeService object to open the compose window **/
+    nsCOMPtr <nsIMsgComposeService> compService = do_GetService (NS_MSGCOMPOSESERVICE_CONTRACTID) ;
+    if (NS_FAILED(rv)|| (!compService) ) return rv ;
+
+    rv = compService->OpenComposeWindowWithParams(nsnull, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    return rv ;
+}

mozilla/mailnews/mapi/mapihook/src/msgMapiHook.h

@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_HOOK_H_
+#define MSG_MAPI_HOOK_H_
+
+#include "prtypes.h"
+
+class nsMapiHook
+{
+    public :
+
+        static PRBool Initialize();
+        static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, 
+                        PRUnichar **aPassword);
+        static PRBool VerifyUserName(const PRUnichar *aUsername, char **aIdKey);
+
+        static PRBool IsBlindSendAllowed () ;
+        static nsresult BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFields(lpnsMapiMessage aMessage, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                        nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, 
+                                        ULONG aFlags, LPTSTR aDelimChar, LPTSTR aFilePaths) ;
+        static nsresult HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode) ;
+        static void CleanUp();
+
+        static PRBool isMapiService;
+};
+
+#endif  // MSG_MAPI_HOOK_H_

mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp

@@ -0,0 +1,266 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiImp.h"
+#include "msgMapiFactory.h"
+#include "msgMapiMain.h"
+
+#include "nsMsgCompFields.h"
+#include "msgMapiHook.h"
+#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsMsgCompCID.h"
+
+
+
+CMapiImp::CMapiImp()
+: m_cRef(1)
+{
+    m_Lock = PR_NewLock();
+}
+
+CMapiImp::~CMapiImp() 
+{ 
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+}
+
+STDMETHODIMP CMapiImp::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if (aIid == IID_IUnknown)
+    {
+        *aPpv = static_cast<nsIMapi*>(this); 
+    }
+    else if (aIid == IID_nsIMapi)
+    {
+        *aPpv = static_cast<nsIMapi*>(this);
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) CMapiImp::AddRef()
+{
+    return PR_AtomicIncrement(&m_cRef);
+}
+
+STDMETHODIMP_(ULONG) CMapiImp::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP CMapiImp::IsValid()
+{
+    return S_OK;
+}
+
+STDMETHODIMP CMapiImp::IsValidSession(unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig && pConfig->IsSessionValid(aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP CMapiImp::Initialize()
+{
+    HRESULT hr = E_FAIL;
+
+    if (!m_Lock)
+        return E_FAIL;
+
+    PR_Lock(m_Lock);
+
+    // Initialize MAPI Configuration
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        if (nsMapiHook::Initialize())
+            hr = S_OK;
+
+    PR_Unlock(m_Lock);
+
+    return hr;
+}
+
+STDMETHODIMP CMapiImp::Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, LOGIN_PW_TYPE aPassWord,
+                unsigned long aFlags, unsigned long *aSessionId)
+{
+    HRESULT hr = E_FAIL;
+    PRBool bNewSession = PR_FALSE;
+    char *id_key = nsnull;
+
+    if (aFlags & MAPI_NEW_SESSION)
+        bNewSession = PR_TRUE;
+
+    // Check For Profile Name
+
+    if (aLogin != nsnull && aLogin[0] != '\0')
+    {
+        if (nsMapiHook::VerifyUserName(aLogin, &id_key) == PR_FALSE)
+    {
+        *aSessionId = MAPI_E_LOGIN_FAILURE;
+        return hr;
+    }
+    }
+
+    // finally register(create) the session.
+
+    PRUint32 nSession_Id;
+    PRInt16 nResult = 0;
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        nResult = pConfig->RegisterSession(aUIArg, aLogin, aPassWord,
+                                           (aFlags & MAPI_FORCE_DOWNLOAD), bNewSession,
+                                           &nSession_Id, id_key);
+
+    switch (nResult)
+    {
+        case -1 :
+        {
+            *aSessionId = MAPI_E_TOO_MANY_SESSIONS;
+            return hr;
+        }
+        case 0 :
+        {
+            *aSessionId = MAPI_E_INSUFFICIENT_MEMORY;
+            return hr;
+        }
+        default :
+        {
+            *aSessionId = nSession_Id;
+            break;
+        }
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP CMapiImp::SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+     short aRecipCount, lpnsMapiRecipDesc aRecips , short aFileCount, lpnsMapiFileDesc aFiles , 
+     unsigned long aFlags, unsigned long aReserved)
+{
+    nsresult rv = NS_OK ;
+
+    // Assign the pointers in the aMessage struct to the array of Recips and Files
+    // recieved here from MS COM. These are used in BlindSendMail and ShowCompWin fns 
+    aMessage->lpRecips = aRecips ;
+    aMessage->lpFiles = aFiles ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFlags & MAPI_UNICODE)
+        rv = nsMapiHook::PopulateCompFields(aMessage, pCompFields) ;
+    else
+        rv = nsMapiHook::PopulateCompFieldsWithConversion(aMessage, pCompFields) ;
+    
+    if (NS_SUCCEEDED (rv))
+    {
+        // see flag to see if UI needs to be brought up
+        if (!(aFlags & MAPI_DIALOG))
+        {
+            rv = nsMapiHook::BlindSendMail(aSession, pCompFields);
+        }
+        else
+        {
+            rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+        }
+    }
+    
+    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
+}
+
+
+STDMETHODIMP CMapiImp::SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                            LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags)
+{
+    nsresult rv = NS_OK ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFilePaths)
+    {
+        rv = nsMapiHook::PopulateCompFieldsForSendDocs(pCompFields, aFlags, aDelimChar, aFilePaths) ;
+    }
+
+    if (NS_SUCCEEDED (rv)) 
+        rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+
+    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
+}
+
+STDMETHODIMP CMapiImp::Logoff (unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+
+    if (pConfig->UnRegisterSession((PRUint32)aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP CMapiImp::CleanUp()
+{
+    nsMapiHook::CleanUp();
+    return S_OK;
+}
+
+

mozilla/mailnews/mapi/mapihook/src/msgMapiImp.h

@@ -0,0 +1,92 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_IMP_H
+#define MSG_MAPI_IMP_H
+
+#include <windows.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "nsXPIDLString.h"
+#include "nspr.h"
+
+const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+// this class implements the MS COM interface nsIMapi that provides the methods
+// called by mapi32.dll to perform the mail operations as specified by MAPI.
+// These class methods in turn use the Mozilla Mail XPCOM interfaces to do so.
+class CMapiImp : public nsIMapi
+{
+
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface(const IID& aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef();
+    STDMETHODIMP_(ULONG)    Release();
+
+    // Interface INsMapi
+
+    STDMETHODIMP Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, 
+                       LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                       unsigned long *aSessionId);
+
+    STDMETHODIMP SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+         short aRecipCount, lpnsMapiRecipDesc aRecips , 
+         short aFileCount, lpnsMapiFileDesc aFiles , 
+         unsigned long aFlags, unsigned long aReserved) ;
+
+    STDMETHODIMP SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                                LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags);
+
+    STDMETHODIMP Initialize();
+    STDMETHODIMP IsValid();
+    STDMETHODIMP IsValidSession(unsigned long aSession);
+
+    STDMETHODIMP Logoff (unsigned long aSession);
+    STDMETHODIMP CleanUp();
+
+    CMapiImp();
+    ~CMapiImp();
+
+private :
+
+    PRLock *m_Lock;
+    PRInt32 m_cRef;
+};
+
+#endif // MSG_MAPI_IMP_H

mozilla/mailnews/mapi/mapihook/src/msgMapiMain.cpp

@@ -0,0 +1,376 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <mapidefs.h>
+#include <mapi.h>
+
+#include "msgCore.h"
+#include "nsMsgComposeStringBundle.h"
+#include "msgMapiMain.h"
+#include "nsIServiceManager.h"
+#include "nsCOMPtr.h"
+
+// move to xpcom bug 81956.
+class nsPRUintKey : public nsHashKey {
+protected:
+    PRUint32 mKey;
+public:
+    nsPRUintKey(PRUint32 key) : mKey(key) {}
+
+    PRUint32 HashCode(void) const {
+        return mKey;
+    }
+
+    PRBool Equals(const nsHashKey *aKey) const {
+        return mKey == ((const nsPRUintKey *) aKey)->mKey;
+    }
+    nsHashKey *Clone() const {
+        return new nsPRUintKey(mKey);
+    }
+    PRUint32 GetValue() { return mKey; }
+};
+//
+
+
+nsMAPIConfiguration *nsMAPIConfiguration::m_pSelfRef = nsnull;
+PRUint32 nsMAPIConfiguration::session_generator = 0;
+PRUint32 nsMAPIConfiguration::sessionCount = 0;
+
+nsMAPIConfiguration *nsMAPIConfiguration::GetMAPIConfiguration()
+{
+    if (m_pSelfRef == nsnull)
+        m_pSelfRef = new nsMAPIConfiguration();
+
+    return m_pSelfRef;
+}
+
+nsMAPIConfiguration::nsMAPIConfiguration()
+: m_nMaxSessions(MAX_SESSIONS)
+{
+    m_Lock = PR_NewLock();
+}
+
+static PRBool
+FreeSessionMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    nsMAPISession *pTemp = (nsMAPISession*) aData;
+    if (pTemp)
+    {
+    delete pTemp;
+    pTemp = nsnull;
+    }
+    return PR_TRUE;
+}
+
+static PRBool
+FreeProfileMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    return PR_TRUE;
+}
+
+nsMAPIConfiguration::~nsMAPIConfiguration()
+{
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+
+    m_SessionMap.Reset(FreeSessionMapEntries);
+    m_ProfileMap.Reset(FreeProfileMapEntries);
+    }
+
+void nsMAPIConfiguration::OpenConfiguration()
+{
+    // No. of max. sessions is set to MAX_SESSIONS.  In future
+    // if it is decided to have configuration (registry)
+    // parameter, this function can be used to set the
+    // max sessions;
+
+    return;
+}
+
+PRInt16 nsMAPIConfiguration::RegisterSession(PRUint32 aHwnd,
+                const PRUnichar *aUserName, const PRUnichar *aPassword,
+                PRBool aForceDownLoad, PRBool aNewSession,
+                PRUint32 *aSession, char *aIdKey)
+{
+    PRInt16 nResult = 0;
+    PRUint32 n_SessionId = 0;
+
+    PR_Lock(m_Lock);
+
+    // Check whether max sessions is exceeded
+
+    if (sessionCount >= m_nMaxSessions)
+    {
+        PR_Unlock(m_Lock);
+        return -1;
+    }
+
+    if (aUserName != nsnull && aUserName[0] != '\0')
+    {
+    nsStringKey usernameKey(aUserName);
+    n_SessionId = (PRUint32) m_ProfileMap.Get(&usernameKey);
+    }
+
+    // try to share a session; if not create a session
+
+    if (n_SessionId > 0)
+    {
+        nsPRUintKey sessionKey(n_SessionId);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+        if (pTemp != nsnull)
+        {
+            pTemp->IncrementSession();
+            *aSession = n_SessionId;
+            nResult = 1;
+        }
+    }
+    else if (aNewSession || n_SessionId == 0) // checking for n_SessionId is a concession
+    {
+        // create a new session ; if new session is specified OR there is no session
+        nsMAPISession *pTemp = nsnull;
+        pTemp = new nsMAPISession(aHwnd, aUserName,
+                               aPassword, aForceDownLoad, aIdKey);
+
+        if (pTemp != nsnull)
+        {
+            session_generator++;
+
+            // I don't think there will be (2 power 32) sessions alive
+            // in a cycle.  This is an assumption
+
+            if (session_generator == 0)
+                session_generator++;
+
+            nsPRUintKey sessionKey(session_generator);
+            m_SessionMap.Put(&sessionKey, pTemp);
+            if (aUserName != nsnull && aUserName[0] != '\0')
+            {
+                nsStringKey usernameKey(aUserName);
+            m_ProfileMap.Put(&usernameKey, (void*)session_generator);
+            }
+
+            *aSession = session_generator;
+            sessionCount++;
+            nResult = 1;
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return nResult;
+}
+
+PRBool nsMAPIConfiguration::UnRegisterSession(PRUint32 aSessionID)
+{
+    PRBool bResult = PR_FALSE;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+
+        if (pTemp != nsnull)
+        {
+            if (pTemp->DecrementSession() == 0)
+            {
+                if (pTemp->m_pProfileName.get() != nsnull)
+                {
+                nsStringKey stringKey(pTemp->m_pProfileName.get());
+                m_ProfileMap.Remove(&stringKey);
+                }
+                m_SessionMap.Remove(&sessionKey);
+                sessionCount--;
+                bResult = PR_TRUE;
+            }
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return bResult;
+}
+
+PRBool nsMAPIConfiguration::IsSessionValid(PRUint32 aSessionID)
+{
+    if (aSessionID == 0)
+        return PR_FALSE;
+
+    PRBool retValue = PR_FALSE;
+    nsPRUintKey sessionKey(aSessionID);
+
+    PR_Lock(m_Lock);
+
+    retValue = m_SessionMap.Exists(&sessionKey);
+        
+    PR_Unlock(m_Lock);
+
+    return retValue;
+}
+
+
+PRUnichar *nsMAPIConfiguration::GetPassword(PRUint32 aSessionID)
+{
+    PRUnichar *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+
+        if (pTemp)
+        {
+            pResult = pTemp->GetPassword();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+
+    return pResult;
+}
+
+char *nsMAPIConfiguration::GetIdKey(PRUint32 aSessionID)
+{
+    char *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+        if (pTemp)
+        {
+           pResult = pTemp->GetIdKey();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return pResult;
+}
+
+// util func
+HRESULT nsMAPIConfiguration::GetMAPIErrorFromNSError (nsresult res)
+{
+    HRESULT hr = SUCCESS_SUCCESS ;
+
+    if (NS_SUCCEEDED (hr)) return hr ;
+
+    // if failure return the related MAPI failure code
+    switch (res)
+    {
+        case NS_MSG_NO_RECIPIENTS :
+            hr = MAPI_E_BAD_RECIPTYPE ;
+            break ;
+        case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS :
+            hr = MAPI_E_INVALID_RECIPS ; 
+            break ;
+        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
+            hr = MAPI_E_LOGIN_FAILURE ;
+            break ;
+        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
+        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
+        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
+        case NS_ERROR_FILE_INVALID_PATH :
+            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
+            break ;
+        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
+            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
+            break ;
+        case NS_MSG_CANCELLING :
+            hr = MAPI_E_USER_ABORT ;
+            break ;
+        case NS_MSG_ERROR_WRITING_FILE :
+        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
+        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
+            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
+            break ;
+        default :
+            hr = MAPI_E_FAILURE ;
+            break ;
+    }
+
+    return hr ;
+}
+
+
+nsMAPISession::nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName,\
+                             const PRUnichar *aPassword, \
+                             PRBool aForceDownLoad, char *aKey)
+: m_bIsForcedDownLoad(aForceDownLoad),
+  m_hAppHandle(aHwnd),
+  m_nShared(1),
+  m_pIdKey(aKey)
+{
+    m_pProfileName.Assign(aUserName);
+    m_pPassword.Assign(aPassword);
+}
+
+nsMAPISession::~nsMAPISession()
+{
+    if (m_pIdKey != nsnull)
+    {
+        delete [] m_pIdKey;
+        m_pIdKey = nsnull;
+    }
+}
+
+PRUint32 nsMAPISession::IncrementSession()
+{
+    return ++m_nShared;
+}
+
+PRUint32 nsMAPISession::DecrementSession()
+{
+    return --m_nShared;
+}
+
+PRUint32 nsMAPISession::GetSessionCount()
+{
+    return m_nShared;
+}
+
+PRUnichar *nsMAPISession::GetPassword()
+{
+    return (PRUnichar *)m_pPassword.get();
+}
+
+char *nsMAPISession::GetIdKey()
+{
+    return m_pIdKey;
+}
+

mozilla/mailnews/mapi/mapihook/src/msgMapiMain.h

@@ -0,0 +1,112 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_MAIN_H_
+#define NSG_MAPI_MAIN_H_
+
+#define        MAX_NAME_LEN    256
+#define        MAX_PW_LEN      256
+#define        MAX_SESSIONS    50
+#define        MAPI_SENDCOMPLETE_EVENT   "SendCompletionEvent"
+
+#define MAPI_PROPERTIES_CHROME "chrome://messenger-mapi/locale/mapi.properties"
+#define PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND "mapi.blind-send.warn"
+#define PREF_MAPI_BLIND_SEND_ENABLED "mapi.blind-send.enabled"
+
+#include "nsXPIDLString.h"
+#include "nspr.h"
+#include "nsString.h"
+#include "nsHashtable.h"
+
+class nsMAPIConfiguration
+{
+private :
+
+    static PRUint32 session_generator;
+    static PRUint32 sessionCount;
+    static nsMAPIConfiguration *m_pSelfRef;
+    PRLock *m_Lock;
+    PRUint32  m_nMaxSessions;
+
+
+    nsHashtable m_ProfileMap;
+    nsHashtable m_SessionMap;
+    nsMAPIConfiguration();
+
+public :
+    static nsMAPIConfiguration *GetMAPIConfiguration();
+    void OpenConfiguration();
+    PRInt16 RegisterSession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                            const PRUnichar *aPassword, PRBool aForceDownLoad, \
+                            PRBool aNewSession, PRUint32 *aSession, char *aIdKey);
+    PRBool IsSessionValid(PRUint32 aSessionID);
+    PRBool UnRegisterSession(PRUint32 aSessionID);
+    PRUnichar *GetPassword(PRUint32 aSessionID);
+    char *GetIdKey(PRUint32 aSessionID);
+    ~nsMAPIConfiguration();
+
+    // a util func
+    static HRESULT GetMAPIErrorFromNSError (nsresult res) ;
+};
+
+class nsMAPISession
+{
+    friend class nsMAPIConfiguration;
+
+    private :
+
+        PRBool   m_bIsForcedDownLoad;
+        PRBool   m_bApp_or_Service;
+        PRUint32 m_hAppHandle;
+        PRUint32 m_nShared;
+        char     *m_pIdKey;
+        nsString m_pProfileName;
+        nsString m_pPassword;
+
+    public :
+
+        nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                      const PRUnichar *aPassword, \
+                      PRBool aForceDownLoad, char *aKey);
+        PRUint32 IncrementSession();
+        PRUint32 DecrementSession();
+        PRUint32 GetSessionCount();
+        PRUnichar *nsMAPISession::GetPassword();
+        char *nsMAPISession::GetIdKey();
+        ~nsMAPISession();
+};
+
+#endif    // MSG_MAPI_MAIN_H_

mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp

@@ -0,0 +1,209 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsCOMPtr.h"
+#include "objbase.h"
+#include "nsISupports.h"
+
+#include "nsIGenericFactory.h"
+#include "nsIObserverService.h"
+#include "nsIAppStartupNotifier.h"
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsICategoryManager.h"
+
+#include "nsIPrefService.h"
+#include "nsIPrefBranch.h"
+#include "nsIPrefBranchInternal.h"
+
+#include "msgMapiSupport.h"
+#include "nsMapiRegistryUtils.h" 
+#include "nsMapiRegistry.h"
+#include "msgMapiImp.h"
+
+/** Implementation of the nsIMapiSupport interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsMapiSupport, nsIMapiSupport, nsIObserver);
+
+static NS_METHOD nsMapiRegistrationProc(nsIComponentManager *aCompMgr,
+                   nsIFile *aPath, const char *registryLocation, const char *componentType,
+                   const nsModuleComponentInfo *info)
+        {
+    
+  nsresult rv;
+
+  nsCOMPtr<nsICategoryManager> categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
+  if (NS_SUCCEEDED(rv)) 
+      rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, "Mapi Support", 
+                  "service," NS_IMAPISUPPORT_CONTRACTID, PR_TRUE, PR_TRUE, nsnull);
+ 
+  return rv ;
+
+}
+
+NS_IMETHODIMP
+nsMapiSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData)
+{
+    nsresult rv = NS_OK ;
+
+    if (!nsCRT::strcmp(aTopic, "profile-after-change"))
+        return InitializeMAPISupport();
+
+    if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
+        return ShutdownMAPISupport();
+
+    if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID))
+    {
+        nsCOMPtr<nsIPrefBranch> prefs = do_QueryInterface(aSubject, &rv);
+        if (NS_FAILED(rv))  return rv;
+        // which preference changed?
+        if (!nsCRT::strcmp(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, NS_ConvertUCS2toUTF8(aData).get()))
+        {
+            PRBool bIsDefault = PR_FALSE ;
+            rv = prefs->GetBoolPref(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, &bIsDefault);
+            if (NS_FAILED(rv)) return rv;
+            nsCOMPtr <nsIMapiRegistry> mapiRegistry = do_CreateInstance(NS_IMAPIREGISTRY_CONTRACTID, &rv) ;
+            if (NS_FAILED(rv)) return rv;
+            return mapiRegistry->SetIsDefaultMailClient(bIsDefault) ;
+        }
+        return rv ;
+    }
+
+    nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1", &rv));
+    if (NS_FAILED(rv)) return rv;
+ 
+    rv = observerService->AddObserver(this,"profile-after-change", PR_FALSE);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
+    if (NS_FAILED(rv))  return rv;
+
+     nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
+    if (NS_FAILED(rv))  return rv;
+
+    nsCOMPtr<nsIPrefBranchInternal> prefInternal = do_QueryInterface(prefs, &rv);
+    if (NS_FAILED(rv))  return rv;
+
+    rv = prefInternal->AddObserver(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, this, PR_FALSE);
+    if (NS_FAILED(rv))  return rv;
+           
+    return rv;
+}
+
+
+nsMapiSupport::nsMapiSupport()
+: m_dwRegister(0),
+  m_nsMapiFactory(nsnull)
+{
+   NS_INIT_ISUPPORTS();
+}
+
+nsMapiSupport::~nsMapiSupport()
+{
+}
+
+NS_IMETHODIMP
+nsMapiSupport::InitializeMAPISupport()
+{
+    ::CoInitialize(nsnull) ;
+
+    if (m_nsMapiFactory == nsnull)    // No Registering if already done.  Sanity Check!!
+    {
+        m_nsMapiFactory = new CMapiFactory();
+
+        if (m_nsMapiFactory != nsnull)
+        {
+            HRESULT hr = ::CoRegisterClassObject(CLSID_CMapiImp, \
+                                                 m_nsMapiFactory, \
+                                                 CLSCTX_LOCAL_SERVER, \
+                                                 REGCLS_MULTIPLEUSE, \
+                                                 &m_dwRegister);
+
+            if (FAILED(hr))
+            {
+                m_nsMapiFactory->Release() ;
+                m_nsMapiFactory = nsnull;
+                return NS_ERROR_FAILURE;
+            }
+        }
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiSupport::ShutdownMAPISupport()
+{
+    if (m_dwRegister != 0)
+        ::CoRevokeClassObject(m_dwRegister);
+
+    if (m_nsMapiFactory != nsnull)
+    {
+        m_nsMapiFactory->Release();
+        m_nsMapiFactory = nsnull;
+    }
+
+    ::CoUninitialize();
+
+    return NS_OK ;
+}
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiSupport);
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+  {
+    NS_IMAPIREGISTRY_CLASSNAME, 
+    NS_IMAPIREGISTRY_CID,
+    NS_IMAPIREGISTRY_CONTRACTID, 
+    nsMapiRegistryConstructor
+  },
+
+{
+    NS_IMAPISUPPORT_CLASSNAME,
+    NS_IMAPISUPPORT_CID,
+    NS_IMAPISUPPORT_CONTRACTID,
+    nsMapiSupportConstructor,
+    nsMapiRegistrationProc,
+    nsnull
+}
+};
+
+NS_IMPL_NSGETMODULE(msgMapiModule, components);
+

mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.h

@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is 
+ # Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_SUPPORT_H_
+#define MSG_MAPI_SUPPORT_H_
+
+#include "nsIObserver.h"
+#include "nsIMapiSupport.h"
+#include "msgMapiFactory.h"
+
+#define NS_IMAPISUPPORT_CID \
+  {0x8967fed2, 0xc8bb, 0x11d5, \
+    { 0xa3, 0xe9, 0x00, 0xb0, 0xd0, 0xf3, 0xba, 0xa7 }}
+
+class nsMapiSupport : public nsIMapiSupport,
+                      public nsIObserver
+{
+    public :
+        nsMapiSupport();
+        ~nsMapiSupport();
+
+        // Declare all interface methods we must implement.
+        NS_DECL_ISUPPORTS
+        NS_DECL_NSIOBSERVER
+        NS_DECL_NSIMAPISUPPORT
+
+    private :
+
+        DWORD   m_dwRegister;
+        CMapiFactory *m_nsMapiFactory;
+};
+
+#endif  // MSG_MAPI_SUPPORT_H_

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.cpp

@@ -0,0 +1,167 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+#include "nsIServiceManager.h"
+#include "nsXPIDLString.h"
+#include "nsIPromptService.h"
+#include "nsIProxyObjectManager.h"
+#include "nsProxiedService.h"
+
+#include "nsMapiRegistryUtils.h" 
+#include "nsMapiRegistry.h"
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+/** Implementation of the nsIMapiRegistry interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+NS_IMPL_ISUPPORTS1(nsMapiRegistry, nsIMapiRegistry);
+
+nsMapiRegistry::nsMapiRegistry() {
+    NS_INIT_ISUPPORTS();
+    m_ShowDialog = ! m_registryUtils.verifyRestrictedAccess();
+    m_DefaultMailClient = m_registryUtils.IsDefaultMailClient();
+}
+
+nsMapiRegistry::~nsMapiRegistry() {
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetIsDefaultMailClient(PRBool * retval) {
+    // we need to get the value from registry everytime
+    // because the registry settings can be changed from
+    // other mail applications.
+    *retval = m_registryUtils.IsDefaultMailClient();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetShowDialog(PRBool * retval) {
+    *retval = m_ShowDialog;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::SetIsDefaultMailClient(PRBool aIsDefaultMailClient) 
+{
+    nsresult rv = NS_OK ;
+
+    if (aIsDefaultMailClient)
+    {
+        rv = m_registryUtils.setDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_TRUE;
+    else
+            m_registryUtils.ShowMapiErrorDialog();
+}
+    else
+    {
+        rv = m_registryUtils.unsetDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_FALSE;
+    else
+            m_registryUtils.ShowMapiErrorDialog();
+}
+
+    return rv ;
+}
+
+/** This will bring up the dialog box only once per session and 
+ * only if the current app is not default Mail Client.
+ * This also checks the registry if the registry key
+ * showMapiDialog is set
+ */
+NS_IMETHODIMP
+nsMapiRegistry::ShowMailIntegrationDialog(nsIDOMWindow *aParentWindow) {
+    nsresult rv;
+    if (!m_ShowDialog || !m_registryUtils.getShowDialog()) return NS_OK;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = m_registryUtils.MakeMapiStringBundle (getter_AddRefs (bundle)) ;
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { m_registryUtils.brandName() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "dialogTitle");
+        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "dialogText");
+        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString checkboxText;
+        rv = bundle->GetStringFromName(
+                           NS_LITERAL_STRING("checkboxText").get(),
+                           getter_Copies(checkboxText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        PRBool checkValue = PR_FALSE;
+        PRInt32 buttonPressed = 0;
+        rv = promptService->ConfirmEx(aParentWindow,
+                                      dialogTitle,
+                                      dialogText.get(),
+                                      (nsIPromptService::BUTTON_TITLE_YES * 
+                                      nsIPromptService::BUTTON_POS_0) +
+                                      (nsIPromptService::BUTTON_TITLE_NO * 
+                                      nsIPromptService::BUTTON_POS_1),
+                                      nsnull,
+                                      nsnull,
+                                      nsnull,
+                                      checkboxText,
+                                      &checkValue,
+                                      &buttonPressed);
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        rv = m_registryUtils.SetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                "showMapiDialog", (checkValue) ? "0" : "1");
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        m_ShowDialog = PR_FALSE;
+        if (!buttonPressed)
+            rv = SetIsDefaultMailClient(PR_TRUE) ; // SetDefaultMailClient();
+    }
+    return rv;
+}
+

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.h

@@ -0,0 +1,76 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsmapiregistry_h____
+#define nsmapiregistry_h____
+
+#include "nsIMapiRegistry.h"
+
+#ifndef MAX_BUF
+#define MAX_BUF 4096
+#endif
+
+/* c5be14ba-4e0a-4eec-a1b8-04363761d63c */
+#define NS_IMAPIREGISTRY_CID \
+ { 0xc5be14ba, 0x4e0a, 0x4eec, {0xa1, 0xb8, 0x04, 0x36, 0x37, 0x61, 0xd6, 0x3c} }
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+
+#define MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT  "mailnews.default_mail_client"
+
+class nsMapiRegistry : public nsIMapiRegistry {
+public:
+    // ctor/dtor
+    nsMapiRegistry();
+    virtual ~nsMapiRegistry();
+
+    // Declare all interface methods we must implement.
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIMAPIREGISTRY
+
+protected:
+    
+    PRBool m_DefaultMailClient;
+    PRBool m_ShowDialog;
+    nsMapiRegistryUtils m_registryUtils ;
+
+private:
+    // Special member to handle initialization.
+    PRBool mHaveBeenSet;
+}; // nsMapiRegistry
+
+#endif // nsmapiregistry_h____

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp

@@ -0,0 +1,743 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "nsIServiceManager.h"
+#include "msgMapiImp.h"
+#include "msgMapiMain.h"
+#include "nsMapiRegistryUtils.h"
+#include "nsString.h"
+#include "nsIStringBundle.h"
+#include "nsIPromptService.h"
+#include "nsXPIDLString.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsDirectoryService.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsIPref.h"
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+#define EXE_EXTENSION ".exe" 
+#define USERAGENT_VERSION_PREF "general.useragent.misc"
+#define USERAGENT_VERSION_NS_PREF "general.useragent.vendorSub"
+#define USERAGENT_PREF_PREFIX "rv:"
+
+nsMapiRegistryUtils::nsMapiRegistryUtils()
+{
+   m_mapiStringBundle = nsnull ;
+}
+    
+const char * nsMapiRegistryUtils::thisApplication()
+{
+    if (m_thisApp.IsEmpty()) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = ::GetModuleFileName(NULL, buffer, MAX_PATH);
+        if (!len) return nsnull ; 
+        char shortPathBuf[MAX_PATH] = {0};
+        len = ::GetShortPathName(buffer, shortPathBuf, MAX_PATH);
+        if (!len) return nsnull ; 
+        m_thisApp = buffer;
+        m_thisApp.ToUpperCase();
+    }
+
+    return m_thisApp.get() ;
+}
+
+const PRUnichar * nsMapiRegistryUtils::brandName() 
+{
+    nsresult rv;
+    if (m_brand.IsEmpty()) {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_SUCCEEDED(rv) && bundleService) {
+            nsCOMPtr<nsIStringBundle> brandBundle;
+            rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+            if (NS_SUCCEEDED(rv)) {
+                nsXPIDLString brandName;
+                rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+                if (NS_SUCCEEDED(rv)) {
+                    m_brand = brandName ;
+                }
+            }
+        }
+    }
+
+    return m_brand.get()  ;
+}
+
+const PRUnichar * nsMapiRegistryUtils::versionNo()
+{
+ if (!m_versionNo.IsEmpty())
+   return m_versionNo.get() ;
+
+ nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
+ if (prefs) {
+     nsXPIDLCString versionStr ;
+     nsresult rv = prefs->GetCharPref(USERAGENT_VERSION_NS_PREF, getter_Copies(versionStr));
+     if (NS_SUCCEEDED(rv) && versionStr)
+         m_versionNo.AssignWithConversion (versionStr.get()) ;
+     else {
+         rv = prefs->GetCharPref(USERAGENT_VERSION_PREF, getter_Copies(versionStr));
+         if (NS_SUCCEEDED(rv) && versionStr)  {
+             m_versionNo.AssignWithConversion (versionStr.get()) ;
+             m_versionNo.StripChars (USERAGENT_PREF_PREFIX) ;
+         }
+     }
+ }
+
+ return m_versionNo.get() ;
+}
+
+
+PRBool nsMapiRegistryUtils::verifyRestrictedAccess() {
+    char   subKey[] = "Software\\Mozilla - Test Key";
+    PRBool result = PR_FALSE;
+    DWORD  dwDisp = 0;
+    HKEY   key;
+    // Try to create/open a subkey under HKLM.
+    DWORD rc = ::RegCreateKeyEx(HKEY_LOCAL_MACHINE,
+                                subKey,
+                                0,
+                                NULL,
+                                REG_OPTION_NON_VOLATILE,
+                                KEY_WRITE,
+                                NULL,
+                                &key,
+                                &dwDisp);
+
+    if (rc == ERROR_SUCCESS) {
+        // Key was opened; first close it.
+        ::RegCloseKey(key);
+        // Delete it if we just created it.
+        switch(dwDisp) {
+            case REG_CREATED_NEW_KEY:
+                ::RegDeleteKey(HKEY_LOCAL_MACHINE, subKey);
+                break;
+            case REG_OPENED_EXISTING_KEY:
+                break;
+        }
+    } else {
+        // Can't create/open it; we don't have access.
+        result = PR_TRUE;
+    }
+    return result;
+}
+
+nsresult nsMapiRegistryUtils::SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegCreateKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegSetValueEx(key, valueName, NULL, REG_SZ, 
+                                 (LPBYTE)(const char*)value, strlen(value));
+        if (rc == ERROR_SUCCESS) {
+            result = NS_OK;
+        }
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+nsresult nsMapiRegistryUtils::DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegDeleteValue(key, valueName);
+        if (rc == ERROR_SUCCESS)
+            result = NS_OK;
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+void nsMapiRegistryUtils::GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName, nsCAutoString & value)
+{
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+    if (rc == ERROR_SUCCESS) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = sizeof buffer;
+        rc = ::RegQueryValueEx(key, valueName, NULL, NULL, 
+                               (LPBYTE)buffer, &len);
+        if (rc == ERROR_SUCCESS) {
+            if (len)
+                value = buffer;
+        }
+        ::RegCloseKey(key);
+     }
+}
+
+
+
+PRBool nsMapiRegistryUtils::IsDefaultMailClient()
+{
+    if (!isSmartDll() && !isMozDll()) 
+        return PR_FALSE;
+    nsCAutoString name; 
+    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Clients\\Mail", "", name);
+    if (!name.IsEmpty()) {
+         nsCAutoString keyName("Software\\Clients\\Mail\\");
+         keyName += name.get(); 
+         keyName += "\\protocols\\mailto\\shell\\open\\command";
+
+         nsCAutoString result;
+         GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", result);
+         if (!result.IsEmpty()) {
+             nsCAutoString strExtension;
+             strExtension.Assign(EXE_EXTENSION);
+             result.ToUpperCase();
+             strExtension.ToUpperCase();
+             PRInt32 index = result.RFind(strExtension.get());
+             if (index != kNotFound) {
+                 result.Truncate(index + strExtension.Length());
+             }
+             nsCAutoString thisApp (thisApplication()) ;
+             return (result == thisApp);
+        }
+    }
+    return PR_FALSE;
+
+}
+
+nsresult nsMapiRegistryUtils::saveDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name ;
+    GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Clients\\Mail", "", name);
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+        if (NS_SUCCEEDED(rv)) {
+            nsCAutoString keyName("Software\\Clients\\Mail\\");
+            keyName += name.get(); 
+            keyName += "\\protocols\\mailto\\shell\\open\\command";
+            nsCAutoString appPath ;
+            GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", appPath);
+            if (!appPath.IsEmpty()) {
+                nsCAutoString stringName("HKEY_LOCAL_MACHINE\\");
+                stringName += keyName.get();
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  stringName.get(), (char *)appPath.get());
+            }
+        }
+    }
+    else
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            "");
+    return rv;
+} 
+
+nsresult nsMapiRegistryUtils::saveUserDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name ;
+    GetRegistryKey(HKEY_CURRENT_USER,"Software\\Clients\\Mail", "", name);
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+    }
+    else {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            "");
+   }
+   return rv;
+}
+
+/**
+ * Check whether it is a smart dll or not. Smart dll is the one installed by
+ * IE5 or Outlook Express which forwards the MAPI calls to the dll based on the 
+ * registry key setttings.
+ * Returns TRUE if is a smart dll.
+ */
+
+typedef HRESULT (FAR PASCAL GetOutlookVersionFunc)(); 
+PRBool nsMapiRegistryUtils::isSmartDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll");
+    
+    HINSTANCE hInst; 
+    GetOutlookVersionFunc *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetOutlookVersionFunc *) GetProcAddress (hInst, "GetOutlookVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+typedef HRESULT (FAR PASCAL GetMapiDllVersion)(); 
+/**
+ * Checks whether mapi32.dll is installed by this app. 
+ * Returns TRUE if it is.
+ */
+PRBool nsMapiRegistryUtils::isMozDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll"); 
+
+    HINSTANCE hInst; 
+    GetMapiDllVersion *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetMapiDllVersion *) GetProcAddress (hInst, "GetMapiDllVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+/** Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
+ *  copies the mozMapi32.dll from bin directory to the system directory
+ */
+nsresult nsMapiRegistryUtils::CopyMozMapiToWinSysDir()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    filePath.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr<nsILocalFile> pCurrentMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return rv;        
+    pCurrentMapiFile->InitWithPath(filePath.get());
+
+    nsCOMPtr<nsIFile> pMozMapiFile;
+    nsCOMPtr<nsIProperties> directoryService =
+          do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
+    if (!directoryService) return NS_ERROR_FAILURE;
+    rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR,
+                              NS_GET_IID(nsIFile),
+                              getter_AddRefs(pMozMapiFile));
+
+    if (NS_FAILED(rv)) return rv;
+    pMozMapiFile->Append("mozMapi32.dll");
+
+    PRBool bExist;
+    rv = pMozMapiFile->Exists(&bExist);
+    if (NS_FAILED(rv) || !bExist) return rv;
+
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+    }
+    if (NS_FAILED(rv)) return rv;
+    filePath.Assign(buffer);
+    filePath.Append("\\Mapi32.dll");
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->MoveTo(nsnull, "Mapi32_moz_bak.dll");
+        if (NS_FAILED(rv)) return rv;
+        nsCAutoString fullFilePath(buffer);
+        fullFilePath.Append("\\Mapi32_moz_bak.dll");
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll", 
+                            (char *)fullFilePath.get());
+        if (NS_FAILED(rv)) {
+             RestoreBackedUpMapiDll();
+             return rv;
+        }
+    }
+    
+    NS_NAMED_LITERAL_STRING(fileName, "Mapi32.dll");
+    filePath.Assign(buffer);
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pMozMapiFile->CopyToUnicode(pCurrentMapiFile, fileName.get());
+    if (NS_FAILED(rv))
+        RestoreBackedUpMapiDll();
+    return rv;
+}
+
+/** deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
+ *  to Mapi32.dll
+ */
+nsresult nsMapiRegistryUtils::RestoreBackedUpMapiDll()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    nsCAutoString previousFileName(buffer);
+    filePath.Append("\\Mapi32.dll");
+    previousFileName.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr <nsILocalFile> pCurrentMapiFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return NS_ERROR_FAILURE;        
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    
+    nsCOMPtr<nsILocalFile> pPreviousMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pPreviousMapiFile) return NS_ERROR_FAILURE;       
+    pPreviousMapiFile->InitWithPath(previousFileName.get());
+
+    PRBool bExist;
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist) {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+        if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = pPreviousMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+        rv = pPreviousMapiFile->MoveTo(nsnull, "Mapi32.dll");
+    if (NS_SUCCEEDED(rv))
+        DeleteRegistryValue(HKEY_LOCAL_MACHINE,
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll");
+    return rv;
+}
+
+/** Sets Mozilla as default Mail Client
+ */
+nsresult nsMapiRegistryUtils::setDefaultMailClient()
+{
+    nsresult rv;
+    nsresult mailKeySet=NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(CopyMozMapiToWinSysDir())) return NS_ERROR_FAILURE;
+    }
+    rv = saveDefaultMailClient();
+    if (NS_FAILED(saveUserDefaultMailClient()) ||
+        NS_FAILED(rv)) return NS_ERROR_FAILURE;
+    nsCAutoString keyName("Software\\Clients\\Mail\\");
+
+    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
+    if (!appName.IsEmpty()) {
+        keyName.Append(appName.get());
+
+ nsCOMPtr<nsIStringBundle> bundle;
+ rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
+ if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+ nsXPIDLString defaultMailTitle;
+ const PRUnichar *keyValuePrefixStr[] = { brandName(), versionNo() };
+ NS_NAMED_LITERAL_STRING(defaultMailTitleTag, "defaultMailDisplayTitle");
+ rv = bundle->FormatStringFromName(defaultMailTitleTag.get(),
+ keyValuePrefixStr, 2,
+ getter_Copies(defaultMailTitle));
+ if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                        keyName.get(), 
+ "", NS_CONST_CAST(char *, NS_ConvertUCS2toUTF8(defaultMailTitle).get()) ) ; 
+    }
+    else
+        rv = NS_ERROR_FAILURE;
+    if (NS_SUCCEEDED(rv)) {
+        nsCAutoString thisApp (thisApplication()) ;
+        if (NS_FAILED(rv)) return rv ;
+
+        nsCAutoString dllPath (thisApp) ;
+        PRInt32 index = dllPath.RFind("\\");
+        if (index != kNotFound)
+            dllPath.Truncate(index + 1);
+        dllPath += "mozMapi32.dll";
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            keyName.get(), "DLLPath", 
+                            (char *)dllPath.get());
+        if (NS_SUCCEEDED(rv)) {
+            keyName.Append("\\protocols\\mailto");
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                keyName.get(), 
+                                "", "URL:MailTo Protocol");
+            if (NS_SUCCEEDED(rv)) {
+                nsCAutoString appPath (thisApp);
+                appPath += " \"%1\"";
+                keyName.Append("\\shell\\open\\command");
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       keyName.get(), 
+                       "", (char *)appPath.get());
+                if (NS_SUCCEEDED(rv)) {
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        "Software\\Clients\\Mail", 
+                                        "", (char *)appName.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString mailAppPath(thisApp);
+                    mailAppPath += " -mail";
+                    nsCAutoString appKeyName ("Software\\Clients\\Mail\\");
+                    appKeyName.Append(appName.get());
+                    appKeyName.Append("\\shell\\open\\command");
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        appKeyName.get(),
+                                        "", (char *)mailAppPath.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString iconPath(thisApp);
+                    iconPath += ",0";
+                    nsCAutoString iconKeyName ("Software\\Clients\\Mail\\");
+                    iconKeyName.Append(appName.get());
+                    iconKeyName.Append("\\DefaultIcon");
+                    mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        iconKeyName.get(),
+                                        "", (char *)iconPath.get());
+                }
+            }            
+        }
+    }
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsresult desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                                "Software\\Clients\\Mail",
+                                                "", (char *)appName.get());
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "1");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        RegisterServer(CLSID_CMapiImp, "Mozilla MAPI", "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    
+    return mailKeySet;
+}
+
+/** Removes Mozilla as the default Mail client and restores the previous setting
+ */
+nsresult nsMapiRegistryUtils::unsetDefaultMailClient() {
+    nsresult result = NS_OK;
+    nsresult mailKeySet = NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(RestoreBackedUpMapiDll())) return NS_ERROR_FAILURE;
+    }
+    nsCAutoString name ;
+    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                      "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", name);
+    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
+
+    if (!name.IsEmpty() && !appName.IsEmpty() && name.Equals(appName)) {
+        nsCAutoString keyName("HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\");
+        keyName.Append(appName.get());
+        keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+        nsCAutoString appPath ;
+        GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                        keyName.get(), appPath);
+        if (!appPath.IsEmpty()) {
+            keyName.Assign("Software\\Clients\\Mail\\");
+            keyName.Append(appName.get());
+            keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+            result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       keyName.get(), 
+                       "", (char *)appPath.get());
+            if (NS_SUCCEEDED(result)) {
+                PRInt32 index = appPath.RFind("\\");
+                if (index != kNotFound)
+                    appPath.Truncate(index + 1);
+                appPath += "mozMapi32.dll";
+                keyName.Assign("Software\\Clients\\Mail\\");
+                keyName.Append(appName.get());
+                result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        keyName.get(), 
+                                        "DLLPath", (char *) appPath.get());
+            }
+        }
+    }
+    if (!name.IsEmpty()) {
+        if (NS_SUCCEEDED(result)) {
+            mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", (char *)name.get());
+        }
+    }
+    else
+        mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", "");
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsCAutoString userAppName ;
+        GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  "HKEY_CURRENT_USER\\Software\\Clients\\Mail", userAppName);
+        nsresult desktopKeySet = NS_OK;
+        if (!userAppName.IsEmpty()) {
+            desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                           "Software\\Clients\\Mail", 
+                                           "", (char *)userAppName.get());
+        }
+        else {
+            DeleteRegistryValue(HKEY_CURRENT_USER, "Software\\Clients\\Mail", "");
+        }
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "0");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        UnregisterServer(CLSID_CMapiImp, "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    return mailKeySet;
+}
+
+/** Returns FALSE if showMapiDialog is set to 0.
+ *  Returns TRUE otherwise
+ *  Also returns TRUE if the Mozilla has been set as the default mail client
+ *  and some other application has changed that setting.
+ *  This function gets called only if the current app is not the default mail
+ *  client
+ */
+PRBool nsMapiRegistryUtils::getShowDialog() {
+    PRBool rv = PR_FALSE;
+    nsCAutoString showDialog ;
+    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                        "showMapiDialog", showDialog);
+    // if the user has not selected the checkbox, show dialog 
+    if (showDialog.IsEmpty() || showDialog.Equals("1"))
+            rv = PR_TRUE;
+
+    if (!rv) {
+        // even if the user has selected the checkbox
+        // show it if some other application has changed the 
+        // default setting.
+        nsCAutoString setMailDefault ;
+        GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Mozilla\\Desktop", 
+                                       "defaultMailHasBeenSet", setMailDefault);
+        if (setMailDefault.Equals("1")) {
+            // need to reset the defaultMailHasBeenSet to "0"
+            // so that after the dialog is displayed once,
+            // we do not keep displaying this dialog after the user has
+            // selected the checkbox
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Mozilla\\Desktop", 
+                                "defaultMailHasBeenSet", "0");
+            rv = PR_TRUE;
+        }
+    }
+    return rv;
+}
+
+nsresult nsMapiRegistryUtils::MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle)
+{
+    nsresult rv = NS_OK ;
+
+    if (m_mapiStringBundle)
+    {
+        *aMapiStringBundle = m_mapiStringBundle ;
+        NS_ADDREF(*aMapiStringBundle);
+        return rv ;
+    }
+
+    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                     kStringBundleServiceCID, &rv));
+    if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
+
+    rv = bundleService->CreateBundle(
+ MAPI_PROPERTIES_CHROME,
+                    getter_AddRefs(m_mapiStringBundle));
+    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+ NS_ADDREF(*aMapiStringBundle = m_mapiStringBundle) ;
+
+    return rv ;
+}
+
+nsresult nsMapiRegistryUtils::ShowMapiErrorDialog() 
+{
+    nsresult rv;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { brandName() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "errorMessageTitle");
+        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "errorMessage");
+        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        rv = promptService->Alert(nsnull, dialogTitle,
+                                  dialogText);
+    }
+    return rv;
+}
+

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.h

@@ -0,0 +1,112 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsmapiregistryutils_h____
+#define nsmapiregistryutils_h____
+
+#include <windows.h>
+#include <string.h>
+#include <winreg.h>
+
+#include "Registry.h"
+#include "nsString.h"
+#include "nsIStringBundle.h"
+
+class nsMapiRegistryUtils
+{
+private :
+    nsCAutoString m_thisApp ;
+    nsAutoString m_brand ;
+ nsAutoString m_versionNo ;
+
+    nsCOMPtr<nsIStringBundle> m_mapiStringBundle ;
+public :
+    nsMapiRegistryUtils() ;
+
+    // returns TRUE if the Mapi32.dll is smart dll.
+    PRBool isSmartDll();
+    // returns TRUE if the Mapi32.dll is a Mozilla dll.
+    PRBool isMozDll();
+
+    // Returns the (fully-qualified) name of this executable.
+    const char * thisApplication() ; 
+    // This returns the brand name for this application
+    const PRUnichar * brandName() ;
+ // This returns the version no for this application
+ const PRUnichar * versionNo() ;
+    // verifyRestrictedAccess - Returns PR_TRUE if this user only has restricted access
+    // to the registry keys we need to modify.
+    PRBool verifyRestrictedAccess() ;
+
+    // set the Windows registry key
+nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value);
+    // delete a registry key
+nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName);
+    // get a Windows registry key
+    void GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName, nsCAutoString & value) ;
+
+    // Returns TRUE if the current application is default mail client.
+PRBool IsDefaultMailClient();
+    // Sets Mozilla as default Mail Client
+    nsresult setDefaultMailClient() ;
+    // Removes Mozilla as the default Mail client and restores the previous setting
+    nsresult unsetDefaultMailClient() ;
+
+    // Saves the current setting of the default Mail Client in 
+    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+nsresult saveDefaultMailClient();
+    // Saves the current user setting of the default Mail Client in 
+    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+nsresult saveUserDefaultMailClient();
+
+nsresult CopyMozMapiToWinSysDir();
+nsresult RestoreBackedUpMapiDll();
+
+    // Returns FALSE if showMapiDialog is set to 0.
+    PRBool getShowDialog() ;
+
+    // create a string bundle for MAPI messages
+    nsresult MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle) ;
+    // display an error dialog for MAPI messages
+    nsresult ShowMapiErrorDialog() ;
+
+} ;
+
+#endif

mozilla/mailnews/mapi/resources/content/contents.rdf

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:messenger-mapi"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:messenger-mapi"
+        chrome:displayName="Messenger"
+        chrome:author="mozilla.org"
+        chrome:name="messenger-mapi"
+        chrome:localeVersion="0.9.7"
+		chrome:skinVersion="0.9.4">
+  </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
+  </RDF:Seq>
+
+  <!-- mapi items for Mail And Newsgroups preferences pane -->
+  <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
+    <RDF:li>chrome://messenger-mapi/content/pref-mailnewsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+</RDF:RDF>

mozilla/mailnews/mapi/resources/content/jar.mn

@@ -0,0 +1,3 @@
+messenger.jar:
+     content/messenger-mapi/pref-mailnewsOverlay.xul
+     content/messenger-mapi/contents.rdf                                

mozilla/mailnews/mapi/resources/content/makefile.win

@@ -0,0 +1,29 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+chrome::
+    $(REGCHROME) content messenger-mapi messenger.jar

mozilla/mailnews/mapi/resources/content/overlays.rdf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:chrome="http://www.mozilla.org/rdf/chrome#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+   <!-- mapi items for mailnews preferences -->
+   <RDF:Seq about="urn:mozilla:overlays">
+     <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
+   </RDF:Seq>
+
+   <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
+     <RDF:li>chrome://messenger/content/pref-mailnewsOverlay.xul</RDF:li>
+   </RDF:Seq>
+
+</RDF:RDF>

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.js

@@ -0,0 +1,104 @@
+/* 
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is mozilla.org code.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 2001 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ * Srilatha Moturi <srilatha@netscape.com>
+ */
+
+function mailnewsOverlayStartup() {
+    mailnewsOverlayInit();
+    parent.hPrefWindow.registerOKCallbackFunc(onOK);
+    if (!("mapiPref" in parent)) {
+        parent.mapiPref = new Object;
+        parent.mapiPref.isDefaultMailClient = 
+               document.getElementById("mailnewsEnableMapi").checked;
+    }
+    else { 
+        // when we switch between different panes
+        // set the checkbox based on the saved state
+        var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
+        if (parent.mapiPref.isDefaultMailClient)
+            mailnewsEnableMapi.setAttribute("checked", "true");
+        else
+            mailnewsEnableMapi.setAttribute("checked", "false");
+    }
+}
+
+function mailnewsOverlayInit() {
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    }
+
+    const prefbase = "system.windows.lock_ui.";
+    var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
+    if (mapiRegistry) {
+    // initialise preference component.
+    // While the data is coming from the system registry, we use a set
+    // of parallel preferences to indicate if the ui should be locked.
+        try { 
+            var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService()
+                          .QueryInterface(Components.interfaces.nsIPrefService);
+            var prefBranch = prefService.getBranch(prefbase);
+            if (prefBranch && prefBranch.prefIsLocked("default_mail_client")) {
+                if (prefBranch.getBoolPref("default_mail_client"))
+                    mapiRegistry.setDefaultMailClient();
+                else
+                    mapiRegistry.unsetDefaultMailClient();
+                mailnewsEnableMapi.setAttribute("disabled", "true");
+           }
+        }
+        catch(ex) {}
+        if (mapiRegistry.isDefaultMailClient)
+            mailnewsEnableMapi.setAttribute("checked", "true");
+        else
+            mailnewsEnableMapi.setAttribute("checked", "false");
+    }
+    else
+        mailnewsEnableMapi.setAttribute("disabled", "true");
+}
+
+function onEnableMapi() {
+    // save the state of the checkbox
+    if ("mapiPref" in parent)
+        parent.mapiPref.isDefaultMailClient = 
+               document.getElementById("mailnewsEnableMapi").checked;
+}
+
+function onOK()
+{
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    }
+    if (mapiRegistry &&
+        ("mapiPref" in parent) && 
+        (mapiRegistry.isDefaultMailClient != parent.mapiPref.isDefaultMailClient)) { 
+        if (parent.mapiPref.isDefaultMailClient)
+            mapiRegistry.setDefaultMailClient();
+        else
+            mapiRegistry.unsetDefaultMailClient();
+    }  
+}

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!-- 
+The contents of this file are subject to the Mozilla Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/MPL/
+
+oftware distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is mozilla.org code.
+The Initial Developer of the Original Code is Netscape
+Communications Corporation.  Portions created by Netscape are 
+Copyright (C) 2001 Netscape Communications Corporation.  All
+Rights Reserved.
+ 
+Contributor(s): 
+  Srilatha Moturi <srilatha@netscape.com>
+-->
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefMailnewsOverlayDTD SYSTEM "chrome://messenger-mapi/locale/pref-mailnewsOverlay.dtd" >
+%prefMailnewsOverlayDTD;
+]>
+<overlay id="prefMailnewsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script type="application/x-javascript">
+  <![CDATA[
+      _elementIDs.push("mailnewsEnableMapi");
+  ]]>
+</script>         
+<script type="application/x-javascript" src="chrome://messenger-mapi/content/pref-mailnewsOverlay.js"/>
+<hbox autostretch="never" id="mapi">
+  <checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
+            accesskey="&enableMapi.accesskey;"
+	        preftype="bool" prefstring="mailnews.default_mail_client" prefattribute="checked"/>
+
+</hbox>
+</overlay> 

mozilla/mailnews/mapi/resources/locale/en-US/contents.rdf

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the skins being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:messenger-mapi"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:en-US:messenger-mapi"
+	chrome:localeVersion="0.9.7"/>
+</RDF:RDF>

mozilla/mailnews/mapi/resources/locale/en-US/jar.mn

@@ -0,0 +1,4 @@
+en-US.jar:
+     locale/en-US/messenger-mapi/pref-mailnewsOverlay.dtd
+     locale/en-US/messenger-mapi/mapi.properties
+     locale/en-US/messenger-mapi/contents.rdf

mozilla/mailnews/mapi/resources/locale/en-US/makefile.win

@@ -0,0 +1,40 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+# 
+
+DEPTH=..\..\..\..\..
+
+
+CHROME_DIR=locales\en-US
+CHROME_L10N_DIR=messenger\locale
+
+CHROME_L10N = \
+    .\pref-mailnewsOverlay.dtd \
+    .\mapi.properties \
+    .\contents.rdf  \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+chrome::
+   $(REGCHROME) locale en-US/messenger-mapi en-US.jar
+

mozilla/mailnews/mapi/resources/locale/en-US/mapi.properties

@@ -0,0 +1,23 @@
+# Mail Integration Dialog
+dialogTitle=%S Mail
+dialogText=Do you want to use %S as the default mail application? 
+checkboxText=Do not display this dialog again
+
+# MAPI Messages
+loginText=Please enter your password for %S:
+loginTextwithName=Please enter your username and password 
+loginTitle=%S Mail
+PasswordTitle=%S Mail
+
+# MAPI Error Messages
+errorMessage=%S Mail could not be set as the default mail application because a registry key could not be updated. Verify with your system administrator that you have write access to your system registry, and then try again.
+errorMessageTitle=%S Mail
+
+# MAPI Security Messages
+mapiBlindSendWarning=Another application is attempting to send mail using your user profile. Are you sure you want to send mail?
+mapiBlindSendDontShowAgain=Warn me whenever other applications try to send mail from me
+
+#Default Mail Display String
+# localization note, $1%S is the app name, $2%S is the version 
+defaultMailDisplayTitle=%S %S Mail
+

mozilla/mailnews/mapi/resources/locale/en-US/pref-mailnewsOverlay.dtd

@@ -0,0 +1,3 @@
+<!ENTITY enableMapiTitle.label        "When sending mail from other applications">
+<!ENTITY enableMapi.label             "Use &vendorShortName; Mail as the default mail application.">
+<!ENTITY enableMapi.accesskey         "u">

mozilla/mailnews/mapi/resources/locale/makefile.win

@@ -0,0 +1,28 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..\..
+
+DIRS=en-US
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/resources/makefile.win

@@ -0,0 +1,27 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..
+
+DIRS=content locale
+
+include <$(DEPTH)\config\rules.mak>

mozilla/webtools/addons/public/htaccess.dist

@@ -1,91 +0,0 @@
-# a) Install me in public/htdocs/.htaccess, or 
-# b) Create a <Directory> entry in your Apache conf
-
-# You MUST define YOURPATH/inc as an include_path!
-php_value include_path /YOURPATH/v2/public/inc:.:/usr/share/pear:/YOURPATH/v2/shared/lib
-
-# Init script to set up required libraries.
-php_value auto_prepend_file init.php
-
-# Finish script that calls $tpl->display for global Smarty object.
-php_value auto_append_file finish.php
-
-# Rewrite engine must be used to simplify URLs so they are human readable.
-RewriteEngine On
-RewriteBase /YOURPATH/public/htdocs
-
-# Rewrites to be compatible with older versions of addons.
-RewriteRule ^update/VersionCheck.php(.*)$ update.php$1
-RewriteRule ^rss/index.php(.*)$ rss.php$1
-
-# Compatibility for v1 extension and theme links.
-# Old example URLs:
-#   /extensions/moreinfo.php?application=thunderbird&id=123
-#   /extensions/moreinfo.php?id=123
-#   /themes/moreinfo.php?id=321&application=seamonkey
-#   /themes/moreinfo.php?id=321
-# New:
-#   /thunderbird/123/
-#   /firefox/123/
-#   /seamonkey/321/
-#   /firefox/321/
-RewriteCond %{QUERY_STRING} application=(\w+)&.*id=([0-9]+)
-RewriteRule ^(extensions|themes)/moreinfo.php$ %1/%2/? [R=301,L]
-RewriteCond %{QUERY_STRING} id=([0-9]+)&.*application=(\w+)
-RewriteRule ^(extensions|themes)/moreinfo.php$ %2/%1/? [R=301,L]
-RewriteCond %{QUERY_STRING} id=([0-9]+)
-RewriteRule ^(extensions|themes)/moreinfo.php$ firefox/%1/? [R=301,L]
-
-# Compatibility for v1 of extensions.  The hardcoded URL's in the old
-# browsers need this to get to the right pages: (the strings are the GUIDs)
-# Old example URL:
-#   /extensions/?application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-# New:
-#   /extensions.php?app={3550f703-e582-4d05-9a08-453d09bdfdc6}
-RewriteCond %{QUERY_STRING} ^application=(.*)$
-RewriteRule ^extensions/$ extensions.php?app=%1 [R=301,L]
-
-# Compatibility for v1 of extensions.  The hardcoded URL's in the old
-# browsers need this to get to the right pages: (the strings are the GUIDs)
-# Old example URL:
-#   /themes/?application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-# New:
-#   /themes.php?app={3550f703-e582-4d05-9a08-453d09bdfdc6}
-RewriteCond %{QUERY_STRING} ^application=(.*)$
-RewriteRule ^themes/$ themes.php?app=%1 [R=301,L]
-
-# Send rss/* to rss.php.
-# Example:
-#     /rss/firefox/extensions/popular/ -> rss.php?app=firefox&type=extensions&list=popular
-RewriteRule ^rss/(\w+)/(\w+)/(\w+)[/]{0,1}$ rss.php?app=$1&type=$2&list=$3
-
-# Rewrite to addon.php if all we have is a numerical id after appname.
-# Example:
-#     /firefox/220/ -> addon.php?app=firefox&id=220
-RewriteRule ^(\w+)/(\d+)[/]{0,1}$ addon.php?app=$1&id=$2
-
-# Rewrite to an addon-specific page, passing app and id.
-# Example:
-#     /firefox/220/previews/ -> previews.php?app=firefox&id=220
-RewriteRule ^(\w+)/(\d+)/(\w+)[/]{0,1}$ $3.php?app=$1&id=$2
-
-# Rewrite to addon.php if there is a name given plus overview (special case for addon.php).
-# Example:
-#     /firefox/flashgot/overview/ -> addon.php?app=firefox&name=flashgot
-RewriteRule ^(\w+)/(\w+)/overview[/]{0,1}$ addon.php?app=$1&name=$2
-
-# Rewrite to addon-specific page, passing app and addon name.
-# Example:
-#     /firefox/flashgot/previews/ -> previews.php?app=firefox&name=flashgot
-RewriteRule ^(\w+)/(\w+)/(\w+)[/]{0,1}$ $3.php?app=$1&name=$2
-
-# Rewrite top-level pages.
-# Examples:
-#     /firefox/extensions/ -> extensions.php?app=firefox
-#     /firefox/themes/ -> themes.php?app=firefox
-RewriteRule ^(\w+)/([\w-]+)[/]{0,1}$ $2.php?app=$1
-
-# Rewrite for main page & app.
-# Example:
-#    /firefox/ -> /?app=firefox
-RewriteRule ^(\w+)[/]{0,1}$ index.php?app=$1

mozilla/webtools/addons/public/htdocs/addcomment.php

@@ -1,130 +0,0 @@
-<?php
-/**
- * Add a comment to any Addon.
- *
- * @package amo
- * @subpackage docs
- *
- * Variables:
- *   $_GET['aid'] = Addon ID (integer)
- */
-
-startProcessing('addcomment.tpl', null, null);
-require_once 'includes.php';
-
-session_start();
-
-if ((!array_key_exists('aid', $_GET)) || !is_numeric($_GET['aid'])) {
-    triggerError('There was an error processing your request.');
-}
-
-//This is a secure page, so we'll check the session
-if (!$_auth->validSession()) {
-    //id is already verified to be numeric from above
-    header('Location: '.WEB_PATH."/login.php?dest=comment&aid={$_GET['aid']}");
-    exit;
-}
-
-// If there are errors, this will be populated
-$_errors = array();
-
-// This will be used in queries and the template
-$addon = new AddOn($_GET['aid']);
-
-// If the comment is added successfully, this will toggle (used in the template)
-$added_comment = false;
-
-// They're posting a comment
-if (isset($_POST['c_submit'])) {
-
-    if (! (array_key_exists('c_rating', $_POST)
-        && array_key_exists('c_title', $_POST)
-        && array_key_exists('c_comments', $_POST))) {
-        //This should never happen, but hey...
-        triggerError('There was an error processing your request.');
-    }
-
-    // Check all our input to make sure something is there, and it is appropriate.
-    // If it isn't, make $_bad_input=true which means we'll print the form back out
-    // with an error message.  (By using booleans here, we keep the error messages in
-    // the .tpl)
-        $_bad_input = false;
-        if (!is_numeric($_POST['c_rating'])) {
-            $_errors['c_rating'] = true;
-            $_bad_input = true;
-        }
-        if (empty($_POST['c_title'])) {
-            $_errors['c_title'] = true;
-            $_bad_input = true;
-        }
-        if (empty($_POST['c_comments'])) {
-            $_errors['c_comments'] = true;
-            $_bad_input = true;
-        }
-
-    // If bad_input is true, we'll skip the rest of the processing and dump them
-    // back out to the from with an error.
-    if ($_bad_input === false) {
-
-        // I got a little carried away with the escaping, but it's not gonna hurt anything.
-        $_c_id         = mysql_real_escape_string($addon->ID);
-        $_c_user_id    = mysql_real_escape_string($_auth->getId());
-        $_c_rating     = mysql_real_escape_string($_POST['c_rating']);
-        $_c_title      = mysql_real_escape_string(strip_tags($_POST['c_title']));
-        $_c_comments   = mysql_real_escape_string(strip_tags($_POST['c_comments']));
-        $_c_commentip  = mysql_real_escape_string($_SERVER['REMOTE_ADDR']);
-
-        $_sql = "INSERT INTO `feedback`
-                 ( 
-                    `ID`,
-                    `UserId`,
-                    `CommentVote`,
-                    `CommentTitle`,
-                    `CommentNote`,
-                    `CommentDate`,
-                    `commentip`
-                 ) VALUES (
-                     {$_c_id},
-                     {$_c_user_id},
-                     {$_c_rating},
-                    '{$_c_title}',
-                    '{$_c_comments}',
-                    NOW(),
-                    '{$_c_commentip}'
-                 )";
-
-        $db->query($_sql);
-
-        if (!DB::isError($db->record)) {
-            // Calculate the lookup value in main for comment avg if our INSERT was successful.
-            $_ratingSql = "UPDATE `main` SET `Rating` = ROUND((SELECT AVG(`CommentVote`) FROM `feedback` WHERE `ID` = {$_c_id}),2) WHERE `ID` = {$_c_id}";
-            $db->query($_ratingSql);
-        }
-
-        // For the template
-        $added_comment = true;
-    }
-}
-
-// Put values back into the form - if something went wrong this will populate the
-// form again
-$c_rating_value   = array_key_exists('c_rating', $_POST)   ? $_POST['c_rating']   : '';
-$c_title_value    = array_key_exists('c_title', $_POST)    ? $_POST['c_title']    : '';
-$c_comments_value = array_key_exists('c_comments', $_POST) ? $_POST['c_comments'] : '';
-
-// Assign template variables.
-$tpl->assign(
-    array(  'title'             => 'Add Comment',
-            'currentTab'        => null,
-            'rate_select_value' => array('','5','4','3','2','1','0'),
-            'rate_select_name'  => array('Rating:','5 stars', '4 stars', '3 stars', '2 stars', '1 star', '0 stars'),
-            'addon'             => $addon,
-            'c_added_comment'   => $added_comment,
-            'c_errors'          => $_errors,
-            'c_rating_value'    => $c_rating_value,
-            'c_title_value'     => $c_title_value,
-            'c_comments_value'  => $c_comments_value,
-            'sidebar'           => 'inc/addon-sidebar.tpl'
-         )
-);
-?>

mozilla/webtools/addons/public/htdocs/addon.php

@@ -1,37 +0,0 @@
-<?php
-/**
- * Addon summary page.  Displays a top-down view of all Addon properties.
- * 
- * @package amo
- * @subpackage docs
- */
-
-// Get the int value of our addon ID.
-$clean['ID'] = intval($_GET['id']);
-$sql['ID'] =& $clean['ID'];
-
-startProcessing('addon.tpl',$clean['ID'],$compileId);
-require_once('includes.php');
-
-// Create our AddOn object using the ID.
-$addon = new AddOn($sql['ID']);
-
-/* This is kind of a cheesy hack to determine how to display
-   download links on the addon page.  If only one link is shown,
-   there will just be an "Install Now" link, otherwise there will
-   be links for each version. */
-if (sizeof($addon->OsVersions) == 1) {
-    $multiDownloadLinks = false;
-} else {
-    $multiDownloadLinks = true;
-}
-
-// Assign template variables.
-$tpl->assign(
-    array(  'addon'     => $addon,
-            'multiDownloadLinks' => $multiDownloadLinks,
-            'title'     => $addon->Name,
-            'content'   => 'addon.tpl',
-            'sidebar'   => 'inc/addon-sidebar.tpl')
-);
-?>

mozilla/webtools/addons/public/htdocs/author.php

@@ -1,24 +0,0 @@
-<?php
-/**
- * Author information.
- * @package amo
- * @subpackage docs
- */
-
-// Get our addon ID.
-$clean['UserID'] = intval($_GET['id']);
-$sql['UserID'] =& $clean['UserID'];
-
-startProcessing('author.tpl',$clean['UserID'],$compileId);
-require_once('includes.php');
-
-$user = new User($sql['UserID']);
-
-// Assign template variables.
-$tpl->assign(
-    array(  'user'     => $user,
-            'title'     => $user->UserName,
-            'content'   => 'author.tpl',
-            'sidebar'   => 'inc/author-sidebar.tpl')
-);
-?>

mozilla/webtools/addons/public/htdocs/comments.php

@@ -1,65 +0,0 @@
-<?php
-/**
- * Comments listing for an addon.
- *
- * @package amo
- * @subpackage docs
- * @TODO Disallow comments for addon authors (authors should not be allowed to comment on their own addon).
- * @TODO Throttle comment entry.
- */
-
-// Get our addon id.
-$clean['id'] = intval($_GET['id']);
-$sql['id'] =& $clean['id'];
-
-// Sort.
-if (isset($_GET['sort'])&&ctype_alpha($_GET['sort'])) {
-    $clean['sort'] = $_GET['sort'];
-}
-
-// Starting point.
-$page['left'] = (isset($_GET['left'])) ? intval($_GET['left']) : 0;
-
-// Ending point.
-$page['right'] = $page['left'] + 10;
-
-// Order by.
-$page['orderby'] = (!empty($_GET['orderby'])&&ctype_alpha($_GET['orderby'])) ? $_GET['orderby'] : "";
-
-startProcessing('comments.tpl',$clean['id'],$compileId);
-require_once('includes.php');
-
-$addon = new AddOn($sql['id']);
-$addon->getComments($page['left'],10,$page['orderby']);
-
-// Get our result count.
-$db->query("SELECT FOUND_ROWS()", SQL_INIT);
-$resultCount = !empty($db->record) ? $db->record[0] : $page['right'];
-if ($resultCount<$page['right']) {
-    $page['right'] = $resultCount;
-}
-
-// Do we even have a next or previous page?
-$page['previous'] = ($page['left'] >= 10) ? $page['left']-10 : null;
-$page['next'] = ($page['left']+10 < $resultCount) ? $page['left']+10 : null;
-$page['resultCount'] = $resultCount;
-$page['leftDisplay'] = $page['left']+1;
-
-// Build the URL based on passed arguments.
-foreach ($clean as $key=>$val) {
-    if (!empty($val)) {
-        $buf[] = $key.'='.$val;
-    }
-}
-$page['url'] = implode('&amp;',$buf);
-unset($buf);
-
-// Assign template variables.
-$tpl->assign(
-    array(  'addon'     => $addon,
-            'title'     => $addon->Name.' Comments',
-            'content'   => 'comments.tpl',
-            'sidebar'   => 'inc/addon-sidebar.tpl',
-            'page'      => $page)
-);
-?>

mozilla/webtools/addons/public/htdocs/createaccount.php

@@ -1,132 +0,0 @@
-<?php
-/**
- * Create a new account
- *
- * @package amo
- * @subpackage docs
- *
- */
-
-startProcessing('createaccount.tpl', null, null, 'nonav');
-require_once 'includes.php';
-
-// If there are problems, these will be set to true and used in the template.  By
-// using null/booleans, error messages are kept in the template.
-$error_email_empty = null;
-$error_email_malformed = null;
-$error_emailconfirm_empty = null;
-$error_emailconfirm_nomatch = null;
-$error_email_duplicate = null;
-$error_name_empty = null;
-$error_password_empty = null;
-$error_passwordconfirm_empty = null;
-$error_passwordconfirm_nomatch = null;
-
-$_bad_input = false; // think positive :)
-$account_created = false;
-
-if (array_key_exists('submit', $_POST) && isset($_POST['submit'])) {
-    /* Verify Input */
-        // Check email - a little long and confusing.  Basically, throw an error if
-        // the following is not met (in order):
-        // $email is set, $emailconfirm is set, $email=$emailconfirm, and $email is a valid address
-        if (!array_key_exists('email', $_POST) || empty($_POST['email'])) {
-            $error_email_empty = true;
-            $_bad_input = true;
-        } else {
-            if (!array_key_exists('emailconfirm', $_POST) || empty($_POST['emailconfirm'])) {
-                $error_emailconfirm_empty = true;
-                $_bad_input = true;
-            } else {
-                // technically this would catch if emailconfirm was empty to, but
-                // waiting until here could make php throw a warning.
-                if ($_POST['email'] != $_POST['emailconfirm']) {
-                    $error_emailconfirm_nomatch = true;
-                    $_bad_input = true;
-                }
-            }
-            // Regex from Gavin Sharp -- thanks Gavin.
-            if (!preg_match('/^(([A-Za-z0-9]+_+)|([A-Za-z0-9]+\-+)|([A-Za-z0-9]+\.+)|([A-Za-z0-9]+\++))*[A-Za-z0-9]+@((\w+\-+)|(\w+\.))*\w{1,63}\.[a-zA-Z]{2,6}$/',$_POST['email'])) {
-                $error_email_malformed = true;
-                $_bad_input = true;
-            }
-        }
-        // name is required
-        if (!array_key_exists('name', $_POST) || empty($_POST['name'])) {
-            $error_name_empty = true;
-            $_bad_input = true;
-        }
-        // password is required and match
-        if (!array_key_exists('password', $_POST) || empty($_POST['password'])) {
-            $error_password_empty = true;
-            $_bad_input = true;
-        } else {
-            if (!array_key_exists('passwordconfirm', $_POST) || empty($_POST['passwordconfirm'])) {
-                $error_passwordconfirm_empty = true;
-                $_bad_input = true;
-            } else {
-                if ($_POST['password'] != $_POST['passwordconfirm']) {
-                    $error_passwordconfirm_nomatch = true;
-                    $_bad_input = true;
-                }
-            }
-        }
-        // This is a little out of order because we're trying to save a query.  If we
-        // haven't had any bad input yet, do one last check to make sure the email
-        // address isn't already in use.
-        if ($_bad_input === false) {
-            $_user_test = user::getUserByEmail($_POST['email']);
-
-            if (is_object($_user_test)) {
-                $_bad_input = true;
-                $error_email_duplicate = true;
-            }
-        }
-
-        // We're happy with the input, make a new account
-        if ($_bad_input === false) {
-            $_user_info = array();
-            $_user_info['email']    = $_POST['email'];
-            $_user_info['name']     = $_POST['name'];
-            $_user_info['website']  = $_POST['website'];
-            $_user_info['password'] = $_POST['password'];
-            $user_id = user::addUser($_user_info);
-            if ($user_id === false) {
-                triggerError('There was an error processing your request.');
-            }
-            $user = new User($user_id[0]);
-            // we're emailing them their plain text password
-            $user->sendConfirmation($_user_info['password']);
-            $account_created = true;
-        }
-
-}
-
-// Pull values from POST to put back in the form
-$email_value        = array_key_exists('email', $_POST) ? $_POST['email'] : '';
-$emailconfirm_value = array_key_exists('emailconfirm', $_POST) ? $_POST['emailconfirm'] : '';
-$name_value         = array_key_exists('name', $_POST) ? $_POST['name'] : '';
-$website_value      = array_key_exists('website', $_POST) ? $_POST['website'] : '';
-
-// Assign template variables.
-$tpl->assign(
-    array(  'title'                         => 'Create an Account',
-            'currentTab'                    => null,
-            'account_created'               => $account_created,
-            'bad_input'                     => $_bad_input,
-            'error_email_empty'             => $error_email_empty,
-            'error_email_malformed'         => $error_email_malformed,
-            'error_emailconfirm_empty'      => $error_emailconfirm_empty,
-            'error_emailconfirm_nomatch'    => $error_emailconfirm_nomatch,
-            'error_email_duplicate'         => $error_email_duplicate,
-            'error_name_empty'              => $error_name_empty,
-            'error_password_empty'          => $error_password_empty,
-            'error_passwordconfirm_empty'   => $error_passwordconfirm_empty,
-            'error_passwordconfirm_nomatch' => $error_passwordconfirm_nomatch,
-            'email_value'                   => $email_value,
-            'emailconfirm_value'            => $emailconfirm_value,
-            'name_value'                    => $name_value,
-            'website_value'                 => $website_value
-            )
-);
-?>

mozilla/webtools/addons/public/htdocs/css/base/content.css

@@ -1,115 +0,0 @@
-body, td, th, h3, input { /* redundant rules for bad browsers  */
-	font-family: verdana, sans-serif;
-	font-size: x-small;
-	voice-family: "\"}\"";
-	voice-family: inherit;
-	font-size: small;
-}
-
-body {
-	color: #333;
-	line-height: 140%;
-}
-
-a:link { color: #039; }
-a:visited { color: #609; }
-a:hover { color: #333; }
-a:active { color: #000; }
-
-#header a:visited { color: #039; }
-#header a:hover { color: #333; }
-
-#mBody li { padding-bottom: 0.5em; }
-
-.sidebar_content > h1,.sidebar_content > h2,.sidebar_content > h3,.sidebar_content > h4,.sidebar_content > h5,.sidebar_content > h6,.sidebar > h1,.sidebar_general > h2,.sidebar_general > h3,.sidebar_general > h4,.sidebar_general > h5,.sidebar_general > h6 {
-	margin-top: 0;
-}
-
-.sidebar_right {
-	margin-left: 65%;
-}
-
-.sidebar_general ul {
-	margin-left: 0;
-	padding-left: 20px;
-}
-
-.sidebar_general li {
-	padding: 0.2em 0;
-}
-
-img.imgright {
-	float: right;
-    margin: .3em .3em .3em 0;
-    padding: .3em .3em .3em 0;
-}
-
-img {
-	border: 0;
-}
-
-dt {
-	font-weight: bold;
-}
-
-dd {
-	margin: 0 0 1em 1em;
-}
-
-.skipLink {
-	position: absolute;
-	left: -1200px;
-	width: 990px;
-}
-
-.hide {
-	display: none;
-}
-
-ul.compact {
-	margin-left: 0;
-	padding-left: 20px;
-}
-
-img.rss {
-	float: right;
-	margin: 0;
-	padding: 4px 4px 0 0;
-}
-
-.first { margin-top: 0.2em; }
-
-.requires img {
-	vertical-align: middle;
-}
-
-/* Headers */
-
-#mainContent > h1:first-child,
-#mainContent > h2:first-child,
-#mainContent > h3:first-child,
-#mainContent > h4:first-child,
-#mainContent > h5:first-child,
-#mainContent > h6:first-child,
-#side > h1:first-child,
-#side > h2:first-child,
-#side > h3:first-child,
-#side > h4:first-child,
-#side > h5:first-child,
-#side > h6:first-child {
-	margin-top: 0;
-}
-
-.appversions {
-    border: 1px solid #ccc;
-    margin: .5em 0;
-}
-
-.appversions th {
-    background-color: #ccc;
-    padding: .2em;
-}
-
-.appversions .row1 {
-    background-color: #eee;
-}

mozilla/webtools/addons/public/htdocs/css/base/template.css

@@ -1,139 +0,0 @@
-body {
-	min-width: 700px;
-	margin: 0 0 2em 0;
-	padding: 0;
-}
-
-#container {
-	width: 740px;
-	margin: 0 auto;
-}
-
-#mBody {
-	clear: both;
-	padding: .2em 0;
-}
-
-.sidebar_content {
-	width: 60%;
-	float: left;
-}
-
-#footer {
-	clear: both;
-}
-
-#side {
-	float: left;
-	width: 23%;
-	margin-bottom: 1em;
-}
-
-#mainContent {
-	margin-left: 25%;
-}
-.nomenu #mainContent {
-	margin-left: 0;
-}
-.bodyleft {
-	margin-left: 25% ! important
-}
-#mainContent.right {
-	float: left;
-	width: 62%;
-	margin-bottom: 1em;
-	margin-left: 0;
-}
-
-#side.right {
-	float: none;
-	width: auto;
-	margin-left: 65%;
-}
-
-p.security-update {
-	padding-left: 35px;
-	background: url(../../images/security-update.png) no-repeat;
-	margin-top: 0;
-	min-height: 30px;
-}
-
-/* Sidebar */
-
-#nav:before {
-	line-height: 0.1;
-	font-size: 1px;
-	background: transparent url("../../images/menu_tr.gif") no-repeat top right;
-	margin: 0;
-	height: 9px;
-	display: block;
-	border-bottom: 1px solid #ddd;
-	content: url("../../images/key-point_tl.gif");
-}
-#nav {
-	background: #E0E9E9 url("../../images/menu_back.gif") right repeat-y;
-}
-#nav:after {
-	display: block;
-	padding-top: 0;
-	line-height: 0.1;
-	font-size: 1px;
-	content:  url("../../images/key-point_bl.gif");
-	margin: 0 0 0 0;
-	height: 8px;
-	background: transparent url("../../images/menu_br.gif") scroll no-repeat bottom right ;
-	border-top: 1px solid #fff;
-}
-
-#nav, #nav ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-#nav {
-	margin-bottom: 1em;
-}	
-#nav li {
-	display: inline;
-	padding: 0;
-	margin: 0;
-}
-
-#nav li span { /* used for un-linked menu items */
-	display: block;
-	padding: 6px 10px;
-	font-weight: bold;
-	color: #666;
-}
-
-#nav li span#configParent, #nav li span #configuration {
-	display: inline;
-	font-weight: normal;
-	padding: 0;
-}
-
-#nav li a {
-	display: block;
-	padding: 6px 10px;
-	text-decoration: none;
-	background: #EDF2F2;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #fff;
-	border-right: 1px solid #ddd;
-}
-
-#nav li a:hover {
-	background: #E0E9E9;
-}
-
-#nav ul li span,#nav ul li a {
-	padding: 4px 8px 4px 20px;
-}
-
-.clear-both {
-    clear: both;
-}
-
-.center {
-    text-align: center;
-}

mozilla/webtools/addons/public/htdocs/css/cavendish/content.css

@@ -1,454 +0,0 @@
-#mBody h2 {
-	font: 140% arial,helvetica,verdana,sans-serif;
-	border-bottom: 1px solid #ccc;
-	margin-bottom: 0;
-}
-
-#mBody h2 a {
-    margin: 0;
-    padding: 0;
-    text-decoration: none;
-}
-
-#mBody h3 {
-	font: 120% arial,helvetica,verdana,sans-serif;
-	border-bottom: 1px solid #ccc;
-	margin-bottom: 0;
-}
-
-#mBody h1 {
-	font: 180% arial,helvetica,sans-serif;
-	border-bottom: 1px solid #ccc;
-	margin-bottom: 0;
-}
-
-.key-point:before {
-	line-height: 0.1;
-	font-size: 1px;
-	background: transparent url("../../images/key-point_tr.gif") no-repeat top right;
-	margin: -15px -15px 0 -15px;
-	height: 15px;
-	display: block;
-	border: none;
-	content: url("../../images/key-point_tl.gif");
-}
-.key-point {
-	background: #EFF8CE url("../../images/key-point_back.gif") right repeat-y;
-	padding: 15px;
-	margin-top: 18px;
-}
-.key-point:after {
-	display: block;
-	padding-top: 15px;
-	line-height: 0.1;
-	font-size: 1px;
-	content:  url("../../images/key-point_bl.gif");
-	margin: -15px;
-	height: 8px;
-	background: transparent url("../../images/key-point_br.gif") scroll no-repeat bottom right ;
-}
-
-#header form #submit {
-	font-size: 100%;
-	padding: 1px;
-	font-family: tahoma, arial, sans-serif;
-}
-
-#header form #q {
-	width: 10em;
-	font-size: 100%;
-	font-weight: normal;
-	border:	1px solid #9097A2;
-	padding: 2px;
-	font-family: tahoma, arial, sans-serif;
-}
-
-#sectionsearch {
-	font-size: 100%;
-	font-weight: normal;
-	font-family: tahoma, arial, sans-serif;
-} 
-
-.popularlist {
-	font-size: 85%;
-}
-
-.popularlist span {
-	color: #666;
-	white-space: nowrap;
-}
-
-.install a {
-	text-decoration: none;
-}
-
-.install a strong {
-	text-decoration: underline;
-}
-
-.install-box {
-	width: 20em;
-}
-.key-point {
-    background-color:#bee6a1;
-}
-
-.install div {
-	background: url(../../images/install.png) no-repeat;
-	padding: 3px 0 8px 30px;
-
-}
-
-#opinions h4 {
-	margin: 0;
-}
-
-.opinions-info {
-	font-size: 85%;
-	margin: 0 0 0.5em 0;
-}
-
-.opinions-info a {
-	text-decoration: none;
-	color: #666;
-}
-
-.opinions-info a:hover {
-	text-decoration: underline;
-}
-
-.opinions-text {
-	margin: 0;
-}
-
-.opinions-rating img {
-	vertical-align: middle;
-}
-
-.rating {
-	float: right;
-	font-size: 85%;
-	font-weight: bold;
-}
-
-.rating img {
-	vertical-align: middle;
-}
-
-.more-links {
-	margin: 0.5em 0 0 0;
-	padding: 0;
-}
-
-.more-links li {
-	display: inline;
-	margin: 0;
-	padding: 5px;
-}
-
-.screenshot {
-	float: right;
-	background: #fff;
-	padding: 0 0 2em 2em;
-}
-
-.screenshot a {
-	text-align: center;
-	display: block;
-}
-
-/* Remaining Original Update Styles */
-
-.item {
-	border: #D2D6D6 1px solid;
-    padding-left: 5px;
-    padding-right: 6px;
-    MARGIN-bottom: 10px;
-    -moz-border-radius: 10px;
-}
-
-.item a {
-	color: #00129c;
-    text-decoration: none;
-}
-.item a:visited {
-	color: #00129c;
-    text-decoration: none;
-}
-.item a:hover {
-	color: #fc5900;
-}
-
-.item h2 {
-    margin-top: 0.2em;
-}
-
-.recommended {
-    clear: both;
-    padding: 1em 0;
-}
-
-.recommended h2 {
-    padding: 1em 0 0 215px;
-    margin: 0;
-}
-
-.recommended p {
-    padding-left: 215px;
-}
-
-.recommended-download h3 {
-	font: small tahoma, verdana, sans-serif;
-	margin: 0;
-	background: url("../../images/download.gif") 0 100%;
-    font-size: small;
-	padding-bottom: 5px;
-}
-
-.recommended-download h3 a {
-	display: block;
-	background: url("../../images/download.gif") 0 0;
-    font-size: 65%;
-    font-weight: bold;
-	width: 165px;
-	padding: 12px 25px 5px 10px;
-	text-decoration: none;
-	color: #5A9A3B;
-}
-
-.recommended-download h3 a:hover {
-	text-decoration: underline;
-	color: #275113;
-}
-
-.recommended-download {
-    display: block;
-	width: 200px;
-    padding: 15px 0 0 215px;
-}
-
-.recommended-img {
-    border: 2px outset #eee;
-    float: left;
-    margin: 1em 1em 0 0;
-}
-
-.iconbar {
-	padding-right: 15px;
-    float: left;
-    width: auto;
-    height: 34px;
-}
-
-.iconbar img {
-    float:left;
-}
-
-.iconbar a {
-    text-decoration: none;
-}
-
-.selected a, .selected a:visited {
-	 color: #fc5900;
-}
-
-.baseline {
-    clear: right;
-	margin-top: 5px;
-    border-top: #ccc 1px solid;
-    padding: 3px;
-    padding-left: 10px;
-    font-size: 8pt;
-    color: #333;
-}
-
-#opinions {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-}
-
-#opinions li {
-    border-top: 1px solid #eee;
-    padding: 1em 0;
-}
-
-#opinions h4 {
-    clear: right;
-    margin: 0;
-    padding: .5em 0 0 0;
-}
-
-.opinions-info {
-    color: #666;
-    margin: 0;
-    padding: 0 0 .5em 0;
-
-}
-
-.opinions-info a {
-    text-decoration: none;
-    color: #666;
-}
-
-.opinions-info a:hover {
-    text-decoration: underline;
-}
-
-.opinions-text {
-    margin: .8em 0 0 0;
-    padding: 0;
-}
-
-.opinions-vote {
-    background-color: #cfc;
-    border: 1px solid #000;
-    float: left;
-    font-style: italic;
-    font-weight: bold;
-    font-size: x-large;
-    padding: 5px;
-    margin: 4px;
-    text-align: center;
-
-}
-
-.opinions-caption {
-    display: block;
-    font-size: x-small;
-    font-weight: normal;
-    margin: 0;
-    padding: 0;
-
-}
-
-.opinions-rating {
-    margin: 0;
-    padding: .5em 0;
-}
-
-.opinions-helpful {
-    font-style: italic;
-    border: 1px dashed #eee;
-    padding: .2em;
-    margin: .7em 0;
-}
-
-.tooltip {
-    cursor: help;
-    border-bottom: 1px dotted;
-}
-
-.pages {
-    color: #999;
-    font-weight: bold;
-    height: 2em;
-}
-
-.next {
-    border-left: 1px solid #000;
-    display: inline;
-    padding-left: 5px;
-}
-
-.prev {
-    display: inline;
-}
-
-.pages a {
-    color: blue;
-    text-decoration: none;
-}
-
-#comment-rate {
-    margin: .5em;
-    padding: .5em;
-    background-color: #eee;
-    border: 1px solid #999;
-}
-
-#search-block:before {
-    line-height: 0.1;
-    font-size: 1px;
-    background: transparent url("../../img/key-point_tr.gif") no-repeat top right;
-    margin: -10px -10px 0 -10px;
-    height: 10px;
-    display: block;
-    border: none;
-    content: url("../../img/key-point_tl.gif");
-}
-
-#search-block{
-    background: #EFF8CE url("../../img/key-point_back.gif") right repeat-y;
-    padding: 10px;
-}
-
-#search-block label{
-    font-weight: bold;
-}
-
-#search-block select {
-    width: 13em;
-}
-
-#search-block input[type=text] {
-    width: 9.2em;
-}
-
-.right #search-block select {
-    width: 20em;
-}
-
-.right #search-block input[type=text] {
-    width: 16.2em;
-}
-
-#search-block:after {
-    display: block;
-    padding-top: 10px;
-    line-height: 0.1;
-    font-size: 1px;
-    content:  url("../../img/key-point_bl.gif");
-    margin: -10px;
-    height: 8px;
-    background: transparent url("../../img/key-point_br.gif") scroll no-repeat bottom right ;
-}
-
-#search-options {
-    display: none;
-}
-
-#hide-search-options {
-    display: none;
-}
-
-#show-search-options {
-    display: inline;
-}
-
-#comments-sort {
-    float: right;
-}
-
-.disclaimer {
-    text-align: center;
-    color: #ccc;
-    font-size: x-small;
-    width: 600px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-.install-thunderbird {
-    background-color: #eee;
-    border: 1px solid #ccc;
-    margin: .5em 0;
-    padding: .5em;
-}
-
-.install-thunderbird p {
-    font-weight: bold;
-    color: blue;
-    margin: 0;
-    padding: 0;
-}

mozilla/webtools/addons/public/htdocs/css/cavendish/template.css

@@ -1,317 +0,0 @@
-body {
-	background: #fff url("../../images/body_back.gif") repeat-x;
-}
-
-#footer {
-	background: url("../../images/footer.gif") 0 8px no-repeat;
-	margin: 10px 0;
-	text-align: center;
-}
-
-#footer span,#footer a {
-	white-space: nowrap;
-	padding: 0 1em;
-	color: #666;
-	font-size: 85%;
-}
-
-#footer p a:hover {
-	color: #000;
-}
-
-#footer .switch-fx, 
-#footer .switch-tb, 
-#footer .switch-suite  {
-	padding-left: 30px;
-	font-size: 100%;
-	background: #fff 9px 0 no-repeat;
-}
-
-#footer .switch-tb {
-	background-image: url("../../images/switch-tb.gif");
-}
-
-#footer .switch-suite {
-	background-image: url("../../images/switch-suite.gif");
-}
-
-#footer .switch-fx {
-	background-image: url("../../images/switch-fx.gif");
-}
-
-/* Site Header */
-
-#header {
-	clear: both;
-	padding-top: 40px;
-	position: relative;
-} * html #header { padding-top: 20px; }
-
-#header h1 {
-	height: 46px;
-	margin: 0;
-	font-size: 2px;
-	position: absolute;
-	top: 0;
-	left: -4px;
-	border: none;
-	z-index: 5000;
-}
-
-#header form {
-	position: absolute;
-	right: 0;
-	top: 9px;
-	margin-left: 200px;
-	font-family: tahoma, arial, sans-serif;
-	font-size: 85%;
-}
-
-#header div#auth {
-    display:inline;
-    position:absolute;
-    top:11px;
-    right:0px;
-    margin-right: 200px;
-}
-
-#key-menu {
-	background: #B2C1C8 url("../../images/header-bottom.gif") 0 100% no-repeat;
-	padding: 0 0 10px 0;
-	overflow: auto;
-	margin-bottom: 1em;
-}
-
-* html #key-menu {
-	overflow: visible;
-	height: 1px;
-}
-
-#key-menu ul, #key-menu li {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-#key-menu ul {
-	padding: 14px 12px 0 12px;
-	background: url("../../images/header-top.gif") 0 0 no-repeat;
-}
-
-#key-menu li {
-	float: left;
-	background: url("../../images/tabs.gif") 100% -50px;
-	padding-right: 5px;
-	margin-right: 2px;
-	border-bottom: 1px solid #849CA4;
-	margin-bottom: -10px;
-}
-
-#key-menu li a, #key-menu li span {
-	display: block;
-	float: left;
-	padding: 3px 15px 2px 20px;
-	background: url("../../images/tabs.gif") 0 -50px;
-	color: #5A7CBA;
-	text-decoration: none;
-}
-
-#key-menu li:hover a {
-	background-position: 0 -100px;
-}
-
-#key-menu li:hover {
-	background-position: 100% -100px;
-}
-
-#key-menu li.current {
-	background: url("../../images/tabs.gif") 100% 0;
-	border-bottom-color: white;
-}
-
-#key-menu li.current a, #key-menu li.current span {
-	background: url("../../images/tabs.gif") 0 0;
-	color: #999;
-}
-
-#mozilla-com a {
-	float: right;
-	display: block;
-	text-indent: -5000em;
-	width: 110px;
-	height: 25px;
-	text-decoration: none;
-	background: url("../../images/mozilla-org.gif") no-repeat;
-}
-
-/* End Site Header */
-
-/* Front Feature */
-.split-feature {
-    background: url("../../images/feature-back.png") 0 100% no-repeat;
-    overflow: auto;
-    padding-bottom: 10px;
-    margin-right: -2px;
-} * html .split-feature { overflow: visible; height: 1px; } 
-
-.split-feature-one, .split-feature-two {
-	padding: 15px 15px 0 15px;
-	float: left;
-}
-
-.split-feature-one {
-	width: 485px;
-	background: url("../../images/feature-back.png") 0 0 no-repeat;
-}
-
-.split-feature-two {
-	width: 185px;
-	padding-left: 25px;
-	background: url("../../images/feature-back.png") 100% 0 no-repeat;
-}
-
-.split-feature h2 {
-	margin: 0 0 0.2em 0;
-    font-family: verdana, arial, sans-serif;
-    font-size: 1.4em;
-}
-
-.split-feature h2 a {
-    text-decoration: none;
-    font-size: medium;
-    font-style: italic;
-}
-
-.split-feature-one p {
-    margin-left: 220px;
-}
-
-.feature-download h3 {
-	font: 85% tahoma, verdana, sans-serif;
-	margin: 5px 0 0 0;
-	background: url("../../images/download.gif") 0 100%;
-	padding-bottom: 5px;
-}
-
-.feature-download h3 a {
-	display: block;
-	background: url("../../images/download.gif") 0 0;
-    font-weight: bold;
-	width: 165px;
-	padding: 12px 25px 5px 10px;
-	text-decoration: none;
-	color: #5A9A3B;
-}
-
-.feature-download h3 a:hover {
-	text-decoration: underline;
-	color: #275113;
-}
-
-.feature-download {
-	float: left;
-	width: 200px;
-	padding-right: 20px;
-}
-
-ol.top-10, ol.top-10 li {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-ol.top-10 li a {
-	display: block;
-	text-align: right;
-	padding: 1px 0 1px 20px;
-	border-top: 1px solid #eee;
-	text-decoration: none;
-	width: 160px;
-	background: url("../../images/top-10.gif") 0 0 no-repeat;
-	cursor: pointer; /* for IE as it ignores floating <strong>s */
-	font-size: 85%;
-}
-
-ol.top-10 li a:hover strong {
-	text-decoration: underline;
-}
-
-ol.top-10 li.top-10-2 a { background-position: 0 -50px; }
-ol.top-10 li.top-10-3 a { background-position: 0 -100px; }
-ol.top-10 li.top-10-4 a { background-position: 0 -150px; }
-ol.top-10 li.top-10-5 a { background-position: 0 -200px; }
-ol.top-10 li.top-10-6 a { background-position: 0 -250px; }
-ol.top-10 li.top-10-7 a { background-position: 0 -300px; }
-ol.top-10 li.top-10-8 a { background-position: 0 -350px; }
-ol.top-10 li.top-10-9 a { background-position: 0 -400px; }
-ol.top-10 li.top-10-10 a { background-position: 0 -450px; }
-
-ol.top-10 li strong {
-	float: left;
-}
-
-#front-search {
-	text-align: center;
-	margin: 1.5em 0 1em 0;
-}
-
-.front-section-left, .front-section-right {
-	width: 220px;
-	float: left;
-	color: #666;
-}
-
-.front-section-left {
-	padding: 5px 0 5px 190px;
-}
-
-.front-section-right {
-	padding: 5px 70px 5px 0;
-}
-
-.front-section-left h2, .front-section-right h2{
-	margin: 0;
-}
-
-.front-section-left ul, .front-section-right ul {
-	margin: 0;
-	padding: 0;
-	margin-bottom: 2em;
-}
-
-.front-section-left li, .front-section-right li {
-	padding: 0.2em 0;
-	margin-left: 20px;
-}
-
-.front-section {
-	width: 220px;
-	padding: 5px 0 5px 25px;
-	float: left;
-	color: #666;
-}
-
-.front-section h2 {
-	margin: 0;
-}
-
-.front-section ul {
-	margin: 0;
-	padding: 0;
-	margin-bottom: 2em;
-}
-
-.front-section li {
-	padding: 0.2em 0;
-	margin-left: 20px;
-}
-
-a.top-feature {
-    float: left;
-    background: #fff;
-}
-
-a.top-feature img {
-    margin: 0;
-    padding: 0;
-}

mozilla/webtools/addons/public/htdocs/css/forms.css

@@ -1,46 +0,0 @@
-.amo-form div {
-    margin: 1em 0;
-}
-
-.amo-submit {
-    background-color: #eee;
-    border: 2px #999 outset;
-}
-
-.amo-submit:hover {
-    background-color: #fff;
-    cursor: pointer;
-}
-
-.amo-cancel {
-}
-
-.amo-label-large, .amo-label-medium, .amo-label-small {
-    border-bottom: 1px dashed #eee;
-    float: left;
-    font-weight: bold;
-}
-
-.amo-label-large {
-    width: 14em;
-}
-
-.amo-label-medium {
-    width: 10em;
-}
-
-.amo-label-small {
-    width: 8em;
-}
-
-.amo-label-xsmall {
-    width: 6em;
-}
-
-.amo-form-error {
-    background-color: #eee;
-    border: 1px dashed #c66;
-    color: #c00;
-    margin: 5px 0;
-    padding: .5em;
-}

mozilla/webtools/addons/public/htdocs/css/rss.xsl

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:template match="/rss">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title><xsl:value-of select="channel/title"/></title>
-    <meta name="keywords" content="mozilla update, mozilla extensions, mozilla plugins, thunderbird themes, thunderbird extensions, firefox extensions, firefox themes" />
-    <link rel="stylesheet" type="text/css" href="/css/print.css" media="print" />
-    <link rel="stylesheet" type="text/css" href="/css/base/content.css" media="all" />
-    <link rel="stylesheet" type="text/css" href="/css/cavendish/content.css" title="Cavendish" media="all" />
-    <link rel="stylesheet" type="text/css" href="/css/base/template.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="/css/cavendish/template.css" title="Cavendish" media="screen" />
-    <link rel="stylesheet" type="text/css" href="/css/forms.css" media="screen" />
-    <link rel="home" title="Home" href="https://addons.mozilla.org/" />
-    <link rel="alternate" type="application/rss+xml" href="{self}" title="{title}" />
-    <link rel="shortcut icon" href="{channel/image/url}" />
-
-</head>
-
-<body>
-    <div id="container">
-        <p class="skipLink"><a href="#firefox-feature" accesskey="2">Skip to main content</a></p>
-        <div id="mozilla-com"><a href="http://www.mozilla.com/">Visit Mozilla.com</a></div>
-        <div id="header">
-            <div id="key-title">
-                <h1>
-                    <a href="/firefox/" title="Return to home page" accesskey="1">
-                        <img src="/images/title-firefox.gif" width="276" height="54" alt="Firefox Add-ons Beta" />
-                    </a>
-                </h1>
-                
-                <script type="text/javascript">
-                    //<![CDATA[
-                        addUsernameToHeader();
-                    //]]>
-                </script>
-
-                <form id="search" method="get" action="/search.php" title="Search Mozilla Update">
-                    <div>
-                        <label for="q" title="Search Mozilla Update">search:</label>
-                        <input type="text" id="q" name="q" accesskey="s" size="10" />
-                        <input type="hidden" name="app" value="firefox" />
-                        <input type="submit" id="submit" value="Go" />
-                    </div>
-                </form>
-            </div>
-
-            <div id="key-menu"> 
-                <ul id="menu-firefox">
-                    <li><a href="/firefox/">Home</a></li>
-                    <li><a href="/firefox/extensions/">Extensions</a></li>
-                    <li><a href="/firefox/plugins/">Plugins</a></li>
-                    <li><a href="/firefox/search-engines/">Search Engines</a></li>
-                    <li><a href="/firefox/themes/">Themes</a></li>
-                </ul>
-            </div>
-            <!-- end key-menu -->
-        </div>
-        <!-- end header -->
-        <hr class="hide" />
-        <div id="mBody">
-            <h1><xsl:value-of select="channel/title"/></h1>
-            <p>
-                This is an RSS feed designed to be read by an RSS reader. Which you aren't.
-            </p>
-            
-            <p>
-                <strong>What's an RSS Feed?</strong><br />
-                <acronym title="Really Simple Syndication">RSS</acronym> feeds 
-                allow you to take the latest content from our site and view it in other places
-                such as a feed reader, your browser or your website. Feeds make it easy and 
-                convenient to stay on top of the latest from Mozilla Add-ons.
-            </p>
-
-            <p>
-                <strong>How do I use this feed?</strong><br/>
-                To add this feed as a live bookmark in Firefox, simply click on the orange icon 
-                (<img src="/images/rss.png" alt="RSS" />) in the address bar. Otherwise, take the
-                URL of this feed and add it to your favorite RSS reader.
-            </p>
-            
-            <p>Preview of this feed:</p>
-                <ul>
-                    <xsl:for-each select="channel/item">
-                        <li>
-                            <strong><a href="{link}"><xsl:value-of select="title"/></a></strong>
-                        </li>
-                    </xsl:for-each>
-                </ul>
-
-        </div>
-        <hr class="hide" />
-        
-        <div id="footer">
-
-        <p><a href="/firefox/" class="switch-fx">Firefox Add-ons </a><a href="/thunderbird/" class="switch-tb">Thunderbird Add-ons </a><a href="/mozilla/" class="switch-suite">Mozilla Suite Add-ons </a></p>
-        <p><a href="/faq.php">FAQ</a> <a href="/feeds.php">Feeds/RSS</a> <a href="/login.php">Log In</a> <a href="/logout.php">Logout</a> <a href="/createaccount.php">Register</a></p>
-        <p><a href="http://www.mozilla.org/privacy-policy.html">Privacy Policy</a> <a href="http://www.mozilla.org/foundation/donate.html">Donate to Mozilla</a> <a href="http://mozilla.org/">The Mozilla Organization</a></p>
-
-        <p><span>Copyright &#169; 2004-2006</span>  <a href="http://www.xramp.com/">256-bit SSL Encryption provided by XRamp</a></p>
-    </div>
-    </div>
-    <!-- close container -->
-
-    <div class="disclaimer">
-        Mozilla is providing links to these applications as a courtesy, and makes no representations 
-        regarding the applications or any information related thereto. Any questions, complaints or 
-        claims regarding the applications must be directed to the appropriate software vendor.  See 
-        our <a href="/support.php">Support Page</a> for support information and contacts.
-    </div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>

mozilla/webtools/addons/public/htdocs/extensions.php

@@ -1,56 +0,0 @@
-<?php
-/**
- * Home page for extensions, switchable on application.  Since v1 used GUIDs, the
- * flow on this page is a little confusing (we need to support both name and GUID.
- *
- * @package amo
- * @subpackage docs
- */
-
-$currentTab = 'extensions';
-
-startProcessing('extensions.tpl', 'extensions', $compileId);
-require_once('includes.php');
-
-$_app = array_key_exists('app', $_GET) ? $_GET['app'] : null;
-
-// Determine our application.
-switch( $_app ) {
-    case 'mozilla':
-        $clean['app'] = 'Mozilla';
-        break;
-    case 'thunderbird':
-        $clean['app'] = 'Thunderbird';
-        break;
-    case 'firefox':
-    default:
-        $clean['app'] = 'Firefox';
-        break;
-}
-
-$amo = new AMO_Object();
-
-// Despite what $clean holds, GUIDs were used in v1 so we have to support them
-if (preg_match('/^(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}|[a-z0-9-\._]*\@[a-z0-9-\._]+)$/i',$_app)) {
-    $newestExtensions  = $amo->getNewestAddonsByGuid($_app,'E',10);
-    $popularExtensions = $amo->getPopularAddonsByGuid($_app,'E',10);
-    /* This is a bit of a cheesy hack because of the way the templates are written.
-     * It's looking for the name of the app in $_GET, so here we are...*/
-    $_GET['app']       = strtolower($amo->getAppNameFromGuid($_app));
-} else {
-    $newestExtensions  = $amo->getNewestAddons($clean['app'],'E',10);
-    $popularExtensions = $amo->getPopularAddons($clean['app'],'E',10);
-}
-
-// Assign template variables.
-$tpl->assign(
-    array(  'newestExtensions'  => $newestExtensions,
-            'popularExtensions' => $popularExtensions,
-            'title'             => 'Add-ons',
-            'currentTab'        => $currentTab,
-            'content'           => 'extensions.tpl',
-            'sidebar'           => 'inc/category-sidebar.tpl',
-            'cats'              => $amo->getCats('E'),
-            'type'              => 'E')
-);
-?>

mozilla/webtools/addons/public/htdocs/faq.php

@@ -1,73 +0,0 @@
-<?php
-/**
- * FAQ page.
- *
- * @package amo
- * @subpackage docs
- *
- * @todo FAQ search?
- */
-
-startProcessing('faq.tpl','faq',$compileId);
-require_once('includes.php');
-
-$db->query("
-    SELECT
-        `title`,
-        `text`
-    FROM
-        `faq`
-    WHERE
-        `active` = 'YES'
-    ORDER BY
-        `index` ASC,
-        `title` ASC
-",SQL_ALL, SQL_ASSOC);
-
-$faq = $db->record;
-
-$sql = "
-    SELECT 
-        `AppName`,
-        `GUID`,
-        `Version`
-    FROM
-        `applications`
-    WHERE
-        `public_ver`='YES'
-    ORDER BY
-        Appname, Version
-";
-
-$db->query($sql,SQL_ALL,SQL_ASSOC);
-
-if (is_array($db->record)) {
-    foreach ($db->record as $row) {
-        $appVersions[] = array(
-            'displayVersion'    => $row['Version'],
-            'appName'           => $row['AppName'],
-            'guid'              => $row['GUID']
-        );
-    }
-}
-
-$links = array(
-    array(  'href'  => './faq.php',
-            'title' => 'Frequently Asked Questions', 
-            'text'  => 'FAQ'),
-
-    array(  'href'  => './policy.php',
-            'title' => 'Addons Policies', 
-            'text'  => 'Policy')
-);
-
-// Send FAQ data to Smarty object.
-$tpl->assign(
-   array(   'faq'       => $faq,
-            'links'     => $links,
-            'sidebar'   => 'inc/nav.tpl',
-            'content'   => 'faq.tpl',
-            'title'     => 'Frequently Asked Questions',
-            'appVersions' => $appVersions   )
-);
-?>

mozilla/webtools/addons/public/htdocs/feeds.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Home page for extensions, switchable on application.
- *
- * @package amo
- * @subpackage docs
- */
-
-startProcessing('feeds.tpl', null, $compileId,'nonav');
-require_once('includes.php');
-
-// Assign template variables.
-$tpl->assign(
-    array(  'title'             => 'Feeds',
-            'content'           => 'feeds.tpl')
-);
-?>

mozilla/webtools/addons/public/htdocs/finalists.php

@@ -1,175 +0,0 @@
-<?php
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Update.
-//
-// The Initial Developer of the Original Code is
-// Chris "Wolf" Crews.
-// Portions created by the Initial Developer are Copyright (C) 2004
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Chris "Wolf" Crews <psychoticwolf@carolina.rr.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-	
-startProcessing('finalists.tpl',null,$compileId,'nonav');
-require_once('includes.php');
-
-/**
- * Setting up variables.
- */
-$guids = array(
-'{34274bf4-1d97-a289-e984-17e546307e4f}',
-'{097d3191-e6fa-4728-9826-b533d755359d}',
-'{B9DAB69C-460E-4085-AE6C-F95B0D858581}',
-'{DDC359D1-844A-42a7-9AA1-88A850A938A8}',
-'{89506680-e3f4-484c-a2c0-ed711d481eda}',
-'{3CE993BF-A3D9-4fd2-B3B6-768CBBC337F8}',
-'{268ad77e-cff8-42d7-b479-da60a7b93305}',
-'{77b819fa-95ad-4f2c-ac7c-486b356188a9}',
-'{bbc21d30-1cff-11da-8cd6-0800200c9a66}',
-'{37E4D8EA-8BDA-4831-8EA1-89053939A250}',
-'{a089fffd-e0cb-431b-8d3a-ebb8afb26dcf}',
-'Reveal@sourmilk.net',
-'{a6ca9b3b-5e52-4f47-85d8-cca35bb57596}',
-'{53A03D43-5363-4669-8190-99061B2DEBA5}',
-'separe@m4ng0.lilik.it',
-'xpose@viamatic.com',
-'{c45c406e-ab73-11d8-be73-000a95be3b12}',
-'{D5EDC062-A372-4936-B782-BD611DD18D86}'
-);
-
-$guids_tmp = array();
-foreach ($guids as $guid) {
-    $guids_tmp[] = "'".$guid."'";
-}
-$guids_imploded = implode(',',$guids_tmp);
-
-$descriptions = array(
-'{34274bf4-1d97-a289-e984-17e546307e4f}'=>"Block ads including Flash ads from their source.  Right click on an ad and select Adblock to block ads.  Hit the status-element and see what has or hasn't been blocked.",
-'{097d3191-e6fa-4728-9826-b533d755359d}'=>"Manage Extensions, Themes, Downloads, and more including Web content via Firefox’s sidebar.",
-'{B9DAB69C-460E-4085-AE6C-F95B0D858581}'=>"Blog directly within Firefox to LiveJournal, WordPress or Blogger. Select Deepest Sender from the ‘Tools’ menu.",
-'{DDC359D1-844A-42a7-9AA1-88A850A938A8}'=>"DownThemAll lets you filter and download all the links contained in any web-page, and lets you pause and resume downloads from previous Firefox sessions.",
-'{89506680-e3f4-484c-a2c0-ed711d481eda}'=>"View open Tabs and Windows with Showcase.  You can use it in two ways: global mode (F12) or local mode (Shift + F12). In global mode, a new window will be opened with thumbnails of the pages you've opened in all windows. In local mode, only content in tabs of your current window will be shown.
-
-You can also right click in those thumbnails to perform the most usual operations on them. Mouse middle button can be used to zoom a thumbnail, although other actions can be assigned to it.",
-'{3CE993BF-A3D9-4fd2-B3B6-768CBBC337F8}'=>"Get international weather forecasts and display it in any toolbar or status bar.",
-'{268ad77e-cff8-42d7-b479-da60a7b93305}'=>"Select from several of your favorite toolbars including including Google, Yahoo, Ask Jeeves, Teoma, Amazon, Download.com and others with one toolbar. The entire toolbar reconfigures when you select a different engine and it includes many advanced features found in each engine.
-You can also easily repeat your search on all engines included in toolbar.",
-'{77b819fa-95ad-4f2c-ac7c-486b356188a9}'=>"View pages with in Internet Explorer with IE Tab.  Select the Firefox icon on the bottom right of the browser to switch to using the Internet Explorer engine or Firefox to switch to IE.",
-'{bbc21d30-1cff-11da-8cd6-0800200c9a66}'=>"Allows sticky notes to be added to any web page, and viewed upon visiting the Web page again.  You can also share sticky notes.  Requires account.",
-'{37E4D8EA-8BDA-4831-8EA1-89053939A250}'=>"PDF Download Extension allows you to choose if you want to view a PDF file inside the browser (as PDF or HTML), if you want to view it outside Firefox with your default or custom PDF reader, or if you want to download it.",
-'{a089fffd-e0cb-431b-8d3a-ebb8afb26dcf}'=>"Platypus is a Firefox extension which lets you modify a Web page from your browser -- \"What You See Is What You Get\" -- and then save those changes as a GreaseMonkey script so that they'll be repeated the next time you visit the page.",
-'Reveal@sourmilk.net'=>"Reveal allows you to see thumbnails of pages in your history by mousing over the back and forward buttons.  With many tabs open, quickly find the page you want, by pressing F2. Reveal also has a rectangular magnifying glass you can use to zoom in on areas of any web page. Comes  with a quick tour of all the features. ",
-'{a6ca9b3b-5e52-4f47-85d8-cca35bb57596}'=>"A lightweight RSS and Atom feed aggregator.  Alt+S to open Sage in the Sidebar to start reading feed content.",
-'{53A03D43-5363-4669-8190-99061B2DEBA5}'=>"Highlight text, create sticky notes, and more to Web pages and Web sites that are saved to your desktop.  Scrapbook Includes full text search and quick filtering of saved pages.",
-'separe@m4ng0.lilik.it'=>"Manage tabs by creating a tab separator.  Right click on a Tab to add a new Tab separator.  Click on the Tab separator to view thumbnail images of web sites that are to the left and right of the Tab separator.",
-'xpose@viamatic.com'=>"Click on the icon in the status bar to view all Web pages in Tabbed windows as thumbnail images.  Press F8 to activate foXpose.",
-'{c45c406e-ab73-11d8-be73-000a95be3b12}'=>"Web developer toolbar includes various development tools such as window resizing, form and image debugging, links to page validation and optimization tools and much more.",
-'{D5EDC062-A372-4936-B782-BD611DD18D86}'=>"RSS news reader with integrated with services such as Feedster and weather information.  Includes online help documentation."
-);
-
-$screenshots = array(
-'{34274bf4-1d97-a289-e984-17e546307e4f}'=>'adblock-mini.png',
-'{097d3191-e6fa-4728-9826-b533d755359d}'=>'all-in-one-mini.png',
-'{B9DAB69C-460E-4085-AE6C-F95B0D858581}'=>'deepest-sender-mini.png',
-'{DDC359D1-844A-42a7-9AA1-88A850A938A8}'=>'downthemall-small.png',
-'{89506680-e3f4-484c-a2c0-ed711d481eda}'=>'firefox-showcase.png',
-'{3CE993BF-A3D9-4fd2-B3B6-768CBBC337F8}'=>'forecastfoxenhanced-small.png',
-'{268ad77e-cff8-42d7-b479-da60a7b93305}'=>'groowe-small.png',
-'{77b819fa-95ad-4f2c-ac7c-486b356188a9}'=>'IE-Tab.png',
-'{bbc21d30-1cff-11da-8cd6-0800200c9a66}'=>'stickies-small.png',
-'{37E4D8EA-8BDA-4831-8EA1-89053939A250}'=>'pdf-download.png',
-'{a089fffd-e0cb-431b-8d3a-ebb8afb26dcf}'=>'platypus.png',
-'Reveal@sourmilk.net'=>'reveal.png',
-'{a6ca9b3b-5e52-4f47-85d8-cca35bb57596}'=>'sage.png',
-'{53A03D43-5363-4669-8190-99061B2DEBA5}'=>'scrapbook-final.png',
-'separe@m4ng0.lilik.it'=>'separe.png',
-'xpose@viamatic.com'=>'xpose-small.png',
-'{c45c406e-ab73-11d8-be73-000a95be3b12}'=>'web-developer-toolbar-small.png',
-'{D5EDC062-A372-4936-B782-BD611DD18D86}'=>'wizz-small.png'
-);
-
-$authors = array(
-'{34274bf4-1d97-a289-e984-17e546307e4f}'=>'Ben Karel (and the Adblock Crew)',
-'{DDC359D1-844A-42a7-9AA1-88A850A938A8}'=>'Federico Parodi',
-'{a6ca9b3b-5e52-4f47-85d8-cca35bb57596}'=>'Peter Andrews (and the Sage Team)',
-'{53A03D43-5363-4669-8190-99061B2DEBA5}'=>'Taiga Gomibuchi',
-'separe@m4ng0.lilik.it'=>'Massimo Mangoni',
-'{77b819fa-95ad-4f2c-ac7c-486b356188a9}'=>'yuoo2k and Hong Jen Yee (PCMan)'
-);
-
-$finalists = array();
-
-// Get data for GUIDs.
-$finalists_sql = "
-            SELECT
-                m.guid,
-                m.id, 
-                m.name, 
-                m.downloadcount,
-                m.homepage,
-                v.dateupdated,
-                v.uri,
-                v.size,
-                v.version,
-                (   
-                    SELECT u.username          
-                    FROM userprofiles u
-                    JOIN authorxref a ON u.userid = a.userid
-                    WHERE a.id = m.id
-                    ORDER BY u.userid DESC
-                    LIMIT 1
-                ) as username
-            FROM
-                main m
-            JOIN version v ON m.id = v.id
-            WHERE
-                v.vid = (SELECT max(vid) FROM version WHERE id=m.id AND approved='YES') AND
-                type = 'E' AND
-                m.guid IN({$guids_imploded})
-            ORDER BY
-                LTRIM(m.name)
-";
-
-$db->query($finalists_sql, SQL_ALL, SQL_ASSOC);
-
-foreach ($db->record as $var => $val) {
-    $val['author'] = !empty($authors[$val['guid']]) ?  $authors[$val['guid']] : $val['username'];
-    $finalists[] = $val;
-}
-
-// Assign template variables.
-$tpl->assign(
-    array( 
-            'title'        => 'Extend Firefox Contest Finalists',
-            'screenshots'  => $screenshots,
-            'descriptions' => $descriptions,
-            'finalists'    => $finalists,
-            'content'      => 'finalists.tpl')
-);
-?>

mozilla/webtools/addons/public/htdocs/history.php

@@ -1,30 +0,0 @@
-<?php
-/**
- * Addon history page.  Displays all the previous releases for a particular
- * addon or theme
- * 
- * @package amo
- * @subpackage docs
- *
- * @todo break this into a simpler design, probably a smaller table with an abbreviated desc.
- * @todo do we still want to allow users access to old versions?
- */
-
-// Get our addon ID.
-$clean['ID'] = intval($_GET['id']);
-$sql['ID'] =& $clean['ID'];
-
-startProcessing('history.tpl',$clean['ID'],$compileId);
-require_once('includes.php');
-
-$addon = new AddOn($sql['ID']);
-$addon->getHistory();
-
-// Assign template variables.
-$tpl->assign(
-    array(  'addon'     => $addon,
-            'title'     => $addon->Name.' Version History',
-            'content'   => 'history.tpl',
-            'sidebar'   => 'inc/addon-sidebar.tpl')
-);
-?>