WWSympa: wwsympa_url would be optional

default/mail_tt2/automatic_bounce_management.tt2

@@ -13,4 +13,6 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 automatic bounce managem
 [% user %]
 [% END %]
 
+[% IF conf.wwsympa_url -%]
 [%|loc%]Managing bouncing subscribers:[%END%] [% 'reviewbouncing' | url_abs([list.name]) %]
+[% END -%]

default/mail_tt2/command_report.tt2

@@ -126,4 +126,6 @@ X-Loop: [% conf.email %]@[% domain %]
 
 -----------==========================================-----------
 
+[% IF conf.wwsympa_url -%]
 [%|loc(conf.wwsympa_url)%]For further information, check the mailing list web site %1[%END%]
+[% END -%]

default/mail_tt2/expire_warning1.tt2

@@ -2,12 +2,16 @@
 Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
 
 [%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
-[% | mailtourl({subject => "sub ${list.name}"}) ~%]
-  [% conf.email %]@[% domain %]
-[%~ END %]
+[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
 
-[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %]
-[%|loc%]Unsubscription:[%END%]
-[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
-  [% conf.email %]@[% domain %]
-[%~ END %]
+[% IF conf.wwsympa_url -%]
+[%|loc%]Everything about this list: [%END ~%]
+  [% 'info' | url_abs([list.name]) %]
+[%|loc%]Unsubscription:[%END%] [%""~%]
+  [% 'signoff' | url_abs([list.name]) %]
+[% ELSE -%]
+[%|loc%]Information about this list: [%END ~%]
+  [% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
+[%|loc%]Unsubscription:[%END%] [%""~%]
+  [% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
+[% END -%]

default/mail_tt2/expire_warning2.tt2

@@ -3,12 +3,16 @@ From: [% fromlist %]
 Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
 
 [%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
-[% | mailtourl({subject => "sub ${list.name}"}) ~%]
-  [% conf.email %]@[% domain %]
-[%~ END %]
+[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
 
-[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %]
-[%|loc%]Unsubscription:[%END%]
-[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
-  [% conf.email %]@[% domain %]
-[%~ END %]
+[% IF conf.wwsympa_url -%]
+[%|loc%]Everything about this list: [%END ~%]
+  [% 'info' | url_abs([list.name]) %]
+[%|loc%]Unsubscription:[%END%] [%""~%]
+  [% 'signoff' | url_abs([list.name]) %]
+[% ELSE -%]
+[%|loc%]Information about this list: [%END ~%]
+  [% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
+[%|loc%]Unsubscription:[%END%] [%""~%]
+  [% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
+[% END -%]

default/mail_tt2/invite.tt2

@@ -6,15 +6,13 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END%
 [%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%]
 
 [%|loc%]To subscribe, click the following URL:[%END%]
-[% IF user_interfaces.size() == 1 && user_interfaces.0 == 'mail' -%]
-[% | mailtourl({subject => "AUTH ${keyauth} ${cmd}"}) ~%]
-  [% conf.email %]@[% domain %]
-[%~ END %]
+[% IF conf.wwsympa_url -%]
+  [% 'auth' | url_abs([keyauth,'subscribe',list.name],{email=>user.email}) %]
+[%~ ELSE -%]
+  [% "${conf.email}@${domain}" | mailtourl({subject => "AUTH ${keyauth} ${cmd}"}) %]
 
 [%|loc(conf.email,domain)%]Or send a message to %1@%2 with the following subject:[%END%]
   AUTH [% keyauth %] [% cmd %]
-[%- ELSE -%]
-  [% 'auth' | url_abs([keyauth,'subscribe'],{email=>user.email}) %]
-[%- END %]
+[%~ END -%]
 
 [%|loc%]If you don't want to subscribe just ignore this message.[%END%]

default/mail_tt2/list_created.tt2

@@ -3,8 +3,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][
 
 [%|loc(list.name,domain)%]%1@%2 mailing list has been activated by listmaster.[%END%]
 
+[% IF conf.wwsympa_url -%]
 [%|loc%]homepage[%END%]
 [% 'info' | url_abs([list.name]) %]
 
 [%|loc(list.name)%]%1 admin page[%END%]
 [% 'admin' | url_abs([list.name]) %]
+[% END -%]

default/mail_tt2/reject.tt2

@@ -6,6 +6,7 @@ Subject: [% FILTER qencode %][%|loc%]Your message has been rejected[%END%][%END%
 
 [%|loc(subject)%](Subject of your mail: %1)[%END%]
 
-
+[% IF conf.wwsympa_url -%]
 [%|loc(list.name)%]Check %1 list usage:[%END%]
 [% 'info' | url_abs([list.name]) %]
+[% END -%]

default/mail_tt2/remind.tt2

@@ -6,10 +6,14 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Reminder of your subscription to
 
 [%|loc%]It is important to us to not send mail to people that don't want to receive it. If you do not want to be on this mailing list, please follow the instructions below to remove yourself.[%END%]
 
-[%|loc%]List information: [%END%][% 'info' | url_abs([list.name]) %]
-[% IF subscriber.included != 1 %]
-[%|loc%]To unsubscribe:[%END%]
-[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
-  [% conf.email %]@[% domain %]
-[%~ END %]
-[%END%]
+[% IF conf.wwsympa_url -%]
+[%|loc%]List information: [%END ~%]
+  [% 'info' | url_abs([list.name]) %]
+[%|loc%]To unsubscribe:[%END%] [%""~%]
+  [% 'signoff' | url_abs([list.name]) %]
+[% ELSE -%]
+[%|loc%]List information: [%END ~%]
+  [% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
+[%|loc%]To unsubscribe:[%END%] [%""~%]
+  [% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
+[% END -%]

default/mail_tt2/request_auth.tt2

@@ -33,7 +33,7 @@ Subject: [% FILTER qencode %]AUTH [%keyauth%] [%cmd%][%END%]
 
 [%- END -%]
 
-[% IF user_interfaces.size() == 1 and user_interfaces.0 == 'mail' -%]
+[% IF not conf.wwsympa_url -%]
 [% sympa = BLOCK %][% conf.email %]@[% domain %][%END -%]
 [%|loc(sympa,"AUTH ${keyauth} ${cmd}") %]If you want this action to be taken, please
 

default/mail_tt2/user_notification.tt2

@@ -31,8 +31,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Management of list %1[%END%][%EN
 [%|loc(delegator,list.name,domain)%]You have been delegated the responsability of list moderator by %1 for list %2@%3.[%END%]
 [% END %]
 
+[% IF conf.wwsympa_url -%]
 [%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
 [%|loc%]Owner and moderator guide:[%END%] [% 'help/admin' | url_abs %]
+[% END -%]
 
 [% ELSIF type == 'ticket_to_family_signoff' -%]
 Subject: [% FILTER qencode %][%|loc(family)%]Unsubscribing from family %1[%END%][%END%]

default/mail_tt2/welcome.tt2

@@ -10,6 +10,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Welcome to list %1[%END%][%END%]
 [% CATCH %]
 [% END %]
 
+[% IF conf.wwsympa_url -%]
 [%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
 [%|loc%]General informations about mailing lists:[%END%] [% 'help/introduction' | url_abs %]
-
+[% END -%]

default/mail_tt2/x509-user-cert-missing.tt2

@@ -8,5 +8,7 @@ Subject: %2[%END%]
 [%|loc(user.email)%]It was not possible to send you the message because the mailing list manager was unable to access your personal certificate (email %1).[%END%]
 [%|loc(conf.email,domain)%]Please, in order to receive future encrypted messages send a signed message to %1@%2.[%END%]
 
+[% IF conf.wwsympa_url -%]
 [%|loc%]Information about this list:[%END%]
 [% 'info' | url_abs([list.name]) %]
+[% END -%]

src/lib/Sympa/ConfDef.pm

@@ -1249,10 +1249,11 @@ our @params = (
     # Basic configuration
 
     {   'name'       => 'wwsympa_url',
-        'sample'     => 'http://web.example.org/sympa',
+        'sample'     => 'https://web.example.org/sympa',
         'gettext_id' => 'URL prefix of web interface',
         'vhost'      => '1',
         'file'       => 'sympa.conf',
+        'optional'   => '1',
         'edit'       => '1',
         'gettext_comment' =>
             'This is used to construct URLs of web interface.',