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

@@ -17,13 +17,11 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): 
+# Contributor(s): Srilatha Moturi  <srilatha@netscape.com>
+#                 Krishna Mohan Khandrika <kkhandrika@netscape.com>
 
-DEPTH=..
-include <$(DEPTH)/config/config.mak>
+DEPTH=..\..
 
-DIRS = nss \
-	manager \
-	$(NULL)
+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

@@ -1,4 +1,3 @@
-#!nmake
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
@@ -12,15 +11,14 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is mozilla.org code.
+# The Original Code is Mozilla.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
+# Netscape Communications Corp.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
-# Contributor(s):
-#   Kai Engert <kaie@netscape.com>
+# 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
@@ -34,22 +32,31 @@
 # 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 *****
+# ***** END LICENSE BLOCK ***** 
 
-MODULE = pipboot
+DEPTH=..\..\..
 
-DEPTH=..\..\..\..
-IGNORE_MANIFEST=1
+MODULE          = mozMapi32
+EXPORT_LIBRARY  = $(MODULE)
+LIBRARY_NAME    = $(MODULE)
+DEFFILE         = Mapi32.def
 
-include <$(DEPTH)/config/config.mak>
+REQUIRES	= MapiProxy \
+                  msgMapi \
+		  xpcom \
+		  string \
+		  $(NULL)
 
-XPIDL_INCLUDES=-I$(DEPTH)\dist\idl
+include <$(DEPTH)\config\config.mak>
+###############################################################
 
-XPIDLSRCS= \
-    .\nsISSLStatusProvider.idl \
-    .\nsISecurityWarningDialogs.idl \
-    .\nsIBufEntropyCollector.idl \
-    $(NULL)
+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

@@ -11,15 +11,14 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is mozilla.org code.
+# The Original Code is Mozilla.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
+# Netscape Communications Corp.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
-# Contributor(s):
-#   Kai Engert <kaie@netscape.com>
+# 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
@@ -33,21 +32,37 @@
 # 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 *****
+# ***** END LICENSE BLOCK ***** 
 
-MODULE = pipboot
+DEPTH=..\..\..\..
 
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
+MODULE           = MapiProxy
+EXPORT_LIBRARY   = $(MODULE)
+LIBRARY_NAME     = $(MODULE)
+DEFFILE          = MapiProxy.def
 
-include $(DEPTH)/config/autoconf.mk
+include <$(DEPTH)\config\config.mak>
 
-XPIDLSRCS = \
-    nsISSLStatusProvider.idl \
-    nsISecurityWarningDialogs.idl \
-    nsIBufEntropyCollector.idl \
+##################################################################
+
+LCFLAGS=-DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
+
+OBJS= .\$(OBJDIR)\dlldata.obj   \
+    .\$(OBJDIR)\msgMapi_p.obj     \
+    .\$(OBJDIR)\msgMapi_i.obj   \
     $(NULL)
 
-include $(topsrcdir)/config/rules.mk
+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

@@ -11,15 +11,14 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is mozilla.org code.
+# The Original Code is Mozilla.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
+# Netscape Communications Corp.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
-# Contributor(s):
-#   Kai Engert <kaie@netscape.com>
+# 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
@@ -33,13 +32,10 @@
 # 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 *****
+# ***** END LICENSE BLOCK ***** 
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..
 
-DIRS		= public src
+DIRS= build public src
 
-include $(topsrcdir)/config/rules.mk
+include <$(DEPTH)\config\rules.mak>

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

@@ -1,4 +1,3 @@
-#!nmake
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
@@ -20,7 +19,7 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#   Kai Engert <kaie@netscape.com>
+# 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
@@ -36,9 +35,15 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
+DEPTH=..\..\..\..
 
-DIRS = public src
+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

@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -20,7 +19,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Terry Hayes <thayes@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
@@ -38,7 +36,29 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(8de811f0-1dd2-11b2-8bf1-e9aa324984b2)]
-interface nsISSLStatusProvider : nsISupports {
-  readonly attribute nsISupports SSLStatus;
+/**
+ * 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

@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -20,8 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   L. David Baron <dbaron@fas.harvard.edu> (original author)
- *   Kai Engert <kaie@netscape.com>
+ * 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
@@ -37,21 +35,22 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
-#include "nsIEntropyCollector.idl"
+#ifndef _REGISTRY_H_
+#define _REGISTRY_H_
 
-[uuid(485b87a8-5dd7-4b8d-8ea8-dee53201f899)]
-interface nsIBufEntropyCollector : nsIEntropyCollector
-{
-  /**
-   * Forward the entropy collected so far to |collector| and then
-   * continue forwarding new entropy as it arrives.
-   */
-  void forwardTo(in nsIEntropyCollector collector);
+#include <objbase.h>
 
-  /**
-   * No longer forward to a (possibly) previously remembered collector.
-   * Do buffering again.
-   */
-  void dontForward();
-};
+// 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

@@ -19,9 +19,7 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#     Javier Delgadillo <javi@netscape.com>
-#     Terry Hayes <thayes@netscape.com>
-#     Kai Engert <kaie@netscape.com>
+# 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
@@ -37,63 +35,73 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..\..
 
-include $(DEPTH)/config/autoconf.mk
+MODULE          = msgMapi
+MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME=$(MODULE)
+MODULE_NAME	= $(MODULE)
 
-MODULE		= pipboot
-LIBRARY_NAME	= pipboot
-IS_COMPONENT	= 1
-MODULE_NAME	= BOOT
-EXPORT_LIBRARY	= 1
-META_COMPONENT	= crypto
-
-EXPORTS =  \
-	$(NULL)
-
-CPPSRCS = \
-	nsEntropyCollector.cpp \
-	nsSecureBrowserUIImpl.cpp \
-	nsBOOTModule.cpp \
-	$(NULL)
-
-REQUIRES	= nspr \
-		  xpcom \
-		  string \
-		  necko \
-		  uriloader \
-		  pref \
-		  caps \
-		  dom \
-		  intl \
-		  locale \
-		  profile \
+REQUIRES        = xpcom \
+                  string \
+		  MapiProxy \
+		  appshell \
 		  windowwatcher \
-		  js \
-		  docshell \
-		  widget \
-		  layout \
-		  content \
-		  pippki \
-		  xpconnect \
-		  jar \
-		  unicharutil \
-                  pipnss \
-		  $(NULL)
+		  dom \
+		  profile \
+		  msgbase \
+		  pref \
+		  msgbaseutil \
+		  msgcompo \
+		  mailnews \
+		  necko \
+		  intl \
+		  editor \
+		  msgdb \
+		  uriloader \
+ 	          appstartup \
+	$(NULL)
 
-include $(topsrcdir)/config/rules.mk
+include <$(DEPTH)\config\config.mak>
+############################################################################
 
-INCLUDES	+= \
-		-I$(DIST)/public/security \
-		$(NULL)
+LCFLAGS=-DUNICODE -D_UNICODE
 
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
 
-EXTRA_LIBS	+= \
-        $(NULL)
+
+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

@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -12,14 +11,14 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Mozilla Communicator.
+ * The Original Code is Mozilla
  *
  * The Initial Developer of the Original Code is
- * Netscape Communications Corp..
+ * Netscape Communications Corp.
  * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s): Kai Engert <kaie@netscape.com>
+ * 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
@@ -35,24 +34,36 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _NSCERTPICKER_H_
-#define _NSCERTPICKER_H_
+#ifndef MSG_MAPI_FACTORY_H
+#define MSG_MAPI_FACTORY_H
 
-#include "nsIUserCertPicker.h"
+#include <windows.h>
+#include <objbase.h>
+#include "nspr.h"
 
-#define NS_CERT_PICKER_CID \
-  { 0x735959a1, 0xaf01, 0x447e, { 0xb0, 0x2d, 0x56, 0xe9, 0x68, 0xfa, 0x52, 0xb4 } }
 
-class nsCertPicker : public nsIUserCertPicker
+class CMapiFactory : public IClassFactory
 {
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIUSERCERTPICKER
+public :
 
-  nsCertPicker();
-  virtual ~nsCertPicker();
-  
-private:
+    // 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 //_NSCERTPICKER_H_
+#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

@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -12,14 +11,14 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Mozilla Communicator.
+ * The Original Code is Mozilla
  *
  * The Initial Developer of the Original Code is
- * Netscape Communications Corp..
+ * Netscape Communications Corp.
  * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s): Terry Hayes <thayes@netscape.com>
+ * 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
@@ -35,44 +34,33 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
+#ifndef MSG_MAPI_HOOK_H_
+#define MSG_MAPI_HOOK_H_
 
-interface nsIX509Cert;
+#include "prtypes.h"
 
-/**
- * nsICMSManager (service)
- *  Interface to access users certificate store
- */
-[scriptable, uuid(14b4394a-1dd2-11b2-b4fd-ba4a194fe97e)]
-interface nsICMSSecureMessage : nsISupports
+class nsMapiHook
 {
-  /**
-   * getCertByPrefID - a BASE64 string representing a user's
-   *   certificate (or NULL if there isn't one)
-   */
-  string getCertByPrefID(in string certID);
+    public :
 
-  /**
-   * decodeCert - decode a BASE64 string into an X509Certificate object
-   */
-  nsIX509Cert decodeCert(in string value);
+        static PRBool Initialize();
+        static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, 
+                        PRUnichar **aPassword);
+        static PRBool VerifyUserName(const PRUnichar *aUsername, char **aIdKey);
 
-  /**
-   * sendMessage - send a text message to the recipient indicated
-   *   by the base64-encoded cert.
-   */
-  string sendMessage(in string msg, in string cert);
+        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();
 
-  /**
-   * receiveMessage - recieve an encrypted (enveloped) message
-   */
-  string receiveMessage(in string msg);
+        static PRBool isMapiService;
 };
 
-/**
- * NS_CMSMESSAGE_CONTRACTID - contract id of a class that
- *   implements nsICMSMessage
- */
-%{C++
-#define NS_CMSSECUREMESSAGE_CONTRACTID "@mozilla.org/nsCMSSecureMessage;1"
-%}
+#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

@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -12,14 +11,14 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Mozilla Communicator.
+ * The Original Code is Mozilla
  *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp..
+ * 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): Kai Engert <kaie@netscape.com>
+ * 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
@@ -35,23 +34,33 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
+#ifndef MSG_MAPI_SUPPORT_H_
+#define MSG_MAPI_SUPPORT_H_
 
-interface nsIX509Cert;
-interface nsIInterfaceRequestor;
+#include "nsIObserver.h"
+#include "nsIMapiSupport.h"
+#include "msgMapiFactory.h"
 
-[scriptable, uuid(06d018e0-d41b-4629-a4fc-daaa6029888e)]
-interface nsIUserCertPicker : nsISupports {
-  nsIX509Cert pickByUsage(in nsIInterfaceRequestor ctx, 
-                          in wstring title,
-                          in wstring infoPrompt,
-                          in PRInt32 certUsage, // as defined by NSS enum SECCertUsage
-                          in boolean allowInvalid,
-                          in boolean allowDuplicateNicknames,
-                          out boolean canceled);
+#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;
 };
 
-%{C++
-#define NS_CERT_PICKER_CONTRACTID "@mozilla.org/user_cert_picker;1"
-#define NS_CERT_PICKER_CLASSNAME "Cert Picker Object"
-%}
+#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

@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -20,8 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   L. David Baron <dbaron@fas.harvard.edu> (original author)
- *   Kai Engert <kaie@netscape.com>
+ * 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
@@ -36,35 +34,43 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#ifndef nsEntropyCollector_h___
-#define nsEntropyCollector_h___
 
-#include "nsIEntropyCollector.h"
-#include "nsIBufEntropyCollector.h"
-#include "nsCOMPtr.h"
+#ifndef nsmapiregistry_h____
+#define nsmapiregistry_h____
 
-#define NS_ENTROPYCOLLECTOR_CID \
- { /* 34587f4a-be18-43c0-9112-b782b08c0add */       \
-  0x34587f4a, 0xbe18, 0x43c0,                       \
- {0x91, 0x12, 0xb7, 0x82, 0xb0, 0x8c, 0x0a, 0xdd} }
+#include "nsIMapiRegistry.h"
 
-class nsEntropyCollector : public nsIBufEntropyCollector
-{
-  public:
-    nsEntropyCollector();
-    virtual ~nsEntropyCollector();
+#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_NSIENTROPYCOLLECTOR
-    NS_DECL_NSIBUFENTROPYCOLLECTOR
+    NS_DECL_NSIMAPIREGISTRY
 
-    enum { entropy_buffer_size = 1024 };
+protected:
+    
+    PRBool m_DefaultMailClient;
+    PRBool m_ShowDialog;
+    nsMapiRegistryUtils m_registryUtils ;
 
-  protected:
-    unsigned char mEntropyCache[entropy_buffer_size];
-    PRInt32 mBytesCollected;
-    unsigned char *mWritePointer;
-    nsCOMPtr<nsIEntropyCollector> mForwardTarget;
-};
+private:
+    // Special member to handle initialization.
+    PRBool mHaveBeenSet;
+}; // nsMapiRegistry
 
-#endif /* !defined nsEntropyCollector_h__ */
+#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

@@ -1,30 +1,29 @@
-#
-# The contents of this file are subject to the Netscape Public
+#!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/NPL/
-#
+# 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) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#  Terry Hayes <thayes@netscape.com>
 # 
+# 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..\..
 
-DIRS		= public resources src
+include <$(DEPTH)\config\rules.mak>
 
-include $(topsrcdir)/config/rules.mk
+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

@@ -2,25 +2,22 @@
 <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 locales being supplied by this jar -->
+  <!-- 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:displayName="English (US)"
-        chrome:author="PSM Team"
-        chrome:name="en-US">
+  <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:pipnss"/>
+        <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:pipnss"
-	chrome:localeVersion="0.9.6"/>
+  <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

@@ -1,30 +1,28 @@
-#
-# The contents of this file are subject to the Netscape Public
+#!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/NPL/
-#
+# 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) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#  Brian Ryner <bryner@netscape.com>
 # 
+# 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..\..
 
-DIRS		= resources src public
+DIRS=en-US
 
-include $(topsrcdir)/config/rules.mk
+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/security/manager/Makefile.in

@@ -1,109 +0,0 @@
-#
-# 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): 
-#  Brian Ryner <bryner@netscape.com>
-# 
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
-LOADABLE_ROOT_MODULE = nssckbi$(DLL_SUFFIX)
-NSS3_LIB = nss3$(DLL_SUFFIX)
-SMIME3_LIB = smime3$(DLL_SUFFIX)
-SSL3_LIB =  ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = softokn3$(DLL_SUFFIX)
-else
-LOADABLE_ROOT_MODULE = libnssckbi$(DLL_SUFFIX)
-NSS3_LIB = libnss3$(DLL_SUFFIX)
-SMIME3_LIB = libsmime3$(DLL_SUFFIX)
-SSL3_LIB =  libssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = libsoftokn3$(DLL_SUFFIX)
-endif
-FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
-FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
-
-# NSS makefiles are not safe for parallel execution.
-DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
-DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
-DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
-DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
-DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
-ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
-ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
-endif
-ifndef MOZ_DEBUG
-DEFAULT_GMAKE_FLAGS += BUILD_OPT=1
-endif
-ifdef GNU_CC
-DEFAULT_GMAKE_FLAGS += NS_USE_GCC=1 NS_USE_NATIVE=
-else
-DEFAULT_GMAKE_FLAGS += NS_USE_GCC= NS_USE_NATIVE=1
-endif
-ifdef USE_N32
-# It is not really necessary to specify USE_PTHREADS=1.  USE_PTHREADS
-# merely adds _PTH to coreconf's OBJDIR name.
-DEFAULT_GMAKE_FLAGS += USE_N32=1 USE_PTHREADS=1
-endif
-ifdef HAVE_64BIT_OS
-DEFAULT_GMAKE_FLAGS += USE_64=1
-endif
-
-SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile
-
-include $(topsrcdir)/config/rules.mk
-
-depend dependclean export::
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C pki $@
-
-libs::
-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
-	cd $(DIST)/lib; cp -f libmozdbm_s.$(LIB_SUFFIX) libdbm.$(LIB_SUFFIX)
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
-ifneq ($(OS_TEST),i86pc)
-ifndef HAVE_64BIT_OS
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
-endif
-endif
-endif
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C pki $@
-
-clean clobber clobber_all realclean distclean::
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C pki $@
-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean

mozilla/security/manager/boot/public/nsISecurityWarningDialogs.idl

@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.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):
- *   Terry Hayes <thayes@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsIInterfaceRequestor;
-
-/**
- * nsISecurityWarningDialogs - functions that
- *   display warnings for transitions between secure
- *   and insecure pages, posts to insecure servers etc.
- */
-[scriptable, uuid(1c399d06-1dd2-11b2-bc58-c87cbcacdb78)]
-interface nsISecurityWarningDialogs : nsISupports
-{
-  /**
-   * alertEnteringSecure
-   */
-  void alertEnteringSecure(in nsIInterfaceRequestor ctx);
-
-  /**
-   * alertEnteringWeak
-   */
-  void alertEnteringWeak(in nsIInterfaceRequestor ctx);
-
-  /**
-   * alertLeavingSecure
-   */
-  void alertLeavingSecure(in nsIInterfaceRequestor ctx);
-
-  /**
-   * alertMixedMode
-   */
-  void alertMixedMode(in nsIInterfaceRequestor ctx);
-
-  /**
-   * confirmPostToInsecure
-   */
-  boolean confirmPostToInsecure(in nsIInterfaceRequestor ctx);
-
-  /**
-   * confirmPostToInsecureFromSecure
-   */
-  boolean confirmPostToInsecureFromSecure(in nsIInterfaceRequestor ctx);
-};
-

mozilla/security/manager/boot/src/makefile.win

@@ -1,86 +0,0 @@
-#!nmake
-# ***** 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):
-#     Terry Hayes <thayes@netscape.com>
-#     Kai Engert <kaie@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 *****
-
-MODULE = pipboot
-
-DEPTH=..\..\..\..
-IGNORE_MANIFEST=1
-
-LIBRARY_NAME   = pipboot
-PDBFILE        = $(LIBRARY_NAME).pdb
-MAPFILE        = $(LIBRARY_NAME).map
-MODULE_NAME = BOOT
-META_COMPONENT = crypto
-
-REQUIRES = \
-	xpcom \
-	string \
-	dom \
-	pref \
-	intl \
-	locale \
-	windowwatcher \
-	necko \
-	pipnss \
-	layout \
-	layout_xul \
-        uriloader \
-        docshell \
-        widget \
-        content \
-	$(NULL)
-
-include <$(DEPTH)/config/config.mak>
-
-LLIBS   = \
-    $(DIST)/lib/js3250.lib \
-    $(LIBNSPR) \
-    $(DIST)\lib\xpcom.lib \
-    $(NULL)
-
-EXPORTS = \
-    $(NULL)
-
-OBJS = \
-    .\$(OBJDIR)\nsEntropyCollector.obj \
-    .\$(OBJDIR)\nsSecureBrowserUIImpl.obj \
-    .\$(OBJDIR)\nsBOOTModule.obj \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/boot/src/nsBOOTModule.cpp

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.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):
- *   Terry Hayes <thayes@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-
-#include "nsEntropyCollector.h"
-#include "nsSecureBrowserUIImpl.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntropyCollector)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl)
-
-static nsModuleComponentInfo components[] =
-{
-  {
-    "Entropy Collector",
-    NS_ENTROPYCOLLECTOR_CID,
-    NS_ENTROPYCOLLECTOR_CONTRACTID,
-    nsEntropyCollectorConstructor
-  },
-
-  {
-    NS_SECURE_BROWSER_UI_CLASSNAME,
-    NS_SECURE_BROWSER_UI_CID,
-    NS_SECURE_BROWSER_UI_CONTRACTID,
-    nsSecureBrowserUIImplConstructor
-  }
-};
-
-NS_IMPL_NSGETMODULE(BOOT, components)

mozilla/security/manager/boot/src/nsEntropyCollector.cpp

@@ -1,131 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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):
- *   L. David Baron <dbaron@fas.harvard.edu> (original author)
- *   Kai Engert <kaie@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 "prlog.h"
-#include "nsEntropyCollector.h"
-#include "nsMemory.h"
-
-nsEntropyCollector::nsEntropyCollector()
-:mBytesCollected(0), mWritePointer(mEntropyCache)
-{
-  NS_INIT_ISUPPORTS();
-}
-
-nsEntropyCollector::~nsEntropyCollector()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsEntropyCollector,
-                              nsIEntropyCollector,
-                              nsIBufEntropyCollector)
-
-NS_IMETHODIMP
-nsEntropyCollector::RandomUpdate(void *new_entropy, PRInt32 bufLen)
-{
-  if (bufLen > 0) {
-    if (mForwardTarget) {
-      return mForwardTarget->RandomUpdate(new_entropy, bufLen);
-    }
-    else {
-      const unsigned char *InputPointer = (const unsigned char *)new_entropy;
-      const unsigned char *PastEndPointer = mEntropyCache + entropy_buffer_size;
-
-      // if the input is large, we only take as much as we can store
-      PRInt32 bytes_wanted = PR_MIN(bufLen, entropy_buffer_size);
-
-      // remember the number of bytes we will have after storing new_entropy
-      mBytesCollected = PR_MIN(entropy_buffer_size, mBytesCollected + bytes_wanted);
-
-      // as the above statements limit bytes_wanted to the entropy_buffer_size,
-      // this loop will iterate at most twice.
-      while (bytes_wanted > 0) {
-
-        // how many bytes to end of cyclic buffer?
-        const PRInt32 space_to_end = PastEndPointer - mWritePointer;
-
-        // how many bytes can we copy, not reaching the end of the buffer?
-        const PRInt32 this_time = PR_MIN(space_to_end, bytes_wanted);
-
-        // copy at most to the end of the cyclic buffer
-        for (PRInt32 i = 0; i < this_time; ++i) {
-
-          // accept the fact that we use our buffer's random uninitialized content
-          unsigned int old = *mWritePointer;
-
-          // combine new and old value already stored in buffer
-          // this logic comes from PSM 1
-          *mWritePointer++ = ((old << 1) | (old >> 7)) ^ *InputPointer++;
-        }
-
-        PR_ASSERT(mWritePointer <= PastEndPointer);
-        PR_ASSERT(mWritePointer >= mEntropyCache);
-
-        // have we arrived at the end of the buffer?
-        if (PastEndPointer == mWritePointer) {
-          // reset write pointer back to begining of our buffer
-          mWritePointer = mEntropyCache;
-        }
-
-        // subtract the number of bytes we have already copied
-        bytes_wanted -= this_time;
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEntropyCollector::ForwardTo(nsIEntropyCollector *aCollector)
-{
-  NS_PRECONDITION(!mForwardTarget, "|ForwardTo| should only be called once.");
-
-  mForwardTarget = aCollector;
-  mForwardTarget->RandomUpdate(mEntropyCache, mBytesCollected);
-  mBytesCollected = 0;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEntropyCollector::DontForward()
-{
-  mForwardTarget = nsnull;
-  return NS_OK;
-}

mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp

@@ -1,834 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.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) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Stuart Parmenter <pavlov@netscape.com>
- *   Brian Ryner <bryner@netscape.com>
- *   Terry Hayes <thayes@netscape.com>
- *   Kai Engert <kaie@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-
-#include "nspr.h"
-#include "prlog.h"
-#include "prmem.h"
-
-#include "nsISecureBrowserUI.h"
-#include "nsSecureBrowserUIImpl.h"
-#include "nsCOMPtr.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIObserverService.h"
-#include "nsIDocumentLoader.h"
-#include "nsCURILoader.h"
-#include "nsIDocShell.h"
-#include "nsIDocumentViewer.h"
-#include "nsIDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIContent.h"
-#include "nsIWebProgress.h"
-#include "nsIChannel.h"
-#include "nsIHttpChannel.h"
-#include "nsIFileChannel.h"
-#include "nsITransportSecurityInfo.h"
-#include "nsIURI.h"
-#include "nsISecurityEventSink.h"
-#include "nsIPrompt.h"
-#include "nsIFormSubmitObserver.h"
-#include "nsISecurityWarningDialogs.h"
-#include "nsIProxyObjectManager.h"
-#include "nsINSSDialogs.h"
-
-#define SECURITY_STRING_BUNDLE_URL "chrome://communicator/locale/security.properties"
-
-static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
-static const char *kNSSDialogsContractId = NS_NSSDIALOGS_CONTRACTID;
-
-#define IS_SECURE(state) ((state & 0xFFFF) == STATE_IS_SECURE)
-
-#if defined(PR_LOGGING)
-//
-// Log module for nsSecureBroswerUI logging...
-//
-// To enable logging (see prlog.h for full details):
-//
-//    set NSPR_LOG_MODULES=nsSecureBroswerUI:5
-//    set NSPR_LOG_FILE=nspr.log
-//
-// this enables PR_LOG_DEBUG level information and places all output in
-// the file nspr.log
-//
-PRLogModuleInfo* gSecureDocLog = nsnull;
-#endif /* PR_LOGGING */
-
-
-nsSecureBrowserUIImpl::nsSecureBrowserUIImpl()
-  : mMixContentAlertShown(PR_FALSE),
-    mSecurityState(STATE_IS_INSECURE)
-{
-  NS_INIT_ISUPPORTS();
-  
-#if defined(PR_LOGGING)
-  if (!gSecureDocLog)
-    gSecureDocLog = PR_NewLogModule("nsSecureBrowserUI");
-#endif /* PR_LOGGING */
-}
-
-nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl()
-{
-  nsresult rv;
-  // remove self from form post notifications:
-  nsCOMPtr<nsIObserverService> svc(do_GetService("@mozilla.org/observer-service;1", &rv));
-  if (NS_SUCCEEDED(rv)) {
-    svc->RemoveObserver(this, NS_FORMSUBMIT_SUBJECT);
-  }
-}
-
-NS_IMPL_ISUPPORTS6(nsSecureBrowserUIImpl,
-                   nsISecureBrowserUI,
-                   nsIWebProgressListener,
-                   nsIFormSubmitObserver,
-                   nsIObserver,
-                   nsISupportsWeakReference,
-                   nsISSLStatusProvider);
-
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Init(nsIDOMWindow *window,
-                            nsIDOMElement *button)
-{
-  nsresult rv = NS_OK;
-  mSecurityButton = button;  /* may be null */
-  mWindow = window;
-
-  nsCOMPtr<nsIStringBundleService> service(do_GetService(kCStringBundleServiceCID, &rv));
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL,
-                             getter_AddRefs(mStringBundle));
-  if (NS_FAILED(rv)) return rv;
-  
-  // hook up to the form post notifications:
-  nsCOMPtr<nsIObserverService> svc(do_GetService("@mozilla.org/observer-service;1", &rv));
-  if (NS_SUCCEEDED(rv)) {
-    rv = svc->AddObserver(this, NS_FORMSUBMIT_SUBJECT, PR_TRUE);
-  }
-  
-  /* GetWebProgress(mWindow) */
-  // hook up to the webprogress notifications.
-  nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(mWindow));
-  if (!sgo) return NS_ERROR_FAILURE;
-  
-  nsCOMPtr<nsIDocShell> docShell;
-  sgo->GetDocShell(getter_AddRefs(docShell));
-  if (!docShell) return NS_ERROR_FAILURE;
-  
-  nsCOMPtr<nsIWebProgress> wp(do_GetInterface(docShell));
-  if (!wp) return NS_ERROR_FAILURE;
-  /* end GetWebProgress */
-  
-  wp->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this));
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::DisplayPageInfoUI()
-{
-#if 0
-  nsresult res = NS_OK;
-  nsCOMPtr<nsISecurityManagerComponent> psm(do_GetService(PSM_COMPONENT_CONTRACTID,
-                                                          &res));
-  if (NS_FAILED(res))
-    return res;
-  
-  nsXPIDLCString host;
-  if (mCurrentURI)
-    mCurrentURI->GetHost(getter_Copies(host));
-  
-  //    return psm->DisplayPSMAdvisor(mLastPSMStatus, host);
-#endif
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Observe(nsISupports*, const char*,
-                               const PRUnichar*)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-static nsresult IsChildOfDomWindow(nsIDOMWindow *parent, nsIDOMWindow *child,
-                                   PRBool* value)
-{
-  *value = PR_FALSE;
-  
-  if (parent == child) {
-    *value = PR_TRUE;
-    return NS_OK;
-  }
-  
-  nsCOMPtr<nsIDOMWindow> childsParent;
-  child->GetParent(getter_AddRefs(childsParent));
-  
-  if (childsParent && childsParent.get() != child)
-    IsChildOfDomWindow(parent, childsParent, value);
-  
-  return NS_OK;
-}
-
-static PRInt32 GetSecurityStateFromChannel(nsIChannel* aChannel)
-{
-  nsresult res;
-  PRInt32 securityState;
-
-  // qi for the psm information about this channel load.
-  nsCOMPtr<nsISupports> info;
-  aChannel->GetSecurityInfo(getter_AddRefs(info));
-  nsCOMPtr<nsITransportSecurityInfo> psmInfo(do_QueryInterface(info));
-  if (!psmInfo) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - no nsITransportSecurityInfo for %p\n",
-                                         aChannel, (nsISupports *)info));
-    return nsIWebProgressListener::STATE_IS_INSECURE;
-  }
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - info is %p\n", aChannel,
-                                       (nsISupports *)info));
-  
-  res = psmInfo->GetSecurityState(&securityState);
-  if (!NS_SUCCEEDED(res)) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - GetSecurityState failed: %d\n",
-                                         aChannel, res));
-    securityState = nsIWebProgressListener::STATE_IS_BROKEN;
-  }
-  
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - Returning %d\n", aChannel,
-                                       securityState));
-  return securityState;
-}
-
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Notify(nsIContent* formNode,
-                              nsIDOMWindowInternal* window, nsIURI* actionURL,
-                              PRBool* cancelSubmit)
-{
-  // Return NS_OK unless we want to prevent this form from submitting.
-  *cancelSubmit = PR_FALSE;
-  if (!window || !actionURL || !formNode)
-    return NS_OK;
-  
-  nsCOMPtr<nsIDocument> document;
-  formNode->GetDocument(*getter_AddRefs(document));
-  if (!document) return NS_OK;
-
-  nsCOMPtr<nsIURI> formURL;
-  document->GetBaseURL(*getter_AddRefs(formURL));
-  
-  nsCOMPtr<nsIScriptGlobalObject> globalObject;
-  document->GetScriptGlobalObject(getter_AddRefs(globalObject));
-  nsCOMPtr<nsIDOMWindow> postingWindow(do_QueryInterface(globalObject));
-  
-  PRBool isChild;
-  IsChildOfDomWindow(mWindow, postingWindow, &isChild);
-  
-  // This notify call is not for our window, ignore it.
-  if (!isChild)
-    return NS_OK;
-  
-  PRBool okayToPost;
-  nsresult res = CheckPost(formURL, actionURL, &okayToPost);
-  
-  if (NS_SUCCEEDED(res) && !okayToPost)
-    *cancelSubmit = PR_TRUE;
-  
-  return res;
-}
-
-//  nsIWebProgressListener
-NS_IMETHODIMP 
-nsSecureBrowserUIImpl::OnProgressChange(nsIWebProgress* aWebProgress,
-                                        nsIRequest* aRequest,
-                                        PRInt32 aCurSelfProgress,
-                                        PRInt32 aMaxSelfProgress,
-                                        PRInt32 aCurTotalProgress,
-                                        PRInt32 aMaxTotalProgress)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::OnStateChange(nsIWebProgress* aWebProgress,
-                                     nsIRequest* aRequest,
-                                     PRInt32 aProgressStateFlags,
-                                     nsresult aStatus)
-{
-  nsresult res = NS_OK;
-
-  if (!aRequest)
-    return NS_ERROR_NULL_POINTER;
-  
-  // Get the channel from the request...
-  // If the request is not network based, then ignore it.
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest, &res));
-  if (NS_FAILED(res))
-    return NS_OK;
-
-  // We are only interested in HTTP and file requests.
-  nsCOMPtr<nsIHttpChannel> httpRequest(do_QueryInterface(aRequest));
-  nsCOMPtr<nsIFileChannel> fileRequest(do_QueryInterface(aRequest));
-  if (!httpRequest && !fileRequest) {
-    return NS_OK;
-  }
-  
-  nsCOMPtr<nsIInterfaceRequestor> requestor;
-  nsCOMPtr<nsISecurityEventSink> eventSink;
-  channel->GetNotificationCallbacks(getter_AddRefs(requestor));
-  if (requestor)
-    eventSink = do_GetInterface(requestor);
-  
-#if defined(DEBUG)
-  nsCOMPtr<nsIURI> loadingURI;
-  res = channel->GetURI(getter_AddRefs(loadingURI));
-  NS_ASSERTION(NS_SUCCEEDED(res), "GetURI failed");
-  if (loadingURI) {
-    nsXPIDLCString temp;
-    loadingURI->GetSpec(getter_Copies(temp));
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
-           ("SecureUI:%p: OnStateChange: %x :%s\n", this,
-            aProgressStateFlags,(const char*)temp));
-  }
-#endif
-
-  // First event when loading doc
-  if (aProgressStateFlags & STATE_START) {
-    if (aProgressStateFlags & STATE_IS_NETWORK) {
-      // Reset state variables used per doc loading
-      mMixContentAlertShown = PR_FALSE;
-      mFirstRequest = PR_TRUE;
-      mSSLStatus = nsnull;
-    }
-  }
-  
-  // A Document is starting to load...
-  if ((aProgressStateFlags & (STATE_STOP)) &&
-      (aProgressStateFlags & STATE_IS_REQUEST)) {
-
-    // work-around for bug 48515.
-    nsCOMPtr<nsIURI> aURI;
-    channel->GetURI(getter_AddRefs(aURI));
-
-    // Sometimes URI is null, so ignore.
-    if (aURI == nsnull) {
-      return NS_OK;
-    }
-
-    // If this is the first request, then do a protocol check
-    if (mFirstRequest) {
-      mFirstRequest = PR_FALSE;
-      return CheckProtocolContextSwitch(eventSink, aRequest, channel);
-    }
-    // Check that the request does not have mixed content.
-    return CheckMixedContext(eventSink, aRequest, channel);
-  }
-
-  // A document has finished loading
-  if ((aProgressStateFlags & STATE_STOP) &&
-    (aProgressStateFlags & STATE_IS_NETWORK)) {
-
-    // Get SSL Status information if possible
-    nsCOMPtr<nsISupports> info;
-    channel->GetSecurityInfo(getter_AddRefs(info));
-    nsCOMPtr<nsISSLStatusProvider> sp = do_QueryInterface(info);
-    if (sp) {
-      // Ignore result
-      sp->GetSSLStatus(getter_AddRefs(mSSLStatus));
-    }
-
-    if (eventSink)
-      eventSink->OnSecurityChange(aRequest, mSecurityState);
-          
-    if (!mSecurityButton)
-      return res;
-          
-    /* TNH - need event for changing the tooltip */
-
-    // Do we really need to look at res here? What happens if there's an error?
-    // We should still set the certificate authority display.
-
-    nsXPIDLString tooltip;
-    if (info) {
-      nsCOMPtr<nsITransportSecurityInfo> secInfo(do_QueryInterface(info));
-      if (secInfo &&
-          NS_SUCCEEDED(secInfo->GetShortSecurityDescription(getter_Copies(tooltip))) &&
-          tooltip) {
-
-        res = mSecurityButton->SetAttribute(NS_LITERAL_STRING("tooltiptext"),
-                                                nsString(tooltip));
-              
-      }
-    }
-  }
-
-  return res;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::OnLocationChange(nsIWebProgress* aWebProgress,
-                                        nsIRequest* aRequest,
-                                        nsIURI* aLocation)
-{
-  mCurrentURI = aLocation;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::OnStatusChange(nsIWebProgress* aWebProgress,
-                                      nsIRequest* aRequest,
-                                      nsresult aStatus,
-                                      const PRUnichar* aMessage)
-{
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::OnSecurityChange(nsIWebProgress *aWebProgress,
-                                        nsIRequest *aRequest,
-                                        PRInt32 state)
-{
-  nsresult res = NS_OK;
-
-#if defined(DEBUG_dougt)
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
-  if (!channel)
-    return NS_ERROR_FAILURE;
-  
-  nsCOMPtr<nsIURI> aURI;
-  channel->GetURI(getter_AddRefs(aURI));
-  
-  nsXPIDLCString temp;
-  aURI->GetSpec(getter_Copies(temp));
-  printf("OnSecurityChange: (%x) %s\n", state, (const char*)temp);
-#endif
-  /* Deprecated support for mSecurityButton */
-  if (mSecurityButton) {
-    NS_NAMED_LITERAL_STRING(level, "level");
-
-    if (state == (STATE_IS_SECURE|STATE_SECURE_HIGH)) {
-      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("high"));
-    } else if (state == (STATE_IS_SECURE|STATE_SECURE_LOW)) {
-      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("low"));
-    } else if (state == STATE_IS_BROKEN) {
-      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("broken"));
-    } else {
-      res = mSecurityButton->RemoveAttribute(level);
-    }
-  }
-
-  return res;
-}
-
-// nsISSLStatusProvider methods
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::GetSSLStatus(nsISupports** _result)
-{
-  NS_ASSERTION(_result, "non-NULL destination required");
-
-  *_result = mSSLStatus;
-  NS_IF_ADDREF(*_result);
-
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::IsURLHTTPS(nsIURI* aURL, PRBool* value)
-{
-	*value = PR_FALSE;
-
-	if (!aURL)
-		return NS_OK;
-  
-  char* scheme;
-	aURL->GetScheme(&scheme);
-
-  // If no scheme, it's not an https url - not necessarily an error.
-  // See bugs 54845 and 54966  
-	if (!scheme)
-		return NS_OK;
-  
-  if (!PL_strncasecmp(scheme, "https",  5))
-		*value = PR_TRUE;
-	
-	nsMemory::Free(scheme);
-	return NS_OK;
-}
-
-void
-nsSecureBrowserUIImpl::GetBundleString(const PRUnichar* name,
-                                       nsString &outString)
-{
-  if (mStringBundle && name) {
-    PRUnichar *ptrv = nsnull;
-    if (NS_SUCCEEDED(mStringBundle->GetStringFromName(name,
-                                                      &ptrv)))
-      outString = ptrv;
-    else
-      outString.SetLength(0);
-    
-    nsMemory::Free(ptrv);
-    
-  } else {
-    outString.SetLength(0);
-  }
-}
-
-nsresult 
-nsSecureBrowserUIImpl::CheckProtocolContextSwitch(nsISecurityEventSink* eventSink,
-                                                  nsIRequest* aRequest,
-                                                  nsIChannel* aChannel)
-{
-  PRInt32 newSecurityState, oldSecurityState = mSecurityState;
-  
-  newSecurityState = GetSecurityStateFromChannel(aChannel);
-  mSecurityState = newSecurityState;
-
-  // Check to see if we are going from a secure page to an insecure page
-  if (newSecurityState == STATE_IS_INSECURE &&
-      (IS_SECURE(oldSecurityState) ||
-       oldSecurityState == STATE_IS_BROKEN)) {
-
-    SetBrokenLockIcon(eventSink, aRequest, PR_TRUE);
-
-    AlertLeavingSecure();
-
-  }
-  // check to see if we are going from an insecure page to a secure one.
-  else if ((newSecurityState == (STATE_IS_SECURE|STATE_SECURE_HIGH) ||
-            newSecurityState == STATE_IS_BROKEN) &&
-           oldSecurityState == STATE_IS_INSECURE) {
-    AlertEnteringSecure();
-  }
-  // check to see if we are going from a strong or insecure page to a
-  // weak one.
-  else if ((IS_SECURE(newSecurityState) &&
-            newSecurityState != (STATE_IS_SECURE|STATE_SECURE_HIGH)) &&
-           (oldSecurityState == STATE_IS_INSECURE ||
-            oldSecurityState == (STATE_IS_SECURE|STATE_SECURE_HIGH))) {
-
-    AlertEnteringWeak();
-  }
-  
-  mSecurityState = newSecurityState;
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::CheckMixedContext(nsISecurityEventSink *eventSink,
-                                         nsIRequest* aRequest, nsIChannel* aChannel)
-{
-  PRInt32 newSecurityState;
-
-  newSecurityState = GetSecurityStateFromChannel(aChannel);
-
-  // Deal with http redirect to https //
-  if (mSecurityState == STATE_IS_INSECURE && newSecurityState != STATE_IS_INSECURE) {
-      return CheckProtocolContextSwitch(eventSink, aRequest, aChannel);
-  }
-
-  if ((newSecurityState == STATE_IS_INSECURE ||
-       newSecurityState == STATE_IS_BROKEN) &&
-      IS_SECURE(mSecurityState)) {
-    
-    // work-around for bug 48515
-    nsCOMPtr<nsIURI> aURI;
-    aChannel->GetURI(getter_AddRefs(aURI));
-
-    nsXPIDLCString temp;
-    aURI->GetSpec(getter_Copies(temp));
-
-    if (!nsCRT::strncmp((const char*) temp, "file:", 5) ||
-        !nsCRT::strcmp((const char*) temp, "about:layout-dummy-request")) {
-      return NS_OK;
-    }
-
-    mSecurityState = STATE_IS_BROKEN;
-    SetBrokenLockIcon(eventSink, aRequest);
-
-    // Show alert to user (first time only)
-    // NOTE: doesn't mSecurityState provide the correct
-    // one-time checking?? Why have mMixContentAlertShown
-    // as well?
-    if (!mMixContentAlertShown) {
-      AlertMixedMode();
-      mMixContentAlertShown = PR_TRUE;
-    }
-  }
-  
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::CheckPost(nsIURI *formURL, nsIURI *actionURL, PRBool *okayToPost)
-{
-  PRBool formSecure,actionSecure;
-  *okayToPost = PR_TRUE;
-
-  nsresult rv = IsURLHTTPS(formURL, &formSecure);
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = IsURLHTTPS(actionURL, &actionSecure);
-  if (NS_FAILED(rv))
-    return rv;
-  
-  // if we are posting to a secure link from a secure page, all is okay.
-  if (actionSecure && formSecure) {
-    return NS_OK;
-  }
-    
-  // posting to insecure webpage from a secure webpage.
-  if (!actionSecure && formSecure) {
-    *okayToPost = ConfirmPostToInsecureFromSecure();
-  } else {
-    *okayToPost = ConfirmPostToInsecure();
-  }
-  
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::SetBrokenLockIcon(nsISecurityEventSink *eventSink,
-                                         nsIRequest* aRequest,
-                                         PRBool removeValue)
-{
-  nsresult rv = NS_OK;
-  if (removeValue) {
-    if (eventSink)
-      (void) eventSink->OnSecurityChange(aRequest, STATE_IS_INSECURE);
-  } else {
-    if (eventSink)
-      (void) eventSink->OnSecurityChange(aRequest, (STATE_IS_BROKEN));
-  }
-  
-  nsAutoString tooltiptext;
-  GetBundleString(NS_LITERAL_STRING("SecurityButtonTooltipText").get(),
-                  tooltiptext);
-
-  /* TNH - need tooltip notification here */
-  if (mSecurityButton)
-    rv = mSecurityButton->SetAttribute(NS_LITERAL_STRING("tooltiptext"),
-                                       tooltiptext);
-  return rv;
-}
-
-//
-// Implementation of an nsIInterfaceRequestor for use
-// as context for NSS calls
-//
-class nsUIContext : public nsIInterfaceRequestor
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIINTERFACEREQUESTOR
-
-  nsUIContext(nsIDOMWindow *window);
-  virtual ~nsUIContext();
-
-private:
-  nsCOMPtr<nsIDOMWindow> mWindow;
-};
-
-NS_IMPL_ISUPPORTS1(nsUIContext, nsIInterfaceRequestor)
-
-nsUIContext::nsUIContext(nsIDOMWindow *aWindow)
-: mWindow(aWindow)
-{
-  NS_INIT_ISUPPORTS();
-}
-
-nsUIContext::~nsUIContext()
-{
-}
-
-/* void getInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */
-NS_IMETHODIMP nsUIContext::GetInterface(const nsIID & uuid, void * *result)
-{
-  nsresult rv;
-
-  if (uuid.Equals(NS_GET_IID(nsIPrompt))) {
-    nsCOMPtr<nsIDOMWindowInternal> internal = do_QueryInterface(mWindow, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsIPrompt *prompt;
-
-    rv = internal->GetPrompter(&prompt);
-    *result = prompt;
-  } else {
-    rv = NS_ERROR_NO_INTERFACE;
-  }
-
-  return rv;
-}
-
-nsresult nsSecureBrowserUIImpl::
-GetNSSDialogs(nsISecurityWarningDialogs **result)
-{
-  nsresult rv;
-  nsCOMPtr<nsISecurityWarningDialogs> my_result(do_GetService(kNSSDialogsContractId, &rv));
-
-  if (NS_FAILED(rv)) 
-    return rv;
-
-  nsCOMPtr<nsIProxyObjectManager> proxyman(do_GetService(NS_XPCOMPROXY_CONTRACTID));
-  if (!proxyman)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsISupports> proxiedResult;
-  proxyman->GetProxyForObject(NS_UI_THREAD_EVENTQ,
-                              NS_GET_IID(nsISecurityWarningDialogs),
-                              my_result, PROXY_SYNC,
-                              getter_AddRefs(proxiedResult));
-
-  if (!proxiedResult) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return CallQueryInterface(proxiedResult, result);
-}
-
-void nsSecureBrowserUIImpl::
-AlertEnteringSecure()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertEnteringSecure(ctx);
-
-  return;
-}
-
-void nsSecureBrowserUIImpl::
-AlertEnteringWeak()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertEnteringWeak(ctx);
-
-  return;
-}
-
-void nsSecureBrowserUIImpl::
-AlertLeavingSecure()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertLeavingSecure(ctx);
-
-  return;
-}
-
-void nsSecureBrowserUIImpl::
-AlertMixedMode()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertMixedMode(ctx);
-
-  return;
-}
-
-/**
- * ConfirmPostToInsecure - returns PR_TRUE if
- *   the user approves the submit (or doesn't care).
- *   returns PR_FALSE on errors.
- */
-PRBool nsSecureBrowserUIImpl::
-ConfirmPostToInsecure()
-{
-  nsresult rv;
-
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return PR_FALSE;  // Should this allow PR_TRUE for unimplemented?
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  PRBool result;
-
-  rv = dialogs->ConfirmPostToInsecure(ctx, &result);
-  if (NS_FAILED(rv)) return PR_FALSE;
-
-  return result;
-}
-
-/**
- * ConfirmPostToInsecureFromSecure - returns PR_TRUE if
- *   the user approves the submit (or doesn't care).
- *   returns PR_FALSE on errors.
- */
-PRBool nsSecureBrowserUIImpl::
-ConfirmPostToInsecureFromSecure()
-{
-  nsresult rv;
-
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return PR_FALSE;  // Should this allow PR_TRUE for unimplemented?
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  PRBool result;
-
-  rv = dialogs->ConfirmPostToInsecureFromSecure(ctx, &result);
-  if (NS_FAILED(rv)) return PR_FALSE;
-
-  return result;
-}

mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.h

@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.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) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Brian Ryner <bryner@netscape.com>
- *   Kai Engert <kaie@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsSecureBrowserUIImpl_h_
-#define nsSecureBrowserUIImpl_h_
-
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsString.h"
-#include "nsIObserver.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindow.h"
-#include "nsIStringBundle.h"
-#include "nsISecureBrowserUI.h"
-#include "nsIDocShell.h"
-#include "nsIWebProgressListener.h"
-#include "nsIFormSubmitObserver.h"
-#include "nsIURI.h"
-#include "nsISecurityEventSink.h"
-#include "nsWeakReference.h"
-#include "nsISSLStatusProvider.h"
-
-class nsITransportSecurityInfo;
-class nsISecurityWarningDialogs;
-
-#define NS_SECURE_BROWSER_UI_CID \
-{ 0xcc75499a, 0x1dd1, 0x11b2, {0x8a, 0x82, 0xca, 0x41, 0x0a, 0xc9, 0x07, 0xb8}}
-
-
-class nsSecureBrowserUIImpl : public nsISecureBrowserUI,
-                              public nsIWebProgressListener,
-                              public nsIFormSubmitObserver,
-                              public nsIObserver,
-                              public nsSupportsWeakReference,
-                              public nsISSLStatusProvider
-{
-public:
-  
-  nsSecureBrowserUIImpl();
-  virtual ~nsSecureBrowserUIImpl();
-  
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIWEBPROGRESSLISTENER
-  NS_DECL_NSISECUREBROWSERUI
-  
-  // nsIObserver
-  NS_DECL_NSIOBSERVER
-  NS_DECL_NSISSLSTATUSPROVIDER
-
-  NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindowInternal* window,
-                    nsIURI *actionURL, PRBool* cancelSubmit);
-  
-protected:
-  
-  nsCOMPtr<nsIDOMWindow> mWindow;
-  nsCOMPtr<nsIDOMElement> mSecurityButton;
-  nsCOMPtr<nsIStringBundle> mStringBundle;
-  nsCOMPtr<nsIURI> mCurrentURI;
-  
-  PRBool mMixContentAlertShown;
-  PRInt32 mSecurityState;
-  PRBool mFirstRequest;
-
-  nsCOMPtr<nsISupports> mSSLStatus;
-
-  void GetBundleString(const PRUnichar* name, nsString &outString);
-  
-  nsresult CheckProtocolContextSwitch(nsISecurityEventSink* sink,
-                                      nsIRequest* request, nsIChannel* aChannel);
-  nsresult CheckMixedContext(nsISecurityEventSink* sink, nsIRequest* request,
-                             nsIChannel* aChannel);
-  nsresult CheckPost(nsIURI *formURI, nsIURI *actionURL, PRBool *okayToPost);
-  nsresult IsURLHTTPS(nsIURI* aURL, PRBool *value);
-  nsresult SetBrokenLockIcon(nsISecurityEventSink* sink, nsIRequest* request,
-                             PRBool removeValue = PR_FALSE);
-
-  // Alerts for security transitions
-  void AlertEnteringSecure();
-  void AlertEnteringWeak();
-  void AlertLeavingSecure();
-  void AlertMixedMode();
-  PRBool ConfirmPostToInsecure();
-  PRBool ConfirmPostToInsecureFromSecure();
-
-  // Support functions
-  nsresult GetNSSDialogs(nsISecurityWarningDialogs **);
-
-};
-
-
-#endif /* nsSecureBrowserUIImpl_h_ */

mozilla/security/manager/makefile.win

@@ -1,41 +0,0 @@
-#!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): 
-#	Javier Delgadillo
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-DEPTH=..\..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = boot ssl pki
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/makefile.win

@@ -1,41 +0,0 @@
-#!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): 
-#	Terry Hayes <thayes@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = public src resources
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/public/Makefile.in

@@ -1,49 +0,0 @@
-#
-# 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): 
-#  Javier Delgadillo <javi@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-MODULE = pippki
-
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS = \
-    nsIPKIParamBlock.idl \
-    nsIASN1Outliner.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/rules.mk

mozilla/security/manager/pki/public/makefile.win

@@ -1,51 +0,0 @@
-#!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): 
-#	Javier Delgadillo
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-MODULE = pippki
-
-DEPTH=..\..\..\..
-IGNORE_MANIFEST=1
-
-include <$(DEPTH)/config/config.mak>
-
-XPIDL_INCLUDES=-I$(DEPTH)\dist\idl
-
-XPIDLSRCS= \
-    .\nsIPKIParamBlock.idl \
-    .\nsIASN1Outliner.idl \
-    $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/public/nsIASN1Outliner.idl

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Ian McGreer <mcgreer@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "nsISupports.idl"
-#include "nsIOutlinerView.idl"
-#include "nsIX509Cert.idl"
-
-[scriptable, uuid(c727b2f2-1dd1-11b2-95df-f63c15b4cd35)]
-interface nsIASN1Outliner : nsIOutlinerView {
-
-  void loadASN1Structure(in nsIASN1Object asn1Object);
-
-  wstring getDisplayData(in unsigned long index);
-
-};
-
-%{C++
-
-#define NS_ASN1OUTLINER_CONTRACTID "@mozilla.org/security/nsASN1Outliner;1"
-
-%}
-

mozilla/security/manager/pki/public/nsIASN1Tree.idl

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Ian McGreer <mcgreer@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "nsISupports.idl"
-#include "nsIOutlinerView.idl"
-#include "nsIX509Cert.idl"
-
-[scriptable, uuid(c727b2f2-1dd1-11b2-95df-f63c15b4cd35)]
-interface nsIASN1Outliner : nsIOutlinerView {
-
-  void loadASN1Structure(in nsIASN1Object asn1Object);
-
-  wstring getDisplayData(in unsigned long index);
-
-};
-
-%{C++
-
-#define NS_ASN1OUTLINER_CONTRACTID "@mozilla.org/security/nsASN1Outliner;1"
-
-%}
-

mozilla/security/manager/pki/public/nsIPKIParamBlock.idl

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *   Javier Delgadillo <javi@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(b6fe3d78-1dd1-11b2-9058-ced9016984c8)]
-interface nsIPKIParamBlock : nsISupports {
-
-  void setISupportAtIndex(in PRInt32 index, in nsISupports object);
-  nsISupports getISupportAtIndex(in PRInt32 index);
-};

mozilla/security/manager/pki/resources/Makefile.in

@@ -1,33 +0,0 @@
-#
-# 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): 
-#  Terry Hayes <thayes@netscape.com>
-# 
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(REGCHROME) content pippki pippki.jar
-	$(REGCHROME) locale en-US/pippki en-US.jar

mozilla/security/manager/pki/resources/content/CAOverlay.xul

@@ -1,66 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="CAOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="CACerts">
-    <description>&certmgr.cas;</description>
-    <separator class="thin"/>
-    <outliner id="ca-outliner" multiple="true" enableColumnDrag="true"
-              onselect="ca_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-      <button id="ca_viewButton"
-              label="&certmgr.view.label;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="ca_editButton"
-              label="&certmgr.edit.label;"
-              disabled="true" oncommand="editCerts();"/>
-<!-- future - import a DER cert?
-      <button id="ca_addButton"
-              label="&certmgr.add.label;"
-              oncommand="addCerts();"/>
--->
-      <button id="ca_deleteButton"
-              label="&certmgr.delete.label;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/MineOverlay.xul

@@ -1,87 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="MineOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="myCerts">
-    <description>&certmgr.mine;</description>
-    <separator class="thin"/>
-    <outliner id="user-outliner" multiple="true" enableColumnDrag="true"
-              onselect="mine_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="verifiedcol" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="purposecol" label="&certmgr.purpose;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="serialnumcol" label="&certmgr.serial;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="issuedcol" label="&certmgr.issued;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   hidden="true" persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="expiredcol" label="&certmgr.expires;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-       <button id="mine_viewButton" class="normal" 
-               label="&certmgr.view.label;"
-               disabled="true" oncommand="viewCerts();"/>
-       <button id="mine_backupButton" class="normal" 
-               label="&certmgr.backup.label;"
-               disabled="true" oncommand="backupCerts();"/>
-       <button id="mine_backupAllButton" class="normal" 
-               label="&certmgr.backupall.label;"
-               oncommand="backupAllCerts();"/>
-       <button id="mine_restoreButton" class="normal" 
-               label="&certmgr.restore.label;"
-               oncommand="restoreCerts();"/>
-       <button id="mine_deleteButton" class="normal" 
-               label="&certmgr.delete.label;"
-               disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/OthersOverlay.xul

@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** 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 Communicator
-   -
-   - 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): Kai Engert <kaie@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 LGPL or the GPL. 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 ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="WebSitesOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="othersCerts">
-    <description>&certmgr.others;</description>
-    <separator class="thin"/>
-    <outliner id="email-outliner" multiple="true"
-              onselect="email_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="emailcol" label="&certmgr.email;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-      <button id="email_viewButton"
-              label="&certmgr.view.label;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="email_editButton"
-              label="&certmgr.edit.label;"
-              disabled="true" oncommand="editCerts();"/>
-<!-- future - import a DER cert?
-      <button id="email_addButton"
-              label="&certmgr.add.label;"
-              oncommand="addCerts();"/>
--->
-      <button id="email_deleteButton"
-              label="&certmgr.delete.label;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/PageInfoOverlay.xul

@@ -1,210 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<!-- This file extends "chrome://navigator/content/pageInfo.xul" -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PageInfoOverlay.dtd">
-
-<overlay id="pipPageInfoOverlayID"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript">
-  <![CDATA[
-    var security = {
-      // Display the server certificate (static)
-      viewCert : function () {
-        var cert = security._cert;
-        if (cert) cert.view();
-      },
-
-      _getSecurityInfo : function() {
-        const nsIX509Cert = Components.interfaces.nsIX509Cert;
-        const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-        const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-        const nsISSLStatusProvider = Components.interfaces.nsISSLStatusProvider;
-        const nsISSLStatus = Components.interfaces.nsISSLStatus;
-
-        // Get the window for this information
-        var w;
-        if ("arguments" in window && window.arguments.length > 1 && window.arguments[0])
-          w = window.arguments[0];
-        else
-          w = window.opener.frames[0];
-
-        var hName = null;
-        try
-        {
-           hName = w.location.host;
-        } catch(exception){}
-
-        var ui = security._getSecurityUI();
-        var sp = ui.QueryInterface(nsISSLStatusProvider);
-        var status = sp.SSLStatus;
-        if (status) {
-          status = status.QueryInterface(nsISSLStatus);
-        }
-        if (status) {
-          var cert = status.serverCert;
-          var issuerName;
-
-          issuerName = this.mapIssuerOrganization(cert.issuerOrganization);
-          if (!issuerName) issuerName = cert.issuerName;
-        
-          return {
-            hostName : hName,
-            cAName : issuerName,
-            encryptionAlgorithm : status.cipherName,
-            encryptionStrength : status.secretKeyLength,
-            cert : cert
-          };
-        } else {
-          return {
-            hostName : hName,
-            cAName : "",
-            encryptionAlgorithm : "",
-            encryptionStrength : 0,
-            cert : null
-          };
-        } 
-      },
-
-      // Find the secureBrowserUI object (if present)
-      _getSecurityUI : function() {
-        return window.opener.gBrowser.boxObject.getPropertyAsSupports("secureBrowserUI");
-      },
-
-      // Interface for mapping a certificate issuer organization to
-      // the value to be displayed.
-      // Bug 82017 - this implementation should be moved to pipnss C++ code
-      mapIssuerOrganization: function(name) {
-        if (!name) return null;
-
-        if (name == "RSA Data Security, Inc.") return "Verisign, Inc.";
-
-        // No mapping required
-        return name;
-      },
-
-      _cert : null
-    };
-
-    function securityOnLoad() {
-      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-      var info = security._getSecurityInfo();
-      var idHdr;
-      var message1;
-      var message2;
-
-      /* Set the identification messages */
-      if (info.cert)
-      {
-        idHdr = bundle.GetStringFromName("pageInfo_WebSiteVerified");
-        document.getElementById("security-identity").setAttribute("value", idHdr);
-
-        message1 = bundle.formatStringFromName("pageInfo_Identity_Verified", 
-                                [ info.hostName, info.cAName ],
-                                2);
-        setText("security-identity-text", message1);
-
-        var viewText = bundle.GetStringFromName("pageInfo_ViewCertificate");
-        setText("security-view-text", viewText);
-        security._cert = info.cert;
-      } else {
-        idHdr = bundle.GetStringFromName("pageInfo_SiteNotVerified");
-        document.getElementById("security-identity").setAttribute("value", idHdr);
-
-        document.getElementById("security-view-cert").setAttribute("disabled", "true");
-        document.getElementById("security-view-cert").setAttribute("hidden", "true");
-      }
-
-      var hdr;
-      var msg1;
-      var msg2;
-      
-      /* Set the encryption messages */
-      if (info.encryptionStrength >= 90) {
-        hdr = bundle.formatStringFromName("pageInfo_StrongEncryption",
-                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
-        document.getElementById("security-privacy").setAttribute("value", hdr);
-
-        msg1 = bundle.GetStringFromName("pageInfo_Privacy_Strong1");
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Strong2");
-        setText("security-privacy-msg2", msg2);
-
-        security._cert = info.cert;
-      } else if (info.encryptionStrength > 0) {
-        hdr = bundle.formatStringFromName("pageInfo_WeakEncryption",
-                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
-        document.getElementById("security-privacy").setAttribute("value", hdr);
-
-        msg1 = bundle.formatStringFromName("pageInfo_Privacy_Weak1",
-                                               [ info.hostName ], 1);
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Weak2");
-        setText("security-privacy-msg2", msg2);
-      } else {
-        hdr = bundle.GetStringFromName("pageInfo_NoEncryption");
-        document.getElementById("security-privacy").setAttribute("value", hdr);
-
-        if(info.hostName != null)
-          msg1 = bundle.formatStringFromName("pageInfo_Privacy_None1", [ info.hostName ], 1);
-        else
-          msg1 = bundle.GetStringFromName("pageInfo_Privacy_None3");
-
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_None2");
-        setText("security-privacy-msg2", msg2);
-      }
-    }
-
-    /* Register for pageInfo onload calls */
-    onLoadRegistry.push(securityOnLoad);
-  ]]>
-  </script>
-  <tabs id="tabs">
-    <tab id="securityTab" label="&pageInfo.securityTab;"/>
-  </tabs>
-  <tabpanels id="tabpanels">
-    <vbox id="securityPanel" flex="1">
-      <label id="security-identity" class="header"/>
-      <description id="security-identity-text" flex="1"/>
-      <hbox>
-        <button id="security-view-cert" label="&pageInfo.view.label;" 
-                oncommand="security.viewCert();"/>
-        <description id="security-view-text" flex="1"/>
-      </hbox>
-      <separator class="groove"/>
-      <label id="security-privacy" class="header"/>
-      <vbox flex="1">
-        <description id="security-privacy-msg1"/>
-        <description id="security-privacy-msg2"/>
-      </vbox>
-    </vbox>
-  </tabpanels>
-</overlay>

mozilla/security/manager/pki/resources/content/PrefOverlay.xul

@@ -1,57 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<!-- This file overlays "chrome://communicator/content/pref/preftree.xul" -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PrefOverlay.dtd">
-
-<overlay id="pipPrefOverlayID"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <treechildren id="securityChildren">
-    <treeitem id="masterpassItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-masterpass.xul"
-                  label="&masterpass.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="sslItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-ssl.xul"
-                  label="&ssl.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="certItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-certs.xul"
-                  label="&certs.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="validationItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-validation.xul"
-                 label="&validation.label;"/>
-      </treerow>
-    </treeitem>
-  </treechildren>
-</overlay>

mozilla/security/manager/pki/resources/content/WebSitesOverlay.xul

@@ -1,66 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="WebSitesOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="webCerts">
-    <description>&certmgr.websites;</description>
-    <separator class="thin"/>
-    <outliner id="server-outliner" multiple="true" enableColumnDrag="true"
-              onselect="websites_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-      <button id="websites_viewButton"
-              label="&certmgr.view.label;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="websites_editButton"
-              label="&certmgr.edit.label;"
-              disabled="true" oncommand="editCerts();"/>
-<!-- future - import a DER cert?
-      <button id="websites_addButton"
-              label="&certmgr.add.label;"
-              oncommand="addCerts();"/>
--->
-      <button id="websites_deleteButton"
-              label="&certmgr.delete.label;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/cacertexists.js

@@ -1,26 +0,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/
- *
- * 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):
- *  Rangan Sen <rangansen@netscape.com>
- */
-
-function doOK()
-{
-  window.close();
-}

mozilla/security/manager/pki/resources/content/cacertexists.xul

@@ -1,52 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Rangan Sen <rangansen@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="cacertexists" 
-  title="&caCertExists.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/cacertexists.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-  <vbox flex="1">
-    <description>&caCertExists.message;</description>
-    
-    <separator/>
-
-    <hbox align="center">
-      <button id="ok-button" label="&ok.label;"
-              oncommand="doOK();"/> 
-    </hbox>
-    
-    <separator/>
-
-  </vbox>
-
-</window>
-

mozilla/security/manager/pki/resources/content/certDump.xul

@@ -1,51 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-   -   Javier Delgadillo <javi@netscape.com>
-  -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="certDumpOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<vbox class="box-padded" id="certPrettyPrint" flex="1">
-  <label class="header" value="&certmgr.hierarchy.label;"/>
-  <tree id="treesetDump" rows="4"
-        onselect="updateCertDump();">
-    <treecolgroup>
-      <treecol flex="1"/>
-    </treecolgroup>
-    <treechildren id="chainDump"/>
-  </tree>
-  <outliner class="inset" id="prettyDumpOutliner" style="height:150px">
-    <outlinercol flex ="1" id="certDataCol" label="&certmgr.details.label;"
-                 ignoreincolumnpicker="true" class="header outlinercol-header" primary="true"/>
-    <splitter/>
-    <outlinerbody flex="1" onselect="displaySelected();"/>
-  </outliner>
-  <label class="header" value="&certmgr.fields.label;"/>
-  <textbox class="inset" id="certDumpVal"  multiline="true" rows="8"
-           readonly="true" style="font-family: -moz-fixed;"/>
-</vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/certManager.js

@@ -1,371 +0,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/
- *
- * 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):
- *  Bob Lord <lord@netscape.com>
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIFilePicker = Components.interfaces.nsIFilePicker;
-const nsFilePicker = "@mozilla.org/filepicker;1";
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-const nsICertOutliner = Components.interfaces.nsICertOutliner;
-const nsCertOutliner = "@mozilla.org/security/nsCertOutliner;1";
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1";
-const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
-const nsPKIParamBlock    = "@mozilla.org/security/pkiparamblock;1";
-
-
-var helpURL = "chrome://help/content/help.xul";
-var key;
-
-var selected_certs = [];
-var certdb;
-
-var caOutlinerView;
-var serverOutlinerView;
-var emailOutlinerView;
-var userOutlinerView;
-
-function LoadCerts()
-{
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-
-  caOutlinerView = Components.classes[nsCertOutliner]
-                    .createInstance(nsICertOutliner);
-  caOutlinerView.loadCerts(nsIX509Cert.CA_CERT);
-  document.getElementById('ca-outliner')
-   .outlinerBoxObject.view = caOutlinerView;
-
-  serverOutlinerView = Components.classes[nsCertOutliner]
-                        .createInstance(nsICertOutliner);
-  serverOutlinerView.loadCerts(nsIX509Cert.SERVER_CERT);
-  document.getElementById('server-outliner')
-   .outlinerBoxObject.view = serverOutlinerView;
-
-  emailOutlinerView = Components.classes[nsCertOutliner]
-                       .createInstance(nsICertOutliner);
-  emailOutlinerView.loadCerts(nsIX509Cert.EMAIL_CERT);
-  document.getElementById('email-outliner')
-   .outlinerBoxObject.view = emailOutlinerView; 
-
-  userOutlinerView = Components.classes[nsCertOutliner]
-                      .createInstance(nsICertOutliner);
-  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
-  document.getElementById('user-outliner')
-   .outlinerBoxObject.view = userOutlinerView;
-
-  var rowCnt = userOutlinerView.rowCount;
-  var enableBackupAllButton=document.getElementById('mine_backupAllButton');
-  if(rowCnt < 1) {
-    enableBackupAllButton.setAttribute("disabled",true);
-  } else  {
-    enableBackupAllButton.setAttribute("enabled",true);
-  }
-
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var verifiedColText;
-  if (certdb.ocspOn) {
-    verifiedColText = bundle.GetStringFromName("certmgr.verifiedNoOCSP");
-  } else {
-    verifiedColText = bundle.GetStringFromName("certmgr.verified");
-  }
-  var verifiedCol = document.getElementById('verifiedcol');
-  verifiedCol.setAttribute('label', verifiedColText);
-}
-
-function ReloadCerts()
-{
-  caOutlinerView.loadCerts(nsIX509Cert.CA_CERT);
-  serverOutlinerView.loadCerts(nsIX509Cert.SERVER_CERT);
-  emailOutlinerView.loadCerts(nsIX509Cert.EMAIL_CERT);
-  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
-}
-
-function getSelectedTab()
-{
-  var selTab = document.getElementById('certMgrTabbox').selectedItem;
-  var selTabID = selTab.getAttribute('id');
-  if (selTabID == 'mine_tab') {
-    key = "?my_certs";
-  } else if (selTabID == "others_tab") {
-    key = "?others_certs";
-  } else if (selTabID == "websites_tab") {
-    key = "?web_certs";
-  } else if (selTabID == "ca_tab") {
-    key = "?ca_certs";
-  }  
-  var context = helpURL + key;
-  return context;
-}
-
-
-function doHelpButton() {
-   var uri = getSelectedTab();
-   openHelp(uri);
-}
-
-
-function getSelectedCerts()
-{
-  var ca_tab = document.getElementById("ca_tab");
-  var mine_tab = document.getElementById("mine_tab");
-  var others_tab = document.getElementById("others_tab");
-  var websites_tab = document.getElementById("websites_tab");
-  var items = null;
-  if (ca_tab.selected) {
-    items = caOutlinerView.selection;
-  } else if (mine_tab.selected) {
-    items = userOutlinerView.selection;
-  } else if (others_tab.selected) {
-    items = emailOutlinerView.selection;
-  } else if (websites_tab.selected) {
-    items = serverOutlinerView.selection;
-  }
-  selected_certs = [];
-  var cert = null;
-  var nr = 0;
-  if (items != null) nr = items.getRangeCount();
-  if (nr > 0) {
-    for (var i=0; i<nr; i++) {
-      var o1 = {};
-      var o2 = {};
-      items.getRangeAt(i, o1, o2);
-      var min = o1.value;
-      var max = o2.value;
-      for (var j=min; j<=max; j++) {
-        if (ca_tab.selected) {
-          cert = caOutlinerView.getCert(j);
-        } else if (mine_tab.selected) {
-          cert = userOutlinerView.getCert(j);
-        } else if (others_tab.selected) {
-          cert = emailOutlinerView.getCert(j);
-        } else if (websites_tab.selected) {
-          cert = serverOutlinerView.getCert(j);
-        }
-        if (cert)
-          selected_certs[selected_certs.length] = cert;
-      }
-    }
-  }
-}
-
-function ca_enableButtons()
-{
-  var items = caOutlinerView.selection;
-  var nr = items.getRangeCount();
-  var toggle="false";
-  if (nr == 0) {
-    toggle="true";
-  }
-  var edit_toggle=toggle;
-/*
-  var edit_toggle="true";
-  if (nr > 0) {
-    for (var i=0; i<nr; i++) {
-      var o1 = {};
-      var o2 = {};
-      items.getRangeAt(i, o1, o2);
-      var min = o1.value;
-      var max = o2.value;
-      var stop = false;
-      for (var j=min; j<=max; j++) {
-        var tokenName = items.outliner.view.getCellText(j, "tokencol");
-	if (tokenName == "Builtin Object Token") { stop = true; } break;
-      }
-      if (stop) break;
-    }
-    if (i == nr) {
-      edit_toggle="false";
-    }
-  }
-*/
-  var enableViewButton=document.getElementById('ca_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableEditButton=document.getElementById('ca_editButton');
-  enableEditButton.setAttribute("disabled",edit_toggle);
-  var enableDeleteButton=document.getElementById('ca_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function mine_enableButtons()
-{
-  var items = userOutlinerView.selection;
-  var toggle="false";
-  if (items.getRangeCount() == 0) {
-    toggle="true";
-  }
-  var enableViewButton=document.getElementById('mine_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableBackupButton=document.getElementById('mine_backupButton');
-  enableBackupButton.setAttribute("disabled",toggle);
-  var enableDeleteButton=document.getElementById('mine_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function websites_enableButtons()
-{
-  var items = serverOutlinerView.selection;
-  var toggle="false";
-  if (items.getRangeCount() == 0) {
-    toggle="true";
-  }
-  var enableViewButton=document.getElementById('websites_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableEditButton=document.getElementById('websites_editButton');
-  enableEditButton.setAttribute("disabled",toggle);
-  var enableDeleteButton=document.getElementById('websites_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function email_enableButtons()
-{
-  var items = emailOutlinerView.selection;
-  var toggle="false";
-  if (items.getRangeCount() == 0) {
-    toggle="true";
-  }
-  var enableViewButton=document.getElementById('email_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableEditButton=document.getElementById('email_editButton');
-  enableEditButton.setAttribute("disabled",toggle);
-  var enableDeleteButton=document.getElementById('email_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function backupCerts()
-{
-  getSelectedCerts();
-  var numcerts = selected_certs.length;
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
-  fp.init(window,
-          bundle.GetStringFromName("chooseP12BackupFileDialog"),
-          nsIFilePicker.modeSave);
-  fp.appendFilter("PKCS12 Files", "*.p12");
-  fp.appendFilters(nsIFilePicker.filterAll);
-  var rv = fp.show();
-  if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
-    certdb.exportPKCS12File(null, fp.file, 
-                            selected_certs.length, selected_certs);
-  }
-}
-
-function backupAllCerts()
-{
-  // Select all rows, then call doBackup()
-  var items = userOutlinerView.selection.selectAll();
-  backupCerts();
-}
-
-function editCerts()
-{
-  getSelectedCerts();
-  var numcerts = selected_certs.length;
-  for (var t=0; t<numcerts; t++) {
-    var cert = selected_certs[t];
-    var certkey = cert.dbKey;
-    var ca_tab = document.getElementById("ca_tab");
-    if (ca_tab.selected) {
-      window.openDialog('chrome://pippki/content/editcacert.xul', certkey,
-                  'chrome,width=100,resizable=1,modal');
-    } else {
-      window.openDialog('chrome://pippki/content/editsslcert.xul', certkey,
-                  'chrome,width=100,resizable=1,modal');
-    }
-  }
-}
-
-function restoreCerts()
-{
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
-  fp.init(window,
-          bundle.GetStringFromName("chooseP12RestoreFileDialog"),
-          nsIFilePicker.modeOpen);
-  fp.appendFilter("PKCS12 Files", "*.p12;*.pfx");
-  fp.appendFilters(nsIFilePicker.filterAll);
-  if (fp.show() == nsIFilePicker.returnOK) {
-    var certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-    certdb.importPKCS12File(null, fp.file);
-  }
-  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
-}
-
-function deleteCerts()
-{
-  getSelectedCerts();
-  
-  var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
-  
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var selTab = document.getElementById('certMgrTabbox').selectedItem;
-  var selTabID = selTab.getAttribute('id');
-  if (selTabID == 'mine_tab') 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteUserCertFlag"));
-  } 
-  else if (selTabID == "websites_tab") 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteSslCertFlag"));
-  } 
-  else if (selTabID == "ca_tab") 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteCaCertFlag"));
-  }
-  else if (selTabID == "others_tab") 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteEmailCertFlag"));
-  }
-  else
-  {
-    return;
-  }
-
-  var numcerts = selected_certs.length;
-  params.SetInt(2,numcerts);
-  for (var t=0; t<numcerts; t++) 
-  {
-    var cert = selected_certs[t];
-    params.SetString(t+3, cert.dbKey);  
-  }
-   
-  window.openDialog('chrome://pippki/content/deletecert.xul', "",
-                'chrome,resizable=1,modal',params);
- 
-  ReloadCerts();
-}
-
-function viewCerts()
-{
-  getSelectedCerts();
-  var numcerts = selected_certs.length;
-  for (var t=0; t<numcerts; t++) {
-    selected_certs[t].view();
-  }
-}
-
-/* XXX future - import a DER cert from a file? */
-function addCerts()
-{
-  alert("Add cert chosen");
-}

mozilla/security/manager/pki/resources/content/certManager.xul

@@ -1,68 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<?xul-overlay href="chrome://pippki/content/MineOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/OthersOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/WebSitesOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/CAOverlay.xul"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="certmanager" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        title="&certmgr.title;"
-        onload="LoadCerts();">
-
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
-
-  <vbox flex="1">
-    <tabbox flex="1">
-      <tabs id="certMgrTabbox">
-        <tab id="mine_tab" label="&certmgr.tab.mine;"/>
-        <tab id="others_tab" label="&certmgr.tab.others;"/>
-        <tab id="websites_tab" label="&certmgr.tab.websites;"/>
-        <tab id="ca_tab" label="&certmgr.tab.ca;" selected="true"/>
-      </tabs>
-      <tabpanels flex="1">
-        <vbox id="myCerts" flex="1"/>
-        <vbox id="othersCerts" flex="1"/>
-        <vbox id="webCerts" flex="1"/>
-        <vbox id="CACerts" flex="1"/>
-      </tabpanels>
-    </tabbox>
-
-    <hbox>
-      <button id="HelpButton"
-              label="&certmgr.help.label;" 
-              accesskey="&certmgr.helpButtonAccessKey;"
-              oncommand="doHelpButton();"/>
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/certViewer.xul

@@ -1,80 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-   -   Javier Delgadillo <javi@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<?xul-overlay href="chrome://pippki/content/viewCertDetails.xul"?>
-<?xul-overlay href="chrome://pippki/content/certDump.xul"?>
-
-
-<window id="certDetails" 
-  title="&certmgr.certdetail.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/viewCertDetails.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<keyset id="keys">
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close()"/>
-</keyset>
-
-  <grid flex="1">
-    <column flex="1"/>
-    <rows>
-      <row flex="1">
-        <tabbox flex="1">
-          <tabs>
-            <tab id="general_tab" label="&certmgr.detail.general_tab.title;"/>
-            <tab id="prettyprint_tab" label="&certmgr.detail.prettyprint_tab.title;"/>
-          </tabs>
-          <tabpanels flex="1">
-            <vbox id="general_info" flex="1"/>
-            <vbox id="certPrettyPrint" flex="1"/>
-          </tabpanels>
-        </tabbox>
-      </row>
-      <row>
-        <separator class="thin"/>
-      </row>
-      <row>
-        <hbox align="right" flex="1">
-          <button id="HelpButton"
-                  label="&certmgr.help.label;" 
-                  accesskey="&certmgr.helpButtonAccessKey;"
-                  oncommand="openHelp('chrome://help/content/help.xul?cert_details');"/>
-          <button id="closeButton"
-                  label="&certmgr.close.label;" 
-                  accesskey="&certmgr.closeWindowAccessKey;"
-                  oncommand="window.close();"/>
-        </hbox>
-      </row>
-    </rows>
-  </grid>
-</window>

mozilla/security/manager/pki/resources/content/certpicker.js

@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 Communicator.
- *
- * 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): Kai Engert <kaie@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 ***** */
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var dialogParams;
-var itemCount = 0;
-
-function onLoad()
-{
-  dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-
-  var pickerTitle = dialogParams.GetString(1);
-  var mainwin = document.getElementById("certPicker");
-  mainwin.setAttribute("title", pickerTitle);
-
-  var pickerInfo = dialogParams.GetString(2);
-  setText("pickerInfo", pickerInfo);
-
-  var selectElement = document.getElementById("nicknames");
-  itemCount = dialogParams.GetInt(1);
-
-  for (var i=0; i < itemCount; i++) {
-      var menuItemNode = document.createElement("menuitem");
-      var nick = dialogParams.GetString(i+3);
-      menuItemNode.setAttribute("value", i);
-      menuItemNode.setAttribute("label", nick); // this is displayed
-      selectElement.firstChild.appendChild(menuItemNode);
-      if (i == 0) {
-          selectElement.selectedItem = menuItemNode;
-      }
-  }
-
-  dialogParams.SetInt(1,0); // set cancel return value
-  setDetails();
-}
-
-function setDetails()
-{
-  var index = parseInt(document.getElementById("nicknames").value);
-  details = dialogParams.GetString(index+itemCount+3);
-  document.getElementById("details").value = details;
-}
-
-function onCertSelected()
-{
-  setDetails();
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  var index = parseInt(document.getElementById("nicknames").value);
-  dialogParams.SetInt(2, index);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/certpicker.xul

@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** 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 Communicator
-   -
-   - 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): Kai Engert <kaie@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 LGPL or the GPL. 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 ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-
-<window id="certPicker" title="&certPicker.defaultTitle;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/certpicker.js"/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-</keyset>
-
-<vbox style="margin: 5px;">
-    <groupbox>
-    <description id="pickerInfo" style="font-weight: bold;">&certPicker.defaultInfo;</description>
-    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
-    <!-- The items in this menulist must never be sorted,
-         but remain in the order filled by the application
-    -->
-    <menulist id="nicknames" observes="certSelected">
-        <menupopup/>
-    </menulist>
-    <label value="&certPicker.detailsLabel;"/>
-    <textbox readonly="true" id="details" multiline="true"
-      style="height: 11em; width=80em;"/>
-    </groupbox>
-  <separator class="thin"/>
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/changepassword.xul

@@ -1,117 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="set_password" title="&setPassword.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-<vbox style="margin: 5px;" flex="1">
-
-<hbox align="center">
-  <label value="&setPassword.tokenName.label;: "/>
-  <label id="tokenName" />
-  <menulist id="tokenMenu" oncommand="onMenuChange()">
-     <menupopup/>
-  </menulist>
-</hbox>
-
-
-<!--
-    <menulist id="signerList" disabled="true">
-      <menupopup>
-        <menuitem id="token-menu" label="Built-in private key database"/>
-        <menuitem label="Bob Lord's iButton"/>
-      </menupopup>
-    </menulist>
--->
-<separator/>
-
-<groupbox>
-<grid>
- <columns>
-   <column/>
-   <column/> 
- </columns>
- <rows>
-   <row>
-     <label value="&setPassword.oldPassword.label;"/> 
-     <textbox id="oldpw" type="password"/>
-     <!-- This textbox is inserted as a workaround to the fact that making the 'type' 
-          & 'disabled' property of the 'oldpw' textbox toggle between ['password' & 
-          'false'] and ['text' & 'true'] - as would be necessary if the menu has more 
-          than one tokens, some initialized and some not - does not work properly. So, 
-          either the textbox 'oldpw' or the textbox 'message' would be displayed, 
-          depending on the state of the token selected 
-     -->
-     <textbox id="message" disabled="true" />
-   </row>
-   <row>
-     <label value="&setPassword.newPassword.label;"/> 
-     <textbox id="pw1" type="password" 
-       onkeypress="setPasswordStrength(); checkPasswords();"/> 
-   </row>
-   <row>
-     <label value="&setPassword.reenterPassword.label;"/> 
-     <textbox id="pw2" type="password" onkeypress="checkPasswords();"/>  
-   </row>
- </rows>
-</grid>
-</groupbox>
-
-<groupbox>
- <caption label="&setPassword.meter.label;"/>
- <progressmeter id="pwmeter" mode="determined" 
-                  value="0"/>
-</groupbox>
-
-<separator/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) setPassword();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="if (!document.getElementById('ok-button').disabled) setPassword();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-</keyset>
-
-<hbox>
-<button id="ok-button" label="&ok.label;"
-        oncommand="setPassword();" disabled="true" default="true"/>
-<button id="cancel-button" label="&cancel.label;"
-        oncommand="window.close();"/> 
-<button id="help-button" label="&help.label;"
-        oncommand="openHelp('chrome://help/content/help.xul?change_pwd');"/> 
-</hbox>
-
-
-</vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/choosetoken.js

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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):
- * David Drinan.
- */
-
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var dialogParams;
-
-function onLoad()
-{
-    dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-    var selectElement = document.getElementById("tokens");
-    for (var i=1; i <= dialogParams.GetInt(1); i++) {
-        var menuItemNode = document.createElement("menuitem");
-        var token = dialogParams.GetString(i);
-        menuItemNode.setAttribute("value", token);
-        menuItemNode.setAttribute("label", token);
-        selectElement.firstChild.appendChild(menuItemNode);
-        if (i == 1) {
-            selectElement.selectedItem = menuItemNode;
-        }
-    }
-}
-
-function doOK()
-{
-  var tokenList = document.getElementById("tokens");
-  var token = tokenList.value;
-  dialogParams.SetInt(1,1);
-  dialogParams.SetString(1, token);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/choosetoken.xul

@@ -1,66 +0,0 @@
-<?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/
-  -
-  - 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):
-  - David Drinan (ddrinan@netscape.com)
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-
-<window id="ssl_warning" title="&chooseToken.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="360"
-  width="400"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/choosetoken.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) doOK();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="if (!document.getElementById('ok-button').disabled) doOK();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-</keyset>
-
-<vbox style="margin: 5px;" flex="1">
-    <groupbox>
-    <description>&chooseToken.message1;</description>
-    <menulist id="tokens">
-        <menupopup/>
-    </menulist>
-    </groupbox>
-  <separator />
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-          oncommand="openHelp('chrome://help/content/help.xul?which_token');"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/clientauthask.js

@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Javier Delgadillo <javi@netscape.com>
- */
-
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var dialogParams;
-var itemCount = 0;
-
-function onLoad()
-{
-    var cn;
-    var org;
-    var issuer;
-
-    dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-    cn = dialogParams.GetString(1);
-    org = dialogParams.GetString(2);
-    issuer = dialogParams.GetString(3);
-
-    var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-    var message1 = bundle.formatStringFromName("clientAuthMessage1", 
-                                             [org],
-                                             1);
-    var message2 = bundle.formatStringFromName("clientAuthMessage2",
-                                             [issuer],
-                                             1);
-    setText("hostname", cn);
-    setText("organization", message1);
-    setText("issuer", message2);
-
-    var selectElement = document.getElementById("nicknames");
-    itemCount = dialogParams.GetInt(1);
-    for (var i=0; i < itemCount; i++) {
-        var menuItemNode = document.createElement("menuitem");
-        var nick = dialogParams.GetString(i+4);
-        menuItemNode.setAttribute("value", i);
-        menuItemNode.setAttribute("label", nick); // this is displayed
-        selectElement.firstChild.appendChild(menuItemNode);
-        if (i == 0) {
-            selectElement.selectedItem = menuItemNode;
-        }
-    }
-
-    setDetails();
-}
-
-function setDetails()
-{
-  var index = parseInt(document.getElementById("nicknames").value);
-  details = dialogParams.GetString(index+itemCount+4);
-  document.getElementById("details").value = details;
-}
-
-function onCertSelected()
-{
-  setDetails();
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  var index = parseInt(document.getElementById("nicknames").value);
-  dialogParams.SetInt(2, index);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/clientauthask.xul

@@ -1,71 +0,0 @@
-<?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/
-   -
-   - 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.
-   -
-   -
-   - Contributor(s):
-   - David Drinan (ddrinan@netscape.com)
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-
-<window id="ssl_warning" title="&clientAuthAsk.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/clientauthask.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-</keyset>
-
-<vbox style="margin: 5px;">
-    <groupbox>
-    <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
-    <description id="hostname"/>
-    <description id="organization"/>
-    <description id="issuer"/>
-    </groupbox>
-    <groupbox>
-    <description style="font-weight: bold;">&clientAuthAsk.message2;</description>
-    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
-    <!-- The items in this menulist must never be sorted,
-         but remain in the order filled by the application
-    -->
-    <menulist id="nicknames" observes="certSelected">
-        <menupopup/>
-    </menulist>
-    <description>&clientAuthAsk.message3;</description>
-    <textbox readonly="true" id="details" multiline="true"
-      style="height: 11em; width=80em;"/>
-    </groupbox>
-  <separator/>
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-     style="width: 10ex" oncommand="openHelp('chrome://help/content/help.xul?which_cert');" /> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/contents.rdf

@@ -1,55 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<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:pippki"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:pippki"
-        chrome:displayName="pippki"
-        chrome:author="PSM Team"
-        chrome:name="pippki"
- 	chrome:localeVersion="0.9.6">
-  </RDF:Description>
-
-  <!-- Declare overlay points used in this package -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://navigator/content/pageInfo.xul"/>
-  </RDF:Seq>
-
-  <!-- Define the local overlay file(s) for each overlay point -->
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://pippki/content/PrefOverlay.xul</RDF:li>
-  </RDF:Seq>
-  <RDF:Seq about="chrome://navigator/content/pageInfo.xul">
-    <RDF:li>chrome://pippki/content/PageInfoOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>  
-

mozilla/security/manager/pki/resources/content/createCertInfo.js

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- */
-
-var keygenThread;
-
-function onLoad()
-{
-  keygenThread = window.arguments[0].QueryInterface(Components.interfaces.nsIKeygenThread);
-  
-  if (!keygenThread) {
-    window.close();
-    return;
-  }
-  
-  setCursor("wait");
-  
-  keygenThread.startKeyGeneration(window);
-}
-
-function onClose()
-{
-  setCursor("default");
-
-  var alreadyClosed = new Object();
-  keygenThread.userCanceled(alreadyClosed);
-}

mozilla/security/manager/pki/resources/content/createCertInfo.xul

@@ -1,37 +0,0 @@
-<?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/
-   -
-   - 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.
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window
-  id="domainMismatch" title="&createCertInfo.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();"
-  onclose="onClose();"
->
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="pippki.js" />
-<script type="application/x-javascript" src="createCertInfo.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
-
-<vbox style="margin: 5px; max-width: 50em;">
-
-  <description>&createCertInfo.msg1;</description>
-  <separator/>
-  <description style="font-weight: bold; text-align: center; text-decoration: blink;">&createCertInfo.msg2;</description>
-  <separator/>
-
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/crlManager.js

@@ -1,105 +0,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/
- *
- * 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):
- *  David Drinan <ddrinan@netscape.com>
- */
-
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsICrlEntry = Components.interfaces.nsICrlEntry;
-const nsISupportsArray = Components.interfaces.nsISupportsArray;
-
-var certdb;
-var crls;
-
-function onLoad()
-{
-  var crlEntry;
-  var i;
-
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  crls = certdb.getCrls();
-
-  for (i=0; i<crls.Count(); i++) {
-    crlEntry = crls.GetElementAt(i).QueryInterface(nsICrlEntry);
-    var org = crlEntry.org;
-    var orgUnit = crlEntry.orgUnit;
-    var lastUpdate = crlEntry.lastUpdate;
-    var nextUpdate = crlEntry.nextUpdate;
-    AddItem("crlList", [org, orgUnit, lastUpdate, nextUpdate], "crltree_", i);
-  }
-}
-
-function AddItem(children,cells,prefix,idfier)
-{
-  var kids = document.getElementById(children);
-  var item  = document.createElement("treeitem");
-  var row   = document.createElement("treerow");
-  for(var i = 0; i < cells.length; i++)
-  {
-    var cell  = document.createElement("treecell");
-    cell.setAttribute("class", "propertylist");
-    cell.setAttribute("label", cells[i])
-    row.appendChild(cell);
-  }
-  item.appendChild(row);
-  item.setAttribute("id",prefix + idfier);
-  kids.appendChild(item);
-}
-
-function DeleteCrlSelected() {
-  var crlEntry;
-
-  // delete selected item
-  var crltree = document.getElementById("crltree");
-  var i = crltree.selectedIndex;
-
-  // Delete it
-  certdb.deleteCrl(i);
-  DeleteItemSelected("crltree", "crltree_", "crlList");
-  if( !crltree.selectedItems.length ) {
-    if( !document.getElementById("deleteCrl").disabled ) {
-      document.getElementById("deleteCrl").setAttribute("disabled", "true")
-    }
-  }
-}
-
-function EnableCrlActions() {
-  document.getElementById("deleteCrl").removeAttribute("disabled", "true");
-  // document.getElementById("updateCrl").removeAttribute("disabled", "true");
-}
-
-function DeleteItemSelected(tree, prefix, kids) {
-  var i;
-  var delnarray = [];
-  var rv = "";
-  var cookietree = document.getElementById(tree);
-  var selitems = cookietree.selectedItems;
-  for(i = 0; i < selitems.length; i++) 
-  { 
-    delnarray[i] = document.getElementById(selitems[i].getAttribute("id"));
-    var itemid = parseInt(selitems[i].getAttribute("id").substring(prefix.length,selitems[i].getAttribute("id").length));
-    rv += (itemid + ",");
-  }
-  for(i = 0; i < delnarray.length; i++) 
-  { 
-    document.getElementById(kids).removeChild(delnarray[i]);
-  }
-  return rv;
-}

mozilla/security/manager/pki/resources/content/crlManager.xul

@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-  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 Communicator client code, released
-  March 31, 1998.
-  
-  The Initial Developer of the Original Code is Netscape
-  Communications Corporation. Portions created by Netscape are
-  Copyright (C) 1998-1999 Netscape Communications Corporation. All
-  Rights Reserved.
-  
-  Contributor(s):
-    David Drinan (ddrinan@netscape.com)
--->
-
-<!-- CHANGE THIS WHEN MOVING FILES -->
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<!-- CHANGE THIS WHEN MOVING FILES -->
-<!DOCTYPE window [
-    <!ENTITY % prefValDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
-    %prefValDTD;
-    <!ENTITY % prefCertMgrDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
-    %prefCertMgrDTD;
-]>
-
-<window id="crlviewer"
-        class="dialog"
-        title="&validation.crlmanager.label;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="width: 30em;"
-        onload="onLoad();">
-
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>
-
-  <description value="&validation.crlmanager.label;"/>
-  <separator class="thin"/>
-  <tree id="crltree" style="height: 10em;"
-   multiple="false" onclick="EnableCrlActions()" flex="1">
-    <treecolgroup>
-      <treecol flex="3" width="0"/>
-      <splitter class="tree-splitter"/>
-      <treecol flex="5" width="0"/>
-      <splitter class="tree-splitter"/>
-      <treecol flex="2" width="0"/>
-      <splitter class="tree-splitter"/>
-      <treecol flex="2" width="0"/>
-    </treecolgroup>
-    <treehead>
-      <treerow>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&certmgr.certdetail.o;"/>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&certmgr.certdetail.ou;"/>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&validation.crllastupdate.label;"/>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&validation.crlnextupdate.label;"/>
-      </treerow>          
-    </treehead>
-    <treechildren id="crlList" flex="1"/>
-  </tree>
-  <hbox>
-    <button id="deleteCrl" disabled="true"
-            label="&validation.deletecrl.label;"
-            oncommand="DeleteCrlSelected();"/>
-  </hbox>
-  <separator class="thin"/>
-</window>

mozilla/security/manager/pki/resources/content/deletecert.js

@@ -1,126 +0,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/
- *
- * 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):
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var certdb;
-var certs = [];
-var helpUrl;
-
-function setWindowName()
-{
-  var params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-  
-  //  Get the cert from the cert database
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  
-  var typeFlag = params.GetString(1);
-  var numberOfCerts = params.GetInt(2);
-  var dbkey;
-  for(var x=0; x<numberOfCerts;x++)
-  {
-     dbkey = params.GetString(x+3);
-     certs[x] = certdb.getCertByDBKey(dbkey , null);
-  }
-  
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var title;
-  var confirm;
-  var impact;
-  
-  if(typeFlag == bundle.GetStringFromName("deleteUserCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteUserCertTitle");
-     confirm = bundle.GetStringFromName("deleteUserCertConfirm");
-     impact = bundle.GetStringFromName("deleteUserCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_my_certs"
-  }
-  else if(typeFlag == bundle.GetStringFromName("deleteSslCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteSslCertTitle");
-     confirm = bundle.GetStringFromName("deleteSslCertConfirm");
-     impact = bundle.GetStringFromName("deleteSslCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_web_certs"
-  }
-  else if(typeFlag == bundle.GetStringFromName("deleteCaCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteCaCertTitle");
-     confirm = bundle.GetStringFromName("deleteCaCertConfirm");
-     impact = bundle.GetStringFromName("deleteCaCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_ca_certs"   
-  }
-  else if(typeFlag == bundle.GetStringFromName("deleteEmailCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteEmailCertTitle");
-     confirm = bundle.GetStringFromName("deleteEmailCertConfirm");
-     impact = bundle.GetStringFromName("deleteEmailCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_email_certs"
-  }
-  else
-  {
-     return;
-  }
-  var windowReference = document.getElementById('deleteCertificate');
-  var confirReference = document.getElementById('confirm');
-  var impactReference = document.getElementById('impact');
-  windowReference.setAttribute("title", title);
-  
-  setText("confirm",confirm);
-
-  var box=document.getElementById("certlist");
-  var text;
-  for(var x=0;x<certs.length;x++)
-  {
-    text = document.createElement("text");
-    text.setAttribute("value",certs[x].commonName);
-    box.appendChild(text);
-  }
-
-  setText("impact",impact);
-
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("height",window.innerHeight + 40);
-
-  
-}
-
-function doOK()
-{
-  for(var i=0;i<certs.length;i++)
-  {
-    certdb.deleteCertificate(certs[i]);
-  }
-  window.close();
-}
-
-function doHelp()
-{
-   openHelp(helpUrl);
-}

mozilla/security/manager/pki/resources/content/deletecert.xul

@@ -1,62 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="deleteCertificate" 
-  title="&certmgr.deletecert.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();"
-  style="width:8ex">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/deletecert.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="pippki.js" />
-
-  <keyset id="keys">
-    <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-    <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-  </keyset>
-
-  <vbox flex="1">
-     <description id="confirm"/>
-     <separator />
-     <vbox id="certlist" flex="100%"/>
-     <description id="impact"/>
-     <separator />
-
-    <hbox align="center">
-      <button id="ok-button" label="&certmgr.ok.label;"
-              oncommand="doOK();"/> 
-      <button id="cancel-button" label="&certmgr.cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&certmgr.help.label;"
-              oncommand="doHelp();"/> 
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/device_manager.js

@@ -1,420 +0,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/
- *
- * 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):
- *  Bob Lord <lord@netscape.com>
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIFilePicker = Components.interfaces.nsIFilePicker;
-const nsFilePicker = "@mozilla.org/filepicker;1";
-const nsIPKCS11Slot = Components.interfaces.nsIPKCS11Slot;
-const nsIPKCS11Module = Components.interfaces.nsIPKCS11Module;
-const nsPKCS11ModuleDB = "@mozilla.org/security/pkcs11moduledb;1";
-const nsIPKCS11ModuleDB = Components.interfaces.nsIPKCS11ModuleDB;
-const nsIPK11Token = Components.interfaces.nsIPK11Token;
-const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
-const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
-
-var bundle;
-var secmoddb;
-
-/* Do the initial load of all PKCS# modules and list them. */
-function LoadModules()
-{
-  bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  secmoddb = Components.classes[nsPKCS11ModuleDB].getService(nsIPKCS11ModuleDB);
-  var modules = secmoddb.listModules();
-  var done = false;
-  try {
-    modules.isDone();
-  } catch (e) { done = true; }
-  while (!done) {
-    var module = modules.currentItem().QueryInterface(nsIPKCS11Module);
-    if (module) {
-      var slotnames = [];
-      var slots = module.listSlots();
-      var slots_done = false;
-      try {
-        slots.isDone();
-      } catch (e) { slots_done = true; }
-      while (!slots_done) {
-        var slot = null;
- 	try {
-          slot = slots.currentItem().QueryInterface(nsIPKCS11Slot);
-        } catch (e) { slot = null; }
-        // in the ongoing discussion of whether slot names or token names
-        // are to be shown, I've gone with token names because NSS will
-        // prefer lookup by token name.  However, the token may not be
-        // present, so maybe slot names should be listed, while token names
-        // are "remembered" for lookup?
-	if (slot != null) {
-          if (slot.tokenName)
-            slotnames[slotnames.length] = slot.tokenName;
-          else
-            slotnames[slotnames.length] = slot.name;
-	}
-        try {
-          slots.next();
-        } catch (e) { slots_done = true; }
-      }
-      AddModule(module.name, slotnames);
-    }
-    try {
-      modules.next();
-    } catch (e) { done = true; }
-  }
-  /* Set the text on the fips button */
-  SetFIPSButtonText();
-}
-
-function SetFIPSButtonText()
-{
-  var fipsButton = document.getElementById("fipsbutton");
-  var label;
-  if (secmoddb.isFIPSEnabled) {
-   label = bundle.GetStringFromName("disable_fips"); 
-  } else {
-   label = bundle.GetStringFromName("enable_fips"); 
-  }
-  fipsButton.setAttribute("label", label);
-}
-
-/* Add a module to the tree.  slots is the array of slots in the module,
- * to be represented as children.
- */
-function AddModule(module, slots)
-{
-  var tree = document.getElementById("device_list");
-  var item  = document.createElement("treeitem");
-  var row  = document.createElement("treerow");
-  var cell = document.createElement("treecell");
-  cell.setAttribute("class", "propertylist");
-  cell.setAttribute("label", module);
-  cell.setAttribute("style", "font-weight: bold");
-  cell.setAttribute("crop", "never");
-  row.appendChild(cell);
-  item.appendChild(row);
-  var parent = document.createElement("treechildren");
-  for (var i = 0; i<slots.length; i++) {
-    var child_item = document.createElement("treeitem");
-    var child_row = document.createElement("treerow");
-    var child_cell = document.createElement("treecell");
-    child_cell.setAttribute("label", slots[i]);
-    child_cell.setAttribute("class", "treecell-indent");
-    child_row.appendChild(child_cell);
-    child_item.appendChild(child_row);
-    child_item.setAttribute("pk11kind", "slot");
-    parent.appendChild(child_item);
-  }
-  item.appendChild(parent);
-  item.setAttribute("pk11kind", "module");
-  item.setAttribute("open", "true");
-  item.setAttribute("container", "true");
-  tree.appendChild(item);
-}
-
-var selected_slot;
-var selected_module;
-
-/* get the slot selected by the user (can only be one-at-a-time) */
-function getSelectedItem()
-{
-  var tree = document.getElementById('device_tree');
-  var items = tree.selectedItems;
-  selected_slot = null;
-  selected_module = null;
-  if (items.length > 0) {
-    var kind = items[0].getAttribute("pk11kind");
-    var module_name;
-    if (kind == "slot") {
-      // get the module cell for this slot cell
-      var cell = items[0].parentNode.parentNode.firstChild.firstChild;
-      module_name = cell.getAttribute("label");
-      var module = secmoddb.findModuleByName(module_name);
-      // get the cell for the selected row (the slot to display)
-      cell = items[0].firstChild.firstChild;
-      var slot_name = cell.getAttribute("label");
-      selected_slot = module.findSlotByName(slot_name);
-    } else { // (kind == "module")
-      // get the cell for the selected row (the module to display)
-      cell = items[0].firstChild.firstChild;
-      module_name = cell.getAttribute("label");
-      selected_module = secmoddb.findModuleByName(module_name);
-    }
-  }
-}
-
-function enableButtons()
-{
-  var login_toggle = "true";
-  var logout_toggle = "true";
-  var pw_toggle = "true";
-  var unload_toggle = "true";
-  getSelectedItem();
-  if (selected_module) {
-    unload_toggle = "false";
-    showModuleInfo();
-  } else if (selected_slot) {
-    // here's the workaround - login functions are all with token,
-    // so grab the token type
-    var selected_token = selected_slot.getToken();
-    if (selected_token != null) {
-      if (selected_token.needsLogin() || !(selected_token.needsUserInit)) {
-        pw_toggle = "false";
-        if(selected_token.needsLogin()) {
-          if (selected_token.isLoggedIn()) {
-            logout_toggle = "false";
-          } else {
-            login_toggle = "false";
-          }
-        }
-      }
-    }
-    showSlotInfo();
-  }
-  var thebutton = document.getElementById('login_button');
-  thebutton.setAttribute("disabled", login_toggle);
-  thebutton = document.getElementById('logout_button');
-  thebutton.setAttribute("disabled", logout_toggle);
-  thebutton = document.getElementById('change_pw_button');
-  thebutton.setAttribute("disabled", pw_toggle);
-  thebutton = document.getElementById('unload_button');
-  thebutton.setAttribute("disabled", unload_toggle);
-  // not implemented
-  //thebutton = document.getElementById('change_slotname_button');
-  //thebutton.setAttribute("disabled", toggle);
-}
-
-// clear the display of information for the slot
-function ClearInfoList()
-{
-  var info_list = document.getElementById("info_list");
-  while (info_list.firstChild)
-      info_list.removeChild(info_list.firstChild);
-}
-
-// show a list of info about a slot
-function showSlotInfo()
-{
-  ClearInfoList();
-  switch (selected_slot.status) {
-   case nsIPKCS11Slot.SLOT_DISABLED:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_disabled"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_NOT_PRESENT:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_notpresent"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_UNINITIALIZED:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_uninitialized"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_NOT_LOGGED_IN:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_notloggedin"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_LOGGED_IN:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_loggedin"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_READY:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_ready"), 
-                "tok_status");
-     break;
-  }
-  AddInfoRow(bundle.GetStringFromName("devinfo_desc"), 
-             selected_slot.desc, "slot_desc");
-  AddInfoRow(bundle.GetStringFromName("devinfo_manID"), 
-             selected_slot.manID, "slot_manID");
-  AddInfoRow(bundle.GetStringFromName("devinfo_hwversion"),
-             selected_slot.HWVersion, "slot_hwv");
-  AddInfoRow(bundle.GetStringFromName("devinfo_fwversion"),
-             selected_slot.FWVersion, "slot_fwv");
-}
-
-function showModuleInfo()
-{
-  ClearInfoList();
-  AddInfoRow(bundle.GetStringFromName("devinfo_modname"),
-             selected_module.name, "module_name");
-  AddInfoRow(bundle.GetStringFromName("devinfo_modpath"),
-             selected_module.libName, "module_path");
-}
-
-// add a row to the info list, as [col1 col2] (ex.: ["status" "logged in"])
-function AddInfoRow(col1, col2, cell_id)
-{
-  var tree = document.getElementById("info_list");
-  var item  = document.createElement("treeitem");
-  var row  = document.createElement("treerow");
-  var cell1 = document.createElement("treecell");
-  cell1.setAttribute("label", col1);
-  cell1.setAttribute("crop", "never");
-  row.appendChild(cell1);
-  var cell2 = document.createElement("treecell");
-  cell2.setAttribute("label", col2);
-  cell2.setAttribute("crop", "never");
-  cell2.setAttribute("id", cell_id);
-  row.appendChild(cell2);
-  item.appendChild(row);
-  tree.appendChild(item);
-}
-
-// log in to a slot
-function doLogin()
-{
-  getSelectedItem();
-  // here's the workaround - login functions are with token
-  var selected_token = selected_slot.getToken();
-  try {
-    selected_token.login(false);
-    var tok_status = document.getElementById("tok_status");
-    if (selected_token.isLoggedIn()) {
-      tok_status.setAttribute("label", 
-                          bundle.GetStringFromName("devinfo_stat_loggedin"));
-    } else {
-      tok_status.setAttribute("label",
-                       bundle.GetStringFromName("devinfo_stat_notloggedin"));
-    }
-  } catch (e) {
-    var alertStr = bundle.GetStringFromName("login_failed"); 
-    alert(alertStr);
-  }
-  enableButtons();
-}
-
-// log out of a slot
-function doLogout()
-{
-  getSelectedItem();
-  // here's the workaround - login functions are with token
-  var selected_token = selected_slot.getToken();
-  try {
-    selected_token.logout(false);
-    var tok_status = document.getElementById("tok_status");
-    if (selected_token.isLoggedIn()) {
-      tok_status.setAttribute("label", 
-                          bundle.GetStringFromName("devinfo_stat_loggedin"));
-    } else {
-      tok_status.setAttribute("label",
-                       bundle.GetStringFromName("devinfo_stat_notloggedin"));
-    }
-  } catch (e) {
-  }
-  enableButtons();
-}
-
-// load a new device
-function doLoad()
-{
-  //device.loaddlg.width=300
-  //device.loaddlg.height=200
-  var dlgWidth = bundle.GetStringFromName("device.loaddlg.width");
-  var dlgHeight = bundle.GetStringFromName("device.loaddlg.height");
-  //
-  window.open("load_device.xul", "loaddevice", 
-              "chrome,width=" + dlgWidth + ",height="+ dlgHeight+ ",resizable=1,dialog=1,modal=1");
-  var device_list = document.getElementById("device_list");
-  while (device_list.firstChild)
-    device_list.removeChild(device_list.firstChild);
-  LoadModules();
-}
-
-function doUnload()
-{
-  getSelectedItem();
-  if (selected_module) {
-    pkcs11.deletemodule(selected_module.name);
-    var device_list = document.getElementById("device_list");
-    while (device_list.firstChild)
-      device_list.removeChild(device_list.firstChild);
-    LoadModules();
-  }
-}
-
-function changePassword()
-{
-  getSelectedItem();
-  token = selected_slot.getToken();
-  window.open("changepassword.xul",
-              selected_slot.tokenName, 
-              "chrome,resizable=1,modal=1,dialog=1");
-  showSlotInfo();
-  enableButtons();
-}
-
-// browse fs for PKCS#11 device
-function doBrowseFiles()
-{
-  var srbundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
-  fp.init(window,
-          srbundle.GetStringFromName("loadPK11TokenDialog"),
-          nsIFilePicker.modeOpen);
-  fp.appendFilters(nsIFilePicker.filterAll);
-  if (fp.show() == nsIFilePicker.returnOK) {
-    var pathbox = document.getElementById("device_path");
-    pathbox.setAttribute("value", fp.file.persistentDescriptor);
-  }
-}
-
-function doLoadDevice()
-{
-  var name_box = document.getElementById("device_name");
-  var path_box = document.getElementById("device_path");
-  pkcs11.addmodule(name_box.value, path_box.value, 0,0);
-  window.close();
-}
-
-// -------------------------------------   Old code
-
-function showTokenInfo()
-{
-  ClearInfoList();
-  getSelectedToken();
-  AddInfoRow(bundle.GetStringFromName("devinfo_label"), 
-             selected_token.tokenLabel, "tok_label");
-  AddInfoRow(bundle.GetStringFromName("devinfo_manID"),
-             selected_token.tokenManID, "tok_manID");
-  AddInfoRow(bundle.GetStringFromName("devinfo_serialnum"), 
-             selected_token.tokenSerialNumber, "tok_sNum");
-  AddInfoRow(bundle.GetStringFromName("devinfo_hwversion"),
-             selected_token.tokenHWVersion, "tok_hwv");
-  AddInfoRow(bundle.GetStringFromName("devinfo_fwversion"),
-             selected_token.tokenFWVersion, "tok_fwv");
-}
-
-function toggleFIPS()
-{
-  secmoddb.toggleFIPSMode();
-  //Remove the existing listed modules so that re-fresh doesn't 
-  //display the module that just changed.
-  var device_list = document.getElementById("device_list");
-  while (device_list.firstChild)
-    device_list.removeChild(device_list.firstChild);
-
-  LoadModules();
-}

mozilla/security/manager/pki/resources/content/device_manager.xul

@@ -1,120 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
-%deviceManangerDTD;
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-<window id="devicemanager" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        title="&devmgr.title;"
-        persist="screenX screenY width height"
-        onload="LoadModules();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<grid flex="1">
-  <columns>
-    <column flex="1"/> 
-    <column flex="1"/> 
-    <column flex="1"/> 
-  </columns>
-  <rows>
-    <row>
-      <hbox flex="1"> <!-- List of devices -->
-        <tree id="device_tree" rows="12" multiple="false"
-              onselect="enableButtons();"
-              flex="1" style="min-width:15em">
-          <treecolgroup> 
-            <treecol flex="1"/> 
-          </treecolgroup>
-          <treehead>
-            <treerow>
-              <treecell class="treecell-header" 
-                        label="&devmgr.devlist.label;"
-                        flex="1"/>
-            </treerow>
-          </treehead>
-          <treechildren id="device_list"/>
-        </tree>
-      </hbox> <!-- / List of devices -->
-      <hbox flex="1"> <!-- Device status -->
-        <tree id="info_tree" rows="12" multiple="false" 
-              class="list" flex="1" style="min-width:10em">
-          <treecolgroup> 
-            <treecol flex="5"/> 
-            <treecol flex="7"/> 
-          </treecolgroup>
-          <treehead>
-            <treerow>
-              <treecell class="treecell-header"
-                        label="&devmgr.details.title;" flex="2"/>
-              <treecell class="treecell-header"
-                        label="&devmgr.details.title2;" flex="7"/>
-            </treerow>
-          </treehead>
-          <treechildren id="info_list"/>
-        </tree>
-      </hbox> <!-- / Device status -->
-      <vbox> <!-- Buttons for manipulating devices -->
-        <button id="login_button" 
-                label="&devmgr.button.login.label;"
-                oncommand="doLogin();" disabled="true"/> 
-        <button id="logout_button" 
-                label="&devmgr.button.logout.label;"
-                oncommand="doLogout();" disabled="true"/> 
-        <button id="change_pw_button" 
-                label="&devmgr.button.changepw.label;"
-                oncommand="changePassword();" disabled="true"/> 
-        <button id="load_button" 
-                label="&devmgr.button.load.label;"
-                oncommand="doLoad();"/> 
-        <button id="unload_button" 
-                label="&devmgr.button.unload.label;"
-                oncommand="doUnload();" disabled="true"/> 
-        <button id="fipsbutton" 
-                label=""
-                oncommand="toggleFIPS();"/>
-      </vbox> <!-- / Buttons for manipulating devices -->
-    </row>
-    <row>
-      <hbox>
-        <button id="help_button" 
-                label="&help.label;" 
-                oncommand="openHelp('chrome://help/content/help.xul?sec_devices');"/> 
-        <button id="ok_button" 
-                label="&ok.label;" 
-                oncommand="window.close();"/> 
-      </hbox>
-    </row>
-  </rows>
-</grid>
-</window>

mozilla/security/manager/pki/resources/content/domainMismatch.js

@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Javier Delgadillo <javi@netscape.com>
- */
-
-
-const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsIX509Cert         = Components.interfaces.nsIX509Cert;
-
-var pkiParams;
-var dialogParams;
-var cert;
-
-function onLoad()
-{
-  pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);  
-  var isupport = pkiParams.getISupportAtIndex(1);
-  cert     = isupport.QueryInterface(nsIX509Cert);
-  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
-  var connectURL = dialogParams.GetString(1); 
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-  var message1 = bundle.formatStringFromName("mismatchDomainMsg1", 
-                                             [ connectURL, cert.commonName ],
-                                             2);
-  var message2 = bundle.formatStringFromName("mismatchDomainMsg2", 
-                                             [ connectURL ],
-                                              1);
-  setText("message1", message1);
-  setText("message2", message2);
-  //Set the focus so key press events work
-  document.getElementById('ok-button').focus();
-
-  var xulWindow = document.getElementById("domainMismatch");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 40);
-   
-}
-
-function viewCert()
-{
-  cert.view();
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/domainMismatch.xul

@@ -1,67 +0,0 @@
-<?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/
-   -
-   - 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.
-   -
-   -
-   - Contributor(s):
-   -  Javier Delgadillo <javi@netscape.com>
-   -  Bob Lord <lord@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="domainMismatch" title="&domainMismatch.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  width="320"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/domainMismatch.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK()"    />
-  <key id="return-key" keycode="VK_RETURN" oncommand="doOK()"    />
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel()"/>
-</keyset>
-
-<vbox style="margin: 5px;" flex="1">
-
-  <description id="message1"/>
-  <separator/>
-  <description id="message2" flex="100%"/>
-
-  <hbox>
-  <button id="examineCert-button" label="&examineCert.label;"
-     oncommand="viewCert();"/> 
-  </hbox>
-  <separator/>
- 
-  <keyset id="keys">
-    <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-    <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-  </keyset>
- 
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-          oncommand="openHelp('chrome://help/content/help.xul?bad_name_web_cert');"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/downloadcert.js

@@ -1,92 +0,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/
- *
- * 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):
- *  Bob Lord <lord@netscape.com>
- *  Terry Hayes <thayes@netscape.com>
- */
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-
-var pkiParams;
-var params;
-var caName;
-var cert;
-
-function onLoad()
-{
-  pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);
-  params = pkiParams.QueryInterface(nsIDialogParamBlock);
-  var isupport = pkiParams.getISupportAtIndex(1);
-  cert = isupport.QueryInterface(nsIX509Cert);
-
-  caName = cert.commonName; 
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-  if (!caName.length)
-    caName = bundle.GetStringFromName("unnamedCA");
-
-  var message2 = bundle.formatStringFromName("newCAMessage1",
-                                             [ caName ],
-                                              1);
-  setText("message2", message2);
-
-  var xulWindow = document.getElementById("download_cert");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 40);
-}
-
-function viewCert()
-{
-  cert.view();
-}
-
-function doOK()
-{
-  var checkSSL = document.getElementById("trustSSL");
-  var checkEmail = document.getElementById("trustEmail");
-  var checkObjSign = document.getElementById("trustObjSign");
-  if (checkSSL.checked)
-    params.SetInt(2,1);
-  else
-    params.SetInt(2,0);
-  if (checkEmail.checked)
-    params.SetInt(3,1);
-  else
-    params.SetInt(3,0);
-  if (checkObjSign.checked)
-    params.SetInt(4,1);
-  else
-    params.SetInt(4,0);
-  params.SetInt(1,1);
-  window.close();
-}
-
-function doCancel()
-{
-  params.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/downloadcert.xul

@@ -1,107 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="download_cert" title="&downloadCert.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="320"
-  width="460"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/downloadcert.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-<vbox style="margin: 5px;" flex="1">
-
-  <!--  Let 'em know what they're doing -->
-  <vbox>
-    <description>&downloadCert.message1;</description>
-  </vbox>
-
-  <separator/>
-
-  <!--  checkboxes for trust bits
-     -  "do you want to?"
-     -  * trust for SSL
-     -  * trust for email
-     -  * trust for object signing
-    -->
-  <vbox>
-    <description id="message2"/>
-    <checkbox label="&downloadCert.trustSSL;"
-              id="trustSSL"/>
-    <checkbox label="&downloadCert.trustEmail;"
-              id="trustEmail"/>
-    <checkbox label="&downloadCert.trustObjSign;"
-              id="trustObjSign"/>
-  </vbox>
-
-  <separator/>
-
-  <!--  buttons for viewing cert and policies
-     -  "suggested you view the following:"
-     -  <>  view cert
-     -  <>  view policy
-    -->
-  <vbox>
-    <description>&downloadCert.message3;</description>
-    <separator/>
-    <grid>
-      <columns>
-        <column/>
-        <column/>
-      </columns>
-      <rows>
-        <row>
-          <button id="viewC-button"
-                  label="&downloadCert.viewCert.label;"
-                  oncommand="viewCert();"/> 
-          <description style="margin: 4px;">&downloadCert.viewCert.text;</description>
-        </row>
-      </rows>
-    </grid>
-  </vbox>
-
-  <separator/>
-
-  <!--  usual runaround
-     -  <ok>  <cancel> <help>
-    -->
-  <hbox align="center">
-    <button id="ok-button" label="&ok.label;"
-            oncommand="doOK();"/> 
-    <button id="cancel-button" label="&cancel.label;"
-            oncommand="doCancel();"/> 
-    <button id="help-button" label="&help.label;"
-            oncommand="openHelp('chrome://help/content/help.xul?new_ca');"/> 
-  </hbox>
-
-</vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/editcacert.xul

@@ -1,70 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="editCaCert" 
-        title="&certmgr.editcacert.title;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="setWindowName();"
->
-
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-  <vbox flex="1">
-    <description id="certmsg"/>
-    <separator />
-    <description flex="100%">&certmgr.editcert.edittrust;</description>
-    <vbox flex="100%">
-      <checkbox label="&certmgr.editcert.trustssl;"
-                id="trustSSL"/>
-      <checkbox label="&certmgr.editcert.trustemail;"
-                id="trustEmail"/>
-      <checkbox label="&certmgr.editcert.trustobjsign;"
-                id="trustObjSign"/>
-    </vbox>
-
-    <keyset id="keys">
-      <key id="enter-key"  keycode="VK_ENTER"  oncommand="doSSLOK();"/>
-      <key id="return-key" keycode="VK_RETURN" oncommand="doSSLOK();"/>
-      <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-    </keyset>
-
-    <hbox>
-      <button id="ok-button" label="&certmgr.ok.label;"
-              oncommand="doOK();"/> 
-      <button id="cancel-button" label="&certmgr.cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&certmgr.help.label;"
-              oncommand="openHelp('chrome://help/content/help.xul?edit_ca_certs');"/>
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/editcerts.js

@@ -1,209 +0,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/
- *
- * 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):
- *  Bob Lord <lord@netscape.com>
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
-
-var certdb;
-var cert;
-
-function setWindowName()
-{
-  var dbkey = self.name;
-
-  //  Get the cert from the cert database
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  //var pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);
-  //var isupport = pkiParams.getISupportAtIndex(1);
-  //cert = isupport.QueryInterface(nsIX509Cert);
-  cert = certdb.getCertByDBKey(dbkey, null);
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var windowReference = document.getElementById('editCaCert');
-
-  var message1 = bundle.formatStringFromName("editTrustCA",
-                                             [ cert.commonName ],
-                                             1);
-  setText("certmsg", message1);
-
-  var ssl = document.getElementById("trustSSL");
-  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT, 
-                          nsIX509CertDB.TRUSTED_SSL)) {
-    ssl.setAttribute("checked", "true");
-  } else {
-    ssl.setAttribute("checked", "false");
-  }
-  var email = document.getElementById("trustEmail");
-  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT, 
-                          nsIX509CertDB.TRUSTED_EMAIL)) {
-    email.setAttribute("checked", "true");
-  } else {
-    email.setAttribute("checked", "false");
-  }
-  var objsign = document.getElementById("trustObjSign");
-  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT,  
-                          nsIX509CertDB.TRUSTED_OBJSIGN)) {
-    objsign.setAttribute("checked", "true");
-  } else {
-    objsign.setAttribute("checked", "false");
-  }
-
-  var xulWindow = document.getElementById("editCaCert");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 70);
-  
-
-}
-
-function doOK()
-{
-  var ssl = document.getElementById("trustSSL");
-  var email = document.getElementById("trustEmail");
-  var objsign = document.getElementById("trustObjSign");
-  var trustssl = (ssl.checked) ? nsIX509CertDB.TRUSTED_SSL : 0;
-  var trustemail = (email.checked) ? nsIX509CertDB.TRUSTED_EMAIL : 0;
-  var trustobjsign = (objsign.checked) ? nsIX509CertDB.TRUSTED_OBJSIGN : 0;
-  //
-  //  Set the cert trust
-  //
-  certdb.setCertTrust(cert, nsIX509Cert.CA_CERT, 
-                      trustssl | trustemail | trustobjsign);
-  window.close();
-}
-
-function doLoadForSSLCert()
-{
-  var dbkey = self.name;
-
-  //  Get the cert from the cert database
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  cert = certdb.getCertByDBKey(dbkey, null);
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var windowReference = document.getElementById('editWebsiteCert');
-
-  var message1 = bundle.formatStringFromName("editTrustSSL",
-                                             [ cert.commonName ],
-                                             1);
-  setText("certmsg", message1);
-
-  setText("issuer", cert.issuerName);
-
-  var cacert = getCaCertForServerCert(cert);
-  if(cacert == null)
-  {
-     setText("explainations",bundle.GetStringFromName("issuerNotKnown"));
-  }
-  else if(certdb.getCertTrust(cacert, nsIX509Cert.CA_CERT,
-                                                nsIX509CertDB.TRUSTED_SSL))
-  {
-     setText("explainations",bundle.GetStringFromName("issuerTrusted"));
-  }
-  else
-  {
-     setText("explainations",bundle.GetStringFromName("issuerNotTrusted"));
-  }
-/*
-  if(cacert == null)
-  {
-     var editButton = document.getElementById('editca-button');
-	 editButton.setAttribute("disabled","true");
-  }
-*/  
-  var trustssl = document.getElementById("trustSSLCert");
-  var notrustssl = document.getElementById("dontTrustSSLCert");
-  if (certdb.getCertTrust(cert, nsIX509Cert.SERVER_CERT, 
-                          nsIX509CertDB.TRUSTED_SSL)) {
-    trustssl.radioGroup.selectedItem = trustssl;
-  } else {
-    trustssl.radioGroup.selectedItem = notrustssl;
-  }
-
-  var xulWindow = document.getElementById("editWebsiteCert");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 70);
-
-}
-
-function doSSLOK()
-{
-  var ssl = document.getElementById("trustSSLCert");
-  //var checked = ssl.getAttribute("value");
-  var trustssl = ssl.selected ? nsIX509CertDB.TRUSTED_SSL : 0;
-  //
-  //  Set the cert trust
-  //
-  certdb.setCertTrust(cert, nsIX509Cert.SERVER_CERT, trustssl);
-  window.close();
-}
-
-function editCaTrust()
-{
-   var cacert = getCaCertForServerCert(cert);
-   if(cacert != null)
-   {
-      window.openDialog('chrome://pippki/content/editcacert.xul', cacert.dbKey,
-                               'chrome,resizable=1,modal');
-   }
-   else
-   {
-      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-      alert(bundle.GetStringFromName("issuerCertNotFound"));
-   }
-}
-
-function getCaCertForServerCert(cert)
-{
-   var i=1;
-   var nextCertInChain;
-   nextCertInChain = cert;
-   var lastSubjectName="";
-   while(true)
-   {
-     if(nextCertInChain == null)
-     {
-        return null;
-     }
-     if((nextCertInChain.type == nsIX509Cert.CA_CERT) || 
-                                 (nextCertInChain.subjectName = lastSubjectName))
-     {
-        break;
-     }
-
-     lastSubjectName = nextCertInChain.subjectName;
-     nextCertInChain = nextCertInChain.issuer;
-   }
-
-   return nextCertInChain;
-}
-

mozilla/security/manager/pki/resources/content/editsslcert.xul

@@ -1,71 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="editWebsiteCert" 
-        title="&certmgr.editsslcert.title;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="doLoadForSSLCert();"
->
-
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-  <vbox flex="1">
-    <description id="certmsg"/>
-    <description id="issuer"/>
-    <separator/>
-    <description id="explainations"/>
-    <separator />
-    <description>&certmgr.editsslcert.edittrust;</description>
-    <vbox>
-      <radiogroup id="sslTrustGroup" flex="1">
-        <radio label="&certmgr.editsslcert.dotrust;"
-               id="trustSSLCert"/>
-        <radio label="&certmgr.editsslcert.donttrust;"
-               id="dontTrustSSLCert"/>
-      </radiogroup>
-    </vbox>
-    <hbox>
-      <button id="editca-button" label="&certmgr.editca.label;"
-            oncommand="editCaTrust();"/> 
-    </hbox>
-
-    <hbox> 
-      <button id="ok-button" label="&certmgr.ok.label;"
-              oncommand="doSSLOK();"/> 
-      <button id="cancel-button" label="&certmgr.cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&certmgr.help.label;"
-              oncommand="openHelp('chrome://help/content/help.xul?edit_web_certs');"/>
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/escrowWarn.js

@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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):
- *  Javier Delgadillo <javi@netscape.com>
- */
-
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
-const nsIX509Cert         = Components.interfaces.nsIX509Cert;
-
-var dialogParams;
-var pkiParams;
-var cert=null;
-
-function onLoad()
-{
-  pkiParams    = window.arguments[0].QueryInterface(nsIPKIParamBlock);
-  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
- 
-  var isupports = pkiParams.getISupportAtIndex(1);
-  cert = isupports.QueryInterface(nsIX509Cert); 
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var dispName = cert.commonName;
-  if (dispName == null)
-    dispName = cert.windowTitle;
-
-  var msg = bundle.formatStringFromName("escrowFinalMessage",
-                                        [dispName], 1);
-  setText("message1",msg);
-
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("height",window.innerHeight + 30);
-
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}
-
-function viewCert()
-{
-  cert.view();
-}

mozilla/security/manager/pki/resources/content/escrowWarn.xul

@@ -1,62 +0,0 @@
-<?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/
-   -
-   - 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.
-   -
-   -
-   - Contributor(s):
-   -  Javier Delgadillo <javi@netscape.com>
-   -  Bob Lord <lord@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="escrowWarnDialog" title="&escrowWarn.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  width="400"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/escrowWarn.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="getPassword();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-</keyset>
-
-<vbox style="margin: 5px;" flex="1">
-
-  <description>&escrowWarn.message1;</description>
-  <separator/>
-  <description>&escrowWarn.benefit1;</description>
-  <separator/>
-  <description>&escrowWarn.message2;</description>
-  <separator/>
-  <description id="message1"/>
-  <hbox>
-  <button id="examineCert-button" label="&examineCert.label;"
-          oncommand="viewCert();"/> 
-  </hbox>
-  <separator/>
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-          oncommand="openHelp('chrome://help/content/help.xul?priv_key_copy');"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/getp12password.xul

@@ -1,67 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="getp12password" title="&pkcs12.getpassword.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="200"
-  width="300"
-  onload="onP12Load();">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-  <keyset id="keys">
-    <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
-    <key id="return-key" keycode="VK_RETURN" oncommand="getPassword();"/>
-    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-  </keyset>
-
-  <vbox style="margin: 5px;" flex="1">
-    <description>&pkcs12.getpassword.message;</description>
-    <separator />
-    <grid>
-      <columns> <column/> <column/> </columns>
-      <rows>
-        <row>
-          <label value="&getPassword.password.label;"/> 
-          <textbox id="pw1" type="password"/> 
-        </row>
-      </rows>
-    </grid>
-    <hbox>
-      <button id="ok-button" label="&ok.label;"
-              oncommand="getPassword();" 
-              default="true" accesskey="&createCertInfo.okButtonAccessKey;"/> 
-      <button id="cancel-button" label="&cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&help.label;"
-              oncommand="openHelp('chrome://help/content/help.xul?my_certs');"/> 
-    </hbox>
-  </vbox>
-</window>

mozilla/security/manager/pki/resources/content/getpassword.xul

@@ -1,72 +0,0 @@
-<?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/
-   - 
-   - 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 Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="getpassword" title="&getPassword.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="320"
-  width="300"
-  onload="onLoad();">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-
-  <vbox style="margin: 5px;" flex="1">
-    <hbox>
-      <text value="&getPassword.tokenName.label;:"/>
-      <text id="tokenName"/>
-    </hbox>
-    <separator/>
-    <grid>
-      <columns> <column/> <column/> </columns>
-      <rows>
-        <row>
-          <text value="&getPassword.password.label;"/> 
-          <textbox id="pw1" type="password"/> 
-        </row>
-      </rows>
-    </grid>
-
-    <keyset id="keys">
-      <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-      <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-      <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-    </keyset>
-
-    <hbox>
-      <button id="ok-button" class="dialog" label="&ok.label;"
-              oncommand="getPassword();" 
-              default="true" accesskey="&createCertInfo.okButtonAccessKey;"/> 
-      <button id="cancel-button" class="dialog" label="&cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" class="dialog" label="&help.label;"
-              oncommand="alert('help goes here');"/> 
-    </hbox>
-  </vbox>
-</window>