[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-devel
Subject:    [SM-DEVEL] Return Reciepts bug fix(different problem)
From:       "Tim C." <tim () umbc ! edu>
Date:       2003-08-22 21:57:12
[Download RAW message or body]

If you don't have your email address set in the preferences, it would
set the email address to send from as "<@>".  The problem was that
someone copied code from the compose.php that does approximately the
same thing, but made it wrong and also forgot to copy everything it
needed.  I also fixed an error where there was a "." instead of a ",".
It doesn't look like it really effected anything, but it was still
wrong. ;)

  I just submitted this and the fread patch to SF, I hope that they can
get into 1.4.2.

Thanks,
  Tim

-----------------------------------------------------------------------
Tim Craig            These are my opinions and not my employers. :)
OIT-Systems
tim@umbc.edu         It's hard to be serious when you're
                       naked. - Garfield
-----------------------------------------------------------------------

["patch.receipt" (TEXT/PLAIN)]

*** squirrelmail-1.4.1/src/read_body.php	Thu Jul  3 15:11:06 2003
--- sqmail/src/read_body.php	Fri Aug 22 17:40:42 2003
***************
*** 167,172 ****
--- 167,179 ----
      $rfc822_header->to[] = $header->dnt;
      $rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject);
  
+     if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
+         $popuser = $usernamedata[1];
+         $domain  = $usernamedata[2];
+         unset($usernamedata);
+     } else {
+         $popuser = $username;
+     }
  
      $reply_to = '';
      if (isset($identity) && $identity != 'default') {
***************
*** 183,189 ****
          $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;
      }
--- 190,197 ----
          $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
          $reply_to  = getPref($data_dir, $username,'reply_to');
      }
! 
!     if (!$from_mail) {
         $from_addr = "$popuser@$domain";
         $from_mail = $from_addr;
      }
***************
*** 743,749 ****
  if (isset($sendreceipt)) {
     if ( !$message->is_mdnsent ) {
        if (isset($identity) ) {
!          $final_recipient = getPref($data_dir, $username, 'email_address' . '0', '' );
        } else {
           $final_recipient = getPref($data_dir, $username, 'email_address', '' );
        }
--- 751,757 ----
  if (isset($sendreceipt)) {
     if ( !$message->is_mdnsent ) {
        if (isset($identity) ) {
!          $final_recipient = getPref($data_dir, $username, 'email_address' , '0', '' );
        } else {
           $final_recipient = getPref($data_dir, $username, 'email_address', '' );
        }

-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
--
squirrelmail-devel mailing list
List Address: squirrelmail-devel@lists.sourceforge.net
List Archives: http://sourceforge.net/mailarchive/forum.php?forum_id=7139
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-devel

[prev in list] [next in list] [prev in thread] [next in thread]