Commit 17c87847 authored by sikeda's avatar sikeda
Browse files

[bug] If the list name contains "+", incorrect web links are generated in...

[bug] If the list name contains "+", incorrect web links are generated in service messages and web interface.
Fixed by encoding special characters using new "url_abs" and "url_rel" template
filters.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12726 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 7881c612
......@@ -16,4 +16,4 @@ selected by Sympa as severe bouncing addresses:[%END%]
[% user %]
[% END %]
[%|loc%]Managing bouncing subscribers:[%END%] [% conf.wwsympa_url %]/reviewbouncing/[% list.name %]
[%|loc%]Managing bouncing subscribers:[%END%] [% 'reviewbouncing' | url_abs([list.name]) %]
......@@ -5,4 +5,4 @@ Subject: [% FILTER qencode %][%|loc%]Your document has been installed.[%END%][%E
[%|loc(filename,list.name,list.host,installed_by)%]Your document %1 for list %2@%3
has been installed by %4 list editor.[%END%]
[%|loc%]The list document repository:[%END%] [% conf.wwsympa_url %]/d_read/[% list.name %]
[%|loc%]The list document repository:[%END%] [% 'd_read' | url_abs([list.name]) %]
......@@ -6,7 +6,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END
[% conf.email %]@[% conf.host %]
[%~ END %]
[%|loc%]Everything about this list: [%END%][% conf.wwsympa_url %]/info/[% 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 %]@[% conf.host %]
......
......@@ -7,7 +7,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END
[% conf.email %]@[% conf.host %]
[%~ END %]
[%|loc%]Everything about this list: [%END%][% conf.wwsympa_url %]/info/[% 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 %]@[% conf.host %]
......
......@@ -4,7 +4,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][
[%|loc(list.name,list.host)%]%1@%2 mailing list has been activated by listmaster.[%END%]
[%|loc%]homepage[%END%]
[% conf.wwsympa_url %]/info/[% list.name %]
[% 'info' | url_abs([list.name]) %]
[%|loc(list.name)%]%1 admin page[%END%]
[% conf.wwsympa_url %]/admin/[% list.name %]
[% 'admin' | url_abs([list.name]) %]
......@@ -3,22 +3,20 @@ To: [% to %]
[% IF type == 'shared_moderated' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Shared document to be approved for %1[%END%][%END%]
[% IF many_files %]
[%|loc(list.name,filename,who,conf.wwsympa_url)%]There are new shared documents in list %1:
[% IF many_files -%]
[%|loc(list.name,filename,who)%]There are new shared documents in list %1:
%2
from %3
To moderate these document:
%4/modindex/%1[% END %]
[% ELSE %]
[%|loc(list.name,filename,who,conf.wwsympa_url)%]There is a new shared document in list %1:
To moderate these document: [%END%]
[%- ELSE -%]
[%|loc(list.name,filename,who)%]There is a new shared document in list %1:
%2 from %3
To moderate this document:
%4/modindex/%1
[% END %][% END %]
To moderate this document: [%END%]
[%- END %]
[% 'modindex' | url_abs([list.name]) %]
[% ELSE -%]
Subject: [% FILTER qencode %][%|loc(list.name,type)%]Moderators List %1 / %2[%END%][%END%]
......
......@@ -7,10 +7,10 @@ Subject: [% FILTER qencode %][%|loc(list.name,list.host,email)%]List "%1@%2" cre
[% list.name %]@[% list.host %]
[% list.subject %]
[% conf.wwsympa_url %]/info/[% list.name %]
[% 'info' | url_abs([list.name]) %]
[%|loc%]To activate/delete this mailing list:[%END%]
[% conf.wwsympa_url %]/ticket/[%one_time_ticket%]
[% 'ticket' | url_abs([one_time_ticket]) %]
[%- ELSIF type == 'list_created' -%]
[% PROCESS 'list_created.tt2' -%]
......@@ -30,7 +30,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]List "%1" renaming[%END%][%END%]
[% END %]
[%|loc%]To activate/delete this mailing list:[%END%]
[% conf.wwsympa_url %]/ticket/[%one_time_ticket%]
[% 'ticket' | url_abs([one_time_ticket]) %]
[% ELSIF type == 'no_db' -%]
Subject: [% FILTER qencode %][%|loc%]No DataBase[%END%][%END%]
......@@ -339,7 +339,7 @@ Subject: [% FILTER qencode %][%|loc(list.name, list.host)%]Listmaster: list %1@%
[%|loc%]See logs for more details.[%END%]
[%|loc%]Check the bounces in this list:[% END %] [% conf.wwsympa_url %]/reviewbouncing/[% listname %]
[%|loc%]Check the bounces in this list:[% END %] [% 'reviewbouncing' | url_abs([listname]) %]
[% ELSIF type == 'automatic_list_creation_failed' -%]
Subject: [% FILTER qencode %][%|loc%]Listmaster: internal server error [%END%][%END%]
......
......@@ -33,7 +33,7 @@ Subject: [% FILTER qencode %][%|loc(type,list.name,who,gecos)%]FYI: %1 List "%2"
[%|loc(who,gecos,list.name)%]WARNING: %1 %2 failed to unsubscribe from %3 because his address was not found in the list.
You may help this person looking for similar email in subscriber list using the following link :[%END%]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[% 'ticket' | url_abs([one_time_ticket]) %]
[% ELSIF type == 'erase_customizing' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]List "%1" customizations have been removed[%END%][%END%]
......@@ -53,7 +53,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Subscription request to list %1[
A user asked to be added as a subscriber to your list. In order to list and manage
pending subscription requests you should click on the following link:[%END%]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[% 'ticket' | url_abs([one_time_ticket]) %]
[%|loc(replyto)%]If prefered, you can accept this subscription request sending an email to %1 with the following subject:[%END%]
AUTH [%keyauth%] ADD [%list.name%] [%who%] [%gecos%]
......@@ -96,8 +96,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]WARNING: bounce rate too high in
You should delete bouncing subscribers:
[%END%]
[% conf.wwsympa_url %]/reviewbouncing/[% list.name %]
[% 'reviewbouncing' | url_abs([list.name]) %]
[% ELSIF type == 'notice' -%]
Subject: [% FILTER qencode %][%|loc(command,list.name,who,gecos)%]FYI: %1 list %2 from %3 %4[%END%][%END%]
......
......@@ -15,7 +15,7 @@ Content-Disposition: inline
[% IF method == 'md5' -%]
[%|loc(mod_spool_size)%]They are %1 messages awaiting moderation.[%END%]
[%|loc%]To browse the awaiting messages, you should click on the following link:[%END%] <[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]>
[%|loc%]To browse the awaiting messages, you should click on the following link:[%END%] <[% 'ticket' | url_abs([one_time_ticket]) %]>
[% IF request_topic -%][%|loc()%]This mailing list is configured to require topics; that's probably why this message went through the moderation process.[%END%]
......@@ -39,7 +39,7 @@ DISTRIBUTE [% list.name %] [% modkey %]
[%|loc(conf.email,conf.host)%]Or send a message to %1@%2 with the following subject:[%END%]
REJECT [% list.name %] [% modkey %]
[%END%]
[%|loc(conf.wwsympa_url)%]The messages moderating documentation:[%END%] <[% conf.wwsympa_url %]/help/admin#moderate>
[%|loc%]The messages moderating documentation:[%END%] <[% 'help/admin' | url_abs %]#moderate>
[%- END%]
[%- END%]
[% IF spam_status != 'spam' -%]
......
......@@ -8,7 +8,7 @@ Content-Disposition: inline
[%|loc(total,list.name,list.host)%]There are %1 messages to be moderated for list %2@%3[%END%]
[%|loc%]The messages moderating documentation:[%END%] <[% conf.wwsympa_url %]/help/admin#moderate>
[%|loc%]The messages moderating documentation:[%END%] <[% 'help/admin' | url_abs %]#moderate>
[% IF spool %]
--[% boundary1 %]
......
......@@ -9,4 +9,4 @@ has been rejected by the moderator (%3).[%END%]
[%|loc(list.name)%]Check %1 list usage:[%END%]
[% conf.wwsympa_url %]/info/[% list.name %]
[% 'info' | url_abs([list.name]) %]
......@@ -4,7 +4,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Reminder of your subscription to
[%|loc(list.name,list.host,user.email,user.password)%]Your are subscriber of list %1@%2 with email %3[%END%]
[%|loc%]Everything about this list: [%END%][% conf.wwsympa_url %]/info/[% list.name %]
[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %]
[% IF subscriber.included != 1 %]
[%|loc%]Unsubscription:[%END%]
[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
......
......@@ -8,9 +8,9 @@ Content-Type: multipart/mixed; boundary="[% boundary %]"
--[% boundary %]
Content-Disposition: inline
[% IF request_topic -%][%|loc(list.name,conf.wwsympa_url,authkey)%]List %1 allows you to tag your messages, using a set of defined topics. To tag the attached message go to the following page:[%END%]
[% IF request_topic -%][%|loc(list.name)%]List %1 allows you to tag your messages, using a set of defined topics. To tag the attached message go to the following page:[%END%]
[%conf.wwsympa_url%]/request_topic/[%list.name%]/[%authkey%]
[% 'request_topic' | url_abs([list.name,authkey]) %]
[%- ELSE -%][%|loc(list.name)%]To distribute the attached message in list %1, follow the link below:[%END%]
[% | mailtourl({subject => "CONFIRM ${authkey}"}) ~%]
......
......@@ -11,7 +11,7 @@ Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%E
[% IF action == 'subrequest' -%]
[%|loc(list,conf.host,request_from_host)%]Someone, probably you, requested to subscribe to list %1@%2. (This request came from host %3).[%END%]
[%|loc%]You may ignore this subscription request or click on the following link in order to confirm it [%END%]: [% base_url %][% path_cgi %]/ticket/[% one_time_ticket %]
[%|loc%]You may ignore this subscription request or click on the following link in order to confirm it [%END%]: [% 'ticket' | url_abs([one_time_ticket]) %]
[% ELSIF action == 'sigrequest' -%]
[%|loc(list)%]You asked to be unsubscribed from %1 mailing list.[%END%]
......@@ -23,8 +23,8 @@ Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%E
[% ELSE -%]
[%|loc(conf.host,request_from_host)%]Someone, probably you, requested to allocate or renew your password for your list server account %1. (This request came from host %2).[%END%]
[%|loc%]You may ignore this request or click on the following link in order to choose your password. [%END%]: [% base_url %][% path_cgi %]/ticket/[% one_time_ticket %]
[%|loc%]You may ignore this request or click on the following link in order to choose your password. [%END%]: [% 'ticket' | url_abs([one_time_ticket]) %]
[%END%]
[%|loc(base_url,path_cgi)%]Help on Sympa: %1%2[%END%]/help
[%|loc(conf.wwsympa_url,'/help')%]Help on Sympa: %1%2[%END%]
......@@ -5,9 +5,9 @@ Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%E
[%|loc%]To complete your account setup actions you need to confirm that you have
supplied a working email address. Please follow the link below to complete your account configuration.[%END%]
[% base_url %][% path_cgi %]/sso_login/[% server.key %]/confirmemail/[% init_email %]/[% one_time_ticket %]
[% 'sso_login' | url_abs([server.key,'confirmemail',init_email,one_time_ticket]) %]
[% conf.title %]: [% base_url %][% path_cgi %]
[% conf.title %]: [% conf.wwsympa_url %]
[%|loc(base_url,path_cgi)%]Help on Sympa: %1%2[%END%]/help
[%|loc(conf.wwsympa_url,'/help')%]Help on Sympa: %1%2[%END%]
......@@ -8,6 +8,6 @@ X-Sympa-NoWrap: yes
[% FOREACH m = msg_list -%]
[%|wrap(0,2)%]* [% m.id %] - [% m.subject %] - [% m.from %][%END#wrap%]
[% IF conf.wwsympa_url -%]
[% conf.wwsympa_url %]/arcsearch_id/[% list.name %]/[% m.month %]/[% m.message_id %]
[% 'arcsearch_id' | url_abs([list.name,m.month,m.message_id]) %]
[% END %]
[% END -%]
......@@ -20,7 +20,7 @@ Deleted topic(s) is(are):[%END%]
[% END -%]
[%|loc%]To update your topics subscription, go to the following page:[%END%]
[% conf.wwsympa_url %]/suboptions/[% list.name %]
[% 'suboptions' | url_abs([list.name]) %]
[% ELSIF type == 'added_as_listadmin' -%]
......@@ -32,15 +32,15 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Management of list %1[%END%][%EN
[%|loc(delegator,list.name,list.host)%]You have been delegated the responsability of list moderator by %1 for list %2@%3.[%END%]
[% END %]
[%|loc%]The list homepage:[%END%] [% conf.wwsympa_url %]/info/[% list.name %]
[%|loc%]Owner and moderator guide:[%END%] [% conf.wwsympa_url %]/help/admin
[%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
[%|loc%]Owner and moderator guide:[%END%] [% 'help/admin' | url_abs %]
[% ELSIF type == 'ticket_to_send' -%]
Subject: [% FILTER qencode %][%|loc%]Changing your subscriber email address[%END%][%END%]
[%|loc%]You have requested to change your subscriber email address. To confirm your new email address with the SYMPA server, please click the link below:[%END%]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[% 'ticket' | url_abs([one_time_ticket]) %]
[% ELSIF type == 'ticket_to_signoff' -%]
......@@ -52,7 +52,7 @@ To confirm and get removed from the list, please click the link below: [%END%]
[% ELSE %]
[%|loc(list.name)%]You have requested to be removed from list %1. To confirm and get removed from the list, please click the link below: [%END%]
[% END %]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[% 'ticket' | url_abs([one_time_ticket]) %]
[% ELSIF type == 'ticket_to_family_signoff' -%]
Subject: [% FILTER qencode %][%|loc(family)%]Unsubscribing from family %1[%END%][%END%]
......@@ -63,7 +63,7 @@ To confirm and get removed from all the lists of this family, please click the l
[% ELSE %]
[%|loc(family)%]You have requested to be removed from family %1. To confirm and get removed from all the lists of this family, please click the link below: [%END%]
[% END %]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[% 'ticket' | url_abs([one_time_ticket]) %]
[% ELSIF type == 'hundred_percent_error' -%]
......
......@@ -10,6 +10,6 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Welcome to list %1[%END%][%END%]
[% CATCH %]
[% END %]
[%|loc%]The list homepage:[%END%] [% conf.wwsympa_url %]/info/[% list.name %]
[%|loc%]General informations about mailing lists:[%END%] [% conf.wwsympa_url %]/help/introduction
[%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
[%|loc%]General informations about mailing lists:[%END%] [% 'help/introduction' | url_abs %]
......@@ -11,4 +11,4 @@ was unable to access your personal certificate (email %1).[%END%]
to %1@%2 .[%END%]
[%|loc%]Information about this list:[%END%]
[% conf.wwsympa_url %]/info/[% list.name %]
[% 'info' | url_abs([list.name]) %]
......@@ -29,7 +29,7 @@
[% IF dark == '1' %]<tr>[% SET dark = '0' %][% ELSE %]<tr class="color0">[% SET dark = '1' %][% END %]
<td headers="list_name">
<a href="[% path_cgi %]/info/[% l.name %]" ><strong>[%|obfuscate(conf.spam_protection) %][% l.name %]@[% l.host %][% END %]</strong></a>
<a href="[% 'info' | url_rel([l.name]) %]" ><strong>[%|obfuscate(conf.spam_protection) %][% l.name %]@[% l.host %][% END %]</strong></a>
</td>
<td class="text_center" headers="message"> [% l.msg_count %] </td>
<td class="text_center" headers="average"> [% l.average %] </td>
......
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