From 4076adf8b427f754af73efd83e7b51c1c9c22b28 Mon Sep 17 00:00:00 2001 From: jengo Date: Mon, 23 Oct 2000 06:34:25 +0000 Subject: [PATCH] LDAP delete users is now working --- admin/inc/accounts_ldap.inc.php | 12 +++++------- admin/inc/accounts_sql.inc.php | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/admin/inc/accounts_ldap.inc.php b/admin/inc/accounts_ldap.inc.php index 107b94cf4c..ed7f9adca5 100644 --- a/admin/inc/accounts_ldap.inc.php +++ b/admin/inc/accounts_ldap.inc.php @@ -219,14 +219,12 @@ function account_delete($account_id) { - global $ldap; + global $phpgw_info, $phpgw, $ldap; - $searchline = getSearchLine($searchstring); - $result = ldap_search($ldap, $BASEDN, $searchline); - $entry = ldap_get_entries($ldap, $result); - $numentries = $entry["count"]; - - @ldap_delete($ldap, $button); + $phpgw->db->query("select account_lid from accounts where account_id='$account_id'"); + $phpgw->db->next_record(); + + ldap_delete($ldap,"uid=" . $phpgw->db->f("account_lid") . ", ". $phpgw_info["server"]["ldap_context"]); } function account_exsists($loginid) diff --git a/admin/inc/accounts_sql.inc.php b/admin/inc/accounts_sql.inc.php index 2d0e97b769..3565c640a5 100755 --- a/admin/inc/accounts_sql.inc.php +++ b/admin/inc/accounts_sql.inc.php @@ -50,6 +50,22 @@ return $account_info; } + function account_view($loginid) + { + global $phpgw_info, $phpgw; + + $phpgw->db->query("select account_id,account_firstname,account_lastname from accounts where " + . "account_lid='$loginid'"); + $phpgw->db->next_record(); + + $account_info["account_id"] = $phpgw->db->f("account_id"); + $account_info["account_lid"] = $loginid; + $account_info["account_lastname"] = $phpgw->db->f("account_lastname"); + $account_info["account_firstname"] = $phpgw->db->f("account_firstname"); + + return $account_info; + } + function account_add($account_info) { global $phpgw, $phpgw_info;