Skip to content

Commit 96ef18d

Browse files
ldidryldidry
committed
Fix sympa-community#323 — Add "Report abuse" button to lists side menu
1 parent 5b8e3bd commit 96ef18d

File tree

6 files changed

+61
-27
lines changed

6 files changed

+61
-27
lines changed

‎default/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ nobase_default_DATA = \
321321
web_tt2/remove_arc.tt2 \
322322
web_tt2/rename_list_request.tt2 \
323323
web_tt2/renewpasswd.tt2 \
324+
web_tt2/report_abuse.tt2 \
324325
web_tt2/requestpasswd.tt2 \
325326
web_tt2/request_topic.tt2 \
326327
web_tt2/reviewbouncing.tt2 \

‎default/web_tt2/list_menu.tt2

+6
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,10 @@
156156
[% PROCESS additional_list_menu_links.tt2 %]
157157
[% CATCH %]
158158
[% END %]
159+
160+
[% IF conf.show_report_abuse %]
161+
<li>
162+
[% PROCESS report_abuse.tt2 ~%]
163+
</li>
164+
[% END %]
159165
<!-- end list_menu.tt2 -->

‎default/web_tt2/report_abuse.tt2

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<!-- report_abuse.tt2 -->
2+
[% IF conf.show_report_abuse %]
3+
[% | mailto("${conf.listmaster_email}@${domain}",{subject=>"Sympa abuse report: ${list}"}) %][%|loc%]Report abuse[%END%][%END%]
4+
[% END %]
5+
<!-- end report_abuse.tt2 -->

‎po/sympa/sympa.pot

+39-27
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ msgid ""
4141
"Incorrect parameter definition: %s\n"
4242
msgstr ""
4343

44-
#: src/lib/Sympa/Upgrade.pm:2092 src/lib/Sympa/Upgrade.pm:2136 src/lib/Sympa/Upgrade.pm:953 src/sbin/sympa_wizard.pl.in:403
44+
#: src/lib/Sympa/Upgrade.pm:2103 src/lib/Sympa/Upgrade.pm:2147 src/lib/Sympa/Upgrade.pm:982 src/sbin/sympa_wizard.pl.in:403
4545
#. This entry is a date/time format
4646
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
4747
msgid "%d.%b.%Y-%H.%M.%S"
@@ -2067,6 +2067,14 @@ msgstr ""
20672067
msgid "Is FastCGI module for HTTP server installed? This module provides a much faster web interface."
20682068
msgstr ""
20692069

2070+
#: src/lib/Sympa/ConfDef.pm:2128
2071+
msgid "Add a \"Report abuse\" link in the side menu of the lists (0|1)"
2072+
msgstr ""
2073+
2074+
#: src/lib/Sympa/ConfDef.pm:2130
2075+
msgid "The link is a mailto link, you can change that by overriding web_tt2/report_abuse.tt2"
2076+
msgstr ""
2077+
20702078
#: default/mhonarc-ressources.tt2:680 src/lib/Sympa/Language.pm:626
20712079
msgid "Sun:Mon:Tue:Wed:Thu:Fri:Sat"
20722080
msgstr ""
@@ -3845,51 +3853,51 @@ msgstr ""
38453853
msgid "(unknown date)"
38463854
msgstr ""
38473855

3848-
#: src/cgi/wwsympa.fcgi.in:10163 src/cgi/wwsympa.fcgi.in:1202 src/cgi/wwsympa.fcgi.in:2766 src/cgi/wwsympa.fcgi.in:3029 src/cgi/wwsympa.fcgi.in:6243 src/cgi/wwsympa.fcgi.in:6246 src/cgi/wwsympa.fcgi.in:9198 src/lib/Sympa/Template.pm:314
3856+
#: src/cgi/wwsympa.fcgi.in:10164 src/cgi/wwsympa.fcgi.in:1203 src/cgi/wwsympa.fcgi.in:2767 src/cgi/wwsympa.fcgi.in:3030 src/cgi/wwsympa.fcgi.in:6244 src/cgi/wwsympa.fcgi.in:6247 src/cgi/wwsympa.fcgi.in:9199 src/lib/Sympa/Template.pm:314
38493857
#. This entry is a date/time format
38503858
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
38513859
msgid "%d %b %Y at %H:%M:%S"
38523860
msgstr ""
38533861

3854-
#: src/lib/Sympa/Upgrade.pm:1031
3862+
#: src/lib/Sympa/Upgrade.pm:1060
38553863
msgid "Unknown parameter"
38563864
msgstr ""
38573865

3858-
#: src/lib/Sympa/Upgrade.pm:1049
3866+
#: src/lib/Sympa/Upgrade.pm:1078
38593867
msgid "Migration from wwsympa.conf"
38603868
msgstr ""
38613869

3862-
#: src/lib/Sympa/Upgrade.pm:1061
3870+
#: src/lib/Sympa/Upgrade.pm:1090
38633871
msgid ""
38643872
"Migrated Parameters\n"
38653873
"Following parameters were migrated from wwsympa.conf."
38663874
msgstr ""
38673875

3868-
#: src/lib/Sympa/Upgrade.pm:1070
3876+
#: src/lib/Sympa/Upgrade.pm:1099
38693877
msgid ""
38703878
"Overrididing Parameters\n"
38713879
"Following parameters existed both in sympa.conf and wwsympa.conf. Previous release of Sympa used those in wwsympa.conf. Comment-out ones you wish to be disabled."
38723880
msgstr ""
38733881

3874-
#: src/lib/Sympa/Upgrade.pm:1079
3882+
#: src/lib/Sympa/Upgrade.pm:1108
38753883
msgid ""
38763884
"Duplicate of sympa.conf\n"
38773885
"These parameters were found in both sympa.conf and wwsympa.conf. Previous release of Sympa used those in sympa.conf. Uncomment ones you wish to be enabled."
38783886
msgstr ""
38793887

3880-
#: src/lib/Sympa/Upgrade.pm:1088
3888+
#: src/lib/Sympa/Upgrade.pm:1117
38813889
msgid ""
38823890
"Old Parameters\n"
38833891
"These parameters are no longer used."
38843892
msgstr ""
38853893

3886-
#: src/lib/Sympa/Upgrade.pm:1097
3894+
#: src/lib/Sympa/Upgrade.pm:1126
38873895
msgid ""
38883896
"Unknown Parameters\n"
38893897
"Though these parameters were found in wwsympa.conf, they were ignored. You may simply remove them."
38903898
msgstr ""
38913899

3892-
#: default/web_tt2/suboptions.tt2:103 default/web_tt2/suboptions.tt2:15 default/web_tt2/suboptions.tt2:17 default/web_tt2/suboptions.tt2:99 src/cgi/wwsympa.fcgi.in:10015 src/cgi/wwsympa.fcgi.in:10017 src/cgi/wwsympa.fcgi.in:10304 src/cgi/wwsympa.fcgi.in:10307 src/cgi/wwsympa.fcgi.in:14276 src/cgi/wwsympa.fcgi.in:14280 src/cgi/wwsympa.fcgi.in:15477 src/cgi/wwsympa.fcgi.in:15569 src/cgi/wwsympa.fcgi.in:15672 src/cgi/wwsympa.fcgi.in:16879 src/cgi/wwsympa.fcgi.in:16881 src/cgi/wwsympa.fcgi.in:5050 src/cgi/wwsympa.fcgi.in:5122 src/cgi/wwsympa.fcgi.in:8848 src/cgi/wwsympa.fcgi.in:9577 src/cgi/wwsympa.fcgi.in:9625 src/cgi/wwsympa.fcgi.in:9943 src/cgi/wwsympa.fcgi.in:9946 src/cgi/wwsympa.fcgi.in:9979 src/cgi/wwsympa.fcgi.in:9982 src/lib/Sympa/Aliases/Template.pm:53 src/lib/Sympa/Message/Template.pm:102 src/lib/Sympa/Message/Template.pm:105 src/lib/Sympa/Message/Template.pm:112
3900+
#: default/web_tt2/suboptions.tt2:103 default/web_tt2/suboptions.tt2:15 default/web_tt2/suboptions.tt2:17 default/web_tt2/suboptions.tt2:99 src/cgi/wwsympa.fcgi.in:10016 src/cgi/wwsympa.fcgi.in:10018 src/cgi/wwsympa.fcgi.in:10305 src/cgi/wwsympa.fcgi.in:10308 src/cgi/wwsympa.fcgi.in:14277 src/cgi/wwsympa.fcgi.in:14281 src/cgi/wwsympa.fcgi.in:15478 src/cgi/wwsympa.fcgi.in:15570 src/cgi/wwsympa.fcgi.in:15673 src/cgi/wwsympa.fcgi.in:16880 src/cgi/wwsympa.fcgi.in:16882 src/cgi/wwsympa.fcgi.in:5051 src/cgi/wwsympa.fcgi.in:5123 src/cgi/wwsympa.fcgi.in:8849 src/cgi/wwsympa.fcgi.in:9578 src/cgi/wwsympa.fcgi.in:9626 src/cgi/wwsympa.fcgi.in:9944 src/cgi/wwsympa.fcgi.in:9947 src/cgi/wwsympa.fcgi.in:9980 src/cgi/wwsympa.fcgi.in:9983 src/lib/Sympa/Aliases/Template.pm:53 src/lib/Sympa/Message/Template.pm:102 src/lib/Sympa/Message/Template.pm:105 src/lib/Sympa/Message/Template.pm:112
38933901
#. (subscriber.date)
38943902
#. (subscriber.update_date)
38953903
#. (subscriber.startdate)
@@ -3917,7 +3925,7 @@ msgstr ""
39173925
msgid "Table of contents:"
39183926
msgstr ""
39193927

3920-
#: src/cgi/wwsympa.fcgi.in:7376 src/cgi/wwsympa.fcgi.in:8133 src/lib/Sympa/Request/Handler/index.pm:77 src/lib/Sympa/Spindle/ProcessDigest.pm:178
3928+
#: src/cgi/wwsympa.fcgi.in:7377 src/cgi/wwsympa.fcgi.in:8134 src/lib/Sympa/Request/Handler/index.pm:77 src/lib/Sympa/Spindle/ProcessDigest.pm:178
39213929
#. This entry is a date/time format
39223930
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
39233931
msgid "%a, %d %b %Y %H:%M:%S"
@@ -3957,7 +3965,7 @@ msgstr ""
39573965
msgid "contains over %d leading characters in sequence"
39583966
msgstr ""
39593967

3960-
#: default/web_tt2/viewlogs.tt2:83 src/cgi/wwsympa.fcgi.in:16151 src/lib/Sympa/WWW/SharedDocument.pm:348
3968+
#: default/web_tt2/viewlogs.tt2:83 src/cgi/wwsympa.fcgi.in:16152 src/lib/Sympa/WWW/SharedDocument.pm:348
39613969
#. (date_from_formated)
39623970
#. (date_to_formated)
39633971
#. This entry is a date/time format
@@ -4193,67 +4201,67 @@ msgstr ""
41934201
msgid "Normalizes file names represented by Unicode."
41944202
msgstr ""
41954203

4196-
#: src/cgi/wwsympa.fcgi.in:1204
4204+
#: src/cgi/wwsympa.fcgi.in:1205
41974205
#. This entry is a date/time format
41984206
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
41994207
msgid "%H:%M:%S"
42004208
msgstr ""
42014209

4202-
#: src/cgi/wwsympa.fcgi.in:4230
4210+
#: src/cgi/wwsympa.fcgi.in:4231
42034211
msgid "Your lists"
42044212
msgstr ""
42054213

4206-
#: src/cgi/wwsympa.fcgi.in:12642 src/cgi/wwsympa.fcgi.in:13115
4214+
#: src/cgi/wwsympa.fcgi.in:12643 src/cgi/wwsympa.fcgi.in:13116
42074215
msgid "New file"
42084216
msgstr ""
42094217

4210-
#: src/cgi/wwsympa.fcgi.in:12646
4218+
#: src/cgi/wwsympa.fcgi.in:12647
42114219
msgid "New directory"
42124220
msgstr ""
42134221

4214-
#: src/cgi/wwsympa.fcgi.in:13121
4222+
#: src/cgi/wwsympa.fcgi.in:13122
42154223
msgid "New bookmark"
42164224
msgstr ""
42174225

4218-
#: src/cgi/wwsympa.fcgi.in:15653
4226+
#: src/cgi/wwsympa.fcgi.in:15654
42194227
msgid "Mail sending"
42204228
msgstr ""
42214229

4222-
#: src/cgi/wwsympa.fcgi.in:15655
4230+
#: src/cgi/wwsympa.fcgi.in:15656
42234231
msgid "Subscription additions"
42244232
msgstr ""
42254233

4226-
#: src/cgi/wwsympa.fcgi.in:15656
4234+
#: src/cgi/wwsympa.fcgi.in:15657
42274235
msgid "Unsubscription"
42284236
msgstr ""
42294237

4230-
#: src/cgi/wwsympa.fcgi.in:15657
4238+
#: src/cgi/wwsympa.fcgi.in:15658
42314239
msgid "Users deleted by admin"
42324240
msgstr ""
42334241

4234-
#: src/cgi/wwsympa.fcgi.in:15659
4242+
#: src/cgi/wwsympa.fcgi.in:15660
42354243
msgid "Users deleted automatically"
42364244
msgstr ""
42374245

4238-
#: src/cgi/wwsympa.fcgi.in:15660
4246+
#: src/cgi/wwsympa.fcgi.in:15661
42394247
msgid "File uploading"
42404248
msgstr ""
42414249

4242-
#: src/cgi/wwsympa.fcgi.in:15661
4250+
#: src/cgi/wwsympa.fcgi.in:15662
42434251
msgid "File creation"
42444252
msgstr ""
42454253

4246-
#: src/cgi/wwsympa.fcgi.in:15662
4254+
#: src/cgi/wwsympa.fcgi.in:15663
42474255
msgid "Directory creation"
42484256
msgstr ""
42494257

4250-
#: src/cgi/wwsympa.fcgi.in:16133 src/cgi/wwsympa.fcgi.in:16135
4258+
#: src/cgi/wwsympa.fcgi.in:16134 src/cgi/wwsympa.fcgi.in:16136
42514259
#. This entry is a date/time format
42524260
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
42534261
msgid "%Y-%m-%d-%H-%M-%S"
42544262
msgstr ""
42554263

4256-
#: src/cgi/wwsympa.fcgi.in:16888
4264+
#: src/cgi/wwsympa.fcgi.in:16889
42574265
#. This entry is a sprintf format
42584266
#. Check the sprintf manpage for format details : http://perldoc.perl.org/functions/sprintf.html
42594267
msgid "topic (%s)"
@@ -6876,6 +6884,10 @@ msgstr ""
68766884
msgid "Request new password"
68776885
msgstr ""
68786886

6887+
#: default/web_tt2/report_abuse.tt2:3
6888+
msgid "Report abuse"
6889+
msgstr ""
6890+
68796891
#: default/web_tt2/request_topic.tt2:5
68806892
msgid "This list is configured to require topic(s) for each message."
68816893
msgstr ""

‎src/cgi/wwsympa.fcgi.in

+1
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,7 @@ while ($query = CGI::Fast->new) {
11591159
'automatic_list_families',
11601160
'spam_protection',
11611161
'pictures_max_size',
1162+
'show_report_abuse',
11621163
) {
11631164

11641165
$param->{'conf'}{$p} = Conf::get_robot_conf($robot, $p);

‎src/lib/Sympa/ConfDef.pm

+9
Original file line numberDiff line numberDiff line change
@@ -2123,6 +2123,15 @@ our @params = (
21232123
'file' => 'wwsympa.conf',
21242124
'optional' => 1,
21252125
},
2126+
{ 'name' => 'show_report_abuse',
2127+
'gettext_id' =>
2128+
'Add a "Report abuse" link in the side menu of the lists (0|1)',
2129+
'gettext_comment' =>
2130+
'The link is a mailto link, you can change that by overriding web_tt2/report_abuse.tt2',
2131+
'default' => '0',
2132+
'file' => 'sympa.conf',
2133+
'optional' => 1,
2134+
},
21262135

21272136
## Not implemented yet.
21282137
## {

0 commit comments

Comments
 (0)