diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/js/app.js | 9 | ||||
| -rw-r--r-- | program/localization/en_US/messages.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 20 |
5 files changed, 29 insertions, 7 deletions
@@ -6,6 +6,7 @@ CHANGELOG RoundCube Webmail - Fix compose window width/height (#1485396) - Allow calling msgimport.sh/msgexport.sh from any directory (#1485431) - Localized filesize units (#1485340) +- Better handling of "no identity" and "no email in identity" situations (#1485117) 2008/09/29 (alec) ---------- diff --git a/program/js/app.js b/program/js/app.js index bcc5e5071..ef9d1c51c 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1924,9 +1924,18 @@ function rcube_webmail() var input_to = rcube_find_object('_to'); var input_cc = rcube_find_object('_cc'); var input_bcc = rcube_find_object('_bcc'); + var input_from = rcube_find_object('_from'); var input_subject = rcube_find_object('_subject'); var input_message = rcube_find_object('_message'); + // check sender (if have no identities) + if (input_from.type == 'text' && !rcube_check_email(input_from.value, true)) + { + alert(this.get_label('nosenderwarning')); + input_from.focus(); + return false; + } + // check for empty recipient var recipients = input_to.value ? input_to.value : (input_cc.value ? input_cc.value : input_bcc.value); if (!rcube_check_email(recipients.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true)) diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 6b1bb8475..8a649437b 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -56,6 +56,7 @@ $messages['formincomplete'] = 'The form was not completely filled out'; $messages['noemailwarning'] = 'Please enter a valid email address'; $messages['nonamewarning'] = 'Please enter a name'; $messages['nopagesizewarning'] = 'Please enter a page size'; +$messages['nosenderwarning'] = 'Please enter sender e-mail address'; $messages['norecipientwarning'] = 'Please enter at least one recipient'; $messages['nosubjectwarning'] = 'The "Subject" field is empty. Would you like to enter one now?'; $messages['nobodywarning'] = 'Send this message without text?'; @@ -90,5 +91,6 @@ $messages['importwait'] = 'Importing, please wait...'; $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.'; $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>'; $messages['opnotpermitted'] = 'Operation not permitted!'; +$messages['nofromaddress'] = 'Missing e-mail address in selected identity'; -?>
\ No newline at end of file +?> diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 830168c24..15d26a260 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -81,7 +81,7 @@ if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_v } // add some labels to client -rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting'); +rcube_add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting'); // add config parameter to client script $OUTPUT->set_env('draft_autosave', !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0); diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index d342124a4..4706af22f 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -63,9 +63,10 @@ function rcmail_get_identity($id) $out = $sql_arr; $out['mailto'] = $sql_arr['email']; $name = strpos($sql_arr['name'], ",") ? '"'.$sql_arr['name'].'"' : $sql_arr['name']; - $out['string'] = sprintf('%s <%s>', - rcube_charset_convert($name, RCMAIL_CHARSET, $OUTPUT->get_charset()), - $sql_arr['email']); + $out['string'] = rcube_charset_convert($name, RCMAIL_CHARSET, $OUTPUT->get_charset()); + if ($sql_arr['email']) + $out['string'] .= ' <' . $sql_arr['email'] . '>'; + return $out; } @@ -160,8 +161,11 @@ else if (empty($mailto)) $mailto = 'undisclosed-recipients:;'; // get sender name and address -$identity_arr = rcmail_get_identity(get_input_value('_from', RCUBE_INPUT_POST)); -$from = $identity_arr['mailto']; +$from = get_input_value('_from', RCUBE_INPUT_POST); +$identity_arr = rcmail_get_identity($from); + +if ($identity_arr) + $from = $identity_arr['mailto']; if (empty($identity_arr['string'])) $identity_arr['string'] = $from; @@ -351,6 +355,12 @@ $MAIL_MIME->headers($headers); // Begin SMTP Delivery Block if (!$savedraft) { + // check for 'From' address (identity may be incomplete) + if ($identity_arr && !$identity_arr['mailto']) { + $OUTPUT->show_message('nofromaddress', 'error'); + $OUTPUT->send('iframe'); + } + $sent = rcmail_deliver_message($MAIL_MIME, $from, $mailto); // return to compose page if sending failed |