bug 122126, reviewed by blythe

cmd/winfe/cxwin.cpp

@@ -5346,6 +5346,11 @@ void FE_SubmitInputElement(MWContext * pContext, LO_Element * pElement)
     // Create the URL to load
 	URL_s = NET_CreateURLStruct((char *)submit->action, NET_DONT_RELOAD); 
 
+#if defined(SingleSignon)
+    // Check for a password submission and remember the data if so
+        SI_RememberSignonData(pContext, submit);
+#endif
+
     // attach form data to the URL
 	NET_AddLOSubmitDataToURLStruct(submit, URL_s);
 

cmd/winfe/dialog.cpp

@@ -525,6 +525,11 @@ int CDialogUPass::DoModal(char * message, char ** user, char ** passwd)
     else
         m_csUser   = "";
 
+#if defined(SingleSignon)
+    if(*passwd)
+	m_csPasswd = *passwd;
+    else
+#endif
     m_csPasswd = "";
 
 	status = CDialog::DoModal();

cmd/winfe/fegui.cpp

@@ -939,6 +939,25 @@ xp_FileName(const char * name, XP_FileType type, char* *myName)
 		// changed -- jonm to support multi-profile
 		sprintf(newName, "%s\\cookies.txt", (const char *)theApp.m_UserDirectory);
 		break;
+
+#if defined(CookieManagement)
+	case xpHTTPCookiePermission:
+		newName = (char *) XP_ALLOC(_MAX_PATH);
+                //sprintf(newName, "%s\\cookperm.txt", theApp.m_pInstallDir->GetCharValue());
+		// changed -- jonm to support multi-profile
+                sprintf(newName, "%s\\cookperm.txt", (const char *)theApp.m_UserDirectory);
+		break;
+#endif
+
+#if defined(SingleSignon)
+	case xpHTTPSingleSignon:
+		newName = (char *) XP_ALLOC(_MAX_PATH);
+                //sprintf(newName, "%s\\signons.txt", theApp.m_pInstallDir->GetCharValue());
+		// changed -- jonm to support multi-profile
+                sprintf(newName, "%s\\signons.txt", (const char *)theApp.m_UserDirectory);
+		break;
+#endif
+
 #ifdef MOZ_MAIL_NEWS      
 	case xpSNewsRC:
 	case xpNewsRC:

cmd/winfe/logindg.cpp

@@ -1785,6 +1785,10 @@ static struct update_PrefTable prefUpdater[] =
   {"security.submit_email_forms","Network","Warn Submit Email Form",PREF_BOOL},
   {"security.email_as_ftp_password","Network","Use Email For FTP",PREF_BOOL},
   {"network.cookie.warnAboutCookies","Network","Warn Accepting Cookie",PREF_BOOL},
+#if defined(SingleSignon)
+  {"network.signon.rememberSignons","Network","Remember Signons",PREF_BOOL},
+#endif
+
   {"network.max_connections","Network","Max Connections",PREF_INT},
   {"network.tcpbufsize","Network","TCP Buffer Size",PREF_INT},
 //
@@ -2095,6 +2099,20 @@ int     login_UpdateFilesToNewLocation(const char * path,CWnd *pParent,BOOL bCop
 		pDlg->StartFileUpdate("General Files","cookies.txt");
 		WFE_CopyFile(csMain + "\\cookies.txt",csTmp);
 
+#if defined(CookieManagement)
+		csTmp = path;
+		csTmp += "\\cookperm.txt";
+		pDlg->StartFileUpdate("General Files","cookperm.txt");
+		WFE_CopyFile(csMain + "\\cookperm.txt",csTmp);
+#endif
+
+#if defined(SingleSignon)
+		csTmp = path;
+		csTmp += "\\signons.txt";
+		pDlg->StartFileUpdate("General Files","signons.txt");
+		WFE_CopyFile(csMain + "\\signons.txt",csTmp);
+#endif
+
 		csTmp = path;
 		csTmp += "\\key.db";
 		pDlg->StartFileUpdate("Security Files","key.db");