[vhffs-dev] Mail delivery failed: returning message to sender

[Mail Delivery System <Mailer-Daemon@xxxxxxxxxxxxxxxxx>]

This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  vhffs-dev@xxxxxxxxx
    local delivery failed

------ This is a copy of the message, including all the headers. ------

Return-path: <vhffs-dev@xxxxxxxxx>
Received: from netu.naquadah.org ([212.85.152.254])
	by mx1.tuxfamily.net with esmtp (Exim 4.50)
	id 1Dh1pI-0005aX-AC
	for vhffs-dev@xxxxxxxxx; Sat, 11 Jun 2005 10:58:48 +0200
Received: from soda by netu.naquadah.org with local (Exim 4.50)
	id 1Dh1pI-0003i4-V9
	for vhffs-dev@xxxxxxxxx; Sat, 11 Jun 2005 10:58:49 +0200
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-0.9.9
Date: Sat, 11 Jun 2005 08:58:48 -0000
Subject: [svn] commit: r46 - trunk/vhffs-listengine/src/listengine.pl
From: vhffs-dev@xxxxxxxxx
To: vhffs-dev@xxxxxxxxx
Message-Id: <E1Dh1pI-0003i4-V9@xxxxxxxxxxxxxxxxx>

Author: soda
Date: Sat Jun 11 10:58:47 2005
New Revision: 46

Log:
Close Bug #0000161, update listengine.pl


Modified:
    trunk/vhffs-listengine/src/listengine.pl

Modified: trunk/vhffs-listengine/src/listengine.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-listengine/src/listengine.pl (original)
+++ trunk/vhffs-listengine/src/listengine.pl Sat Jun 11 10:58:47 2005
@@ -28,6 +28,7 @@
 ###########################
 my $MAIL_UID =3D 8;
 my $MAIL_GID =3D 8;
+my $DOMAIN	 =3D "tuxfamily.org";
 ###########################
 =

 #Huho, if the program stop heres, you have some problems with your MTA con=
figuration
@@ -75,7 +76,6 @@
 =

 =

     $mail->delete('Received');
-    $mail->delete('Date');
 =

 =

 =

@@ -105,7 +105,7 @@
 =

 =

     recv SOCK, $err, 512, 0;
-    send SOCK, "HELO tuxfamily.org\r\n", 0;
+    send SOCK, "HELO $DOMAIN\r\n", 0;
     recv SOCK, $err, 512, 0;
     send SOCK, "MAIL FROM: $ADMIN\r\n", 0;
     recv SOCK, $err, 512, 0;
@@ -244,7 +244,7 @@
 	    $header =3D new Mail::Header( );
 	    $header->replace( 'To' ,  $from );
 	    $header->replace( 'From' ,  $LISTMASTER );
-	    $header->replace( 'Subject' ,  "confirm $hash" );
+	    $header->replace( 'Subject' ,  "confirm subscribe $hash" );
 	    $header->replace( 'Reply-To' , $list->get_localpart ."-request"."\@".=
$list->get_domain);
 	    =

 	    =

@@ -314,7 +314,7 @@
 	}
 	else
 	{
-	    $header->replace( 'Subject' ,  "confirm $hash" );
+	    $header->replace( 'Subject' ,  "confirm unsubscribe $hash" );
 	    $header->replace( 'Reply-To' , $list->get_localpart ."-request"."\@".=
$list->get_domain);
 	    =

 	    $email =3D Mail::Internet->new(  [ <> ] , =

@@ -324,9 +324,6 @@
 	}
 	sendmail( $email , $from );
     }
-    =

-
-    =

 }
 =

 =

@@ -397,6 +394,7 @@
 	    $header =3D new Mail::Header( );
 	    $header->replace( 'To' ,  $from );
 	    $header->replace( 'From' ,  $LISTMASTER );
+	    $header->replace( 'Subject' , "Successfully unsubscribe" );
 	    =

 	    =

 	    $email =3D Mail::Internet->new(  [ <> ] , =

@@ -442,7 +440,11 @@
     $mail->replace( 'Reply-To' , $list->get_localpart ."\@" . $list->get_d=
omain ) if( $list->get_replyto =3D=3D 1 );
 =

     #Add prefix if not null
-    $mail->replace( 'Subject' , "[".$list->get_prefix."]" . " " . $mail->g=
et('Subject') ) if( length( $list->get_prefix ) > 0 );
+	my $subject=3D$mail->get('Subject');
+	unless ($subject=3D~ /^.*\[$prefix\].*$/)
+      {
+      $mail->replace( 'Subject' , "[".$list->get_prefix."]" . " " . $mail-=
>get('Subject') ) if( length( $list->get_prefix ) > 0 );
+      }
 =

 =

     foreach ( keys %{$subs} )
@@ -451,7 +453,11 @@
 	push( @tos , $_ ) if( $subs->{$_}{perm} !=3D Vhffs::Constants::ML_RIGHT_S=
UB_WAITING_FOR_REPLY );
     }
 =

-  =

+ =

+  	#Add date if not exist
+	my $date=3Dgmtime()." +00";
+	$mail->replace('Date',$date); =

+
     sendmail( $mail , \@tos );
     archive_it( $mail , $list );
 }