Bug 361433: More descriptive error messages for network level error on sending mail; p=Christian Eyrich <ch.ey@gmx.net>, r=bienvenu, sr=mscott;\n\nNPOTB for the firefox freeze.
git-svn-id: svn://10.0.0.236/trunk@231184 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mnyromyr%tprac.de
parent
b1a369c86b
commit
a3b40cfd8a
@ -76,9 +76,6 @@
|
||||
## @name NS_MSG_ERROR_WRITING_FILE
|
||||
12512=Error writing temporary file.
|
||||
|
||||
## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER
|
||||
12513=An error occurred sending mail: Unable to connect to SMTP server %S. The server may be down or may be incorrectly configured. Please verify that your Mail/News account settings are correct and try again.
|
||||
|
||||
## @name NS_ERROR_SENDING_FROM_COMMAND
|
||||
12514=An error occurred while sending mail. The mail server responded: %s. Please verify that your email address is correct in your Mail preferences and try again.
|
||||
|
||||
@ -89,7 +86,7 @@
|
||||
12517=An error occurred while sending mail. The mail server responded: %s. Please check the message and try again.
|
||||
|
||||
## @name NS_ERROR_POST_FAILED
|
||||
12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server setting is correct and try again, or else contact your network administrator.
|
||||
12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again, or else contact your network administrator.
|
||||
|
||||
## @name NS_ERROR_QUEUED_DELIVERY_FAILED
|
||||
12519=An error occurred delivering unsent messages.
|
||||
@ -124,9 +121,6 @@
|
||||
## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
|
||||
12529=An error occurred sending mail: the return mail address was invalid. Please verify that your email address is correct in your Mail preferences and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
|
||||
12530=Error getting mail password.
|
||||
|
||||
## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
|
||||
12531=Attachment error.
|
||||
|
||||
@ -162,9 +156,6 @@
|
||||
|
||||
noIdentities=You don't have any email identities yet. Create one with the Account Wizard.
|
||||
|
||||
## @name NS_SMTP_PASSWORD_PROMPT_TITLE
|
||||
12542=Mail Server Password Required
|
||||
|
||||
## @name NS_SMTP_PASSWORD_PROMPT1
|
||||
12543=Enter your password for %S:
|
||||
|
||||
@ -219,22 +210,10 @@ sendAnyway=Send anyway
|
||||
## @name NS_FOLLOWUPTO_SENDER
|
||||
12564=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED
|
||||
12565=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server setting is correct and try again, or else contact your network administrator.
|
||||
|
||||
## @name NS_MSG_UNDISCLOSED_RECIPIENTS
|
||||
## LOCALIZATION NOTE: this string must be using only US_ASCII characters
|
||||
12566=undisclosed-recipients
|
||||
|
||||
## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
|
||||
12567=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent, try to reduce the message size and try again. The server responded: %s.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
|
||||
12568=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent, try to reduce the message size and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
|
||||
12569=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent, try to reduce the message size and try again. The server responded: %s.
|
||||
|
||||
## @name NS_MSG_ERROR_ATTACHING_FILE
|
||||
12570=There was an error attaching %S. Please check if you have access to the file.
|
||||
|
||||
@ -259,6 +238,39 @@ sendAnyway=Send anyway
|
||||
## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
|
||||
12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
|
||||
|
||||
## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER
|
||||
12583=An error occurred sending mail: Unable to log in to SMTP server %S. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
|
||||
12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
|
||||
|
||||
## @name NS_SMTP_PASSWORD_PROMPT_TITLE
|
||||
12585=SMTP Server Password Required
|
||||
|
||||
## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
|
||||
12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded: %s.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
|
||||
12587=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
|
||||
12588=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded: %s.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
|
||||
12589=An error occurred sending mail: SMTP server %S is unknown. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
|
||||
12590=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server settings are correct and try again, or contact the server administrator.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
|
||||
12591=The message could not be sent because the connection to SMTP server %S was lost in the middle of the transaction. Try again or contact your network administrator.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
|
||||
12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
|
||||
12593=The message could not be sent using SMTP server %S for unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
|
||||
|
||||
## Strings use for the save message dialog shown when the user close a message compose window
|
||||
saveDlogTitle=Save Message
|
||||
saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
#define NS_MSG_NO_SENDER NS_MSG_GENERATE_FAILURE(12510)
|
||||
#define NS_MSG_NO_RECIPIENTS NS_MSG_GENERATE_FAILURE(12511)
|
||||
#define NS_MSG_ERROR_WRITING_FILE NS_MSG_GENERATE_FAILURE(12512)
|
||||
#define NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER NS_MSG_GENERATE_FAILURE(12513)
|
||||
#define NS_ERROR_SENDING_FROM_COMMAND NS_MSG_GENERATE_FAILURE(12514)
|
||||
#define NS_ERROR_SENDING_DATA_COMMAND NS_MSG_GENERATE_FAILURE(12516)
|
||||
#define NS_ERROR_SENDING_MESSAGE NS_MSG_GENERATE_FAILURE(12517)
|
||||
@ -35,7 +34,6 @@
|
||||
#define NS_ERROR_BUT_DONT_SHOW_ALERT NS_MSG_GENERATE_FAILURE(12527)
|
||||
#define NS_ERROR_TCP_READ_ERROR NS_MSG_GENERATE_FAILURE(12528)
|
||||
#define NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS NS_MSG_GENERATE_FAILURE(12529)
|
||||
#define NS_ERROR_SMTP_PASSWORD_UNDEFINED NS_MSG_GENERATE_FAILURE(12530)
|
||||
#define NS_ERROR_MIME_MPART_ATTACHMENT_ERROR NS_MSG_GENERATE_FAILURE(12531)
|
||||
#define NS_MSG_FAILED_COPY_OPERATION 12532
|
||||
// For message sending operations...
|
||||
@ -49,7 +47,6 @@
|
||||
#define NS_MSG_START_COPY_MESSAGE_FAILED 12540
|
||||
#define NS_MSG_LARGE_MESSAGE_WARNING 12541
|
||||
|
||||
#define NS_SMTP_PASSWORD_PROMPT_TITLE 12542
|
||||
#define NS_SMTP_PASSWORD_PROMPT1 12543
|
||||
#define NS_SMTP_PASSWORD_PROMPT2 12544
|
||||
#define NS_SMTP_CONNECTING_TO_SERVER 12545
|
||||
@ -74,14 +71,8 @@
|
||||
#define NS_MSG_ERROR_READING_FILE NS_MSG_GENERATE_FAILURE(12563)
|
||||
#define NS_MSG_FOLLOWUPTO_ALERT 12564
|
||||
|
||||
#define NS_ERROR_SMTP_SEND_FAILED NS_MSG_GENERATE_FAILURE(12565)
|
||||
|
||||
#define NS_MSG_UNDISCLOSED_RECIPIENTS 12566
|
||||
|
||||
#define NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED NS_MSG_GENERATE_FAILURE(12567)
|
||||
#define NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1 NS_MSG_GENERATE_FAILURE(12568)
|
||||
#define NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 NS_MSG_GENERATE_FAILURE(12569)
|
||||
|
||||
#define NS_MSG_ERROR_ATTACHING_FILE NS_MSG_GENERATE_FAILURE(12570)
|
||||
#define NS_MSG_ERROR_DOING_FCC 12571
|
||||
|
||||
@ -95,4 +86,17 @@
|
||||
|
||||
#define NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS NS_MSG_GENERATE_FAILURE(12582)
|
||||
|
||||
#define NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER NS_MSG_GENERATE_FAILURE(12583)
|
||||
#define NS_ERROR_SMTP_PASSWORD_UNDEFINED NS_MSG_GENERATE_FAILURE(12584)
|
||||
#define NS_SMTP_PASSWORD_PROMPT_TITLE 12585
|
||||
#define NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED NS_MSG_GENERATE_FAILURE(12586)
|
||||
#define NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1 NS_MSG_GENERATE_FAILURE(12587)
|
||||
#define NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 NS_MSG_GENERATE_FAILURE(12588)
|
||||
|
||||
#define NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER NS_MSG_GENERATE_FAILURE(12589)
|
||||
#define NS_ERROR_SMTP_SEND_FAILED_REFUSED NS_MSG_GENERATE_FAILURE(12590)
|
||||
#define NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED NS_MSG_GENERATE_FAILURE(12591)
|
||||
#define NS_ERROR_SMTP_SEND_FAILED_TIMEOUT NS_MSG_GENERATE_FAILURE(12592)
|
||||
#define NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON NS_MSG_GENERATE_FAILURE(12593)
|
||||
|
||||
#endif /* _nsComposeStrings_H__ */
|
||||
|
||||
@ -3352,11 +3352,25 @@ SendDeliveryCallback(nsIURI *aUrl, nsresult aExitCode, nsMsgDeliveryType deliver
|
||||
{
|
||||
case NS_ERROR_UNKNOWN_HOST:
|
||||
case NS_ERROR_UNKNOWN_PROXY_HOST:
|
||||
aExitCode = NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER;
|
||||
aExitCode = NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER;
|
||||
break;
|
||||
case NS_ERROR_CONNECTION_REFUSED:
|
||||
case NS_ERROR_PROXY_CONNECTION_REFUSED:
|
||||
aExitCode = NS_ERROR_SMTP_SEND_FAILED_REFUSED;
|
||||
break;
|
||||
case NS_ERROR_NET_INTERRUPT:
|
||||
aExitCode = NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED;
|
||||
break;
|
||||
case NS_ERROR_NET_TIMEOUT:
|
||||
case NS_ERROR_NET_RESET:
|
||||
aExitCode = NS_ERROR_SMTP_SEND_FAILED_TIMEOUT;
|
||||
break;
|
||||
case NS_ERROR_SMTP_PASSWORD_UNDEFINED:
|
||||
// nothing to do, just keep the code
|
||||
break;
|
||||
default:
|
||||
if (aExitCode != NS_ERROR_ABORT && !NS_IS_MSG_ERROR(aExitCode))
|
||||
aExitCode = NS_ERROR_SMTP_SEND_FAILED;
|
||||
aExitCode = NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON;
|
||||
break;
|
||||
}
|
||||
msgSend->DeliverAsMailExit(aUrl, aExitCode);
|
||||
@ -3751,7 +3765,11 @@ nsMsgComposeAndSend::DoDeliveryExitProcessing(nsIURI * aUri, nsresult aExitCode,
|
||||
#endif
|
||||
|
||||
nsString eMsg;
|
||||
if (aExitCode == NS_ERROR_SMTP_SEND_FAILED ||
|
||||
if (aExitCode == NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER ||
|
||||
aExitCode == NS_ERROR_SMTP_SEND_FAILED_REFUSED ||
|
||||
aExitCode == NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED ||
|
||||
aExitCode == NS_ERROR_SMTP_SEND_FAILED_TIMEOUT ||
|
||||
aExitCode == NS_ERROR_SMTP_PASSWORD_UNDEFINED ||
|
||||
aExitCode == NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER ||
|
||||
aExitCode == NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS ||
|
||||
aExitCode == NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_INSECAUTH ||
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Christian Eyrich <ch.ey@gmx.net>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
@ -287,8 +288,8 @@ void nsSmtpProtocol::Initialize(nsIURI * aURL)
|
||||
m_tlsEnabled = PR_FALSE;
|
||||
m_addressCopy = nsnull;
|
||||
m_addresses = nsnull;
|
||||
m_addressesLeft = 0;
|
||||
|
||||
m_addressesLeft = nsnull;
|
||||
m_verifyAddress = nsnull;
|
||||
#ifdef UNREADY_CODE
|
||||
m_totalAmountWritten = 0;
|
||||
@ -1152,27 +1153,27 @@ PRInt32 nsSmtpProtocol::AuthLoginStep1()
|
||||
PRInt32 status = 0;
|
||||
nsCString username;
|
||||
char *base64Str = nsnull;
|
||||
nsCString origPassword;
|
||||
nsCAutoString password;
|
||||
nsCOMPtr<nsISmtpServer> smtpServer;
|
||||
rv = m_runningURL->GetSmtpServer(getter_AddRefs(smtpServer));
|
||||
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
|
||||
|
||||
rv = smtpServer->GetUsername(getter_Copies(username));
|
||||
|
||||
if (username.IsEmpty()) {
|
||||
rv = GetUsernamePassword(getter_Copies(username), getter_Copies(origPassword));
|
||||
if (username.IsEmpty())
|
||||
{
|
||||
rv = GetUsernamePassword(getter_Copies(username), getter_Copies(password));
|
||||
m_usernamePrompted = PR_TRUE;
|
||||
password.Assign(origPassword);
|
||||
if (username.IsEmpty() || password.IsEmpty())
|
||||
return NS_ERROR_SMTP_PASSWORD_UNDEFINED;
|
||||
}
|
||||
else if (!TestFlag(SMTP_USE_LOGIN_REDIRECTION))
|
||||
{
|
||||
rv = GetPassword(getter_Copies(origPassword));
|
||||
password.Assign(origPassword);
|
||||
GetPassword(getter_Copies(password));
|
||||
if (password.IsEmpty())
|
||||
{
|
||||
m_urlErrorState = NS_ERROR_SMTP_PASSWORD_UNDEFINED;
|
||||
return NS_ERROR_SMTP_PASSWORD_UNDEFINED;
|
||||
}
|
||||
}
|
||||
else
|
||||
password.Assign(mLogonCookie);
|
||||
@ -1226,7 +1227,6 @@ PRInt32 nsSmtpProtocol::AuthLoginStep1()
|
||||
|
||||
PRInt32 nsSmtpProtocol::AuthLoginStep2()
|
||||
{
|
||||
|
||||
/* use cached smtp password first
|
||||
* if not then use cached pop password
|
||||
* if pop password undefined
|
||||
@ -1238,9 +1238,12 @@ PRInt32 nsSmtpProtocol::AuthLoginStep2()
|
||||
|
||||
if (!TestFlag(SMTP_USE_LOGIN_REDIRECTION))
|
||||
{
|
||||
rv = GetPassword(getter_Copies(password));
|
||||
GetPassword(getter_Copies(password));
|
||||
if (password.IsEmpty())
|
||||
{
|
||||
m_urlErrorState = NS_ERROR_SMTP_PASSWORD_UNDEFINED;
|
||||
return NS_ERROR_SMTP_PASSWORD_UNDEFINED;
|
||||
}
|
||||
}
|
||||
else
|
||||
password.Assign(mLogonCookie);
|
||||
@ -1281,7 +1284,7 @@ PRInt32 nsSmtpProtocol::AuthLoginStep2()
|
||||
PR_snprintf(buffer, sizeof(buffer), "%s %s", userName.get(), encodedDigest.get());
|
||||
char *base64Str = PL_Base64Encode(buffer, strlen(buffer), nsnull);
|
||||
PR_snprintf(buffer, sizeof(buffer), "%s" CRLF, base64Str);
|
||||
PR_Free(base64Str);
|
||||
NS_Free(base64Str);
|
||||
}
|
||||
if (NS_FAILED(rv))
|
||||
PR_snprintf(buffer, sizeof(buffer), "*" CRLF);
|
||||
@ -1333,14 +1336,17 @@ PRInt32 nsSmtpProtocol::SendMailResponse()
|
||||
nsCAutoString buffer;
|
||||
nsresult rv;
|
||||
|
||||
if(m_responseCode != 250 || CHECK_SIMULATED_ERROR(SIMULATED_SEND_ERROR_11))
|
||||
if (m_responseCode/10 != 25 || CHECK_SIMULATED_ERROR(SIMULATED_SEND_ERROR_11))
|
||||
{
|
||||
rv = nsExplainErrorDetails(m_runningURL,
|
||||
(m_responseCode == 452) ? NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED :
|
||||
((m_responseCode == 552) ? NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 :
|
||||
NS_ERROR_SENDING_FROM_COMMAND),
|
||||
m_responseText.get());
|
||||
int errorcode;
|
||||
if (TestFlag(SMTP_EHLO_SIZE_ENABLED))
|
||||
errorcode = (m_responseCode == 452) ? NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED :
|
||||
(m_responseCode == 552) ? NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 :
|
||||
NS_ERROR_SENDING_FROM_COMMAND;
|
||||
else
|
||||
errorcode = NS_ERROR_SENDING_FROM_COMMAND;
|
||||
|
||||
rv = nsExplainErrorDetails(m_runningURL, errorcode, m_responseText.get());
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
|
||||
|
||||
m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
|
||||
@ -1396,15 +1402,18 @@ PRInt32 nsSmtpProtocol::SendRecipientResponse()
|
||||
nsCAutoString buffer;
|
||||
nsresult rv;
|
||||
|
||||
if(m_responseCode != 250 && m_responseCode != 251)
|
||||
if (m_responseCode / 10 != 25)
|
||||
{
|
||||
rv = nsExplainErrorDetails(m_runningURL,
|
||||
(m_responseCode == 452) ? NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED :
|
||||
((m_responseCode == 552) ? NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 :
|
||||
NS_ERROR_SENDING_RCPT_COMMAND),
|
||||
m_responseText.get(),
|
||||
m_addresses);
|
||||
int errorcode;
|
||||
if (TestFlag(SMTP_EHLO_SIZE_ENABLED))
|
||||
errorcode = (m_responseCode == 452) ? NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED :
|
||||
(m_responseCode == 552) ? NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 :
|
||||
NS_ERROR_SENDING_RCPT_COMMAND;
|
||||
else
|
||||
errorcode = NS_ERROR_SENDING_RCPT_COMMAND;
|
||||
|
||||
rv = nsExplainErrorDetails(m_runningURL, errorcode,
|
||||
m_responseText.get(), m_addresses);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
|
||||
|
||||
m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
|
||||
@ -1412,13 +1421,11 @@ PRInt32 nsSmtpProtocol::SendRecipientResponse()
|
||||
}
|
||||
|
||||
/* take the address we sent off the list (move the pointer to just
|
||||
past the terminating null.)
|
||||
*/
|
||||
past the terminating null.) */
|
||||
m_addresses += PL_strlen (m_addresses) + 1;
|
||||
if(--m_addressesLeft > 0)
|
||||
if (--m_addressesLeft > 0)
|
||||
{
|
||||
/* more senders to RCPT to
|
||||
*/
|
||||
// more senders to RCPT to
|
||||
// fake to 250 because SendMailResponse() can't handle 251
|
||||
m_responseCode = 250;
|
||||
m_nextState = SMTP_SEND_MAIL_RESPONSE;
|
||||
@ -1455,26 +1462,27 @@ PRInt32 nsSmtpProtocol::SendData(nsIURI *url, const char *dataBuffer, PRBool aSu
|
||||
PRInt32 nsSmtpProtocol::SendDataResponse()
|
||||
{
|
||||
PRInt32 status = 0;
|
||||
char * command=0;
|
||||
char *command = nsnull;
|
||||
|
||||
if((m_responseCode != 354) && (m_responseCode != 250)) {
|
||||
if (m_responseCode != 354)
|
||||
{
|
||||
nsresult rv = nsExplainErrorDetails(m_runningURL, NS_ERROR_SENDING_DATA_COMMAND, m_responseText.get());
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
|
||||
|
||||
m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
|
||||
return(NS_ERROR_SENDING_DATA_COMMAND);
|
||||
}
|
||||
}
|
||||
|
||||
PR_FREEIF(command);
|
||||
PR_FREEIF(command);
|
||||
|
||||
m_nextState = SMTP_SEND_POST_DATA;
|
||||
ClearFlag(SMTP_PAUSE_FOR_READ); /* send data directly */
|
||||
|
||||
UpdateStatus(SMTP_DELIV_MAIL);
|
||||
|
||||
{
|
||||
// m_runningURL->GetBodySize(&m_totalMessageSize);
|
||||
}
|
||||
{
|
||||
// m_runningURL->GetBodySize(&m_totalMessageSize);
|
||||
}
|
||||
|
||||
|
||||
return(status);
|
||||
@ -1534,24 +1542,24 @@ PRInt32 nsSmtpProtocol::SendPostData()
|
||||
|
||||
PRInt32 nsSmtpProtocol::SendMessageResponse()
|
||||
{
|
||||
|
||||
if(((m_responseCode != 354) && (m_responseCode != 250)) || CHECK_SIMULATED_ERROR(SIMULATED_SEND_ERROR_12)) {
|
||||
if((m_responseCode/10 != 25) || CHECK_SIMULATED_ERROR(SIMULATED_SEND_ERROR_12))
|
||||
{
|
||||
nsresult rv = nsExplainErrorDetails(m_runningURL, NS_ERROR_SENDING_MESSAGE, m_responseText.get());
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
|
||||
|
||||
m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
|
||||
return(NS_ERROR_SENDING_MESSAGE);
|
||||
}
|
||||
}
|
||||
|
||||
UpdateStatus(SMTP_PROGRESS_MAILSENT);
|
||||
|
||||
/* else */
|
||||
m_sendDone = PR_TRUE;
|
||||
nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
|
||||
nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
|
||||
SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
|
||||
m_nextState = SMTP_RESPONSE;
|
||||
m_nextStateAfterResponse = SMTP_DONE;
|
||||
return(0);
|
||||
m_nextState = SMTP_RESPONSE;
|
||||
m_nextStateAfterResponse = SMTP_DONE;
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
@ -1789,8 +1797,9 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer )
|
||||
{
|
||||
nsCOMPtr <nsIMsgMailNewsUrl> mailNewsUrl = do_QueryInterface(m_runningURL);
|
||||
mailNewsUrl->SetUrlState(PR_FALSE, NS_OK);
|
||||
m_nextState = SMTP_FREE;
|
||||
}
|
||||
|
||||
m_nextState = SMTP_FREE;
|
||||
break;
|
||||
|
||||
case SMTP_ERROR_DONE:
|
||||
@ -1858,7 +1867,7 @@ nsSmtpProtocol::GetPassword(char **aPassword)
|
||||
// empty password
|
||||
|
||||
NS_Free(*aPassword);
|
||||
*aPassword = 0;
|
||||
*aPassword = nsnull;
|
||||
|
||||
nsCString redirectorType;
|
||||
rv = smtpServer->GetRedirectorType(getter_Copies(redirectorType));
|
||||
@ -1929,8 +1938,8 @@ nsSmtpProtocol::PromptForPassword(nsISmtpServer *aSmtpServer, nsISmtpUrl *aSmtpU
|
||||
nsCOMPtr<nsIAuthPrompt> netPrompt;
|
||||
rv = aSmtpUrl->GetAuthPrompt(getter_AddRefs(netPrompt));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
nsString passwordTitle;
|
||||
|
||||
nsString passwordTitle;
|
||||
rv = composeStringBundle->GetStringFromID(NS_SMTP_PASSWORD_PROMPT_TITLE, getter_Copies(passwordTitle));
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
|
||||
@ -2142,4 +2151,3 @@ NS_IMETHODIMP nsSmtpProtocol::OnLogonRedirectionReply(const PRUnichar * aHost, u
|
||||
// we may want to always return NS_OK regardless of an error
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
@ -76,9 +76,6 @@
|
||||
## @name NS_MSG_ERROR_WRITING_FILE
|
||||
12512=Error writing temporary file.
|
||||
|
||||
## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER
|
||||
12513=An error occurred sending mail: Unable to connect to SMTP server %S. The server may be down or may be incorrectly configured. Please verify that your Mail/News account settings are correct and try again.
|
||||
|
||||
## @name NS_ERROR_SENDING_FROM_COMMAND
|
||||
12514=An error occurred while sending mail. The mail server responded: %s. Please verify that your email address is correct in your Mail preferences and try again.
|
||||
|
||||
@ -89,7 +86,7 @@
|
||||
12517=An error occurred while sending mail. The mail server responded: %s. Please check the message and try again.
|
||||
|
||||
## @name NS_ERROR_POST_FAILED
|
||||
12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server setting is correct and try again, or else contact your network administrator.
|
||||
12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again, or else contact your network administrator.
|
||||
|
||||
## @name NS_ERROR_QUEUED_DELIVERY_FAILED
|
||||
12519=An error occurred delivering unsent messages.
|
||||
@ -124,9 +121,6 @@
|
||||
## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
|
||||
12529=An error occurred sending mail: the return mail address was invalid. Please verify that your email address is correct in your Mail preferences and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
|
||||
12530=Error getting mail password.
|
||||
|
||||
## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
|
||||
12531=Attachment error.
|
||||
|
||||
@ -162,9 +156,6 @@
|
||||
|
||||
noIdentities=You don't have any email identities yet. Create one with the Account Wizard.
|
||||
|
||||
## @name NS_SMTP_PASSWORD_PROMPT_TITLE
|
||||
12542=Mail Server Password Required
|
||||
|
||||
## @name NS_SMTP_PASSWORD_PROMPT1
|
||||
12543=Enter your password for %S:
|
||||
|
||||
@ -219,22 +210,10 @@ sendAnyway=Send anyway
|
||||
## @name NS_FOLLOWUPTO_SENDER
|
||||
12564=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED
|
||||
12565=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server setting is correct and try again, or else contact your network administrator.
|
||||
|
||||
## @name NS_MSG_UNDISCLOSED_RECIPIENTS
|
||||
## LOCALIZATION NOTE: this string must be using only US_ASCII characters
|
||||
12566=undisclosed-recipients
|
||||
|
||||
## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
|
||||
12567=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent, try to reduce the message size and try again. The server responded: %s.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
|
||||
12568=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent, try to reduce the message size and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
|
||||
12569=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent, try to reduce the message size and try again. The server responded: %s.
|
||||
|
||||
## @name NS_MSG_ERROR_ATTACHING_FILE
|
||||
12570=There was an error attaching %S. Please check if you have access to the file.
|
||||
|
||||
@ -259,6 +238,39 @@ sendAnyway=Send anyway
|
||||
## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
|
||||
12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
|
||||
|
||||
## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER
|
||||
12583=An error occurred sending mail: Unable to log in to SMTP server %S. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
|
||||
12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
|
||||
|
||||
## @name NS_SMTP_PASSWORD_PROMPT_TITLE
|
||||
12585=SMTP Server Password Required
|
||||
|
||||
## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
|
||||
12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded: %s.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
|
||||
12587=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
|
||||
12588=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded: %s.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
|
||||
12589=An error occurred sending mail: SMTP server %S is unknown. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
|
||||
12590=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server settings are correct and try again, or contact the server administrator.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
|
||||
12591=The message could not be sent because the connection to SMTP server %S was lost in the middle of the transaction. Try again or contact your network administrator.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
|
||||
12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
|
||||
|
||||
## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
|
||||
12593=The message could not be sent using SMTP server %S for unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
|
||||
|
||||
## Strings use for the save message dialog shown when the user close a message compose window
|
||||
saveDlogTitle=Save Message
|
||||
saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user