holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first modifications to make ldap working again

Browse Source
This commit is contained in:
Lars Kneschke 2001-02-03 22:51:20 +00:00
parent 11b9d5b5bc
commit 33a24db25b
3 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,13 @@
var $groups; var $groups;
var $group_names; var $group_names;
var $apps; var $apps;
var $db;
function accounts_()
{
global $phpgw;
$this->db = $phpgw->db;
}
function fill_user_array() function fill_user_array()
{ {
@ -36,7 +43,6 @@
// get a ldap connection handle // get a ldap connection handle
$ds = $phpgw->common->ldapConnect(); $ds = $phpgw->common->ldapConnect();
// search the dn for the given uid // search the dn for the given uid
$sri = ldap_search($ds, $phpgw_info["server"]["ldap_context"], "uid=".$phpgw_info["user"]["userid"]); $sri = ldap_search($ds, $phpgw_info["server"]["ldap_context"], "uid=".$phpgw_info["user"]["userid"]);
$allValues = ldap_get_entries($ds, $sri); $allValues = ldap_get_entries($ds, $sri);
@ -44,41 +50,21 @@
/* Now dump it into the array; take first entry found */ /* Now dump it into the array; take first entry found */
$phpgw_info["user"]["account_id"] = $allValues[0]["uidnumber"][0]; $phpgw_info["user"]["account_id"] = $allValues[0]["uidnumber"][0];
$phpgw_info["user"]["account_dn"] = $allValues[0]["dn"]; $phpgw_info["user"]["account_dn"] = $allValues[0]["dn"];
$phpgw_info["user"]["account_lid"] = $allValues[0]["uid"][0]; # $phpgw_info["user"]["account_lid"] = $allValues[0]["uid"][0];
$phpgw_info["user"]["firstname"] = $allValues[0]["givenname"][0]; $phpgw_info["user"]["firstname"] = $allValues[0]["givenname"][0];
$phpgw_info["user"]["lastname"] = $allValues[0]["sn"][0]; $phpgw_info["user"]["lastname"] = $allValues[0]["sn"][0];
$phpgw_info["user"]["fullname"] = $allValues[0]["cn"][0]; $phpgw_info["user"]["fullname"] = $allValues[0]["cn"][0];
/* $this->db->query("select * from accounts where account_lid='" . $phpgw_info["user"]["userid"] . "'",__LINE__,__FILE__);
// Please don't remove this code. Lars Kneschke $this->db->next_record();
// remove the "count" value
for ($i=0; $i < $allValues[0]["phpgw_groups"]["count"]; $i++)
{
$phpgw_info["user"]["groups"][] = $allValues[0]["phpgw_groups"][$i];
}
// remove the "count" value $phpgw_info["user"]["groups"] = explode (",",$this->db->f("account_groups"));
for ($i=0; $i < $allValues[0]["phpgw_account_perms"]["count"]; $i++) # $apps = CreateObject('phpgwapi.applications',array(intval($phpgw_info["user"]["account_id"]),'u'));
{ # $phpgw_info["user"]["app_perms"] = $apps->app_perms;
$phpgw_info["user"]["app_perms"][] = $allValues[0]["phpgw_account_perms"][$i]; $phpgw_info["user"]["lastlogin"] = $this->db->f("account_lastlogin");
} $phpgw_info["user"]["lastloginfrom"] = $this->db->f("account_lastloginfrom");
$phpgw_info["user"]["lastpasswd_change"] = $this->db->f("account_lastpwd_change");
$phpgw_info["user"]["lastlogin"] = $allValues[0]["phpgw_lastlogin"][0]; $phpgw_info["user"]["status"] = $this->db->f("account_status");
$phpgw_info["user"]["lastloginfrom"] = $allValues[0]["phpgw_lastfrom"][0];
$phpgw_info["user"]["lastpasswd_change"] = $allValues[0]["phpgw_lastpasswd_change"][0];
$phpgw_info["user"]["status"] = $allValues[0]["phpgw_status"][0];
*/
$db = $phpgw->db;
$db->query("select * from accounts where account_lid='" . $phpgw_info["user"]["userid"] . "'",__LINE__,__FILE__);
$db->next_record();
$phpgw_info["user"]["groups"] = explode (",",$db->f("account_groups"));
$apps = CreateObject('phpgwapi.applications',array(intval($phpgw_info["user"]["account_id"]),'u'));
$phpgw_info["user"]["app_perms"] = $apps->app_perms;
$phpgw_info["user"]["lastlogin"] = $db->f("account_lastlogin");
$phpgw_info["user"]["lastloginfrom"] = $db->f("account_lastloginfrom");
$phpgw_info["user"]["lastpasswd_change"] = $db->f("account_lastpwd_change");
$phpgw_info["user"]["status"] = $db->f("account_status");
} }
function read_userData($dn) function read_userData($dn)
@ -259,4 +245,9 @@
return False; return False;
} }
} }
function exists($accountname)
{
return True;
}
} }

1
phpgwapi/inc/class.accounts_shared.inc.php
View File

@ -29,7 +29,6 @@
function accounts_const() function accounts_const()
{ {
global $phpgw, $phpgw_info; global $phpgw, $phpgw_info;
$phpgw->accounts->fill_user_array(); $phpgw->accounts->fill_user_array();
$this->groups = $this->read_groups($phpgw_info["user"]["userid"]); $this->groups = $this->read_groups($phpgw_info["user"]["userid"]);
} }

4
phpgwapi/inc/class.sessions.inc.php
View File

@ -127,13 +127,13 @@
return False; return False;
exit; exit;
} }
$accts = CreateObject("phpgwapi.accounts");
$accts = CreateObject("phpgwapi.accounts");
if (!$accts->exists($phpgw_info["user"]["userid"])) { if (!$accts->exists($phpgw_info["user"]["userid"])) {
$accts->auto_generate($phpgw_info["user"]["userid"], $passwd); $accts->auto_generate($phpgw_info["user"]["userid"], $passwd);
} }
$phpgw_info["user"]["sessionid"] = md5($phpgw->common->randomstring(10)); $phpgw_info["user"]["sessionid"] = md5($phpgw->common->randomstring(10));
$phpgw_info["user"]["kp3"] = md5($phpgw->common->randomstring(15)); $phpgw_info["user"]["kp3"] = md5($phpgw->common->randomstring(15));