From ced6763cc89aaa3996f77cabf27c394792bf4db7 Mon Sep 17 00:00:00 2001 From: lars Date: Sun, 24 Aug 2008 15:02:51 +0000 Subject: [PATCH] remove MAIL_ADDRESS_PREFIX from dotqmail file names (Closes: #45) update some comments remove obsolete subscription log output from template --- ezmlm-web.cgi | 5 +++-- template/show_subscription_log.cs | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ezmlm-web.cgi b/ezmlm-web.cgi index 6240ba3..4d19ac5 100755 --- a/ezmlm-web.cgi +++ b/ezmlm-web.cgi @@ -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 + # 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; diff --git a/template/show_subscription_log.cs b/template/show_subscription_log.cs index b651b4b..13bd4a8 100644 --- a/template/show_subscription_log.cs +++ b/template/show_subscription_log.cs @@ -25,8 +25,6 @@ ?>