Explorar el Código

update for changed message class

stekkel hace 23 años
padre
commit
ee4412e78a
Se han modificado 1 ficheros con 8 adiciones y 7 borrados
  1. 8 7
      src/compose.php

+ 8 - 7
src/compose.php

@@ -392,16 +392,18 @@ function newMail () {
         $message = sqimap_get_message($imapConnection, $id, $mailbox);
         $message = sqimap_get_message($imapConnection, $id, $mailbox);
         $orig_header = $message->header;
         $orig_header = $message->header;
 	$body = '';
 	$body = '';
+
         if ($ent_num) {
         if ($ent_num) {
 	    $ent_ar = preg_split('/_/',$ent_num);
 	    $ent_ar = preg_split('/_/',$ent_num);
 	    foreach($ent_ar as $ent_num) {
 	    foreach($ent_ar as $ent_num) {
-        	$message = getEntity($message, $ent_num);
-    		if ($message->header->type0 == 'text' ||
-        	    $message->header->type1 == 'message') {
+	        $msg = $message;
+        	$msg->getEntity($ent_num);
+    		if ($msg->header->type0 == 'text' ||
+        	    $msg->header->type1 == 'message') {
             	    $bodypart = decodeBody(
             	    $bodypart = decodeBody(
 		        mime_fetch_body($imapConnection, $id, $ent_num),
 		        mime_fetch_body($imapConnection, $id, $ent_num),
-                	    $message->header->encoding);
-			if ($message->header->type1 == 'html') {
+                	    $msg->header->encoding);
+			if ($msg->header->type1 == 'html') {
         		    $bodypart = strip_tags($bodypart);
         		    $bodypart = strip_tags($bodypart);
     			}
     			}
 			$body .= $bodypart;
 			$body .= $bodypart;
@@ -479,10 +481,9 @@ function newMail () {
             $body = $bodyTop . $body;
             $body = $bodyTop . $body;
         }
         }
         elseif ($reply_id) {
         elseif ($reply_id) {
-            $orig_from = decodeHeader($orig_header->from, false);
+            $orig_from = decodeHeader($orig_header->getAddr_s('from' ), false);
             $body = getReplyCitation($orig_from) . $body;
             $body = getReplyCitation($orig_from) . $body;
         }
         }
-
         return;
         return;
     }
     }