Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BARDOT Jérôme
fusiondirectory
Commits
f052e1c9
Commit
f052e1c9
authored
7 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(ldap) Return number of entry imported and avoid PHP errors
issue
#5789
parent
733b58ee
1.4-fixes
1.3.1-fixes
6199-creation-of-new-class-mail-template-new-configuration-menu-item
master
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_ldap.inc
+5
-2
include/class_ldap.inc
with
5 additions
and
2 deletions
+5
-2
include/class_ldap.inc
+
5
−
2
View file @
f052e1c9
...
...
@@ -1016,8 +1016,9 @@ class LDAP
}
/* Joining lines */
$line
=
NULL
;
$entry
=
array
();
$line
=
NULL
;
$entry
=
array
();
$entries
=
array
();
$entryStart
=
-
1
;
foreach
(
$fileLines
as
$lineNumber
=>
$fileLine
)
{
if
(
preg_match
(
'/^ /'
,
$fileLine
))
{
...
...
@@ -1087,6 +1088,8 @@ class LDAP
throw
new
LDIFImportException
(
sprintf
(
_
(
'Error while importing dn: "%s", please check your LDIF from line %s on!'
),
$entry
[
'dn'
][
0
],
$startLine
));
}
}
return
count
(
$entries
);
}
/*! \brief Function to Imports a single entry
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets