Commit 11c5bc8f authored by olivier.salaun's avatar olivier.salaun
Browse files

[feature][#3802][submited by P.Crandall, U.Chicago] SYMPA gecos used in...

[feature][#3802][submited by P.Crandall, U.Chicago] SYMPA gecos used in service messages is no more hard-coded. New 'email_gecos' sympa.conf parameter.


git-svn-id: https://subversion.renater.fr/sympa/trunk@7037 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent af066f47
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]near expiration of your certificate[%END%][%END%]
[%|loc(expiration_date)%]Your authentification certificate will expire on %1.[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% to %]
Subject: [% FILTER qencode %][%|loc%]Results of your commands[%END%][%END%]
X-Loop: [% conf.sympa %]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]Subscription summary[%END%][%END%]
[%|loc(user.email)%]Summary of your subscription (using the e-mail %1).[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]User guide[%END%][%END%]
SYMPA -- Systeme de Multi-Postage Automatique
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc(list.name)%]Archives index of list %1[%END%][%END%]
[% FOREACH a = archives -%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][%END%]
[%|loc(list.name,list.host)%]%1@%2 mailing list has been activated by listmaster.[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][% list.name %][%END%]
[%|loc(list.name,list.host)%]%1@%2 mailing list has been rejected by listmaster.[%END%]
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% to %]
Subject: [% FILTER qencode %][%|loc%]List unknown[%END%][%END%]
Content-Type: multipart/report; report-type=delivery-status;
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% to %]
[% IF type == 'shared_moderated' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Shared document to be approved for %1[%END%][%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% FILTER qencode %][%|loc%]Listmaster[%END%] <[% to %]>[%END%]
[% IF type == 'request_list_creation' -%]
Subject: [% FILTER qencode %][%|loc(list.name,list.host,email)%]List "%1@%2" creation request from %3[%END%][%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% to %]
[% IF type == 'arc_quota_exceeded' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 archive quota exceeded[%END%][%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]Public lists[%END%][%END%]
[%|loc(conf.email,conf.host)%]Here is the list of lists from %1@%2[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% to %]
[% IF type == 'intern_error' -%]
Subject: [% FILTER qencode %][%|loc%]Message distribution: Internal server error[%END%][%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% to %]
Subject: [% FILTER qencode %][%command%][%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% newuser.email %]
[% IF action == 'subrequest' -%]
Subject: [% FILTER qencode %][%|loc(conf.title,list)%]%1 / subscribing to %2[%END%][%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
To: [% to %]
[% IF type == 'auto_notify_bouncers' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Your bouncing address in list %1[%END%][%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]Result of your command[%END%][%END%]
[%|loc%]Here are the lists you are currently subscribed to:[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
From: [% conf.email_gecos %] <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]A virus in your email[%END%][%END%]
[%|loc%]***** V I R U S A L E R T *****[%END%]
......
......@@ -2946,7 +2946,7 @@ sub send_global_file {
return undef;
}
foreach my $p ('email','host','sympa','request','listmaster','wwsympa_url','title','listmaster_email') {
foreach my $p ('email','email_gecos','host','sympa','request','listmaster','wwsympa_url','title','listmaster_email') {
$data->{'conf'}{$p} = &Conf::get_robot_conf($robot, $p);
}
......@@ -3072,7 +3072,7 @@ sub send_file {
&tt2::add_include_path($d);
}
foreach my $p ('email','host','sympa','request','listmaster','wwsympa_url','title','listmaster_email') {
foreach my $p ('email','email_gecos','host','sympa','request','listmaster','wwsympa_url','title','listmaster_email') {
$data->{'conf'}{$p} = &Conf::get_robot_conf($robot, $p);
}
......
......@@ -310,6 +310,15 @@ our @params = (
edit => '1',
file => 'sympa.conf',
advice => 'Effective address will be \[EMAIL\]@\[HOST\]',
},
{
name => 'email_gecos',
default => 'SYMPA',
query => 'Gecos for service mail send by Sympa itself',
vhost => '1',
edit => '1',
file => 'sympa.conf',
advice => 'This parameter is used in mail_tt2 files',
},
{
name => 'create_list',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment