gunnar: server/kolab-webclient activesync_conf.patch, 1.1.2.1, 1.1.2.2 kolab-webclient.spec, 1.23.2.22, 1.23.2.23

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv19689

Modified Files:
      Tag: kolab_2_2_branch
	activesync_conf.patch kolab-webclient.spec 
Log Message:
Fix problem when deleting an activesync device which was still shown on the share settings.

Index: activesync_conf.patch
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/activesync_conf.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- activesync_conf.patch	2 Jun 2010 19:06:32 -0000	1.1.2.1
+++ activesync_conf.patch	6 Jun 2010 08:50:51 -0000	1.1.2.2
@@ -166,7 +166,7 @@
      header('Location: ' . Horde::applicationUrl('calendars/', true));
      exit;
  }
-@@ -57,6 +56,23 @@
+@@ -57,6 +56,26 @@
  if (isset($params['fbrelevance'])) {
      $vars->set('fbrelevance', $params['fbrelevance']);
  }
@@ -176,7 +176,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
@@ -280,7 +283,7 @@
 diff -Naur a/notepads/edit.php b/notepads/edit.php
 --- a/mnemo/notepads/edit.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/mnemo/notepads/edit.php	2010-05-10 08:28:19.000000000 +0200
-@@ -51,6 +51,26 @@
+@@ -51,6 +51,29 @@
  
  $vars->set('name', $notepad->get('name'));
  $vars->set('description', $notepad->get('desc'));
@@ -292,7 +295,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
@@ -310,7 +316,7 @@
 diff -Naur a/addressbooks/edit.php b/addressbooks/edit.php
 --- a/turba/addressbooks/edit.php	2010-05-10 08:30:03.000000000 +0200
 +++ b/turba/addressbooks/edit.php	2010-05-10 08:31:19.000000000 +0200
-@@ -53,6 +53,26 @@
+@@ -53,6 +53,29 @@
  
  $vars->set('name', $addressbook->get('name'));
  $vars->set('description', $addressbook->get('desc'));
@@ -322,7 +328,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));
@@ -424,7 +433,7 @@
 diff -Naur a/tasklists/edit.php b/tasklists/edit.php
 --- a/nag/tasklists/edit.php	2010-05-10 08:10:16.000000000 +0200
 +++ b/nag/tasklists/edit.php	2010-05-10 08:22:49.000000000 +0200
-@@ -51,6 +51,26 @@
+@@ -51,6 +51,29 @@
  
  $vars->set('name', $tasklist->get('name'));
  $vars->set('description', $tasklist->get('desc'));
@@ -436,7 +445,10 @@
 +    } else {
 +        $default = 0;
 +    }
-+    $devices = $params['activesync']['DEVICE'];
++    require_once 'Horde/Kolab/Storage.php';
++    $folder = Kolab_Storage::getFolder('INBOX');
++    $result = $folder->getActiveSync();
++    $devices = isset($result['DEVICE']) ? $result['DEVICE'] : null;
 +    if (!empty($devices)) {
 +        $folders = $params['activesync']['FOLDER'];
 +        $vars->set('activesync_devices', implode('|', array_keys($devices)));

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.22
retrieving revision 1.23.2.23
diff -u -d -r1.23.2.22 -r1.23.2.23
--- kolab-webclient.spec	2 Jun 2010 19:06:32 -0000	1.23.2.22
+++ kolab-webclient.spec	6 Jun 2010 08:50:51 -0000	1.23.2.23
@@ -11,7 +11,7 @@
 %if "%{with_activesync}" == "no"
 %define         V_release %{V_year}%{V_month}%{V_day}
 %else
-%define         V_release %{V_year}%{V_month}%{V_day}+activesync1
+%define         V_release %{V_year}%{V_month}%{V_day}+activesync2
 %endif
 
 # Package Information