Changeset 1333

Show
Ignore:
Timestamp:
08/20/08 13:30:29 (3 months ago)
Author:
scitech
Message:

Fixed #1498: normal mail + forward doesn't work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/CHANGELOG

    r1332 r1333  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     32008-08-20 Daniel Andreca 
     4        - ENGINE: 
     5                * Fixed #1498: normal mail + forward doesn't work 
    36 
    472008-08-18 Daniel Andreca 
  • trunk/engine/ispcp-mbox-mngr

    r1275 r1333  
    11561156        } 
    11571157 
    1158     } if ($mail_type =~ /.*normal_forward.*/ || $mail_type =~ /.*alias_forward.*/ || $mail_type =~ /.*subdom_forward.*/); 
     1158    } if ($mail_type =~ /^normal_forward.*/ || $mail_type =~ /^alias_forward.*/ || $mail_type =~ /^subdom_forward.*/); 
    11591159 
    11601160    do { 
     
    24192419    } if ($mail_type =~ /.*subdom_mail.*/); 
    24202420 
    2421     if ($mail_type eq 'normal_mail' || $mail_type eq 'subdom_mail' || $mail_type eq 'alias_mail') { 
     2421    if ($mail_type=~ /.*normal_mail.*/ || $mail_type=~ /.*subdom_mail.*/ || $mail_type=~ /.*alias_mail.*/) { 
    24222422 
    24232423        ($rs, $rdata) = mbox_check_sasl_user($check_user); 
  • trunk/engine/ispcp-rqst-mngr

    r1286 r1333  
    208208            } 
    209209 
    210             $rs = sys_command("$main::ispcp_mbox_mngr $mail_id 1>>$main::ispcp_mbox_mngr_stdout 2>>$main::ispcp_mbox_mngr_stderr"); 
     210            $rs = sys_command("$main::ispcp_mbox_mngr $mail_id 1>$main::ispcp_mbox_mngr_stdout 2>$main::ispcp_mbox_mngr_stderr"); 
    211211 
    212212            if ($rs != 0) {