projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Wrong include path
[squirrelmail.git] / src / compose.php
diff --git a/src/compose.php b/src/compose.php
index b0b8257b7795ab6ad1c0dc5c0d5c90ee08e165c2..082af4d616cdfaa0b8c7ff1190d35987b602a391 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -21,7 +21,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'functions/mime.php');
@@ -31,7 +31,6 @@ require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'class/deliver/Deliver.class.php');
 
 /* --------------------- Specific Functions ------------------------------ */
-
 function replyAllString($header) {
    global $include_self_reply_all, $username, $data_dir;
    $excl_arr = array();
@@ -112,50 +111,47 @@ function getforwardHeader($orig_header) {
 }
 /* ----------------------------------------------------------------------- */
 
+/* OLD: should be adapted to composeMessage */
+
 /*
  * If the session is expired during a post this restores the compose session 
  * vars.
  */
 //$session_expired = false; 
 if (session_is_registered('session_expired_post')) {
-   global $session_expired_post, $session_expired;
-   /* 
-    * extra check for username so we don't display previous post data from
-    * another user during this session.
-    */
-   if ($session_expired_post['username'] != $username) {
-      session_unregister('session_expired_post');
-      session_unregister('session_expired');      
-   } else {
-      foreach ($session_expired_post as $postvar => $val) {
-         if (isset($val)) {
-            $$postvar = $val;
-         } else {
-            $$postvar = '';
-         }
-      }
-      if (isset($send)) {
-         unset($send);
-      }
-      $session_expired = true;
-   }
-   session_unregister('session_expired_post');
-   session_unregister('session_expired');
-   if (!isset($mailbox)) {
-      $mailbox = '';
-   }
-   if ($compose_new_win == '1') {
-      compose_Header($color, $mailbox);
-   } else {
-      displayPageHeader($color, $mailbox);
-   }
-   showInputForm($session, false);
-   exit();
-}
-
-if (!isset($attachments)) {
-    $attachments = array();
-    sqsession_register(array(), 'attachments');
+    global $session_expired_post, $session_expired;
+    /* 
+     * extra check for username so we don't display previous post data from
+     * another user during this session.
+     */
+    if ($session_expired_post['username'] != $username) {
+        session_unregister('session_expired_post');
+        session_unregister('session_expired');      
+    } else {
+        foreach ($session_expired_post as $postvar => $val) {
+            if (isset($val)) {
+                $$postvar = $val;
+            } else {
+                $$postvar = '';
+            }
+        }
+        if (isset($send)) {
+            unset($send);
+        }
+        $session_expired = true;
+    }
+    session_unregister('session_expired_post');
+    session_unregister('session_expired');
+    if (!isset($mailbox)) {
+        $mailbox = '';
+    }
+    if ($compose_new_win == '1') {
+        compose_Header($color, $mailbox);
+    } else {
+        displayPageHeader($color, $mailbox);
+    }
+    showInputForm($session, false);
+    exit();
 }
 
 if (!isset($composesession)) {
@@ -172,14 +168,17 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) {
 if (!isset($compose_messages)) {
   $compose_messages = array();
 }
-if (!array_key_exists($session, $compose_messages)) {
-  $composeMessage = new message();
+if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)) {
+/* if (!array_key_exists($session, $compose_messages)) {  /* We can only do this in PHP >= 4.1 */
+  $composeMessage = new Message();
   $rfc822_header = new Rfc822Header();
   $composeMessage->rfc822_header = $rfc822_header;
   $composeMessage->reply_rfc822_header = '';
   $compose_messages[$session] = $composeMessage;
+  sqsession_register($compose_messages,'compose_messages');  
+} else {
+  $composeMessage=$compose_messages[$session];
 }
-sqsession_register($compose_messages,'compose_messages');
 
 if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
     $mailbox = 'INBOX';
@@ -537,9 +536,9 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
         switch ($action) {
         case ('draft'):
             $use_signature = FALSE;
-            $send_to = $orig_header->getAddr_s('to');
-            $send_to_cc = $orig_header->getAddr_s('cc');
-            $send_to_bcc = $orig_header->getAddr_s('bcc');
+            $send_to = decodeHeader($orig_header->getAddr_s('to'));
+            $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
+            $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
             $subject = decodeHeader($orig_header->subject);
 
             $body_ary = explode("\n", $body);
@@ -556,9 +555,9 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
             break;
         case ('edit_as_new'):
-            $send_to = $orig_header->getAddr_s('to');
-            $send_to_cc = $orig_header->getAddr_s('cc');
-            $send_to_bcc = $orig_header->getAddr_s('bcc');
+            $send_to = decodeHeader($orig_header->getAddr_s('to'));
+            $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
+            $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
             $subject = decodeHeader($orig_header->subject);
             $mailprio = $orig_header->priority;
             $orig_from = '';
@@ -586,9 +585,9 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
         case ('reply'):
             $send_to = $orig_header->reply_to;
             if (is_object($send_to)) {
-                $send_to = $send_to->getAddr_s('reply_to');
+                $send_to = decodeHeader($send_to->getAddr_s('reply_to'));
             } else {
-                $send_to = $orig_header->getAddr_s('from');
+                $send_to = decodeHeader($orig_header->getAddr_s('from'));
             }
             $subject =  decodeHeader($orig_header->subject);
             $subject = str_replace('"', "'", $subject);
@@ -1151,24 +1150,25 @@ function sendMessage($composeMessage, $draft=false) {
     }
     $reply_to = '';
     if (isset($identity) && $identity != 'default') {
-        $from_mail = getPref($data_dir, $username, 
-                     'email_address' . $identity);
-        $full_name = getPref($data_dir, $username, 
-                     'full_name' . $identity);
-        $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
-        $reply_to = getPref($data_dir, $username, 
-                     'reply_to' . $identity);
+        $from_mail = getPref($data_dir, $username,'email_address' . $identity);
+        $full_name = getPref($data_dir, $username,'full_name' . $identity);
+        $reply_to = getPref($data_dir, $username,'reply_to' . $identity);
     } else {
         $from_mail = getPref($data_dir, $username, 'email_address');
         $full_name = getPref($data_dir, $username, 'full_name');
-        $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
         $reply_to = getPref($data_dir, $username,'reply_to');
     }
-    if (!$from_addr) {
-       $from_addr = "$popuser@$domain";
-       $from_mail = $from_addr;
+    if (!$from_mail) {
+       $from_mail = "$popuser@$domain";
+       $full_name = '';
+    }
+    $rfc822_header->from = $rfc822_header->parseAddress($from_mail,true);
+    if ($full_name) {
+        $from = $rfc822_header->from[0];
+       if (!$from->host) $from->host = $domain;
+       $from_addr = $full_name .' <'.$from->mailbox.'@'.$from->host.'>';
+        $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
     }
-    $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
     if ($reply_to) {
        $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true);
     }
@@ -1232,7 +1232,6 @@ function sendMessage($composeMessage, $draft=false) {
     } elseif ($draft) {
        global $draft_folder;
        require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
-       $imap_deliver = new Deliver_IMAP();
        $imap_stream = sqimap_login($username, $key, $imapServerAddress,
                       $imapPort, 0);
        if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
Unnamed repository; edit this file 'description' to name the repository.