Changeset 0f1faec in github

Timestamp:

Aug 11, 2011 6:24:29 PM (23 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a170304

Parents:

077cfda

Message:

Fix saving and deleting LDAP contacts; skip client-side input validation for contacts, this is done server-side

Location:

program

Files:

• include/rcube_ldap.php (modified) (3 diffs)
• js/app.js (modified) (2 diffs)

program/include/rcube_ldap.php

@@ -729 +729 @@
         $replacedata = array();
         $deletedata = array();
+        
+        // flatten composite fields in $record
+        if (is_array($record['address'])) {
+          foreach ($record['address'] as $i => $struct) {
+            foreach ($struct as $col => $val) {
+              $record[$col][$i] = $val;
+            }
+          }
+        }
 
         foreach ($this->fieldmap as $col => $fld) {
@@ -844 +853 @@
         if (!is_array($ids)) {
             // Not an array, break apart the encoded DNs.
-            $dns = explode(',', $ids);
+            $ids = explode(',', $ids);
         } // end if
 
-        foreach ($dns as $id) {
+        foreach ($ids as $id) {
             $dn = base64_decode($id);
             $this->_debug("C: Delete [dn: $dn]");
@@ -870 +879 @@
         } // end foreach
 
-        return count($dns);
+        return count($ids);
     }
 

program/js/app.js

@@ -643 +643 @@
               form.action += '?_reload=1';
             }
-            else if ((input = $("input[name='_name']", form)) &&input.length && input.val() == '') {
-              alert(this.get_label('nonamewarning'));
-              input.focus();
-              break;
-            }
             else if (this.task == 'settings' && (this.env.identities_level % 2) == 0  &&
               (input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
@@ -4428 +4423 @@
   {
     var n, buttons = this.buttons['upload-photo'];
-    for (n=0; n < buttons.length; n++)
+    for (n=0; n < buttons && buttons.length; n++)
       $('#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));