Files
ezmlm-web/ezmlm-web-3.3.1-modiffor722.patch

227 lines
7.8 KiB
Diff
Raw Permalink Normal View History

--- ezmlm-web-3.3.1/ezmlm-web.cgi.plusmodif 2016-04-20 06:55:41.000000000 -0400
+++ ezmlm-web-3.3.1/ezmlm-web.cgi 2016-04-20 15:21:15.000000000 -0400
@@ -1169,6 +1169,20 @@
$item = '' unless defined($item);
$pagedata->setValue("Data.List.CopyLines", "$item");
}
+ if (Mail::Ezmlm->get_version() >= 7) {
+ $item = $list->getpart('digsize');
+ $item = '' unless defined($item);
+ $pagedata->setValue("Data.List.digsize", "$item");
+
+ $item = $list->getpart('digcount');
+ $item = '' unless defined($item);
+ $pagedata->setValue("Data.List.digcount", "$item");
+
+ $item = $list->getpart('digtime');
+ $item = '' unless defined($item);
+ $pagedata->setValue("Data.List.digtime", "$item");
+ }
+
$item = $list->getpart('mimereject');
$item = '' unless defined($item);
@@ -2524,6 +2538,46 @@
}
}
+ # 'digsize' setting (since ezmlm-idx v7)
+ if (defined($q->param('digsize'))) {
+ my $digsize;
+ $digsize = (defined($q->param('digsize'))) ?
+ $q->param('digsize') : 0;
+ if (defined($q->param('digsize_state')) && ($digsize)) {
+ $list->setpart('digsize', "$digsize");
+ } else {
+ my $digsize = $list->thislist() . "/digsize";
+ unlink ($digsize) if (-e $digsize);
+ }
+ }
+ # 'digsize' setting (since ezmlm-idx v7)
+ if (defined($q->param('digcount'))) {
+ my $digcount;
+ $digcount = (defined($q->param('digcount'))) ?
+ $q->param('digcount') : 0;
+ if (defined($q->param('digcount_state')) && ($digcount)) {
+ $list->setpart('digcount', "$digcount");
+ } else {
+ my $digcount = $list->thislist() . "/digcount";
+ unlink ($digcount) if (-e $digcount);
+ }
+ }
+ # 'digtime' setting (since ezmlm-idx v7)
+ if (defined($q->param('digtime'))) {
+ my $digtime;
+ $digtime = (defined($q->param('digtime'))) ?
+ $q->param('digtime') : 0;
+ if (defined($q->param('digtime_state')) && ($digtime)) {
+ $list->setpart('digtime', "$digtime");
+ } else {
+ my $digtime = $list->thislist() . "/digtime";
+ unlink ($digtime) if (-e $digtime);
+ }
+ }
+
+
+
+
# 'msgsize' setting
if (defined($q->param('msgsize_max_value'))
&& defined($q->param('msgsize_min_value'))) {
--- ezmlm-web/lang/en.hdf.plusmodif 2016-04-20 06:55:41.000000000 -0400
+++ ezmlm-web/lang/en.hdf 2016-04-20 15:06:49.000000000 -0400
@@ -234,6 +234,12 @@
ListAddress = List Address
ListOptions = Basic List Options
AllowedToEdit = Users allowed to edit this list via web interface
+ digsize = Size of message body accumulated since the latest digest
+ digsize.unit = kbytes
+ digcount = Number of message accumulated since the latest digest
+ digcount.unit = messages
+ digtime = Time since lastest digest
+ digtime.unit = hours
HeaderFiltering = Header filtering
HeaderRemove = strip these header lines
HeaderKeep = keep only these header lines
--- ezmlm-web/template/ui/easy.hdf.plusmodif 2016-04-20 06:55:42.000000000 -0400
+++ ezmlm-web/template/ui/easy.hdf 2016-04-20 14:54:20.000000000 -0400
@@ -40,7 +40,6 @@
Listname = create_listname
Listaddress = create_listaddress
Listlanguage = lang_select
- Webuser = webusers
}
@@ -60,7 +59,6 @@
SubscribeRules = subscribe_selection
PostingRules = posting_selection
Confirm = confirm_selection
- WebUsers = webusers
}
Processing {
--- ezmlm-web/template/ui/normal.hdf.plusmodif 2016-04-20 06:55:42.000000000 -0400
+++ ezmlm-web/template/ui/normal.hdf 2016-04-20 14:54:58.000000000 -0400
@@ -47,7 +47,6 @@
Listname = create_listname
Listaddress = create_listaddress
Listlanguage = lang_select
- Webuser = webusers
}
@@ -58,7 +57,6 @@
}
Deny {
- Enabled = block_deny
}
Moderators {
@@ -85,7 +83,6 @@
Main {
Language = lang_select
Owner = owner_address
- WebUsers = webusers
}
Archive {
@@ -110,7 +107,6 @@
Posting {
Moderate = posting_selection
- UseDeny = block_deny
Confirm = confirm_post
SizeMax = msgsize_max
SizeMin = msgsize_min
--- ezmlm-web/template/ui/expert.hdf.plusmodif 2016-04-20 06:55:42.000000000 -0400
+++ ezmlm-web/template/ui/expert.hdf 2016-04-20 14:53:16.000000000 -0400
@@ -49,7 +49,6 @@
Listaddress = create_listaddress
Listlanguage = lang_select
Mysql = mysql
- Webuser = webusers
}
@@ -61,7 +60,6 @@
}
Deny {
- Enabled = block_deny
}
Moderators {
@@ -93,10 +91,8 @@
Charset = charset_select
Owner = owner_address
MainList = mainlist
- MailmanRequests = mailman_requests
RemoveWarn = warn_remove
SQL = mysql
- WebUsers = webusers
}
Archive {
@@ -123,7 +119,6 @@
Posting {
Rules = posting_selection
- UseDeny = block_deny
Confirm = confirm_post
SizeMax = msgsize_max
SizeMin = msgsize_min
@@ -156,12 +151,10 @@
ConfirmSub = confirm_sub
ConfirmUnsub = confirm_unsub
ModSubEnable = mod_sub
- UseDeny = block_deny
BlockOthers = block_others_post
ConfirmPosting = confirm_post
ModPosting = mod_post
NonModPosting = block_nonmod_post
- MailmanRequests = mailman_requests
RemoveWarn = warn_remove
DigestEnabled = digest_enabled
DigestSettings = digest_settings
@@ -190,7 +183,6 @@
CopyLines = copylines
Language = lang_select
Charset = charset_select
- WebUsers = webusers
}
}
--- ezmlm-web/template/config_options/digest_settings.cs.ori 2016-04-20 13:51:45.000000000 -0400
+++ ezmlm-web/template/config_options/digest_settings.cs 2016-04-20 15:13:35.000000000 -0400
@@ -1,3 +1,27 @@
<!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
<!-- digest settings -->
-<?cs call:setting("4") ?>
+<input type="checkbox" name="digsize_state"
+ value="selected" id="digsize_state" <?cs
+ if:Data.List.digsize>0 ?>checked="checked"<?cs /if ?> />
+ <label for="digsize"><?cs var:html_escape(Lang.Misc.digsize) ?></label>
+ <ul><li><input type="text" name="digsize" size="10"
+ style="text-align:right" value="<?cs
+ alt:Data.List.digsize ?>64<?cs /alt ?>" /> <?cs
+ var:html_escape(Lang.Misc.digsize.unit) ?></li></ul>
+<input type="checkbox" name="digcount_state"
+ value="selected" id="digcount_state" <?cs
+ if:Data.List.digcount>0 ?>checked="checked"<?cs /if ?> />
+ <label for="digcount"><?cs var:html_escape(Lang.Misc.digcount) ?></label>
+ <ul><li><input type="text" name="digcount" size="10"
+ style="text-align:right" value="<?cs
+ alt:Data.List.digcount ?>30<?cs /alt ?>" /> <?cs
+ var:html_escape(Lang.Misc.digcount.unit) ?></li></ul>
+<input type="checkbox" name="digtime_state"
+ value="selected" id="digtime_state" <?cs
+ if:Data.List.digtime>0 ?>checked="checked"<?cs /if ?> />
+ <label for="digtime"><?cs var:html_escape(Lang.Misc.digtime) ?></label>
+ <ul><li><input type="text" name="digtime" size="10"
+ style="text-align:right" value="<?cs
+ alt:Data.List.digtime ?>48<?cs /alt ?>" /> <?cs
+ var:html_escape(Lang.Misc.digtime.unit) ?></li></ul>
+