ezmlm-web
/
ezmlm-web
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove MAIL_ADDRESS_PREFIX from dotqmail file names (Closes: #45) 

update some comments
remove obsolete subscription log output from template
This commit is contained in:
lars 2008-08-24 15:02:51 +00:00
parent 5b203e002f
commit ced6763cc8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ezmlm-web.cgi
View File

@ -1358,6 +1358,7 @@ sub set_pagedata_subscription_log {
$line = $_;
# a line of the log file could look like the following:
# 748392136 +manual foo@bar.org Foo Bar <foo@bar.org>
# for encoded sender names see "decode_quoted_string" above
$line =~ m/^(\d+) ([+-])(\w*) ([^ ]*) ?(.*)$/;
if (defined($5)) {
$epoch_seconds = $1;
@ -1369,7 +1370,7 @@ sub set_pagedata_subscription_log {
$pagedata->setValue("Data.List.SubscribeLog.$i.date", $datetext);
# the the action should be +/-
$pagedata->setValue("Data.List.SubscribeLog.$i.action", $action);
# manual/auto/mod/probe - TODO: verify "auto"
# manual, probe (removal) or auto (empty details)
$pagedata->setValue("Data.List.SubscribeLog.$i.details", $action_details);
$pagedata->setValue("Data.List.SubscribeLog.$i.address", $address);
$i++;
@ -1672,7 +1673,7 @@ sub create_list {
my ($qmail, $listname, $options, $i);
# Some taint checking ...
$qmail = $1 if $q->param('inlocal') =~ /(?:$USER-)?([^\<\>\\\/\s]+)$/;
$qmail = $1 if $q->param('inlocal') =~ /(?:$MAIL_ADDRESS_PREFIX-)?([^\<\>\\\/\s]+)$/;
# dots have to be turned into colons
# see http://www.qmail.org/man/man5/dot-qmail.html
$qmail =~ s/\./:/g;

2
template/show_subscription_log.cs
View File

@ -25,8 +25,6 @@
?><?cs /if ?></td>
<td><?cs if:Data.List.SubscribeLog[x].details == 'manual' ?><?cs
var:html_escape(Lang.Misc.SubscribeActions.manual) ?><?cs
elif:Data.List.SubscribeLog[x].details == 'mod' ?><?cs
var:html_escape(Lang.Misc.SubscribeActions.mod) ?><?cs
elif:Data.List.SubscribeLog[x].details == 'probe' ?><?cs
var:html_escape(Lang.Misc.SubscribeActions.probe) ?><?cs
elif:Data.List.SubscribeLog[x].details == '' ?><?cs