smeserver-roundcube/contribs10/smeserver-roundcube-1.2-bz12059-24syntax.patch

diff -urN smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube
--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube        2022-07-22 22:29:59.137742906 +0300
+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube    2022-07-22 22:34:58.294244550 +0300
@@ -4,7 +4,7 @@
             unless $status eq 'enabled';
 
     $OUT = "";
-    my $allow = 'all';
+    my $allow = 'all granted';
     my $pass = '0';
     my $satisfy = 'all';
     my $name = $roundcube{'Name'} || 'RoundCube IMAP Client';
@@ -19,31 +19,31 @@
           }
           elsif ($roundcube{'PublicAccess'} eq 'local')
           {
-            $allow   = $localAccess;
+            $allow   = "ip $localAccess";
             $pass    = 0;
             $satisfy = 'all';
           }
           elsif ($roundcube{'PublicAccess'} eq 'local-pw')
           {
-            $allow   = $localAccess;
+            $allow   = "ip $localAccess";
             $pass    = 1;
             $satisfy = 'all';
           }
           elsif ($roundcube{'PublicAccess'} eq 'global')
           {
-            $allow   = 'all';
+            $allow   = 'all granted';
             $pass    = 0;
             $satisfy = 'all';
           }
           elsif ($roundcube{'PublicAccess'} eq 'global-pw')
           {
-            $allow   = 'all';
+            $allow   = 'all granted';
             $pass    = 1;
             $satisfy = 'all';
           }
           elsif ($roundcube{'PublicAccess'} eq 'global-pw-remote')
           {
-            $allow   = $localAccess;
+            $allow   = "ip $localAccess";
             $pass    = 1;
             $satisfy = 'any';
           }
@@ -63,9 +63,7 @@
       
       $OUT .= "\n";
       $OUT .= "<Directory /usr/share/roundcubemail>\n";
-      $OUT .= "    order deny,allow\n";
-      $OUT .= "    deny from all\n";
-      $OUT .= "    allow from $allow\n";
+      $OUT .= "    Require $allow\n";
 
       if ($pass)
       {
@@ -86,8 +84,7 @@
 
       $OUT .= qq (
 <Directory /usr/share/roundcubemail/installer/>
-  Order Deny,Allow
-  Deny from All
+  Require all denied
 </Directory>
                  );
 
1	diff -urN smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube
2	--- smeserver-roundcube-1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube 2022-07-22 22:29:59.137742906 +0300
3	+++ smeserver-roundcube-1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92roundcube 2022-07-22 22:34:58.294244550 +0300
4	@@ -4,7 +4,7 @@
5	unless $status eq 'enabled';
6
7	$OUT = "";
8	- my $allow = 'all';
9	+ my $allow = 'all granted';
10	my $pass = '0';
11	my $satisfy = 'all';
12	my $name = $roundcube{'Name'} \|\| 'RoundCube IMAP Client';
13	@@ -19,31 +19,31 @@
14	}
15	elsif ($roundcube{'PublicAccess'} eq 'local')
16	{
17	- $allow = $localAccess;
18	+ $allow = "ip $localAccess";
19	$pass = 0;
20	$satisfy = 'all';
21	}
22	elsif ($roundcube{'PublicAccess'} eq 'local-pw')
23	{
24	- $allow = $localAccess;
25	+ $allow = "ip $localAccess";
26	$pass = 1;
27	$satisfy = 'all';
28	}
29	elsif ($roundcube{'PublicAccess'} eq 'global')
30	{
31	- $allow = 'all';
32	+ $allow = 'all granted';
33	$pass = 0;
34	$satisfy = 'all';
35	}
36	elsif ($roundcube{'PublicAccess'} eq 'global-pw')
37	{
38	- $allow = 'all';
39	+ $allow = 'all granted';
40	$pass = 1;
41	$satisfy = 'all';
42	}
43	elsif ($roundcube{'PublicAccess'} eq 'global-pw-remote')
44	{
45	- $allow = $localAccess;
46	+ $allow = "ip $localAccess";
47	$pass = 1;
48	$satisfy = 'any';
49	}
50	@@ -63,9 +63,7 @@
51
52	$OUT .= "\n";
53	$OUT .= "<Directory /usr/share/roundcubemail>\n";
54	- $OUT .= " order deny,allow\n";
55	- $OUT .= " deny from all\n";
56	- $OUT .= " allow from $allow\n";
57	+ $OUT .= " Require $allow\n";
58
59	if ($pass)
60	{
61	@@ -86,8 +84,7 @@
62
63	$OUT .= qq (
64	<Directory /usr/share/roundcubemail/installer/>
65	- Order Deny,Allow
66	- Deny from All
67	+ Require all denied
68	</Directory>
69	);
70