aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sympa/templates
diff options
context:
space:
mode:
Diffstat (limited to 'modules/sympa/templates')
-rw-r--r--modules/sympa/templates/scenari/sender.ldap_group5
-rw-r--r--modules/sympa/templates/scenari/sender.restricted (renamed from modules/sympa/templates/scenari/sender.email)7
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/sympa/templates/scenari/sender.ldap_group b/modules/sympa/templates/scenari/sender.ldap_group
deleted file mode 100644
index ac8b3fd9..00000000
--- a/modules/sympa/templates/scenari/sender.ldap_group
+++ /dev/null
@@ -1,5 +0,0 @@
-title.gettext restricted to group <%= @ldap_group %>
-
-search(<%= @ldap_group %>.ldap) smtp,md5,smime -> do_it
-true() smtp,md5,smime -> reject(reason='send_subscriber')
-
diff --git a/modules/sympa/templates/scenari/sender.email b/modules/sympa/templates/scenari/sender.restricted
index 18704f48..69da52c5 100644
--- a/modules/sympa/templates/scenari/sender.email
+++ b/modules/sympa/templates/scenari/sender.restricted
@@ -1,7 +1,12 @@
title.gettext restricted list
-<%- for e in @email -%>
+<%- if @ldap_group -%>
+search(<%= @ldap_group %>.ldap) smtp,md5,smime -> do_it
+<%- end -%>
+<%- if @email -%>
+ <%- for e in @email -%>
equal([sender], '<%= e %>') smtp,md5,smime -> do_it
+ <%- end -%>
<%- end -%>
true() smtp,md5,smime -> reject(reason='send_subscriber')