fixing yet another warning

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 66d968da6fcb526e10fbccd825e5abb0f012038b..165b6429bb0d9cc4ca2db10537c07c3b8a00abbd 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -150,9 +150,12 @@ function ServerMDNSupport( $read ) {
     $num = 0;
     $ret = FALSE;
     while ( !$ret && $num < count($read) ) {
+        $ret = preg_match( '/.*PERMANENTFLAGS.*(MDNSent|\\\*).*/i', $read[$num] );
+        /*
         if ( ereg('PERMANENTFLAGS', $read[$num] ) ) {
             $ret = ( ereg('mdnsent',strtolower($read[$num]) ) || ereg("\\\*", $read[$num] ) );
         }
+        */
         $num++;
     }
     return ( $ret );
@@ -162,9 +165,7 @@ function SendMDN ( $recipient , $sender) {
     global $imapConnection, $mailbox, $username, $attachment_dir, $SERVER_NAME,
            $version, $attachments, $identity, $data_dir, $passed_id;
 
-    $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-    $header = $message->header;
-
+    $header = sqimap_get_message_header($imapConnection, $passed_id, $mailbox);
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
 
     // part 1 (RFC2298)
@@ -221,7 +222,7 @@ function SendMDN ( $recipient , $sender) {
     $MDN_to = trim($recipient);
     $reply_id = 0;
 
-    return (SendMessage($MDN_to,'','',"Read: $subject", $body,$reply_id, True, 3) );
+    return (SendMessage($MDN_to,'','', _("Read:") . ' ' . $subject, $body,$reply_id, True, 3) );
 }
 
 
@@ -518,6 +519,9 @@ if (isset ($message->header->cc[0]) && trim($message->header->cc[0])) {
         }
     }
 }
+else {
+    $cc_string = '';
+}
 
 /** FORMAT THE BCC STRING **/
 $i = 0;
@@ -559,6 +563,9 @@ if (isset ($message->header->bcc[0]) && trim($message->header->bcc[0])){
         }
     }
 }
+else {
+    $bcc_string = '';
+}
 
 if ($default_use_priority) {
     $priority_level = substr($message->header->priority,0,1);
@@ -619,7 +626,11 @@ if ($where && $what) {
 echo _("Delete") . '</A>&nbsp;';
 if (($mailbox == $draft_folder) && ($save_as_draft)) {
     echo '|&nbsp;<A HREF="' . $base_uri .
-         "src/compose.php?mailbox=$mailbox&send_to=$to_string&send_to_cc=$cc_string&send_to_bcc=$bcc_string&subject=$url_subj&draft_id=$passed_id&ent_num=$ent_num\">".
+         "src/compose.php?mailbox=$mailbox&send_to=$to_string&send_to_cc=$cc_string&send_to_bcc=$bcc_string&subject=$url_subj&draft_id=$passed_id&ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
          _("Resume Draft") . '</a>';
 }
 
@@ -656,17 +667,29 @@ echo                '</SMALL>' .
                    '<SMALL>' .
                    '<A HREF="' . $base_uri . "src/compose.php?forward_id=$passed_id&forward_subj=$url_subj&".
                     ($default_use_priority?"mailprio=$priority_level&":"")
-                    ."mailbox=$urlMailbox&ent_num=$ent_num\">" .
+                    ."mailbox=$urlMailbox&ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
     _("Forward") .
     '</A>&nbsp;|&nbsp;' .
                    '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replyto&reply_subj=$url_subj&".
                     ($default_use_priority?"mailprio=$priority_level&":"").
-                    "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
+                    "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
     _("Reply") .
     '</A>&nbsp;|&nbsp;' .
                    '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
                     ($default_use_priority?"mailprio=$priority_level&":"").
-                    "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
+                    "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
     _("Reply All") .
     '</A>&nbsp;&nbsp;' .
                    '</SMALL>' .