some changes for ldap support

This commit is contained in:
Lars Kneschke 2001-02-04 10:26:15 +00:00
parent 286b7327c3
commit d902c27d85
4 changed files with 4 additions and 3 deletions

View File

@ -181,4 +181,4 @@
$tmpl->set_var("template_set","default"); $tmpl->set_var("template_set","default");
$tmpl->parse("loginout", "login_form"); $tmpl->parse("loginout", "login_form");
$tmpl->p("loginout"); $tmpl->p("loginout");
?> ?>

View File

@ -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) {

View File

@ -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; }

View File

@ -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();