1 files changed, 9 insertions, 68 deletions
diff --git a/net/phpldapadmin/files/patch-lib_import__functions.php b/net/phpldapadmin/files/patch-lib_import__functions.php
index 2ff2d7bd82a5..1050a3d20069 100644
--- a/net/phpldapadmin/files/patch-lib_import__functions.php
+++ b/net/phpldapadmin/files/patch-lib_import__functions.php
@@ -1,70 +1,11 @@
---- lib/import_functions.php.orig	2024-01-10 22:23:54 UTC
+--- lib/import_functions.php.orig	2025-05-26 10:22:02 UTC
 +++ lib/import_functions.php
-@@ -257,7 +257,7 @@ class ImportLDIF extends Import {
- 		if (substr($value,0,1) == ':')
- 			$value = base64_decode(trim(substr($value,1)));
- 		else
--			$value = trim($value);
-+			$value = trim((string) $value);
+@@ -147,6 +147,8 @@ class ImportLDIF extends Import {
+ class ImportLDIF extends Import {
+ 	private $_currentLineNumber = 0;
+ 	private $_currentLine = '';
++	private $_currentDnLine = '';
++	private $dnLineNumber = 0;
+ 	private $template;
+ 	public $error = array();
  
- 		return array($attr,$value);
- 	}
-@@ -273,7 +273,7 @@ class ImportLDIF extends Import {
- 
- 		if ($this->hasMoreEntries() && ! $this->eof()) {
- 			# The first line is the DN one
--			$current[0]= trim($this->_currentLine);
-+			$current[0]= trim((string) $this->_currentLine);
- 
- 			# While we end on a blank line, fetch the attribute lines
- 			$count = 0;
-@@ -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())
--					$current[$count] .= trim($this->_currentLine);
-+					$current[$count] .= trim((string) $this->_currentLine);
- 				elseif ($this->isCommentLine()) {}
- 				# Do nothing
- 				elseif (! $this->isBlankLine())
--					$current[++$count] = trim($this->_currentLine);
-+					$current[++$count] = trim((string) $this->_currentLine);
- 				else
- 					$endEntryFound = true;
- 			}
-@@ -338,7 +338,7 @@ class ImportLDIF extends Import {
- 	 * @return boolean true if it's a comment line,false otherwise
- 	 */
- 	private function isCommentLine() {
--		return substr(trim($this->_currentLine),0,1) == '#' ? true : false;
-+		return substr(trim((string) $this->_currentLine),0,1) == '#' ? true : false;
- 	}
- 
- 	/**
-@@ -356,7 +356,7 @@ class ImportLDIF extends Import {
- 	 * @return boolean if it is a blank line,false otherwise.
- 	 */
- 	private function isBlankLine() {
--		return(trim($this->_currentLine) == '') ? true : false;
-+		return(trim((string) $this->_currentLine) == '') ? true : false;
- 	}
- 
- 	/**
-@@ -388,7 +388,7 @@ class ImportLDIF extends Import {
- 			$url = trim(substr($value,1));
- 
- 			if (preg_match('^file://',$url)) {
--				$filename = substr(trim($url),7);
-+				$filename = substr(trim((string) $url),7);
- 
- 				if ($fh = @fopen($filename,'rb')) {
- 					if (! $return = @fread($fh,filesize($filename)))
-@@ -482,7 +482,7 @@ class ImportLDIF extends Import {
- 			# Fetch the attribute for the following line
- 			$currentLine = array_shift($lines);
- 
--			while ($processline && trim($currentLine) && (trim($currentLine) != '-')) {
-+			while ($processline && trim((string) $currentLine) && (trim((string) $currentLine) != '-')) {
- 				$processline = false;
- 
- 				# If there is a valid line