Fixing up telephone number functionality

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

diff --git a/lib/Driver/ldap.php b/lib/Driver/ldap.php
index 4878069..5c38a0e 100644 (file)
--- a/lib/Driver/ldap.php
+++ b/lib/Driver/ldap.php
@@ -274,7 +274,6 @@ type");
         }
 
         $res = ldap_get_entries($this->_LDAP, $search);
-
         #
         # ATTRIBUTES RETURNED FROM ldap_get_entries ARE ALL LOWER CASE!!
         #
@@ -309,9 +308,10 @@ type");
                 $res[$i]['cn'][0];
 
             $j = 0;
-            $entries[$context][$extension]['phonenumbers'] = array();
+            $entries[$context][$extension]['telephonenumber'] = array();
             while ($j < @$res[$i]['telephonenumber']['count']) {
-                $entries[$context][$extension]['phonenumbers'][] =
+                // Start with 1 for telephone numbers for user convenience
+                $entries[$context][$extension]['telephonenumber'][$j+1] =
                     $res[$i]['telephonenumber'][$j];
                 $j++;
             }
@@ -949,4 +949,4 @@ Check authentication credentials.");
         return true;
     }
     // }}}
-}
\ No newline at end of file
+}

diff --git a/lib/User.php b/lib/User.php
index ad61cdb..5a3de4e 100644 (file)
--- a/lib/User.php
+++ b/lib/User.php
@@ -58,7 +58,7 @@ class UserDetailsForm extends Horde_Form {
         # FIXME: Make this work if limits don't exist.
         $t = 1;
         while ($t <= $limits['telephonenumbersmax']) {
-            $this->addVariable(_("Telephone Number $t:"), "telephone$t",
+            $this->addVariable(_("Telephone Number $t:"), "telephonenumber[$t]",
             'cellphone', false);
             $t++;
         }
@@ -99,8 +99,7 @@ class UserDetailsForm extends Horde_Form {
         if (!$this->_userdetails) {
             return true;
         }
-        foreach(array('name', 'email', 'pageremail', 'mailboxpin', 'uid')
-            as $var) {
+        foreach(array('name', 'email', 'pageremail', 'mailboxpin', 'uid', 'telephonenumber') as $var) {
             # FIXME This will be done the Right Way in Shout 0.7
             $vars->set($var, $this->_userdetails[$var]);
         }
@@ -111,12 +110,6 @@ class UserDetailsForm extends Horde_Form {
 //         $vars->set('uid', $this->_userdetails['uid']);
         $vars->set('newextension', $vars->get('extension'));
 
-        $i = 1;
-        foreach($this->_userdetails['phonenumbers'] as $number) {
-            $vars->set("telephone$i", $number);
-            $i++;
-        }
-
         $vars->set('moh', false);
         $vars->set('eca', false);
         $vars->set('transfer', false);
@@ -157,4 +150,4 @@ class UserDetailsForm extends Horde_Form {
     }
     // }}}
 }
-// }}}
\ No newline at end of file
+// }}}