mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:20 +01:00
some changes for ldap support
This commit is contained in:
parent
286b7327c3
commit
d902c27d85
@ -124,7 +124,7 @@
|
|||||||
{
|
{
|
||||||
global $phpgw_info, $phpgw;
|
global $phpgw_info, $phpgw;
|
||||||
|
|
||||||
if (gettype($id) == "string") { $id = $this->username2userid($id); }
|
if (gettype($id) == "string") { $id = $this->name2id($id); }
|
||||||
$groups = Array();
|
$groups = Array();
|
||||||
$group_memberships = $phpgw->acl->get_location_list_for_id("phpgw_group", 1, "u", intval($id));
|
$group_memberships = $phpgw->acl->get_location_list_for_id("phpgw_group", 1, "u", intval($id));
|
||||||
if ($group_memberships) {
|
if ($group_memberships) {
|
||||||
|
@ -294,7 +294,7 @@ It should use the values in the $this->data
|
|||||||
global $phpgw, $phpgw_info;
|
global $phpgw, $phpgw_info;
|
||||||
if ($account_id == False){ $account_id = $phpgw_info["user"]["account_id"]; }
|
if ($account_id == False){ $account_id = $phpgw_info["user"]["account_id"]; }
|
||||||
$sql = "select acl_location, acl_rights from phpgw_acl where acl_appname = '$app' and ";
|
$sql = "select acl_location, acl_rights from phpgw_acl where acl_appname = '$app' and ";
|
||||||
$sql .= "acl_account = ".$account_id;
|
$sql .= "acl_account = '".$account_id."'";
|
||||||
$this->db->query($sql ,__LINE__,__FILE__);
|
$this->db->query($sql ,__LINE__,__FILE__);
|
||||||
$rights = 0;
|
$rights = 0;
|
||||||
if ($this->db->num_rows() == 0 ){ return False; }
|
if ($this->db->num_rows() == 0 ){ return False; }
|
||||||
|
@ -161,6 +161,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$phpgw->accounts->accounts_const();
|
$phpgw->accounts->accounts_const();
|
||||||
|
print "hallo<br>";
|
||||||
|
|
||||||
$phpgw_info["user"]["session_ip"] = $this->getuser_ip();
|
$phpgw_info["user"]["session_ip"] = $this->getuser_ip();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user