Added (c) stuff and some formatting.

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index fd179db65baecbf0225982ee74d38bf5c4f5c08c..221ae0ec09e9a00690ffc763bb33296e40526350 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -1,5 +1,9 @@
 <?php
+
    /** smtp.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
     **
     ** This contains all the functions needed to send messages through
     ** an smtp server or sendmail.
@@ -7,10 +11,6 @@
     ** $Id$
     **/
 
-   if (defined('smtp_php'))
-      return;
-   define('smtp_php', true);
-
    require_once('../functions/addressbook.php');
    require_once('../functions/plugin.php');
 
@@ -68,6 +68,35 @@
       return $array;
    }
 
+
+   // looks up aliases in the addressbook and expands them to
+   // the RFC 821 valid RCPT address. ie <user@example.com>
+   // Adds @$domain if it wasn't in the address book and if it
+   // doesn't have an @ symbol in it
+   function expandRcptAddrs ($array) {
+      global $domain;
+
+      // don't show errors -- kinda critical that we don't see
+      // them here since the redirect won't work if we do show them
+      $abook = addressbook_init(false);
+      for ($i=0; $i < count($array); $i++) {
+         $result = $abook->lookup($array[$i]);
+         $ret = "";
+         if (isset($result['email'])) {
+            $ret = '<'.$result['email'].'>';
+            $array[$i] = $ret;
+         }
+         else
+         {
+            if (strpos($array[$i], '@') === false)
+               $array[$i] .= '@' . $domain;
+            $array[$i] = '<' . $array[$i] . '>';
+         }
+      }
+      return $array;
+   }
+
+
    // Attach the files that are due to be attached
    function attachFiles ($fp) {
       global $attachments, $attachment_dir;
@@ -338,9 +367,13 @@
       $envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom);
       $envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom);
 
-      // open pipe to sendmail
-      $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), 'w');
-      
+      // open pipe to sendmail or qmail-inject (qmail-inject doesn't accept -t param)
+      if (strstr($sendmail_path, "qmail-inject")) {
+         $fp = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w");
+      } else {
+         $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), "w");
+      }
+
       $headerlength = write822Header ($fp, $t, $c, $b, $subject, $more_headers);
       $bodylength = writeBody($fp, $body);
 
@@ -365,9 +398,9 @@
          $smtpPort, $data_dir, $color, $use_authenticated_smtp, $identity, 
         $key, $onetimepad;
 
-      $to = expandAddrs(parseAddrs($t));
-      $cc = expandAddrs(parseAddrs($c));
-      $bcc = expandAddrs(parseAddrs($b));
+      $to = expandRcptAddrs(parseAddrs($t));
+      $cc = expandRcptAddrs(parseAddrs($c));
+      $bcc = expandRcptAddrs(parseAddrs($b));
       if (isset($identity) && $identity != 'default')
         $from_addr = getPref($data_dir, $username, 'email_address' . $identity);
       else
@@ -565,9 +598,10 @@
       return $err_num;
    }
 
-   function sendMessage($t, $c, $b, $subject, $body, $reply_id) {
+   function sendMessage($t, $c, $b, $subject, $body, $reply_id, $prio = 3) {
       global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad;
       global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort;
+      global $default_use_priority;
       global $more_headers;
       $more_headers = Array();
 
@@ -589,6 +623,9 @@
             $more_headers['References']  = $hdr->message_id;
          }
       }
+      if ($default_use_priority) {
+       $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
@@ -621,5 +658,25 @@
         
       return $length;
    }
-   
-?>
\ No newline at end of file
+
+   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;
+   }
+?>