summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f18ea37)
one in smtp.php which is called from mime for sending retrievalerrors.
At a later time we should adapt retrievalerror or just remove the function
because I don't think retrievalerror messages can supply us valueable
information right anymore.
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3884
7612ce4b-ef26-0410-bec9-
ea0150e637f0
*/
set_my_charset();
$composeMessage=$compose_messages[$session];
*/
set_my_charset();
$composeMessage=$compose_messages[$session];
- if (! sendMessage($composeMessage, true)) {
+ if (! deliverMessage($composeMessage, true)) {
showInputForm($session);
exit();
} else {
showInputForm($session);
exit();
} else {
do_hook('compose_send');
$composeMessage=$compose_messages[$session];
do_hook('compose_send');
$composeMessage=$compose_messages[$session];
- $Result = sendMessage($composeMessage);
+ $Result = deliverMessage($composeMessage);
if (! $Result) {
showInputForm($session);
exit();
if (! $Result) {
showInputForm($session);
exit();
The message also should be constructed by the message class.
*/
The message also should be constructed by the message class.
*/
-function sendMessage($composeMessage, $draft=false) {
+function deliverMessage($composeMessage, $draft=false) {
global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
$username, $popuser, $usernamedata, $identity, $data_dir,
$request_mdn, $request_dr, $default_charset, $color, $useSendmail,
global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
$username, $popuser, $usernamedata, $identity, $data_dir,
$request_mdn, $request_dr, $default_charset, $color, $useSendmail,