Perfecting telephoneNumber management

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

diff --git a/lib/Driver/ldap.php b/lib/Driver/ldap.php
index 5c38a0e..5bcba9e 100644 (file)
--- a/lib/Driver/ldap.php
+++ b/lib/Driver/ldap.php
@@ -743,8 +743,8 @@ for $context"));
             'asteriskUserDialOptions' => $userdetails['dialopts'],
         );
 
-        if (!empty ($userdetails['telephonenumbers'])) {
-            $entry['telephoneNumber'] = $userdetails['telephonenumbers'];
+        if (!empty ($userdetails['telephonenumber'])) {
+            $entry['telephoneNumber'] = $userdetails['telephonenumber'];
         }
 
         $validusers = &$this->getUsers($context);

diff --git a/usermgr/save.php b/usermgr/save.php
index 8a4768a..e5a9355 100644 (file)
--- a/usermgr/save.php
+++ b/usermgr/save.php
@@ -43,14 +43,17 @@ if (!$FormValid || !$Form->isSubmitted()) {
         "uid" => $vars->get('uid'),
     );
 
-    $i = 1;
-    $userdetails['telephonenumbers'] = array();
-    while ($i <= $limits['telephonenumbersmax']) {
-        $tmp = $vars->get("telephone$i");
-        if (!empty($tmp)) {
-            $userdetails['telephonenumbers'][] = $tmp;
+    $userdetails['telephonenumber'] = array();
+    $telephonenumber = $vars->get("telephonenumber");
+    if (!empty($telephonenumber) && is_array($telephonenumber)) {
+        $i = 1;
+        while ($i <= $limits['telephonenumbersmax']) {
+            if (!empty($telephonenumber[$i])) {
+                $userdetails['telephonenumber'][] = $telephonenumber[$i++];
+            } else {
+                $i++;
+            }
         }
-        $i++;
     }
 
     $userdetails['dialopts'] = array();