/[smecontribs]/rpms/ezmlm-web/contribs9/ezmlm-web-3.3.1-modiffor722.patch
ViewVC logotype

Annotation of /rpms/ezmlm-web/contribs9/ezmlm-web-3.3.1-modiffor722.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Fri Apr 22 09:24:36 2016 UTC (8 years, 6 months ago) by unnilennium
Branch: MAIN
CVS Tags: ezmlm-web-3_3_1-7_el6_sme, ezmlm-web-3_3_1-5_el6_sme, ezmlm-web-3_3_1-6_el6_sme, HEAD
Initial import

1 unnilennium 1.1 --- ezmlm-web-3.3.1/ezmlm-web.cgi.plusmodif 2016-04-20 06:55:41.000000000 -0400
2     +++ ezmlm-web-3.3.1/ezmlm-web.cgi 2016-04-20 15:21:15.000000000 -0400
3     @@ -1169,6 +1169,20 @@
4     $item = '' unless defined($item);
5     $pagedata->setValue("Data.List.CopyLines", "$item");
6     }
7     + if (Mail::Ezmlm->get_version() >= 7) {
8     + $item = $list->getpart('digsize');
9     + $item = '' unless defined($item);
10     + $pagedata->setValue("Data.List.digsize", "$item");
11     +
12     + $item = $list->getpart('digcount');
13     + $item = '' unless defined($item);
14     + $pagedata->setValue("Data.List.digcount", "$item");
15     +
16     + $item = $list->getpart('digtime');
17     + $item = '' unless defined($item);
18     + $pagedata->setValue("Data.List.digtime", "$item");
19     + }
20     +
21    
22     $item = $list->getpart('mimereject');
23     $item = '' unless defined($item);
24     @@ -2524,6 +2538,46 @@
25     }
26     }
27    
28     + # 'digsize' setting (since ezmlm-idx v7)
29     + if (defined($q->param('digsize'))) {
30     + my $digsize;
31     + $digsize = (defined($q->param('digsize'))) ?
32     + $q->param('digsize') : 0;
33     + if (defined($q->param('digsize_state')) && ($digsize)) {
34     + $list->setpart('digsize', "$digsize");
35     + } else {
36     + my $digsize = $list->thislist() . "/digsize";
37     + unlink ($digsize) if (-e $digsize);
38     + }
39     + }
40     + # 'digsize' setting (since ezmlm-idx v7)
41     + if (defined($q->param('digcount'))) {
42     + my $digcount;
43     + $digcount = (defined($q->param('digcount'))) ?
44     + $q->param('digcount') : 0;
45     + if (defined($q->param('digcount_state')) && ($digcount)) {
46     + $list->setpart('digcount', "$digcount");
47     + } else {
48     + my $digcount = $list->thislist() . "/digcount";
49     + unlink ($digcount) if (-e $digcount);
50     + }
51     + }
52     + # 'digtime' setting (since ezmlm-idx v7)
53     + if (defined($q->param('digtime'))) {
54     + my $digtime;
55     + $digtime = (defined($q->param('digtime'))) ?
56     + $q->param('digtime') : 0;
57     + if (defined($q->param('digtime_state')) && ($digtime)) {
58     + $list->setpart('digtime', "$digtime");
59     + } else {
60     + my $digtime = $list->thislist() . "/digtime";
61     + unlink ($digtime) if (-e $digtime);
62     + }
63     + }
64     +
65     +
66     +
67     +
68     # 'msgsize' setting
69     if (defined($q->param('msgsize_max_value'))
70     && defined($q->param('msgsize_min_value'))) {
71     --- ezmlm-web/lang/en.hdf.plusmodif 2016-04-20 06:55:41.000000000 -0400
72     +++ ezmlm-web/lang/en.hdf 2016-04-20 15:06:49.000000000 -0400
73     @@ -234,6 +234,12 @@
74     ListAddress = List Address
75     ListOptions = Basic List Options
76     AllowedToEdit = Users allowed to edit this list via web interface
77     + digsize = Size of message body accumulated since the latest digest
78     + digsize.unit = kbytes
79     + digcount = Number of message accumulated since the latest digest
80     + digcount.unit = messages
81     + digtime = Time since lastest digest
82     + digtime.unit = hours
83     HeaderFiltering = Header filtering
84     HeaderRemove = strip these header lines
85     HeaderKeep = keep only these header lines
86     --- ezmlm-web/template/ui/easy.hdf.plusmodif 2016-04-20 06:55:42.000000000 -0400
87     +++ ezmlm-web/template/ui/easy.hdf 2016-04-20 14:54:20.000000000 -0400
88     @@ -40,7 +40,6 @@
89     Listname = create_listname
90     Listaddress = create_listaddress
91     Listlanguage = lang_select
92     - Webuser = webusers
93     }
94    
95    
96     @@ -60,7 +59,6 @@
97     SubscribeRules = subscribe_selection
98     PostingRules = posting_selection
99     Confirm = confirm_selection
100     - WebUsers = webusers
101     }
102    
103     Processing {
104     --- ezmlm-web/template/ui/normal.hdf.plusmodif 2016-04-20 06:55:42.000000000 -0400
105     +++ ezmlm-web/template/ui/normal.hdf 2016-04-20 14:54:58.000000000 -0400
106     @@ -47,7 +47,6 @@
107     Listname = create_listname
108     Listaddress = create_listaddress
109     Listlanguage = lang_select
110     - Webuser = webusers
111     }
112    
113    
114     @@ -58,7 +57,6 @@
115     }
116    
117     Deny {
118     - Enabled = block_deny
119     }
120    
121     Moderators {
122     @@ -85,7 +83,6 @@
123     Main {
124     Language = lang_select
125     Owner = owner_address
126     - WebUsers = webusers
127     }
128    
129     Archive {
130     @@ -110,7 +107,6 @@
131    
132     Posting {
133     Moderate = posting_selection
134     - UseDeny = block_deny
135     Confirm = confirm_post
136     SizeMax = msgsize_max
137     SizeMin = msgsize_min
138     --- ezmlm-web/template/ui/expert.hdf.plusmodif 2016-04-20 06:55:42.000000000 -0400
139     +++ ezmlm-web/template/ui/expert.hdf 2016-04-20 14:53:16.000000000 -0400
140     @@ -49,7 +49,6 @@
141     Listaddress = create_listaddress
142     Listlanguage = lang_select
143     Mysql = mysql
144     - Webuser = webusers
145     }
146    
147    
148     @@ -61,7 +60,6 @@
149     }
150    
151     Deny {
152     - Enabled = block_deny
153     }
154    
155     Moderators {
156     @@ -93,10 +91,8 @@
157     Charset = charset_select
158     Owner = owner_address
159     MainList = mainlist
160     - MailmanRequests = mailman_requests
161     RemoveWarn = warn_remove
162     SQL = mysql
163     - WebUsers = webusers
164     }
165    
166     Archive {
167     @@ -123,7 +119,6 @@
168    
169     Posting {
170     Rules = posting_selection
171     - UseDeny = block_deny
172     Confirm = confirm_post
173     SizeMax = msgsize_max
174     SizeMin = msgsize_min
175     @@ -156,12 +151,10 @@
176     ConfirmSub = confirm_sub
177     ConfirmUnsub = confirm_unsub
178     ModSubEnable = mod_sub
179     - UseDeny = block_deny
180     BlockOthers = block_others_post
181     ConfirmPosting = confirm_post
182     ModPosting = mod_post
183     NonModPosting = block_nonmod_post
184     - MailmanRequests = mailman_requests
185     RemoveWarn = warn_remove
186     DigestEnabled = digest_enabled
187     DigestSettings = digest_settings
188     @@ -190,7 +183,6 @@
189     CopyLines = copylines
190     Language = lang_select
191     Charset = charset_select
192     - WebUsers = webusers
193    
194     }
195     }
196     --- ezmlm-web/template/config_options/digest_settings.cs.ori 2016-04-20 13:51:45.000000000 -0400
197     +++ ezmlm-web/template/config_options/digest_settings.cs 2016-04-20 15:13:35.000000000 -0400
198     @@ -1,3 +1,27 @@
199     <!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
200     <!-- digest settings -->
201     -<?cs call:setting("4") ?>
202     +<input type="checkbox" name="digsize_state"
203     + value="selected" id="digsize_state" <?cs
204     + if:Data.List.digsize>0 ?>checked="checked"<?cs /if ?> />
205     + <label for="digsize"><?cs var:html_escape(Lang.Misc.digsize) ?></label>
206     + <ul><li><input type="text" name="digsize" size="10"
207     + style="text-align:right" value="<?cs
208     + alt:Data.List.digsize ?>64<?cs /alt ?>" /> <?cs
209     + var:html_escape(Lang.Misc.digsize.unit) ?></li></ul>
210     +<input type="checkbox" name="digcount_state"
211     + value="selected" id="digcount_state" <?cs
212     + if:Data.List.digcount>0 ?>checked="checked"<?cs /if ?> />
213     + <label for="digcount"><?cs var:html_escape(Lang.Misc.digcount) ?></label>
214     + <ul><li><input type="text" name="digcount" size="10"
215     + style="text-align:right" value="<?cs
216     + alt:Data.List.digcount ?>30<?cs /alt ?>" /> <?cs
217     + var:html_escape(Lang.Misc.digcount.unit) ?></li></ul>
218     +<input type="checkbox" name="digtime_state"
219     + value="selected" id="digtime_state" <?cs
220     + if:Data.List.digtime>0 ?>checked="checked"<?cs /if ?> />
221     + <label for="digtime"><?cs var:html_escape(Lang.Misc.digtime) ?></label>
222     + <ul><li><input type="text" name="digtime" size="10"
223     + style="text-align:right" value="<?cs
224     + alt:Data.List.digtime ?>48<?cs /alt ?>" /> <?cs
225     + var:html_escape(Lang.Misc.digtime.unit) ?></li></ul>
226     +

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed