smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.6.0-bz12055-httpd24.patch

diff -Nur --no-dereference smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin
--- smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin        2022-07-23 23:24:01.232000000 -0400
+++ smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin    2022-07-23 23:42:12.972000000 -0400
@@ -4,37 +4,31 @@
     SSLRequireSSL on
     Options -Indexes
     AllowOverride None
-    order deny,allow
-    deny from all
+    <IfModule mod_access_compat.c>
+      order deny,allow
+      deny from all
+      allow from { (($phpldapadmin{access} || 'private' ) eq "public" ) ? "all" : "$localAccess $externalSSLAccess";}
+    </IfModule>
+    <IfModule !mod_access_compat.c>
+      Require { (($phpldapadmin{access} || 'private' ) eq "public" ) ?  "all granted": "ip $localAccess $externalSSLAccess";}
+    </IfModule>
 {
-    my $phpldapadminaxs = $phpldapadmin{'access'} || "private";
-    if ($phpldapadminaxs eq "private")
-    {
-        $OUT .= "    allow from $localAccess $externalSSLAccess";
-    } else {
-        $OUT .= "    allow from all";
-    }
-}
+# we use the ldap auth now
 #    AuthName "phpLdapAdmin"
 #    AuthBasicProvider external
 #    AuthType Basic
 #    AuthExternal pwauth
 #    require user admin
 #    Satisfy all
-    AddType application/x-httpd-php .php .php3
-    
+}    AddType application/x-httpd-php .php 
     {
        # we do not want people to mess with this for the moment
     my $version =  '74';    
     $OUT .= qq( 
-               <FilesMatch .php\$\>
-                 SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost"
-               </FilesMatch>
-               )
-        
+    <FilesMatch .php\$\>
+      SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost"
+    </FilesMatch>
+    )
     } 
-    
-    #php_flag  magic_quotes_gpc  on
-    #php_flag  track_vars        on
 </Directory>
 
1	jpp	1.1	diff -Nur --no-dereference smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin
2			--- smeserver-phpldapadmin-1.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin 2022-07-23 23:24:01.232000000 -0400
3			+++ smeserver-phpldapadmin-1.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin 2022-07-23 23:42:12.972000000 -0400
4			@@ -4,37 +4,31 @@
5			SSLRequireSSL on
6			Options -Indexes
7			AllowOverride None
8			- order deny,allow
9			- deny from all
10			+ <IfModule mod_access_compat.c>
11			+ order deny,allow
12			+ deny from all
13			+ allow from { (($phpldapadmin{access} \|\| 'private' ) eq "public" ) ? "all" : "$localAccess $externalSSLAccess";}
14			+ </IfModule>
15			+ <IfModule !mod_access_compat.c>
16			+ Require { (($phpldapadmin{access} \|\| 'private' ) eq "public" ) ? "all granted": "ip $localAccess $externalSSLAccess";}
17			+ </IfModule>
18			{
19			- my $phpldapadminaxs = $phpldapadmin{'access'} \|\| "private";
20			- if ($phpldapadminaxs eq "private")
21			- {
22			- $OUT .= " allow from $localAccess $externalSSLAccess";
23			- } else {
24			- $OUT .= " allow from all";
25			- }
26			-}
27			+# we use the ldap auth now
28			# AuthName "phpLdapAdmin"
29			# AuthBasicProvider external
30			# AuthType Basic
31			# AuthExternal pwauth
32			# require user admin
33			# Satisfy all
34			- AddType application/x-httpd-php .php .php3
35			-
36			+} AddType application/x-httpd-php .php
37			{
38			# we do not want people to mess with this for the moment
39			my $version = '74';
40			$OUT .= qq(
41			- <FilesMatch .php\$\>
42			- SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock\|fcgi://localhost"
43			- </FilesMatch>
44			- )
45			-
46			+ <FilesMatch .php\$\>
47			+ SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock\|fcgi://localhost"
48			+ </FilesMatch>
49			+ )
50			}
51			-
52			- #php_flag magic_quotes_gpc on
53			- #php_flag track_vars on
54			</Directory>
55