| [vhffs-dev] [897] Moved Vhffs::Listengine::Intl to Vhffs::Listengine, bye bye Vhffs:: Listengine::* , prefixed all functions which contain a mail with mail_ |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
- To: vhffs-dev@xxxxxxxxx
- Subject: [vhffs-dev] [897] Moved Vhffs::Listengine::Intl to Vhffs::Listengine, bye bye Vhffs:: Listengine::* , prefixed all functions which contain a mail with mail_
- From: subversion@xxxxxxxxxxxxx
- Date: Mon, 10 Sep 2007 05:52:46 +0200
Revision: 897
Author: gradator
Date: 2007-09-10 03:52:46 +0000 (Mon, 10 Sep 2007)
Log Message:
-----------
Moved Vhffs::Listengine::Intl to Vhffs::Listengine, bye bye Vhffs::Listengine::* , prefixed all functions which contain a mail with mail_
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Makefile.am
trunk/vhffs-listengine/src/listengine.pl
Added Paths:
-----------
trunk/vhffs-api/src/Vhffs/Listengine.pm
Removed Paths:
-------------
trunk/vhffs-api/src/Vhffs/Listengine/
Copied: trunk/vhffs-api/src/Vhffs/Listengine.pm (from rev 880, trunk/vhffs-api/src/Vhffs/Listengine/Intl.pm)
===================================================================
--- trunk/vhffs-api/src/Vhffs/Listengine.pm (rev 0)
+++ trunk/vhffs-api/src/Vhffs/Listengine.pm 2007-09-10 03:52:46 UTC (rev 897)
@@ -0,0 +1,492 @@
+#!%PERL%
+# Copyright (c) vhffs project and its contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#3. Neither the name of vhffs nor the names of its contributors
+# may be used to endorse or promote products derived from this
+# software without specific prior written permission.
+#
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package Vhffs::Listengine;
+
+use locale;
+use Locale::gettext;
+
+
+sub mail_generate_help
+{
+ my $list = shift;
+
+ my @result;
+ push( @result , gettext("Hello and welcome on listengine help\n" ));
+ push( @result , "\n" );
+ push( @result , gettext( "All commands can be sent as mail subject.\n" ) );
+ push( @result , gettext( "You can also send a command list in the mail body.\n" ) );
+ push( @result , gettext( "All mails with commands must be sent on YOURLIST-request\@domain.tld list.\n" ) );
+ push( @result , "\n" );
+ push( @result , gettext("Here are the basic listengine commands:\n") );
+ push( @result , gettext("help\t\t - show this help\n") );
+ push( @result , gettext("subscribe\t - subscribe the shipper to the list\n") );
+ push( @result , gettext("unsubscribe\t - unsubscribe from this list\n") );
+ push( @result , gettext("lang [fr|us|es]\t - set listengine language\n") );
+ push( @result , "\n" );
+ push( @result , gettext("Only this list administrators can use the following commands.\n" ) );
+ push( @result , gettext("subscription accept XXXXX\t\t - accept the subscription with key XXXXX\n" ) );
+ push( @result , gettext("subscription refuse XXXXX\t\t - refuse the subscription with key XXXXX\n" ) );
+ push( @result , gettext("moderate XXXXX\t\t\t - accept the message with message-id XXXXX\n" ) );
+ push( @result , gettext("moderate accept XXXXX\t\t\t - accept the message with message-id XXXXX\n" ) );
+ push( @result , gettext("moderate refused XXXXX\t\t\t - refuse the message with message-id XXXXX\n" ) );
+ push( @result , gettext("moderate list\t\t\t - give the message list for moderation\n" ) );
+ push( @result , gettext("user unsubscribe user\@domain.tld\t - delete user user\@domain.tld from list\n") );
+ push( @result , gettext("user subscribe user\@domain.tld\t\t - register the user user\@domain.tld on the list\n") );
+ push( @result , gettext("user right RIGHT user\@domain.tld\t - change right for this user\n") );
+ push( @result , gettext("\t\t\t\t RIGHT can be subscriber or admin\n") );
+ push( @result , gettext("user info user\@domain.tld\t\t - show user information\n") );
+
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_new_sub
+{
+ my $list = shift;
+ my $from = shift;
+ my $pass = shift;
+ my @result;
+
+ push( @result , sprintf( "You sent a request to be subscribed to the following mailing list:\n %s\n\nWith the following email:\n %s\n\n" , $list->get_listname , $from ) );
+ push( @result , gettext( "You must confirm your request by sending a confirmation email\n") );
+ push( @result , sprintf( gettext( "This mail must have the following subject : \"confirm subscribe %s\"\nOn most clients it should work by just replying this email\n") , $pass ) );
+ push( @result , "\n" );
+ push( @result , gettext( "If you don't asked to be subscribed to this mailing list,\njust forget this email\n" ) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_new_unsub
+{
+ my $list = shift;
+ my $from = shift;
+ my $hash = shift;
+ my @result;
+
+ push( @result , sprintf( "You asked to be removed from the following list:\n\n%s\n\n" , $list->get_listname) );
+ push( @result , gettext( "You must confirm your request by sending a confirmation email\n") );
+ push( @result , sprintf( gettext( "This mail must contains the following subject : \"confirm unsubscribe %s\"\n") , $hash ) );
+ push( @result , "\n" );
+ push( @result , gettext( "If you haven't asked to be unsubscribed from this list,\nplease don't answer to this mail\n" ) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_sub_already_exist
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "You asked to be subscribed to the following list:\n\n%s\n\n" ) , $list->get_listname) );
+ push( @result , sprintf( gettext( "However you are (%s) already subscribed to this list.\n") , $from ) );
+ push( @result , "\n" );
+ push( @result , gettext( "The state of you subscription was not changed, you are still subscribed\n") , $hash );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_sub_deny
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "Subscription to the following list is forbidden:\n %s\n\nHave a nice day.\n" ) , $list->get_listname) );
+
+ return( \@result );
+}
+
+
+sub mail_confirm_sub
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "You have been successfully subscribed to the following mailing list:\n %s\n" ) , $list->get_listname) );
+ push( @result , gettext( "\n") );
+ push( @result , gettext( "You may get some help on listengine by sending an email to\n") );
+ push( @result , sprintf( gettext( "%s-request\@%s with subject \"help\"\n") , $list->get_localpart , $list->get_domain ) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_confirm_sub_approvalneeded
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "You have been successfully subscribed to the following mailing list:\n %s\n" ) , $list->get_listname) );
+ push( @result , gettext( "\n") );
+ push( @result , gettext( "However this list require approval for new subscribers.\n") );
+ push( @result , gettext( "You will receive an email with the decision of administrators.\n") );
+ push( @result , gettext( "\n") );
+ push( @result , gettext( "You may get some help on listengine by sending an email to\n") );
+ push( @result , sprintf( gettext( "%s-request\@%s with subject \"help\"\n") , $list->get_localpart , $list->get_domain ) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_confirm_unsub
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "You have been successfully removed from the following list:\n %s\n" ) , $list->get_listname) );
+
+ return( \@result );
+}
+
+
+sub mail_error_sub
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "An error occured during your subscription to the following list:\n %s\n\n" ) , $list->get_listname) );
+ push( @result , gettext("The confirmation code was wrong\n" ));
+ push( @result , gettext("Please try again !\n" ));
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_sub_not_exist
+{
+ my $list = shift;
+ my $from = shift;
+
+ my @result;
+
+ push( @result , sprintf( gettext( "The following address %s is not on the following mailing list:\n %s\n" ) , $from , $list->get_listname) );
+ push( @result , gettext("You demand was refused\n" ));
+
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_error_unsub
+{
+ my $list = shift;
+ my $from = shift;
+
+ my @result;
+
+ push( @result , sprintf( gettext( "You cannot unsubscribe from the list %s\n" ) , $list->get_listname) );
+ push( @result , gettext("You are not a subscriber on this list.\n" ));
+
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_error_unsub_hash
+{
+ my $list = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "Unsubscribe for the list %s was not complete.\n" ) , $list->get_listname) );
+ push( @result , gettext("Confirmation code was wrong.\n" ));
+ push( @result , gettext("Please try again.\n" ));
+
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_unsub_success
+{
+ my $list = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "You have been successfully removed from the list %s.\n" ) , $list->get_listname) );
+
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_lang_change_success
+{
+ my $list = shift;
+ my $from = shift;
+ my $lang = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "The listengine language preference was changed for the following address %s.\n" ) , $from) );
+ push( @result , sprintf( gettext( "New language is: %s\n" ) , $lang) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_lang_change_error
+{
+ my $list = shift;
+ my $from = shift;
+ my $lang = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "An error occured while updating language for the following address: %s.\n" ) , $from) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_unknown_command
+{
+ my $list = shift;
+
+ my @result;
+
+ push( @result , gettext( "Unknow command\n\n" ) );
+ push( @result , gettext( "Please read help of listengine\n" ) );
+ push( @result , gettext( "Send an email with the subject \"help\" to the following address: \n" ) );
+ push( @result , sprintf( "%s\@%s" , $list->get_localpart , $list->get_domain) );
+ push( @result , "\n" );
+ push( @result , "---\n" );
+ push( @result , "Listengine 4.0\n" );
+
+ return( \@result );
+}
+
+
+sub mail_refuse_error
+{
+ my $list = shift;
+ my $hash = shift;
+
+
+ push( @result , sprintf( gettext( "The message with the following id %s") , $hash ) );
+ push( @result , sprintf( gettext( "present in the moderation queue for the list %s") , $list->get_listname ) );
+ push( @result , gettext( "cannot be removed.\n" ) );
+ push( @result , gettext( "The message does not exists or was moderated before you.\n" ) );
+ push( @result , "\n" );
+ push( @result , "---\n" );
+ push( @result , "Listengine 4.0\n" );
+
+ return( \@result );
+}
+
+
+sub mail_refuse_success
+{
+ my $list = shift;
+ my $hash = shift;
+
+
+ push( @result , sprintf( gettext( "Message with id: %s") , $hash ) );
+ push( @result , sprintf( gettext( "was removed from the moderation queue from the list %s") , $list->get_listname ) );
+ push( @result , "\n" );
+ push( @result , "---\n" );
+ push( @result , "Listengine 4.0\n" );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_error
+{
+ my $list = shift;
+ my $hash = shift;
+
+
+ push( @result , sprintf( gettext( "Message with id: %s") , $hash ) );
+ push( @result , sprintf( gettext( "present in the moderation queue for the list %s") , $list->get_listname ) );
+ push( @result , gettext( "cannot be removed from the list\n" ) );
+ push( @result , "\n" );
+ push( @result , "---\n" );
+ push( @result , "Listengine 4.0\n" );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_success
+{
+ my $list = shift;
+ my $hash = shift;
+
+ push( @result , sprintf( gettext( "Mail with id %s") , $hash ) );
+ push( @result , sprintf( gettext( "in the moderation queue of the list %s") , $list->get_listname ) );
+ push( @result , gettext( "was sent on the list.\n" ) );
+ push( @result , "\n" );
+ push( @result , "---\n" );
+ push( @result , "Listengine 4.0\n" );
+
+ return( \@result );
+}
+
+
+sub mail_not_allowed
+{
+ my $list = shift;
+ my $from = shift;
+
+ my @result;
+
+ push( @result , sprintf( gettext( "The following address %s is not allowed to execute commands on the list %s\n") , $from , $list->get_listname ) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_message
+{
+ my $list = shift;
+ my $hash = shift;
+ my $from = shift;
+ my $subject = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "A mail to moderate is on the following mailing list:\n %s\n\n" ) , $list->get_listname) );
+ push( @result , sprintf( gettext( "This mail was sent by %s with the following subject:\n %s\n\n" ) , $from, $subject) );
+ push( @result , sprintf( gettext( "To put this post on the list, send a message to:\n %s-request\@%s\n" ) , $list->get_localpart , $list->get_domain) );
+ push( @result , sprintf( gettext( "with the following subject :\n \"moderate %s\" \n" ) , $hash) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_subscriber
+{
+ my $list = shift;
+ my $from = shift;
+ my $pass = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "A new person wants to subscribe to the following mailing list:\n %s\n\n" ) , $list->get_listname) );
+ push( @result , sprintf( gettext( "His email address is:\n %s\n" ) , $from) );
+ push( @result , $subject );
+ push( @result , "\n" );
+ push( @result , gettext( "To accept this subscriber, send a message to\n" ) );
+ push( @result , sprintf( gettext( " %s-request\@%s\nwith the following subject :\n \"subscription accept %s %s\" \n" ) , $list->get_localpart , $list->get_domain , $from, $pass) );
+ push( @result , "\n" );
+ push( @result , gettext( "To refuse this subscriber, send a message to\n" ) );
+ push( @result , sprintf( gettext( " %s-request\@%s\nwith the following subject :\n \"subscription refuse %s %s\" \n" ) , $list->get_localpart , $list->get_domain , $from, $pass) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_subscription_accepted
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "Your subscription was accepted to the following mailing list:\n %s\n" ) , $list->get_listname) );
+ push( @result , gettext( "\n") );
+ push( @result , gettext( "You may get some help on listengine by sending an email to\n") );
+ push( @result , sprintf( gettext( "%s-request\@%s with subject \"help\"\n") , $list->get_localpart , $list->get_domain ) );
+ push( @result , "\n" );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_subscription_accept_ack
+{
+ my $list = shift;
+ my $subscriber = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "We confirm that you accepted the subscription of:\n %s\n\nto the following mailing list:\n %s\n\n") , $subscriber, $list->get_listname ) );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_subscription_refused
+{
+ my $list = shift;
+ my $from = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "Your subscription was refused to the following mailing list:\n %s\n\nHave a nice day.\n" ) , $list->get_listname) );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_subscription_refuse_ack
+{
+ my $list = shift;
+ my $subscriber = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "We confirm that you REFUSED the subscription of:\n %s\n\nto the following mailing list:\n %s\n\n") , $subscriber, $list->get_listname ) );
+
+ return( \@result );
+}
+
+
+sub mail_moderate_subscription_error
+{
+ my $list = shift;
+ my $subscriber = shift;
+ my @result;
+
+ push( @result , sprintf( gettext( "An error occured during your approval of subscription of:\n %s\ninto the following mailing list:\n %s\n\n" ) , $subscriber, $list->get_listname) );
+
+ return( \@result );
+}
+
+
+1;
Modified: trunk/vhffs-api/src/Vhffs/Makefile.am
===================================================================
--- trunk/vhffs-api/src/Vhffs/Makefile.am 2007-09-10 03:38:23 UTC (rev 896)
+++ trunk/vhffs-api/src/Vhffs/Makefile.am 2007-09-10 03:52:46 UTC (rev 897)
@@ -12,6 +12,7 @@
Functions.pm \
Group.pm \
Intl.pm \
+ Listengine.pm \
Mailings.pm \
Main.pm \
ObjectFactory.pm \
@@ -20,7 +21,6 @@
Services.pm \
Stats.pm \
User.pm \
- Listengine/Intl.pm \
Panel/Admin.pm \
Panel/Avatar.pm \
Panel/Commons.pm \
Modified: trunk/vhffs-listengine/src/listengine.pl
===================================================================
--- trunk/vhffs-listengine/src/listengine.pl 2007-09-10 03:38:23 UTC (rev 896)
+++ trunk/vhffs-listengine/src/listengine.pl 2007-09-10 03:52:46 UTC (rev 897)
@@ -40,7 +40,7 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Main;
use Vhffs::Services::MailingList;
-use Vhffs::Listengine::Intl;
+use Vhffs::Listengine;
use Vhffs::Functions;
# open (MYFILE, '>/tmp/grunt');
@@ -226,7 +226,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header,
- Body => Vhffs::Listengine::Intl::moderate_message( $list , $filehash , $from , $subject )
+ Body => Vhffs::Listengine::mail_moderate_message( $list , $filehash , $from , $subject )
);
sendmail( $email , \@tos ) if( ( defined $email ) && ( $#tos >= 0 ) );
@@ -260,7 +260,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::sub_deny( $list , $from )
+ Body => Vhffs::Listengine::mail_sub_deny( $list , $from )
);
}
else
@@ -277,7 +277,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header,
- Body => Vhffs::Listengine::Intl::new_sub( $list , $from , $pass )
+ Body => Vhffs::Listengine::mail_new_sub( $list , $from , $pass )
);
}
else
@@ -291,7 +291,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header,
- Body => Vhffs::Listengine::Intl::sub_already_exist( $list , $from )
+ Body => Vhffs::Listengine::mail_sub_already_exist( $list , $from )
);
}
}
@@ -322,7 +322,7 @@
$header->replace( 'Subject' , "error while unsubscribe" );
$email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::sub_not_exist( $list , $from )
+ Body => Vhffs::Listengine::mail_sub_not_exist( $list , $from )
);
}
elsif( $hash == -3 )
@@ -331,7 +331,7 @@
#If $hash == -3, the subscriber was not a subscriber or admin but has different rights (waiting for confirm ...)
$email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::error_unsub( $list , $from , $hash )
+ Body => Vhffs::Listengine::mail_error_unsub( $list , $from , $hash )
);
}
else
@@ -341,7 +341,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::new_unsub( $list , $from , $hash )
+ Body => Vhffs::Listengine::mail_new_unsub( $list , $from , $hash )
);
}
sendmail( $email , $from );
@@ -373,7 +373,7 @@
my $email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::confirm_sub_approvalneeded( $list , $from )
+ Body => Vhffs::Listengine::mail_confirm_sub_approvalneeded( $list , $from )
);
$list->change_state_for_sub( $from , Vhffs::Constants::ML_RIGHT_SUB_WAITING_FOR_VALIDATION );
@@ -399,7 +399,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header,
- Body => Vhffs::Listengine::Intl::moderate_subscriber( $list , $from , $pass )
+ Body => Vhffs::Listengine::mail_moderate_subscriber( $list , $from , $pass )
);
sendmail( $email , \@tos ) if( ( defined $email ) && ( $#tos >= 0 ) );
@@ -408,7 +408,7 @@
my $email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::confirm_sub( $list , $from )
+ Body => Vhffs::Listengine::mail_confirm_sub( $list , $from )
);
$list->change_state_for_sub( $from , Vhffs::Constants::ML_RIGHT_SUB );
@@ -428,7 +428,7 @@
my $email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::error_sub( $list , $from )
+ Body => Vhffs::Listengine::mail_error_sub( $list , $from )
);
sendmail( $email , $from );
}
@@ -459,7 +459,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::unsub_success( $list )
+ Body => Vhffs::Listengine::mail_unsub_success( $list )
);
sendmail( $email , $from );
@@ -474,7 +474,7 @@
$header->replace( 'From' , $LISTMASTER );
$email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::error_unsub_hash( $list )
+ Body => Vhffs::Listengine::mail_error_unsub_hash( $list )
);
}
@@ -505,7 +505,7 @@
my $email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::moderate_subscription_accepted( $list , $from )
+ Body => Vhffs::Listengine::mail_moderate_subscription_accepted( $list , $from )
);
$list->change_state_for_sub( $subscriber , Vhffs::Constants::ML_RIGHT_SUB );
@@ -531,7 +531,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header,
- Body => Vhffs::Listengine::Intl::moderate_subscription_accept_ack( $list , $subscriber )
+ Body => Vhffs::Listengine::mail_moderate_subscription_accept_ack( $list , $subscriber )
);
sendmail( $email , \@tos ) if( ( defined $email ) && ( $#tos >= 0 ) );
@@ -548,7 +548,7 @@
my $email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::moderate_subscription_error( $list , $subscriber )
+ Body => Vhffs::Listengine::mail_moderate_subscription_error( $list , $subscriber )
);
sendmail( $email , $from );
}
@@ -578,7 +578,7 @@
my $email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::moderate_subscription_refused( $list , $from )
+ Body => Vhffs::Listengine::mail_moderate_subscription_refused( $list , $from )
);
$list->del_sub( $subscriber );
@@ -603,7 +603,7 @@
$email = Mail::Internet->new( [ <> ] ,
Header => $header,
- Body => Vhffs::Listengine::Intl::moderate_subscription_refuse_ack( $list , $subscriber )
+ Body => Vhffs::Listengine::mail_moderate_subscription_refuse_ack( $list , $subscriber )
);
sendmail( $email , \@tos ) if( ( defined $email ) && ( $#tos >= 0 ) );
@@ -620,7 +620,7 @@
my $email = Mail::Internet->new( [ <> ] ,
Header => $header ,
- Body => Vhffs::Listengine::Intl::moderate_subscription_error( $list , $subscriber )
+ Body => Vhffs::Listengine::mail_moderate_subscription_error( $list , $subscriber )
);
sendmail( $email , $from );
}
@@ -840,7 +840,7 @@
if( $subject =~ /^help$/ )
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::generate_help
+ Body => Vhffs::Listengine::mail_generate_help
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -862,7 +862,7 @@
unless( Vhffs::Services::MailingList::set_language_for_sub( $vhffs , $from , $lang ) )
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::lang_change_error( $from , $lang )
+ Body => Vhffs::Listengine::mail_lang_change_error( $from , $lang )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -873,7 +873,7 @@
else
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::lang_change_success( $from , $lang )
+ Body => Vhffs::Listengine::mail_lang_change_success( $from , $lang )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -889,7 +889,7 @@
if( $members->{$from}{perm} != Vhffs::Constants::ML_RIGHT_ADMIN )
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::not_allowed( $list , $from )
+ Body => Vhffs::Listengine::mail_not_allowed( $list , $from )
);
$email->replace('From' , $LISTMASTER );
@@ -905,7 +905,7 @@
if( validate_message( $list , $hash , $from ) < 0 )
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::moderate_error( $list , $hash )
+ Body => Vhffs::Listengine::mail_moderate_error( $list , $hash )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -916,7 +916,7 @@
else
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::moderate_success( $list , $hash )
+ Body => Vhffs::Listengine::mail_moderate_success( $list , $hash )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -932,7 +932,7 @@
if( refuse_message( $list , $hash , $from ) < 0 )
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::refuse_error( $list , $hash )
+ Body => Vhffs::Listengine::mail_refuse_error( $list , $hash )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -944,7 +944,7 @@
else
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::refuse_success( $list , $hash )
+ Body => Vhffs::Listengine::mail_refuse_success( $list , $hash )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -971,7 +971,7 @@
if( validate_message( $list , $temp , $from ) < 0 )
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::moderate_error( $list , $temp )
+ Body => Vhffs::Listengine::mail_moderate_error( $list , $temp )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -982,7 +982,7 @@
else
{
$email = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::moderate_success( $list , $temp )
+ Body => Vhffs::Listengine::mail_moderate_success( $list , $temp )
);
$email->replace('From' , $LISTMASTER );
$email->replace('To' , $from );
@@ -1023,7 +1023,7 @@
else
{
$mail = Mail::Internet->new( [ <> ],
- Body => Vhffs::Listengine::Intl::unknown_command( $list )
+ Body => Vhffs::Listengine::mail_unknown_command( $list )
);
$mail->replace('From' , $LISTMASTER );
$mail->replace('To' , $from );