Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 00:02:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sending a message now takes a host. Use it.

Browse Source
This commit is contained in:
mscott%netscape.com 1999-02-26 19:17:42 +00:00
parent c9578bf5d8
commit 19f9335789
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailnews/compose/src/nsMsgSend.cpp
View File

@ -4920,7 +4920,7 @@ nsMsgSendMimeDeliveryState::DeliverFileAsMail ()
if (NS_SUCCEEDED(rv) && smtpService)
{
// mscott --> eventually we want to pass buf (minus the mailto: part) into here....
rv = smtpService->SendMailMessage(filePath, m_fields->GetFrom(), buf, nsnull);
rv = smtpService->SendMailMessage(filePath, "", m_fields->GetFrom(), buf, nsnull);
nsServiceManager::ReleaseService(kSmtpServiceCID, smtpService);
}

13
mailnews/compose/src/nsSmtpService.cpp
View File

@ -30,7 +30,7 @@
// foward declarations...
nsresult NS_MsgBuildMailtoUrl(const nsFilePath& aFilePath, const nsString& aSender, const nsString& aRecipients, nsIURL ** aUrl);
nsresult NS_MsgBuildMailtoUrl(const nsFilePath& aFilePath, const nsString& aHostName, const nsString& aSender, const nsString& aRecipients, nsIURL ** aUrl);
nsresult NS_MsgLoadMailtoUrl(nsIURL * aUrl, nsISupports * aConsumer);
nsSmtpService::nsSmtpService()
@ -43,13 +43,13 @@ nsSmtpService::~nsSmtpService()
NS_IMPL_THREADSAFE_ISUPPORTS(nsSmtpService, nsISmtpService::IID());
nsresult nsSmtpService::SendMailMessage(const nsFilePath& aFilePath, const nsString& aSender, const nsString& aRecipients, nsIURL ** aURL)
nsresult nsSmtpService::SendMailMessage(const nsFilePath& aFilePath, const nsString& aHostName, const nsString& aSender, const nsString& aRecipients, nsIURL ** aURL)
{
nsIURL * urlToRun = nsnull;
nsresult rv = NS_OK;
NS_LOCK_INSTANCE();
rv = NS_MsgBuildMailtoUrl(aFilePath, aSender, aRecipients, &urlToRun); // this ref counts urlToRun
rv = NS_MsgBuildMailtoUrl(aFilePath, aHostName, aSender, aRecipients, &urlToRun); // this ref counts urlToRun
if (NS_SUCCEEDED(rv) && urlToRun)
{
rv = NS_MsgLoadMailtoUrl(urlToRun, nsnull);
@ -70,7 +70,7 @@ nsresult nsSmtpService::SendMailMessage(const nsFilePath& aFilePath, const nsSt
#define TEMP_DEFAULT_HOST "nsmail-2.mcom.com:25"
// short cut function for creating a mailto url...
nsresult NS_MsgBuildMailtoUrl(const nsFilePath& aFilePath, const nsString& aSender, const nsString& aRecipients, nsIURL ** aUrl)
nsresult NS_MsgBuildMailtoUrl(const nsFilePath& aFilePath, const nsString& aHostName, const nsString& aSender, const nsString& aRecipients, nsIURL ** aUrl)
{
// mscott: this function is a convience hack until netlib actually dispatches smtp urls.
// in addition until we have a session to get a password, host and other stuff from, we need to use default values....
@ -83,9 +83,12 @@ nsresult NS_MsgBuildMailtoUrl(const nsFilePath& aFilePath, const nsString& aSend
{
// assemble a url spec...
char * recipients = aRecipients.ToNewCString();
char * urlSpec= PR_smprintf("mailto://%s/%s", TEMP_DEFAULT_HOST, recipients ? recipients : "");
char * hostName = aHostName.ToNewCString();
char * urlSpec= PR_smprintf("mailto://%s:%d/%s", hostName && *hostName ? hostName : TEMP_DEFAULT_HOST, 25, recipients ? recipients : "");
if (recipients)
delete [] recipients;
if (hostName)
delete [] hostName;
if (urlSpec)
{
smtpUrl->ParseURL(urlSpec); // load the spec we were given...

2
mailnews/compose/src/nsSmtpService.h
View File

@ -50,7 +50,7 @@ public:
// the returned URL.
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
NS_IMETHOD SendMailMessage(const nsFilePath& aFilePath, const nsString& aSender, const nsString& aRecipients, nsIURL ** aURL);
NS_IMETHOD SendMailMessage(const nsFilePath& aFilePath, const nsString& aHostName, const nsString& aSender, const nsString& aRecipients, nsIURL ** aURL);
////////////////////////////////////////////////////////////////////////////////////////
// End support of nsISmtpService interface