Added mark as read/unread functionality. Rearrange UI of right_main's grey action...

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index f171693e89946090aa665bfc96a7e032b241916f..fd179db65baecbf0225982ee74d38bf5c4f5c08c 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -11,7 +11,8 @@
       return;
    define('smtp_php', true);
 
-   include('../functions/addressbook.php');
+   require_once('../functions/addressbook.php');
+   require_once('../functions/plugin.php');
 
    global $username, $popuser, $domain;
 
@@ -447,7 +448,7 @@
       if ($num != 250) {
          $tmp = nl2br(htmlspecialchars($tmp));
          displayPageHeader($color, 'None');
-         include ("../functions/display_messages.php");
+         include_once('../functions/display_messages.php');
          $msg  = "Message not sent!<br>\nReason given: $tmp";
          plain_error_message($msg, $color);
          return(0);
@@ -553,9 +554,9 @@
       }
 
       if ($status == 0) {
-         include '../functions/page_header.php';
+         include_once('../functions/page_header.php');
          displayPageHeader($color, 'None');
-                include ("../functions/display_messages.php");
+         include_once('../functions/display_messages.php');
          $lines = nl2br(htmlspecialchars($lines));
                 $msg  = $message . "<br>\nServer replied: $lines";
                 plain_error_message($msg, $color);
@@ -564,11 +565,14 @@
       return $err_num;
    }
 
-   function sendMessage($t, $c, $b, $subject, $body, $reply_id, $prio = 3) {
+   function sendMessage($t, $c, $b, $subject, $body, $reply_id) {
       global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad;
       global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort;
+      global $more_headers;
       $more_headers = Array();
 
+      do_hook("smtp_send");
+
       $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1);
 
       if (isset($reply_id) && $reply_id) {
@@ -585,7 +589,6 @@
             $more_headers['References']  = $hdr->message_id;
          }
       }
-      $more_headers = array_merge($more_headers, createPriorityHeaders($prio));
 
       // In order to remove the problem of users not able to create
       // messages with "." on a blank line, RFC821 has made provision
@@ -619,24 +622,4 @@
       return $length;
    }
    
-   function createPriorityHeaders($prio) {
-      $prio_headers = Array();
-      $prio_headers["X-Priority"] = $prio;
-
-      switch($prio) {
-        case 1: $prio_headers["Importance"] = "High";
-                $prio_headers["X-MSMail-Priority"] = "High";
-                break;
-
-        case 3: $prio_headers["Importance"] = "Normal";
-                $prio_headers["X-MSMail-Priority"] = "Normal";
-                break;
-
-        case 5:
-               $prio_headers["Importance"] = "Low";
-               $prio_headers["X-MSMail-Priority"] = "Low";
-               break;
-      }
-      return  $prio_headers;
-   }
-?>
+?>
\ No newline at end of file