gunnar: server/kolab-webclient/turba/patches/turba-2.3.3 t_turba_HK_GW_ZpushAnnotations.diff, 1.2, 1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv29677/kolab-webclient/turba/patches/turba-2.3.3

Modified Files:
	t_turba_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_turba_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3/t_turba_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_turba_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
+++ t_turba_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -51,17 +51,19 @@
 diff -Naur a/lib/Forms/EditAddressBook.php b/lib/Forms/EditAddressBook.php
 --- a/lib/Forms/EditAddressBook.php	2010-05-10 08:30:05.000000000 +0200
 +++ b/lib/Forms/EditAddressBook.php	2010-05-10 08:32:28.000000000 +0200
-@@ -40,16 +40,46 @@
+@@ -40,16 +40,50 @@
          parent::Horde_Form($vars, sprintf(_("Edit %s"), $addressbook->get('name')));
  
          $this->addHidden('', 'a', 'text', true);
 -        $this->addVariable(_("Name"), 'name', 'text', true);
 +        if ($this->_addressbook->get('owner') != Auth::getAuth()) {
 +            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
 +        } else {
 +            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
 +        }
-         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
  
          $this->setButtons(array(_("Save")));
      }
@@ -86,7 +88,10 @@
          $this->_addressbook->set('desc', $this->_vars->get('description'));
 +
 +        if ($this->_vars->get('activesync_devices', '')) {
-+            $params = array();
++            $params = @unserialize($this->_addressbook->get('params'));
++            if ($params === false) {
++                $params = array();
++            }
 +            $ids = explode('|', $this->_vars->get('activesync_devices', ''));
 +            foreach ($ids as $id) {
 +                $sync = (int) $this->_vars->get('activesync_' . $id, 0);