--- /opt/gemeinschaft/dialplan-scripts/dial-log-store 2009-09-29 14:44:29.000000000 +0200 +++ ./dial-log-store 2010-06-17 15:09:34.000000000 +0200 @@ -79,10 +79,16 @@ $rs = $db->execute('SELECT `firstname`, `lastname` FROM `pb_prv` WHERE `user_id`='.$uid.' AND `number`=\''. $db->escape($number) .'\''); //FIXME - probably doesn't make much sense with uncanonized phone numbers $remote_user = $rs->fetchRow(); + + if ( isset( $remote_user ) ) { + # if there is nothimg in the private phonebook, check the ldap phonebook + $rs = $db->execute('SELECT `firstname`, `lastname` FROM `pb_ldap` WHERE `number`=\''. $db->escape($number) .'\''); + $remote_user = $rs->fetchRow(); + } $is_from_phonebook = true; } -if ($remote_user) { +if ( isset( $remote_user ) ) { if (! $is_from_phonebook) $db_remote_user_id = (int)$remote_user['id']; else @@ -103,4 +109,4 @@ -?> \ Kein Zeilenumbruch am Dateiende. +?>