From 77d623fe861fe711e6099bf2cfb22f815c83b7b2 Mon Sep 17 00:00:00 2001 From: Ben Klang Date: Thu, 30 Jun 2005 05:27:16 +0000 Subject: [PATCH] see above git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@37 06cd67b6-e706-0410-b29e-9de616bca6e9 --- lib/Driver/ldap.php | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/lib/Driver/ldap.php b/lib/Driver/ldap.php index 81fbcecfc..0b8b6b96a 100644 --- a/lib/Driver/ldap.php +++ b/lib/Driver/ldap.php @@ -89,20 +89,37 @@ class Shout_Driver_ldap extends Shout_Driver $entries = array(); $i = 0; while ($i < $res['count']) { + # FIXME Add method to handle this ldap silliness $extension = $res[$i]['voicemailbox'][0]; $entries[$extension] = array(); - $entries[$extension]['dialopts'] = - $res[$i]['asteriskuserdialoptions']; + if ($res[$i]['asteriskuserdialoptions']['count'] > 0) { + $entries[$extension]['dialopts'] = + $res[$i]['asteriskuserdialoptions']; + } else { + $entries[$extension]['dialopts'] = null; + } - $entries[$extension]['mailboxopts'] = - $res[$i]['asteriskvoicemailboxoptions']; + if ($res[$i]['asteriskvoicemailboxoptions']['count'] > 0) { + $entries[$extension]['mailboxopts'] = + $res[$i]['asteriskvoicemailboxoptions']; + } else { + $entries[$extension]['mailboxopts'] = null; + } - $entries[$extension]['mailboxpin'] = - $res[$i]['voicemailboxpin'][0]; + if ($res[$i]['voicemailboxpin']['count'] > 0) { + $entries[$extension]['mailboxpin'] = + $res[$i]['voicemailboxpin'][0]; + } else { + $entries[$extension]['mailboxpin'] = null; + } - $entries[$extension]['name'] = - $res[$i]['cn'][0]; + if ($res[$i]['cn']['count'] > 0) { + $entries[$extension]['name'] = + $res[$i]['cn'][0]; + } else { + $entries[$extension]['name'] = null; + } $entries[$extension]['phonenumbers'] = $res[$i]['telephonenumber']; -- 2.11.0