renamed sendMessage function to deliverMessage so it won't conflict with the

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

diff --git a/src/compose.php b/src/compose.php
index c5e506809d72bb6faac8c6f875f0759efe93c959..e7c5b7e2a58e161ab120f5118a7b51b2b8ba8513 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -264,7 +264,7 @@ if ($draft) {
      */
     set_my_charset();
     $composeMessage=$compose_messages[$session];
-    if (! sendMessage($composeMessage, true)) {
+    if (! deliverMessage($composeMessage, true)) {
         showInputForm($session);
         exit();
     } else {
@@ -335,7 +335,7 @@ if ($send) {
         do_hook('compose_send');
         $composeMessage=$compose_messages[$session];
 
-       $Result = sendMessage($composeMessage);
+       $Result = deliverMessage($composeMessage);
         if (! $Result) {
             showInputForm($session);
             exit();
@@ -1220,7 +1220,7 @@ function getReplyCitation($orig_from) {
    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,