Moved to clearer API calls into Congregation. Implementing application key

using unique customer ID.

git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@78 06cd67b6-e706-0410-b29e-9de616bca6e9

diff --git a/andrew.webprj b/andrew.webprj
index a3a5d8f..270e6d3 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -6,20 +6,20 @@
     <item url="config/" uploadstatus="1" />
     <item modified_time="1120073766" url="config/conf.xml" uploadstatus="1" />
     <item url="dialplan/" uploadstatus="1" />
-    <item modified_time="1130716381" url="dialplan/edit.php" uploadstatus="1" />
+    <item modified_time="1130769960" url="dialplan/edit.php" uploadstatus="1" />
     <item url="lib/" uploadstatus="1" />
     <item url="lib/Driver/" uploadstatus="1" />
-    <item modified_time="1130709096" url="lib/Driver/ldap.php" uploadstatus="1" />
-    <item modified_time="1130704853" url="lib/base.php" uploadstatus="1" />
+    <item modified_time="1130792001" url="lib/Driver/ldap.php" uploadstatus="1" />
+    <item modified_time="1130769961" url="lib/base.php" uploadstatus="1" />
     <item modified_time="1121689003" url="lib/Dialplan.php" uploadstatus="1" />
-    <item modified_time="1130705377" url="lib/Driver.php" uploadstatus="1" />
-    <item modified_time="1130703542" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1130769960" url="lib/Driver.php" uploadstatus="1" />
+    <item modified_time="1130769961" url="lib/Shout.php" uploadstatus="1" />
     <item modified_time="1121689003" url="lib/System.php" uploadstatus="1" />
-    <item modified_time="1130724077" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1130769961" url="lib/User.php" uploadstatus="1" />
     <item url="main/" uploadstatus="1" />
     <item modified_time="1121689003" url="main/dialplan.php" uploadstatus="1" />
     <item modified_time="1121401845" url="main/moh.php" uploadstatus="1" />
-    <item modified_time="1130716385" url="main/system.php" uploadstatus="1" />
+    <item modified_time="1130769962" url="main/system.php" uploadstatus="1" />
     <item modified_time="1121689003" url="main/users.php" uploadstatus="1" />
     <item url="templates/" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
@@ -44,10 +44,10 @@
     <item url="users/" uploadstatus="1" />
     <item modified_time="1122704539" url="users/add.php" uploadstatus="1" />
     <item modified_time="1122704539" url="users/delete.php" uploadstatus="1" />
-    <item modified_time="1130716394" url="users/edit.php" uploadstatus="1" />
-    <item modified_time="1130716388" url="users/save.php" uploadstatus="1" />
+    <item modified_time="1130769962" url="users/edit.php" uploadstatus="1" />
+    <item modified_time="1130769962" url="users/save.php" uploadstatus="1" />
     <item modified_time="1121689003" url="dialplan.php" uploadstatus="1" />
-    <item modified_time="1121689003" url="index.php" uploadstatus="1" />
+    <item modified_time="1129871121" url="index.php" uploadstatus="1" />
     <item modified_time="1122704475" url="users.php" uploadstatus="1" />
     <item url="" uploadstatus="1" />
     <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
@@ -57,23 +57,23 @@
         <uploadeditem upload_time="1120073766" url="config/conf.xml" />
         <uploadeditem upload_time="1121689003" url="dialplan.php" />
         <uploadeditem upload_time="0" url="dialplan/" />
-        <uploadeditem upload_time="1130716381" url="dialplan/edit.php" />
-        <uploadeditem upload_time="1121689003" url="index.php" />
+        <uploadeditem upload_time="1130769960" url="dialplan/edit.php" />
+        <uploadeditem upload_time="1129871121" url="index.php" />
         <uploadeditem upload_time="0" url="lib/" />
         <uploadeditem upload_time="1121689003" url="lib/Dialplan.php" />
-        <uploadeditem upload_time="1130705377" url="lib/Driver.php" />
+        <uploadeditem upload_time="1130769960" url="lib/Driver.php" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
-        <uploadeditem upload_time="1130709096" url="lib/Driver/ldap.php" />
-        <uploadeditem upload_time="1130703542" url="lib/Shout.php" />
+        <uploadeditem upload_time="1130792001" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1130769961" url="lib/Shout.php" />
         <uploadeditem upload_time="1121689003" url="lib/System.php" />
-        <uploadeditem upload_time="1130724077" url="lib/User.php" />
-        <uploadeditem upload_time="1130705457" url="lib/api.php" />
-        <uploadeditem upload_time="1130704853" url="lib/base.php" />
-        <uploadeditem upload_time="1130706300" url="lib/defines.php" />
+        <uploadeditem upload_time="1130769961" url="lib/User.php" />
+        <uploadeditem upload_time="1130762122" url="lib/api.php" />
+        <uploadeditem upload_time="1130769961" url="lib/base.php" />
+        <uploadeditem upload_time="1130762122" url="lib/defines.php" />
         <uploadeditem upload_time="0" url="main/" />
         <uploadeditem upload_time="1121689003" url="main/dialplan.php" />
         <uploadeditem upload_time="1121401845" url="main/moh.php" />
-        <uploadeditem upload_time="1130716385" url="main/system.php" />
+        <uploadeditem upload_time="1130769962" url="main/system.php" />
         <uploadeditem upload_time="1121689003" url="main/users.php" />
         <uploadeditem upload_time="0" url="templates/" />
         <uploadeditem upload_time="1120174958" url="templates/common-header.inc" />
@@ -99,13 +99,13 @@
         <uploadeditem upload_time="0" url="users/" />
         <uploadeditem upload_time="1122704539" url="users/add.php" />
         <uploadeditem upload_time="1122704539" url="users/delete.php" />
-        <uploadeditem upload_time="1130716394" url="users/edit.php" />
-        <uploadeditem upload_time="1130716388" url="users/save.php" />
+        <uploadeditem upload_time="1130769962" url="users/edit.php" />
+        <uploadeditem upload_time="1130769962" url="users/save.php" />
       </profile>
     </uploadprofiles>
     <templates>templates/</templates>
     <toolbars>toolbars/</toolbars>
-    <item modified_time="1130705457" url="lib/api.php" uploadstatus="1" />
+    <item modified_time="1130762122" url="lib/api.php" uploadstatus="1" />
     <author>Ben Klang</author>
     <email>ben@alkaloid.net</email>
     <debuggerclient>No Debugger</debuggerclient>
@@ -116,7 +116,7 @@
       <mailinglist address="" />
     </teamdata>
     <events/>
-    <item modified_time="1130706300" url="lib/defines.php" />
+    <item modified_time="1130762122" url="lib/defines.php" uploadstatus="1" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="dialplan" />

diff --git a/lib/Driver/ldap.php b/lib/Driver/ldap.php
index 4d556a8..985fd7d 100644 (file)
--- a/lib/Driver/ldap.php
+++ b/lib/Driver/ldap.php
@@ -195,13 +195,10 @@ type");
             return $entries[$context];
         }
 
-        $contexts = &$this->getContexts();
-        $domain = $contexts[$context]['domain'];
-
         $registry = &Registry::singleton();
         require_once $registry->applicationFilePath('%application%/lib/defines.php', 'congregation');
-        $users = $registry->callByPackage('congregation', 'getUsersByDomain',
-            array($domain, CONGREGATION_USER_PHONE));
+        $users = $registry->callByPackage('congregation', 'getUsersByContext',
+            array($context, CONGREGATION_USER_PHONE));
 
         foreach ($users as $user) {
             $extension = $user['extension'];
@@ -210,69 +207,6 @@ type");
         ksort($entries[$context]);
 
         return($entries[$context]);
-
-//         $search = @ldap_search($this->_LDAP,
-//             SHOUT_USERS_BRANCH.','.$this->_params['basedn'],
-//'(&(objectClass='.SHOUT_USER_OBJECTCLASS.')(context='.$context.'))',
-//             array('voiceMailbox', 'asteriskUserDialOptions',
-//                 'asteriskVoiceMailboxOptions', 'voiceMailboxPin',
-//                 'cn', 'telephoneNumber',
-//                 'asteriskUserDialTimeout', 'mail', 'asteriskPager'));
-//         if (!$search) {
-//             return PEAR::raiseError("Unable to search directory: " .
-//                 ldap_error($this->_LDAP));
-//         }
-//         $res = ldap_get_entries($this->_LDAP, $search);
-//         $entries[$context] = array();
-//         $i = 0;
-//         while ($i < $res['count']) {
-//             $extension = $res[$i]['voicemailbox'][0];
-//             $entries[$context][$extension] = array();
-//
-//             $j = 0;
-//             $entries[$context][$extension]['dialopts'] = array();
-//             while ($j < @$res[$i]['asteriskuserdialoptions']['count']) {
-//                 $entries[$context][$extension]['dialopts'][] =
-//                     $res[$i]['asteriskuserdialoptions'][$j];
-//                 $j++;
-//             }
-//
-//             $j = 0;
-//             $entries[$context][$extension]['mailboxopts'] = array();
-//             while ($j < @$res[$i]['asteriskvoicemailboxoptions']['count']) {
-//                 $entries[$context][$extension]['mailboxopts'][] =
-//                     $res[$i]['asteriskvoicemailboxoptions'][$j];
-//                 $j++;
-//             }
-//
-//             $entries[$context][$extension]['mailboxpin'] =
-//                 $res[$i]['voicemailboxpin'][0];
-//
-//             @$entries[$context][$extension]['name'] =
-//                 $res[$i]['cn'][0];
-//
-//             $j = 0;
-//             $entries[$context][$extension]['phonenumbers'] = array();
-//             while ($j < @$res[$i]['telephonenumber']['count']) {
-//                 $entries[$context][$extension]['phonenumbers'][] =
-//                     $res[$i]['telephonenumber'][$j];
-//                 $j++;
-//             }
-//
-//             # FIXME Do some sanity checking here.  Also set a default?
-//             @$entries[$context][$extension]['dialtimeout'] =
-//                 $res[$i]['asteriskuserdialtimeout'][0];
-//
-//             @$entries[$context][$extension]['email'] =
-//                 $res[$i]['mail'][0];
-//
-//             @$entries[$context][$extension]['pageremail'] =
-//                 $res[$i]['asteriskpager'][0];
-//
-//             $i++;
-//         }
-//
-//         return $entries[$context];
     }
     // }}}
 
@@ -638,7 +572,7 @@ for $context"));
         }
         if (($res['count'] > 1) ||
             ($res['count'] != 0 &&
-            !in_array($res[0][$ldapKey], $userdetails[$appKey])_) {
+            !in_array($res[0][$ldapKey], $userdetails[$appKey]))) {
             return PEAR::raiseError('Duplicate extension found.  Not saving changes.');
         }