smeserver-ezmlm-www/contribs10/smeserver-ezmlm-www-2.0.0-bz11909-sme10-bis.patch

diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/createlinks smeserver-ezmlm-www-2.0.0/createlinks
--- smeserver-ezmlm-www-2.0.0.old/createlinks   2022-03-20 03:19:22.779000000 -0400
+++ smeserver-ezmlm-www-2.0.0/createlinks       2022-03-20 03:22:30.630000000 -0400
@@ -14,7 +14,7 @@
     console-save
     email-update
     mailinglist-create
-    mailinglist-update
+    mailinglist-modify
     mailinglist-assign
     ));
 templates2events("/opt/mailinglist/config.pm", qw(
@@ -22,7 +22,7 @@
     console-save
     email-update
     mailinglist-create
-    mailinglist-update
+    mailinglist-modify
     mailinglist-assign
     ));
 #foreach (qw(
diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist
--- smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist    2007-12-03 13:07:01.000000000 -0500
+++ smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist        2022-03-20 03:21:59.597000000 -0400
@@ -9,9 +9,14 @@
     Deny from all
     allow from all
 
-    <Files ~ "^(.htaccess|.htpasswd)">
+    <Files ~ "^(.htaccess|.htpasswd|config\.pm|ez_indexer\.pl)">
         Order allow,deny
         Deny from all
     </Files>
 </Directory>
 
+<Directory /opt/mailinglist/search/indexes>
+        Order allow,deny
+        Deny from all
+</Directory>
+
diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/config.pm smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/config.pm
--- smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/config.pm  2022-03-20 03:19:22.780000000 -0400
+++ smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/config.pm      2022-03-20 03:21:59.864000000 -0400
@@ -23,6 +23,7 @@
         my $show_inline_images = (( $list->prop('show_inline_images') || 'enabled') eq 'enabled')? 1 : 0;
        my $subscription_info = (( $list->prop('subscription_info') || 'disabled') eq 'enabled') ? 1 :  0;
        my $descending_by_default = (( $list->prop('descending_by_default') ||  'enabled') eq 'enabled')? 1 : 0;
+        my $search = (( $list->prop('search') ||  'disabled') eq 'enabled') ? 1 :  0;
 
        $OUT.=<<"END_TXT";
 push \@\$lists, {
@@ -37,7 +38,10 @@
        default_sorting => '$default_sorting',   #may be 'thread', 'date' or 'subject'
        show_html => $show_html,
        highlight => $highlight,
-       show_inline_images => $show_inline_images
+       show_inline_images => $show_inline_images,
+       search => $search,
+       index_dir => '/opt/mailinglist/search/indexes/$key',
+       search_dir => '/opt/mailinglist/search/indexes/$key'
 };
 END_TXT
    }
diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl
--- smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl       2022-03-20 03:19:22.780000000 -0400
+++ smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl   2022-03-20 03:22:00.147000000 -0400
@@ -39,7 +39,7 @@
     my @sortings=('thread' , 'date' , 'subject' );
     foreach my $list ($adb->get_all_by_prop(type => 'mailinglist'))
     {
-        #next if (($list->prop('DisplayArchives') || 'disabled') ne 'enabled');
+        next if (($list->prop('DisplayArchives') || 'disabled') ne 'enabled');
         my $key= $list->key;
        $OUT .= <<"END_TEXT";
 push \@Lists, {
1	diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/createlinks smeserver-ezmlm-www-2.0.0/createlinks
2	--- smeserver-ezmlm-www-2.0.0.old/createlinks 2022-03-20 03:19:22.779000000 -0400
3	+++ smeserver-ezmlm-www-2.0.0/createlinks 2022-03-20 03:22:30.630000000 -0400
4	@@ -14,7 +14,7 @@
5	console-save
6	email-update
7	mailinglist-create
8	- mailinglist-update
9	+ mailinglist-modify
10	mailinglist-assign
11	));
12	templates2events("/opt/mailinglist/config.pm", qw(
13	@@ -22,7 +22,7 @@
14	console-save
15	email-update
16	mailinglist-create
17	- mailinglist-update
18	+ mailinglist-modify
19	mailinglist-assign
20	));
21	#foreach (qw(
22	diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist
23	--- smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist 2007-12-03 13:07:01.000000000 -0500
24	+++ smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99mailinglist 2022-03-20 03:21:59.597000000 -0400
25	@@ -9,9 +9,14 @@
26	Deny from all
27	allow from all
28
29	- <Files ~ "^(.htaccess\|.htpasswd)">
30	+ <Files ~ "^(.htaccess\|.htpasswd\|config\.pm\|ez_indexer\.pl)">
31	Order allow,deny
32	Deny from all
33	</Files>
34	</Directory>
35
36	+<Directory /opt/mailinglist/search/indexes>
37	+ Order allow,deny
38	+ Deny from all
39	+</Directory>
40	+
41	diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/config.pm smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/config.pm
42	--- smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/config.pm 2022-03-20 03:19:22.780000000 -0400
43	+++ smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/config.pm 2022-03-20 03:21:59.864000000 -0400
44	@@ -23,6 +23,7 @@
45	my $show_inline_images = (( $list->prop('show_inline_images') \|\| 'enabled') eq 'enabled')? 1 : 0;
46	my $subscription_info = (( $list->prop('subscription_info') \|\| 'disabled') eq 'enabled') ? 1 : 0;
47	my $descending_by_default = (( $list->prop('descending_by_default') \|\| 'enabled') eq 'enabled')? 1 : 0;
48	+ my $search = (( $list->prop('search') \|\| 'disabled') eq 'enabled') ? 1 : 0;
49
50	$OUT.=<<"END_TXT";
51	push \@\$lists, {
52	@@ -37,7 +38,10 @@
53	default_sorting => '$default_sorting', #may be 'thread', 'date' or 'subject'
54	show_html => $show_html,
55	highlight => $highlight,
56	- show_inline_images => $show_inline_images
57	+ show_inline_images => $show_inline_images,
58	+ search => $search,
59	+ index_dir => '/opt/mailinglist/search/indexes/$key',
60	+ search_dir => '/opt/mailinglist/search/indexes/$key'
61	};
62	END_TXT
63	}
64	diff -Nur --no-dereference smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl
65	--- smeserver-ezmlm-www-2.0.0.old/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl 2022-03-20 03:19:22.780000000 -0400
66	+++ smeserver-ezmlm-www-2.0.0/root/etc/e-smith/templates/opt/mailinglist/search/ez_indexer.pl 2022-03-20 03:22:00.147000000 -0400
67	@@ -39,7 +39,7 @@
68	my @sortings=('thread' , 'date' , 'subject' );
69	foreach my $list ($adb->get_all_by_prop(type => 'mailinglist'))
70	{
71	- #next if (($list->prop('DisplayArchives') \|\| 'disabled') ne 'enabled');
72	+ next if (($list->prop('DisplayArchives') \|\| 'disabled') ne 'enabled');
73	my $key= $list->key;
74	$OUT .= <<"END_TEXT";
75	push \@Lists, {