extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-03 20:09:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated to accept a single array for the account values

Browse Source
This commit is contained in:
jengo 2001-05-06 11:32:03 +00:00
parent b1f61c2fff
commit d3af581109
1 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,31 +332,38 @@
return $rtrn; return $rtrn;
} }
function create($account_type, $account_lid, $account_pwd, $account_firstname, $account_lastname, $account_status, $account_id='',$account_home='',$account_shell='') function create($account_info)
{ {
global $phpgw_info, $phpgw; global $phpgw_info, $phpgw;
$ds = $phpgw->common->ldapConnect(); $ds = $phpgw->common->ldapConnect();
if (!$account_id) { if (! $account_info['id'])
if ($phpgw_info["server"]["account_min_id"]) { $min = $phpgw_info["server"]["account_min_id"]; } {
if ($phpgw_info["server"]["account_max_id"]) { $max = $phpgw_info["server"]["account_max_id"]; } if ($phpgw_info['server']['account_min_id']) { $min = $phpgw_info['server']['account_min_id']; }
if ($phpgw_info['server']['account_max_id']) { $max = $phpgw_info['server']['account_max_id']; }
$nextid = $phpgw->common->last_id("accounts_ldap",$min,$max); $nextid = $phpgw->common->last_id('accounts_ldap',$min,$max);
// Loop until we find a free id // Loop until we find a free id
$free = 0; $free = 0;
while (!$free) { while (!$free)
$ldap_fields = ""; {
$sri = ldap_search($ds, $phpgw_info["server"]["ldap_context"], "uidnumber=".$nextid); $ldap_fields = '';
$sri = ldap_search($ds, $phpgw_info['server']['ldap_context'],'uidnumber='.$nextid);
$ldap_test = ldap_get_entries($ds, $sri); $ldap_test = ldap_get_entries($ds, $sri);
if ($ldap_test[0]['dn'][0]) { if ($ldap_test[0]['dn'][0])
$nextid = $phpgw->common->next_id("accounts_ldap",$min,$max); {
} else { $nextid = $phpgw->common->next_id('accounts_ldap',$min,$max);
}
else
{
$free = True; $free = True;
} }
} }
if ($phpgw_info["server"]["account_max_id"] && ($nextid > $phpgw_info["server"]["account_max_id"])) {
if ($phpgw_info['server']['account_max_id'] && ($nextid > $phpgw_info['server']['account_max_id']))
{
return False; return False;
} }
$account_id = $nextid; $account_id = $nextid;
@ -364,44 +371,46 @@
} }
$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_lid . "account_firstname, account_lastname, account_status) values ('" . $account_id . "','" . $account_info['lid']
. "','" . $account_type . "','" . md5($account_pwd) . "', '" . $account_firstname . "','" . $account_info['type'] . "','" . md5($account_info['paswd']) . "', '" . $account_info['firstname']
. "','" . $account_lastname . "','" . $account_status . "')",__LINE__,__FILE__); . "','" . $account_info['lastname'] . "','" . $account_info['status'] . "','" . $account_info['expires']
. "')",__LINE__,__FILE__);
$sri = ldap_search($ds, $phpgw_info["server"]["ldap_context"], "uid=$account_lid"); $sri = ldap_search($ds, $phpgw_info['server']['ldap_context'],'uid=' . $account_info['lid']);
$allValues = ldap_get_entries($ds, $sri); $allValues = ldap_get_entries($ds, $sri);
$entry["uidnumber"] = $account_id; $entry['uidnumber'] = $account_id;
$entry["gidnumber"] = $account_id; $entry['gidnumber'] = $account_id;
$entry["uid"] = $account_lid; $entry['uid'] = $account_lid;
$entry["cn"] = sprintf("%s %s", $account_firstname, $account_lastname); $entry['cn'] = sprintf('%s %s', $account_firstname, $account_lastname);
$entry["sn"] = $account_lastname; $entry['sn'] = $account_lastname;
$entry["givenname"] = $account_firstname; $entry['givenname'] = $account_firstname;
$entry["userpassword"] = $phpgw->common->encrypt_password($account_pwd); $entry['userpassword'] = $phpgw->common->encrypt_password($account_pwd);
if ($phpgw_info["server"]["ldap_extra_attributes"] && $account_type != 'g') { if ($phpgw_info['server']['ldap_extra_attributes'] && $account_type != 'g')
{
if ($account_home) if ($account_home)
{ {
$entry["homedirectory"] = $account_home; $entry['homedirectory'] = $account_home;
} }
else else
{ {
$entry["homedirectory"] = $phpgw_info["server"]["ldap_account_home"].SEP.$account_lid; $entry['homedirectory'] = $phpgw_info['server']['ldap_account_home'].SEP.$account_lid;
} }
if ($account_shell) if ($account_shell)
{ {
$entry["loginshell"] = $account_shell; $entry['loginshell'] = $account_shell;
} }
else else
{ {
$entry["loginshell"] = $phpgw_info["server"]["ldap_account_shell"]; $entry['loginshell'] = $phpgw_info['server']['ldap_account_shell'];
} }
} }
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']);
while (list($key,$val) = each($entry)) while (list($key,$val) = each($entry))
{ {
@ -429,18 +438,18 @@
// $tmpentry["objectclass"][1] = 'posixGroup'; // $tmpentry["objectclass"][1] = 'posixGroup';
// } // }
// else // else
if ($account_type == "u") if ($account_type == 'u')
{ {
$tmpentry["objectclass"][0] = 'top'; $tmpentry['objectclass'][0] = 'top';
$tmpentry["objectclass"][1] = 'person'; $tmpentry['objectclass'][1] = 'person';
$tmpentry["objectclass"][2] = 'organizationalPerson'; $tmpentry['objectclass'][2] = 'organizationalPerson';
$tmpentry["objectclass"][3] = 'inetOrgPerson'; $tmpentry['objectclass'][3] = 'inetOrgPerson';
$tmpentry["objectclass"][4] = 'account'; $tmpentry['objectclass'][4] = 'account';
$tmpentry["objectclass"][5] = 'posixAccount'; $tmpentry['objectclass'][5] = 'posixAccount';
$tmpentry["objectclass"][6] = 'shadowAccount'; $tmpentry['objectclass'][6] = 'shadowAccount';
} }
ldap_modify($ds, $allValues[0]["dn"], $tmpentry); ldap_modify($ds, $allValues[0]['dn'], $tmpentry);
} else { } else {
// if ($account_type == "g") // if ($account_type == "g")
// { // {
@ -448,16 +457,16 @@
// $entry["objectclass"][1] = 'posixGroup'; // $entry["objectclass"][1] = 'posixGroup';
// } // }
// else // else
if ($account_type == "u") if ($account_type == 'u')
{ {
$dn = 'uid=' . $account_lid . ',' . $phpgw_info["server"]["ldap_context"]; $dn = 'uid=' . $account_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';
$entry["objectclass"][3] = 'inetOrgPerson'; $entry['objectclass'][3] = 'inetOrgPerson';
$entry["objectclass"][4] = 'account'; $entry['objectclass'][4] = 'account';
$entry["objectclass"][5] = 'posixAccount'; $entry['objectclass'][5] = 'posixAccount';
$entry["objectclass"][6] = 'shadowAccount'; $entry['objectclass'][6] = 'shadowAccount';
ldap_add($ds, $dn, $entry); ldap_add($ds, $dn, $entry);
} }