Changeset 529 in subversion

Timestamp:

Mar 28, 2007 9:53:36 AM (6 years ago)

Author:

thomasb

Message:

devel-addressbook: allow to copy multiple LDAP records to local address book

Location:

branches/devel-addressbook/program

Files:

• include/rcube_ldap.inc (modified) (1 diff)
• steps/addressbook/copy.inc (modified) (1 diff)

branches/devel-addressbook/program/include/rcube_ldap.inc

@@ -246 +246 @@
     {
       $ids = explode(',', $value);
-      $this->result = new rcube_result_set();
+      $result = new rcube_result_set();
       foreach ($ids as $id)
         if ($rec = $this->get_record($id, true))
         {
-          $this->result->add($rec);
-          $this->result->count++;
+          $result->add($rec);
+          $result->count++;
         }
       
-      return $this->result;
+      return $result;
     }
     

branches/devel-addressbook/program/steps/addressbook/copy.inc

@@ -22 +22 @@
 $cid = get_input_value('_cid', RCUBE_INPUT_POST);
 $target = get_input_value('_to', RCUBE_INPUT_POST);
-if ($cid && preg_match('/^[a-z0-9\-_=]+(,[0-9]+)*$/i', $cid) && strlen($target) && $target != $source)
+if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && strlen($target) && $target != $source)
 {
   if ($target != '0')