deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SF Bug #3398344 - Import LDIF overwrites entries

Browse Source
This commit is contained in:
Deon George
2011-10-06 14:29:35 +11:00
parent d8ab7fc2f0
commit 1e1fcabb3d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/import_functions.php
View File

@@ -215,7 +215,7 @@ class ImportLDIF extends Import {
return $this->error(sprintf('%s %s',_('DN does not exist'),$dn),$lines);
$this->template->setDN($dn);
$this->template->accept();
$this->template->accept(false,true);
return $this->getModifyDetails($lines);
@@ -511,7 +511,7 @@ class ImportLDIF extends Import {
case 'delete':
$deleteattr = false;
if ($key = array_search($attribute_value_part,$attribute->getValues()))
if (($key = array_search($attribute_value_part,$attribute->getValues())) !== false)
$attribute->delValue($key);
else
return $this->error(sprintf('%s %s',_('Delete value doesnt exist in DN'),$attribute_value_part),