extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update for create using array

Browse Source
This commit is contained in:
Miles Lott 2001-05-06 13:07:57 +00:00
parent e54d4c4f1a
commit f6b3e189cf
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,7 +372,7 @@
$this->db->query("insert into phpgw_accounts (account_id, account_lid, account_type, account_pwd, " $this->db->query("insert into phpgw_accounts (account_id, account_lid, account_type, account_pwd, "
. "account_firstname, account_lastname, account_status) values ('" . $account_id . "','" . $account_info['lid'] . "account_firstname, account_lastname, account_status) values ('" . $account_id . "','" . $account_info['lid']
. "','" . $account_info['type'] . "','" . md5($account_info['paswd']) . "', '" . $account_info['firstname'] . "','" . $account_info['type'] . "','" . md5($account_info['passwd']) . "', '" . $account_info['firstname']
. "','" . $account_info['lastname'] . "','" . $account_info['status'] . "','" . $account_info['expires'] . "','" . $account_info['lastname'] . "','" . $account_info['status'] . "','" . $account_info['expires']
. "')",__LINE__,__FILE__); . "')",__LINE__,__FILE__);
@ -381,26 +381,26 @@
$entry['uidnumber'] = $account_id; $entry['uidnumber'] = $account_id;
$entry['gidnumber'] = $account_id; $entry['gidnumber'] = $account_id;
$entry['uid'] = $account_lid; $entry['uid'] = $account_info['lid'];
$entry['cn'] = sprintf('%s %s', $account_firstname, $account_lastname); $entry['cn'] = sprintf('%s %s', $account_firstname, $account_info['lastname']);
$entry['sn'] = $account_lastname; $entry['sn'] = $account_info['lastname'];
$entry['givenname'] = $account_firstname; $entry['givenname'] = $account_info['firstname'];
$entry['userpassword'] = $phpgw->common->encrypt_password($account_pwd); $entry['userpassword'] = $phpgw->common->encrypt_password($account_info['passwd']);
if ($phpgw_info['server']['ldap_extra_attributes'] && $account_type != 'g') if ($phpgw_info['server']['ldap_extra_attributes'] && $account_info['type'] != 'g')
{ {
if ($account_home) if ($account_home)
{ {
$entry['homedirectory'] = $account_home; $entry['homedirectory'] = $account_info['homedirectory'];
} }
else else
{ {
$entry['homedirectory'] = $phpgw_info['server']['ldap_account_home'].SEP.$account_lid; $entry['homedirectory'] = $phpgw_info['server']['ldap_account_home'].SEP.$account_info['lid'];
} }
if ($account_shell) if ($account_shell)
{ {
$entry['loginshell'] = $account_shell; $entry['loginshell'] = $account_info['loginshell'];
} }
else else
{ {
@ -408,7 +408,8 @@
} }
} }
if ($allValues[0]['dn']) { if ($allValues[0]['dn'])
{
// This should keep the password from being overwritten here ? // This should keep the password from being overwritten here ?
unset($entry['userpassword']); unset($entry['userpassword']);
@ -438,7 +439,7 @@
// $tmpentry["objectclass"][1] = 'posixGroup'; // $tmpentry["objectclass"][1] = 'posixGroup';
// } // }
// else // else
if ($account_type == 'u') if ($account_info['type'] == 'u')
{ {
$tmpentry['objectclass'][0] = 'top'; $tmpentry['objectclass'][0] = 'top';
$tmpentry['objectclass'][1] = 'person'; $tmpentry['objectclass'][1] = 'person';
@ -450,16 +451,18 @@
} }
ldap_modify($ds, $allValues[0]['dn'], $tmpentry); ldap_modify($ds, $allValues[0]['dn'], $tmpentry);
} else { }
else
{
// if ($account_type == "g") // if ($account_type == "g")
// { // {
// $entry["objectclass"][0] = 'top'; // $entry["objectclass"][0] = 'top';
// $entry["objectclass"][1] = 'posixGroup'; // $entry["objectclass"][1] = 'posixGroup';
// } // }
// else // else
if ($account_type == 'u') if ($account_info['type'] == 'u')
{ {
$dn = 'uid=' . $account_lid . ',' . $phpgw_info['server']['ldap_context']; $dn = 'uid=' . $account_info['lid'] . ',' . $phpgw_info['server']['ldap_context'];
$entry['objectclass'][0] = 'top'; $entry['objectclass'][0] = 'top';
$entry['objectclass'][1] = 'person'; $entry['objectclass'][1] = 'person';
$entry['objectclass'][2] = 'organizationalPerson'; $entry['objectclass'][2] = 'organizationalPerson';