From 6b221a9f2f21d1191e51d562a17869ec0d45a8b2 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 6 Apr 2017 16:18:15 +0200 Subject: [PATCH] Add support for separated __VILLE__ __RUE__ and __CODE_POSTAL__ tags for signature --- root/etc/e-smith/events/actions/generate-email-sign | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/root/etc/e-smith/events/actions/generate-email-sign b/root/etc/e-smith/events/actions/generate-email-sign index 7c92e36..e036aff 100644 --- a/root/etc/e-smith/events/actions/generate-email-sign +++ b/root/etc/e-smith/events/actions/generate-email-sign @@ -121,6 +121,9 @@ foreach my $user (@users){ $src =~ s/__START_FONCTION3__.*__END_FONCTION3__//smg if ($func3 eq ''); $src =~ s/__START_FONCTION4__.*__END_FONCTION4__//smg if ($func4 eq ''); $src =~ s/__START_ENTREPRISE__.*__END_ENTREPRISE__//smg if ($comp eq ''); + $src =~ s/__START_CODE_POSTAL__.*__END_CODE_POSTAL__//smg if ($postalcode eq ''); + $src =~ s/__START_RUE__.*__END_RUE__//smg if ($street eq ''); + $src =~ s/__START_VILLE__.*__END_VILLE__//smg if ($city eq ''); $src =~ s/__START_ADRESSE__.*__END_ADRESSE__//smg if ($addr eq ''); $src =~ s/__START_URL__.*__END_URL__//smg if ($url eq ''); @@ -137,6 +140,9 @@ foreach my $user (@users){ $src =~ s/__SERVICE__/$dep/g; $src =~ s/__ENTREPRISE__/$comp/g; $src =~ s/__ADRESSE__/$addr/g; + $src =~ s/__CODE_POSTAL__/$postalcode/g; + $src =~ s/__RUE__/$street/g; + $src =~ s/__VILLE__/$city/g; $src =~ s/__URL__/$url/g; # Now remove any remaining __START_ and __END_ tags