extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

change needed for integration of emailadmin

Browse Source 
ldap bugfixing
This commit is contained in:
Lars Kneschke 2003-08-31 22:09:12 +00:00
parent ec432051ff
commit e3dde66e08
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/inc/class.boaccounts.inc.php
View File

@ -682,6 +682,13 @@
} }
*/ */
if ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap' &&
(!$_userData['account_lastname'] && !$_userData['lastname']))
{
$error[$totalerrors] = lang('You must enter a lastname');
$totalerrors++;
}
if (!$_userData['account_lid']) if (!$_userData['account_lid'])
{ {
$error[$totalerrors] = lang('You must enter a loginid'); $error[$totalerrors] = lang('You must enter a loginid');

18
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -718,7 +718,7 @@
$entry['objectclass'][0] = 'top'; $entry['objectclass'][0] = 'top';
$entry['objectclass'][1] = 'posixGroup'; $entry['objectclass'][1] = 'posixGroup';
$entry['objectclass'][2] = 'phpgwAccount'; $entry['objectclass'][2] = 'phpgwAccount';
$entry['cn'] = $account_info['account_lid']; $entry['cn'] = utf8_encode($account_info['account_lid']);
$entry['gidnumber'] = $account_id; $entry['gidnumber'] = $account_id;
$entry['userpassword'] = $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd']); $entry['userpassword'] = $GLOBALS['phpgw']->common->encrypt_password($account_info['account_passwd']);
$entry['description'] = 'phpgw-created group'; $entry['description'] = 'phpgw-created group';
@ -726,9 +726,17 @@
else else
{ {
$dn = 'uid=' . $account_info['account_lid'] . ',' . $this->user_context; $dn = 'uid=' . $account_info['account_lid'] . ',' . $this->user_context;
$entry['cn'] = sprintf("%s %s", $account_info['account_firstname'], $account_info['account_lastname']);
$entry['sn'] = $account_info['account_lastname']; $entry['cn'] = utf8_encode(sprintf("%s %s",
$entry['givenname'] = $account_info['account_firstname']; $account_info['account_firstname'],
$account_info['account_lastname']
));
$entry['sn'] = utf8_encode($account_info['account_lastname']);
if($account_info['account_firstname'])
$entry['givenname'] = utf8_encode($account_info['account_firstname']);
$entry['uid'] = $account_info['account_lid']; $entry['uid'] = $account_info['account_lid'];
$entry['uidnumber'] = $account_id; $entry['uidnumber'] = $account_id;
if ($GLOBALS['phpgw_info']['server']['ldap_group_id']) if ($GLOBALS['phpgw_info']['server']['ldap_group_id'])
@ -756,7 +764,7 @@
ldap_add($this->ds, $dn, $entry); ldap_add($this->ds, $dn, $entry);
} }
/* print ldap_error($this->ds); */ // print ldap_error($this->ds);
if($account_id && is_object($GLOBALS['phpgw']->preferences) && $default_prefs) if($account_id && is_object($GLOBALS['phpgw']->preferences) && $default_prefs)
{ {