More compatible with new LDAP.

This commit is contained in:
skeeter 2001-09-11 03:04:44 +00:00
parent a3502cc6a8
commit 1610c4196b

View File

@ -794,25 +794,14 @@
{ {
return False; return False;
} }
$db = $GLOBALS['phpgw']->db; $GLOBALS['phpgw']->accounts->get_account_name($account_id,$lid,$fname,$lname);
$db->query('SELECT account_lid,account_lastname,account_firstname FROM phpgw_accounts WHERE account_id='.$account_id,__LINE__,__FILE__); $fullname = $lid;
if($db->num_rows())
{
$db->next_record();
$fullname = $db->f('account_lid');
$lname = $db->f('account_lastname');
$fname = $db->f('account_firstname');
if($lname && $fname) if($lname && $fname)
{ {
$fullname = $lname.', '.$fname; $fullname = $lname.', '.$fname;
} }
return $fullname; return $fullname;
} }
else
{
return False;
}
}
function display_status($user_status) function display_status($user_status)
{ {
@ -1728,9 +1717,8 @@
@reset($event['participants']); @reset($event['participants']);
while(list($part,$status) = each($event['participants'])) while(list($part,$status) = each($event['participants']))
{ {
$db->query('select account_firstname,account_lastname from phpgw_accounts where account_id='.$part,__LINE__,__FILE__); $GLOBALS['phpgw']->accounts->get_account_name($accountid,$lid,$fname,$lname);
$db->next_record(); $name = $fname.' '.$lname;
$name = $db->f('account_firstname').' '.$db->f('account_lastname');
$owner_status = $icalendar->switch_partstat(intval($this->switch_status($event['participants'][$part]))); $owner_status = $icalendar->switch_partstat(intval($this->switch_status($event['participants'][$part])));
$owner_mailto = 'mpeters@satx.rr.com'; $owner_mailto = 'mpeters@satx.rr.com';
$str = 'CN="'.$name.'";PARTSTAT='.$owner_status.':'.$owner_mailto; $str = 'CN="'.$name.'";PARTSTAT='.$owner_status.':'.$owner_mailto;