smeserver-phpsysinfo/contribs10/smeserver-phpsysinfo-3.2.3-bz12057-httpd24.patch

diff -Nur --no-dereference smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias
--- smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias       2022-07-24 00:25:03.153000000 -0400
+++ smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias   2022-07-24 00:33:44.744000000 -0400
@@ -4,32 +4,30 @@
 <Directory /opt/phpsysinfo>
     SSLRequireSSL
     Options -Indexes
-    AllowOverride None
-    order deny,allow
-    deny from all
-{
-my $access = ($phpsysinfo{'access'} || 'private'); 
-if ("$access" eq "private")
-    {
-    $OUT .= "    allow from $localAccess $externalSSLAccess";
-    }
-    elsif ("$access" eq "public")
-    {
-    $OUT .= "    allow from all";
-    }
-}
     AuthName "phpSysInfo"
     AuthBasicProvider external
     AuthType Basic
     AuthExternal pwauth
-    require user admin
-    Satisfy all
+
+    <IfModule mod_access_compat.c>
+      AllowOverride None
+      order deny,allow
+      deny from all
+      allow from {(($phpsysinfo{access} || 'private' ) eq "public" ) ?  "all": "$localAccess $externalSSLAccess";}
+      Require user admin
+      Satisfy all
+    </IfModule>
+    <IfModule !mod_access_compat.c>
+      <RequireAll>
+        Require user admin
+        Require {(($phpmyadmin{access} || 'private' ) eq "public" ) ?  "all granted": "ip $localAccess $externalSSLAccess";}
+      </RequireAll>
+    </IfModule>
+
     AddType application/x-httpd-php .php .php3
-<FilesMatch .php$>
+    <FilesMatch .php$>
         SetHandler "proxy:unix:/var/run/php-fpm/php.sock|fcgi://localhost"
-</FilesMatch>
+    </FilesMatch>
 
-    #php_flag  magic_quotes_gpc  on
-    #php_flag  track_vars        on
 </Directory>
 
diff -Nur --no-dereference smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias
--- smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias       2022-07-31 23:28:58.214000000 -0400
+++ smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias   2022-07-31 23:30:57.243000000 -0400
@@ -9,20 +9,10 @@
     AuthType Basic
     AuthExternal pwauth
 
-    <IfModule mod_access_compat.c>
-      AllowOverride None
-      order deny,allow
-      deny from all
-      allow from {(($phpsysinfo{access} || 'private' ) eq "public" ) ?  "all": "$localAccess $externalSSLAccess";}
-      Require user admin
-      Satisfy all
-    </IfModule>
-    <IfModule !mod_access_compat.c>
-      <RequireAll>
+    <RequireAll>
         Require user admin
         Require {(($phpmyadmin{access} || 'private' ) eq "public" ) ?  "all granted": "ip $localAccess $externalSSLAccess";}
-      </RequireAll>
-    </IfModule>
+    </RequireAll>
 
     AddType application/x-httpd-php .php .php3
     <FilesMatch .php$>
1	diff -Nur --no-dereference smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias
2	--- smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias 2022-07-24 00:25:03.153000000 -0400
3	+++ smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias 2022-07-24 00:33:44.744000000 -0400
4	@@ -4,32 +4,30 @@
5	<Directory /opt/phpsysinfo>
6	SSLRequireSSL
7	Options -Indexes
8	- AllowOverride None
9	- order deny,allow
10	- deny from all
11	-{
12	-my $access = ($phpsysinfo{'access'} \|\| 'private');
13	-if ("$access" eq "private")
14	- {
15	- $OUT .= " allow from $localAccess $externalSSLAccess";
16	- }
17	- elsif ("$access" eq "public")
18	- {
19	- $OUT .= " allow from all";
20	- }
21	-}
22	AuthName "phpSysInfo"
23	AuthBasicProvider external
24	AuthType Basic
25	AuthExternal pwauth
26	- require user admin
27	- Satisfy all
28	+
29	+ <IfModule mod_access_compat.c>
30	+ AllowOverride None
31	+ order deny,allow
32	+ deny from all
33	+ allow from {(($phpsysinfo{access} \|\| 'private' ) eq "public" ) ? "all": "$localAccess $externalSSLAccess";}
34	+ Require user admin
35	+ Satisfy all
36	+ </IfModule>
37	+ <IfModule !mod_access_compat.c>
38	+ <RequireAll>
39	+ Require user admin
40	+ Require {(($phpmyadmin{access} \|\| 'private' ) eq "public" ) ? "all granted": "ip $localAccess $externalSSLAccess";}
41	+ </RequireAll>
42	+ </IfModule>
43	+
44	AddType application/x-httpd-php .php .php3
45	-<FilesMatch .php$>
46	+ <FilesMatch .php$>
47	SetHandler "proxy:unix:/var/run/php-fpm/php.sock\|fcgi://localhost"
48	-</FilesMatch>
49	+ </FilesMatch>
50
51	- #php_flag magic_quotes_gpc on
52	- #php_flag track_vars on
53	</Directory>
54
55	diff -Nur --no-dereference smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias
56	--- smeserver-phpsysinfo-3.2.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias 2022-07-31 23:28:58.214000000 -0400
57	+++ smeserver-phpsysinfo-3.2.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias 2022-07-31 23:30:57.243000000 -0400
58	@@ -9,20 +9,10 @@
59	AuthType Basic
60	AuthExternal pwauth
61
62	- <IfModule mod_access_compat.c>
63	- AllowOverride None
64	- order deny,allow
65	- deny from all
66	- allow from {(($phpsysinfo{access} \|\| 'private' ) eq "public" ) ? "all": "$localAccess $externalSSLAccess";}
67	- Require user admin
68	- Satisfy all
69	- </IfModule>
70	- <IfModule !mod_access_compat.c>
71	- <RequireAll>
72	+ <RequireAll>
73	Require user admin
74	Require {(($phpmyadmin{access} \|\| 'private' ) eq "public" ) ? "all granted": "ip $localAccess $externalSSLAccess";}
75	- </RequireAll>
76	- </IfModule>
77	+ </RequireAll>
78
79	AddType application/x-httpd-php .php .php3
80	<FilesMatch .php$>