smeserver-userpanel/contribs10/smeserver-userpanel-1.4-bz12064-24syntax.patch

diff -urN smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user
--- smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user        2022-07-22 15:28:14.221036281 +0300
+++ smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user    2022-07-22 15:43:43.648404844 +0300
@@ -53,29 +53,27 @@
 <Directory \"/etc/e-smith/web/panels/user/html\" >
     Options Includes Indexes FollowSymLinks
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from $localAccess
     AuthName "SME User manager"
     AuthType Basic
     TKTAuthLoginURL /server-common/cgi-bin/login
-    require valid-user
     SetEnv IMGHDR_SRC \"/e-smith-common/server-manager.jpg\"
-    Satisfy all
+    <RequireAll>
+       require valid-user
+       Require ip $localAccess
+    </RequireAll>
 </Directory>
 
 <Directory \"/etc/e-smith/web/panels/user/cgi-bin\" >
     Options Includes Indexes FollowSymLinks
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from $localAccess
     AuthName "SME User Manager"
     AuthType Basic
     TKTAuthLoginURL /server-common/cgi-bin/login
-    require valid-user
     SetEnv IMGHDR_SRC \"/e-smith-common/server-manager.jpg\"
-    Satisfy all
+    <RequireAll>
+       require valid-user
+       Require ip $localAccess
+    </RequireAll>
 HERE
 
     foreach $file (@files)
diff -urN smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass
--- smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass        2022-07-22 15:28:14.220036286 +0300
+++ smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass    2022-07-22 15:48:31.086986931 +0300
@@ -18,13 +18,11 @@
         }
 
         $OUT .= "    <Location /$place>\n";
-        $OUT .= "        order deny,allow\n";
-        $OUT .= "        deny from all\n";
         if (($haveSSL eq 'yes') && (($port eq "443") || ($plainTextAccess ne 'yes')))
         {
-            $OUT .= "        allow from $localAccess $externalSSLAccess\n";
+            $OUT .= "        Require ip $localAccess $externalSSLAccess\n";
         } else {
-            $OUT .= "        allow from $localAccess\n";
+            $OUT .= "        Require ip $localAccess\n";
         }
         $OUT .= "    </Location>\n";
     }
1	diff -urN smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user
2	--- smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user 2022-07-22 15:28:14.221036281 +0300
3	+++ smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess30user 2022-07-22 15:43:43.648404844 +0300
4	@@ -53,29 +53,27 @@
5	<Directory \"/etc/e-smith/web/panels/user/html\" >
6	Options Includes Indexes FollowSymLinks
7	AllowOverride None
8	- order deny,allow
9	- deny from all
10	- allow from $localAccess
11	AuthName "SME User manager"
12	AuthType Basic
13	TKTAuthLoginURL /server-common/cgi-bin/login
14	- require valid-user
15	SetEnv IMGHDR_SRC \"/e-smith-common/server-manager.jpg\"
16	- Satisfy all
17	+ <RequireAll>
18	+ require valid-user
19	+ Require ip $localAccess
20	+ </RequireAll>
21	</Directory>
22
23	<Directory \"/etc/e-smith/web/panels/user/cgi-bin\" >
24	Options Includes Indexes FollowSymLinks
25	AllowOverride None
26	- order deny,allow
27	- deny from all
28	- allow from $localAccess
29	AuthName "SME User Manager"
30	AuthType Basic
31	TKTAuthLoginURL /server-common/cgi-bin/login
32	- require valid-user
33	SetEnv IMGHDR_SRC \"/e-smith-common/server-manager.jpg\"
34	- Satisfy all
35	+ <RequireAll>
36	+ require valid-user
37	+ Require ip $localAccess
38	+ </RequireAll>
39	HERE
40
41	foreach $file (@files)
42	diff -urN smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass
43	--- smeserver-userpanel-1.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass 2022-07-22 15:28:14.220036286 +0300
44	+++ smeserver-userpanel-1.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28UserManagerProxyPass 2022-07-22 15:48:31.086986931 +0300
45	@@ -18,13 +18,11 @@
46	}
47
48	$OUT .= " <Location /$place>\n";
49	- $OUT .= " order deny,allow\n";
50	- $OUT .= " deny from all\n";
51	if (($haveSSL eq 'yes') && (($port eq "443") \|\| ($plainTextAccess ne 'yes')))
52	{
53	- $OUT .= " allow from $localAccess $externalSSLAccess\n";
54	+ $OUT .= " Require ip $localAccess $externalSSLAccess\n";
55	} else {
56	- $OUT .= " allow from $localAccess\n";
57	+ $OUT .= " Require ip $localAccess\n";
58	}
59	$OUT .= " </Location>\n";
60	}