net/phpldapadmin: Fix runtime with php82

phpldapadmin needs some more patches to work correctly (without
error/warning messages in webserver logs).

PR:		274970
This commit is contained in:
Krzysztof 2023-11-12 20:03:48 +01:00 committed by Muhammad Moinur Rahman
parent e53ab23531
commit a5bd98809b
3 changed files with 24 additions and 2 deletions

View file

@ -1,12 +1,12 @@
PORTNAME= phpldapadmin PORTNAME= phpldapadmin
DISTVERSION= 1.2.6.6 DISTVERSION= 1.2.6.6
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= net www CATEGORIES= net www
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
MAINTAINER= ports@bsdserwis.com MAINTAINER= ports@bsdserwis.com
COMMENT= PHP application to administer LDAP over the web COMMENT= PHP application to administer LDAP over the web
WWW= https://phpldapadmin.sourceforge.net/ WWW= https://github.com/leenooks/phpLDAPadmin/wiki
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE

View file

@ -0,0 +1,11 @@
--- lib/ds_ldap.php.orig 2023-04-01 13:46:16 UTC
+++ lib/ds_ldap.php
@@ -991,7 +991,7 @@ class ldap extends DS {
$return = $dn;
foreach ($this->getBaseDN() as $base) {
- if (preg_match("/${base}$/i",$dn)) {
+ if (preg_match("/{$base}$/i",$dn)) {
$return = $base;
break;
}

View file

@ -0,0 +1,11 @@
--- lib/xmlTemplates.php.orig 2023-04-01 13:46:16 UTC
+++ lib/xmlTemplates.php
@@ -122,7 +122,7 @@ abstract class xmlTemplates {
# Ignore any files that are not the predefined custom files.
if ($_SESSION[APPCONFIG]->getValue('appearance','custom_templates_only')
- && ! preg_match("/^${custom_prefix}/",$file))
+ && ! preg_match("/^{$custom_prefix}/",$file))
continue;
$filename = sprintf('%s/%s',$dir,$file);