Merge pull request #390 from ikedas/issue-386 by ikedas

Notify user that he already subscribed to a list #386

default/mail_tt2/user_notification.tt2

@@ -53,6 +53,25 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]No valid recipient in list %1[%E
 [%|loc(list.name,conf.listmaster_email,domain) %]Your message to list %1 could not be delivered. All the subscribers to this list have their address in error.
 Please contact the listmaster (%2@%3) to fix this problem before re-posting your message.[% END %]
 
+[% ELSIF type == 'vain_request_by_other' -%]
+[% IF request.action == 'subscribe' -%]
+Subject: [% FILTER qencode %][%|loc(list.name)%]FYI: subscribing to %1[%END%][%END%]
+[%- ELSIF request.action == 'signoff' -%]
+Subject: [% FILTER qencode %][%|loc(conf.title,list.name)%]FYI: unsubscribing from %1[%END%][%END%]
+[%- ELSE -%]
+Subject: [% request.action %]
+[%- END %]
+
+[% IF request.action == 'subscribe' -%]
+[%|loc(list.name)%]Someone (probably you) requested for subscribing to list %1, but you have already subscribed to this list.[%END%]
+[%- ELSIF request.action == 'signoff' -%]
+[%|loc(list.name)%]Someone (probably you) requested for unsubscribing from list %1, but you have not subscribed to this list.[%END%]
+[%- ELSE -%]
+[% request.action %]
+[%- END %]
+
+[%|loc%]No action is needed on your side.[%END%]
+
 [% ELSIF type == 'plugin' -%]
 [%- TRY -%][%- INCLUDE $entry -%]
 [%- CATCH -%]

default/scenari/subscribe.auth

+# subscribe.auth
 title.gettext subscription request confirmed
 
-is_subscriber([listname],[sender]) smtp,dkim,smime     -> do_it
-true()				   smtp,dkim           -> request_auth
-true()				   md5,smime           -> do_it
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp,dkim           -> request_auth([email])
+true()                             md5,smime           -> do_it

default/scenari/subscribe.auth_notify

+# subscribe.auth_notify
 title.gettext need authentication (notification is sent to owners)
 
-# do not authentify nor notify updates 
-is_subscriber ([listname],[sender])  smtp,dkim,smime,md5 -> do_it
-true()				     smtp,dkim           -> request_auth
-true()				     md5,smime           -> do_it,notify
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp,dkim           -> request_auth([email])
+true()                             md5,smime           -> do_it,notify

default/scenari/subscribe.auth_notifydkim

+# subscribe.auth_notifydkim
 title.gettext need authentication unless DKIM signature is OK (notification is sent to owners)
 
-# do not authentify nor notify updates 
-is_subscriber ([listname],[sender])  smtp,dkim,smime,md5 -> do_it
-true()				     smtp                -> request_auth
-true()				     dkim,md5,smime      -> do_it,notify
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp                -> request_auth([email])
+true()                             dkim,md5,smime      -> do_it,notify

default/scenari/subscribe.auth_owner

+# subscribe.auth_owner
 title.gettext requires authentication then owner approval
 
-# subscription under owner control but previously email are checked by auth
-true()                                     smtp,dkim      -> request_auth
-is_subscriber([listname],[previous_email]) md5,smime -> do_it
-true()                                     md5,smime -> owner
-
-
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp,dkim           -> request_auth([email])
+true()                             md5,smime           -> owner

default/scenari/subscribe.auth_ownerdkim

+# subscribe.auth_ownerdkim
 title.gettext requires authentication unless DKIM signature is OK, then owner approval
 
-# subscription under owner control but previously email are checked by auth
-true()                                     smtp      -> request_auth
-is_subscriber([listname],[previous_email]) dkim,md5,smime -> do_it
-true()                                     dkim,md5,smime -> owner
-
-
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp                -> request_auth([email])
+true()                             dkim,md5,smime      -> owner

default/scenari/subscribe.authdkim

+# subscribe.authdkim
 title.gettext subscription request confirmed
 
-is_subscriber([listname],[sender]) smtp,dkim,smime     -> do_it
-true()				   smtp                -> request_auth
-true()				   dkim,md5,smime          -> do_it
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp                -> request_auth([email])
+true()                             dkim,md5,smime      -> do_it

default/scenari/subscribe.closed

+# subscribe.closed
 title.gettext subscription is impossible
 
-true()   smtp,dkim,md5,smime -> reject(reason='subscribe_closed')
-
+true()  smtp,dkim,md5,smime -> reject(reason='subscribe_closed')

default/scenari/subscribe.intranet

+# subscribe.intranet
 title.gettext restricted to local domain users
 
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+
 # if subscriber request come from local domain do_it else reject
-is_subscriber([listname],[sender]) smtp,dkim,smime,md5    -> do_it
-match([sender],/[domain]$/)          smtp,dkim,smime,md5    -> do_it
+match([email],/[domain]$/)         smtp,dkim,md5,smime -> do_it
 #
 # this is example of a rule to check local adresses
 # verify_netmask('1.12.123.0/24') smtp,dkim,md5,smime -> do_it
 #
-true()                         smtp,dkim,md5,smime -> reject(reason='subscribe_local_user')	
 
+true()  smtp,dkim,md5,smime -> reject(reason='subscribe_local_user')

default/scenari/subscribe.intranetorowner

+# subscribe.intranetorowner
 title.gettext local domain users or owner approval
 
-# if subscriber request come from local domain do_it else reject
-is_subscriber([listname],[sender]) smtp,smime,md5    -> do_it
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+
+#
 # this is example of a rule to check local adresses
 # verify_netmask('1.12.123.0/24') smtp,md5,smime -> do_it
-match([sender],/[domain]$/)          smtp,dkim,smime,md5    -> do_it
-true()                             smtp,dkim,smime,md5    -> owner
+#
+# if subscriber request come from local domain do_it else reject
+match([email],/[domain]$/)         smtp,dkim,md5,smime -> do_it
+
+true()                             smtp,dkim,md5,smime -> owner

default/scenari/subscribe.open

+# subscribe.open
 title.gettext for anyone without authentication
 
-true()  smtp,dkim,smime,md5 -> do_it
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+true()                             smtp,dkim,md5,smime -> do_it

default/scenari/subscribe.open_notify

+# subscribe.open_notify
 title.gettext anyone, notification is sent to list owner
 
-# do not notify if it is just an update
-is_subscriber([listname],[sender])	 smtp,dkim,smime,md5 -> do_it
-true()					 smtp,dkim,smime,md5 -> do_it,notify
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+true()                             smtp,dkim,md5,smime -> do_it,notify

default/scenari/subscribe.open_quiet

+# subscribe.open_quiet
 title.gettext anyone, no welcome message
 
-true()  smtp,dkim,smime,md5 -> do_it,quiet
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+true()                             smtp,dkim,md5,smime -> do_it,quiet

default/scenari/subscribe.owner

+# subscribe.owner
 title.gettext owners approval
 
-# if subscriber request come from a subscriber, it's just an update, do it
-is_subscriber([listname],[sender]) smtp,smime,md5    -> do_it
-# if subscribtion request is just a change email, it is open :
-is_subscriber([listname],[previous_email]) smtp,smime,md5    -> do_it
-true()                             smtp,dkim,smime,md5    -> owner
-
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp,dkim,md5,smime -> owner

default/scenari/subscribe.smime

+# subscribe.smime
 title.gettext requires S/MIME signed
 
-is_subscriber([listname],[sender]) smtp,dkim,smime -> do_it
-true()				   smime           -> do_it
-true()                             smtp,dkim,md5        -> reject(reason='subscribe_smime')	
-
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smime               -> do_it
+true()                             smtp,dkim,md5       -> reject(reason='subscribe_smime')

default/scenari/subscribe.smimeorowner

+# subscribe.smimeorowner
 title.gettext requires S/MIME signed or owner approval
 
-# if subscriber request come from a subscriber, it's just an update, do it
-is_subscriber([listname],[sender]) smtp,dkim,smime,md5    -> do_it
-true()                             smtp,dkim,md5          -> owner
-true()                             smime                  -> do_it
-
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+is_subscriber([listname],[email])  smtp,dkim,md5,smime -> do_it
+true()                             smtp,dkim,md5       -> owner
+true()                             smime               -> do_it

default/scenari/unsubscribe.auth

+# unsubscribe.auth
 title.gettext need authentication
 
-!is_subscriber ([listname],[email]) smtp,dkim,smime,md5 -> do_it
-true()                              smtp, dkim          -> request_auth([email])
-true()			            md5,smime           -> do_it
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+!is_subscriber([listname],[email]) smtp,dkim,md5,smime -> do_it
+true()                             smtp,dkim           -> request_auth([email])
+true()                             md5,smime           -> do_it

default/scenari/unsubscribe.auth_notify

+# unsubscribe.auth_notify
 title.gettext authentication requested, notification sent to owner
 
-!is_subscriber ([listname],[email]) smtp,dkim,md5,smime -> do_it,notify
-true()                              smtp,dkim          -> request_auth([email])
-true()			            md5,smime      -> do_it,notify
-
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+!is_subscriber([listname],[email]) smtp,dkim,md5,smime -> do_it,notify
+true()                             smtp,dkim           -> request_auth([email])
+true()                             md5,smime           -> do_it,notify

default/scenari/unsubscribe.auth_notifydkim

+# unsubscribe.auth_notifydkim
 title.gettext authentication requested unless DKIM signature is OK, notification sent to owner
 
-!is_subscriber ([listname],[email]) smtp,dkim,md5,smime -> do_it,notify
-true()                              smtp           -> request_auth([email])
-true()			            dkim,md5,smime      -> do_it,notify
-
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+!is_subscriber([listname],[email]) smtp,dkim,md5,smime -> do_it,notify
+true()                             smtp                -> request_auth([email])
+true()                             dkim,md5,smime      -> do_it,notify

default/scenari/unsubscribe.authdkim

+# unsubscribe.authdkim
 title.gettext need authentication unless DKIM signature is OK
 
-!is_subscriber ([listname],[email]) smtp,dkim,smime,md5 -> do_it
-true()                              smtp                -> request_auth([email])
-true()			            dkim,md5,smime      -> do_it
+!equal([sender],[email])           smtp,dkim,md5,smime -> request_auth([email])
+!is_subscriber([listname],[email]) smtp,dkim,md5,smime -> do_it
+true()                             smtp                -> request_auth([email])
+true()                             dkim,md5,smime      -> do_it