Mirrors
/
freebsd-ports
mirror of https://git.freebsd.org/ports.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/phpldapadmin: update to 1.2.6.7 

PR:	276372
Submitted by:	Krzysztof (ports@bsdserwis.com)
Approved by:	Krzysztof (ports@bsdserwis.com)
2024Q2
Piotr Kubaj 2024-02-10 00:55:26 +01:00
parent 010d332046
commit 184f0f7628
6 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/phpldapadmin/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= phpldapadmin
DISTVERSION= 1.2.6.6
PORTREVISION= 2
DISTVERSION= 1.2.6.7
CATEGORIES= net www
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}

6
net/phpldapadmin/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1688152341
SHA256 (leenooks-phpLDAPadmin-1.2.6.6_GH0.tar.gz) = 7a8c02a611e60aa6713d1cf863dfac9637e23c3f4d401ea5e47dbe2b22d4895a
SIZE (leenooks-phpLDAPadmin-1.2.6.6_GH0.tar.gz) = 1132820
TIMESTAMP = 1705354612
SHA256 (leenooks-phpLDAPadmin-1.2.6.7_GH0.tar.gz) = dde104aca695e18b0615859ae96177cdcb8a3294aee8d1d47a0b828af939679d
SIZE (leenooks-phpLDAPadmin-1.2.6.7_GH0.tar.gz) = 1133418

4
net/phpldapadmin/files/patch-lib_Template.php
View File

@ -1,6 +1,6 @@
--- lib/Template.php.orig 2023-04-01 13:46:16 UTC
--- lib/Template.php.orig 2024-01-10 22:23:54 UTC
+++ lib/Template.php
@@ -56,6 +56,8 @@ class Template extends xmlTemplate {
@@ -58,6 +58,8 @@ class Template extends xmlTemplate {
# Template RDN attributes
private $rdn;

11
net/phpldapadmin/files/patch-lib_ds__ldap.php
View File

@ -1,11 +0,0 @@
--- 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;
}

25
net/phpldapadmin/files/patch-lib_import__functions.php
View File

@ -1,6 +1,6 @@
--- lib/import_functions.php.orig 2023-04-01 13:46:16 UTC
--- lib/import_functions.php.orig 2024-01-10 22:23:54 UTC
+++ lib/import_functions.php
@@ -255,7 +255,7 @@ class ImportLDIF extends Import {
@@ -257,7 +257,7 @@ class ImportLDIF extends Import {
if (substr($value,0,1) == ':')
$value = base64_decode(trim(substr($value,1)));
else
@ -9,7 +9,7 @@
return array($attr,$value);
}
@@ -271,7 +271,7 @@ class ImportLDIF extends Import {
@@ -273,7 +273,7 @@ class ImportLDIF extends Import {
if ($this->hasMoreEntries() && ! $this->eof()) {
# The first line is the DN one
@ -18,7 +18,7 @@
# While we end on a blank line, fetch the attribute lines
$count = 0;
@@ -282,11 +282,11 @@ class ImportLDIF extends Import {
@@ -284,11 +284,11 @@ class ImportLDIF extends Import {
/* If the next line begin with a space, we append it to the current row
* else we push it into the array (unwrap)*/
if ($this->isWrappedLine())
@ -32,7 +32,7 @@
else
$endEntryFound = true;
}
@@ -336,7 +336,7 @@ class ImportLDIF extends Import {
@@ -338,7 +338,7 @@ class ImportLDIF extends Import {
* @return boolean true if it's a comment line,false otherwise
*/
private function isCommentLine() {
@ -41,7 +41,7 @@
}
/**
@@ -354,7 +354,7 @@ class ImportLDIF extends Import {
@@ -356,7 +356,7 @@ class ImportLDIF extends Import {
* @return boolean if it is a blank line,false otherwise.
*/
private function isBlankLine() {
@ -50,7 +50,7 @@
}
/**
@@ -386,7 +386,7 @@ class ImportLDIF extends Import {
@@ -388,7 +388,7 @@ class ImportLDIF extends Import {
$url = trim(substr($value,1));
if (preg_match('^file://',$url)) {
@ -59,7 +59,7 @@
if ($fh = @fopen($filename,'rb')) {
if (! $return = @fread($fh,filesize($filename)))
@@ -480,7 +480,7 @@ class ImportLDIF extends Import {
@@ -482,7 +482,7 @@ class ImportLDIF extends Import {
# Fetch the attribute for the following line
$currentLine = array_shift($lines);
@ -68,12 +68,3 @@
$processline = false;
# If there is a valid line
@@ -541,7 +541,7 @@ class ImportLDIF extends Import {
array_merge(array($currentLine),$lines));
$currentLine = array_shift($lines);
- if (trim($currentLine))
+ if (trim((string) $currentLine))
$processline = true;
}

11
net/phpldapadmin/files/patch-lib_xmlTemplates.php
View File

@ -1,11 +0,0 @@
--- 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);