diff -aburN --exclude='CVS*' phpgroupware.old/phpgwapi/inc/class.accounts_ldap.inc.php phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php
--- phpgroupware.old/phpgwapi/inc/class.accounts_ldap.inc.php 2004-09-01 11:06:51.000000000 -0500
+++ phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php 2004-09-01 11:14:33.000000000 -0500
@@ -444,17 +444,10 @@
{
$type = 'u';
}
- if ($this->group_exists($id))
- {
- if ($type == 'u')
- {
- die('account/group id ('.$id.')conflict - bad luck');
- }
- else
+ else if ($this->group_exists($id))
{
$type = 'g';
}
- }
if ($type)
{
return $type;
diff -aburN --exclude='CVS*' phpgroupware.old/setup/ldapmodify.php phpgroupware/setup/ldapmodify.php
--- phpgroupware.old/setup/ldapmodify.php 2004-09-01 11:06:51.000000000 -0500
+++ phpgroupware/setup/ldapmodify.php 2004-09-01 11:14:18.000000000 -0500
@@ -141,7 +141,7 @@
$entry = array();
$thisacctid = $group_info[$groupid]['gidnumber'][0];
$thisacctlid = $group_info[$groupid]['cn'][0];
- /* echo "Updating GROUPID : ".$thisacctlid."
\n"; */
+ echo "Updating GROUPID : ".$thisacctlid."
\n";
$thisfirstname = $group_info[$groupid]['cn'][0];
$thismembers = $group_info[$groupid]['memberuid'];
$thisdn = $group_info[$groupid]['dn'];
@@ -177,8 +177,11 @@
$ok = ldap_mod_replace($ldap,$thisdn,$replace);
if (!$ok)//give user some feedback
{
- echo lang('failed to modify: %1', $thisdn) . '
';
+ echo lang('failed to modify: ');
+ echo $thisdn." - ".ldap_err2str(ldap_errno($ldap)). '
';
}
+ else
+ echo lang('successfully modified: ', $thisdn) . '
';
unset($replace);
unset($addclass);
@@ -247,8 +250,8 @@
$id_exist = 0;
$thisacctid = $account_info[$id]['uidnumber'][0];
$thisacctlid = $account_info[$id]['uid'][0];
- /* echo "Updating USERID : ".$thisacctlid."
\n"; */
$thisdn = $account_info[$id]['dn'];
+ echo "Updating USERID : ".$thisacctlid." dn: ".$thisdn."
\n";
/* Do some checks before we try to import the data. */
if (!empty($thisacctid) && !empty($thisacctlid))
@@ -294,8 +297,11 @@
if (!$ok)//give user some feedback
{
- echo lang('failed to modify: ', $thisdn) . '
';
+ echo lang('failed to modify: ');
+ echo $thisdn." - ".ldap_err2str(ldap_errno($ldap)). '
';
}
+ else
+ echo lang('successfully modified: ', $thisdn) . '
';
unset($replace);
unset($addclass);