summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-06-06 08:50:51 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-06-06 08:50:51 (GMT)
commitf35beb3ca25941018f216b8ada52e7c91bd0f397 (patch)
tree8b73d1f288933da645f2d9af62ef6f21e9ecd334
parent174a62adc9811f6496b1487636e631c423fdb865 (diff)
downloadserver-f35beb3ca25941018f216b8ada52e7c91bd0f397.tar.gz
Fix problem when deleting an activesync device which was still shown on the share settings.
-rw-r--r--kolab-webclient/activesync_conf.patch28
-rw-r--r--kolab-webclient/kolab-webclient.spec2
2 files changed, 21 insertions, 9 deletions
diff --git a/kolab-webclient/activesync_conf.patch b/kolab-webclient/activesync_conf.patch
index e995c46..700661c 100644
--- a/kolab-webclient/activesync_conf.patch
+++ b/kolab-webclient/activesync_conf.patch
@@ -166,7 +166,7 @@ diff -Naur a/calendars/edit.php b/calendars/edit.php
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 @@ diff -Naur a/calendars/edit.php b/calendars/edit.php
+ } 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/lib/Forms/EditNotepad.php b/lib/Forms/EditNotepad.php
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 @@ diff -Naur a/notepads/edit.php b/notepads/edit.php
+ } 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/notepads/edit.php b/notepads/edit.php
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 @@ diff -Naur a/addressbooks/edit.php b/addressbooks/edit.php
+ } 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/lib/Forms/EditTaskList.php b/lib/Forms/EditTaskList.php
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 @@ diff -Naur a/tasklists/edit.php b/tasklists/edit.php
+ } 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)));
diff --git a/kolab-webclient/kolab-webclient.spec b/kolab-webclient/kolab-webclient.spec
index de24889..cf5a6f0 100644
--- a/kolab-webclient/kolab-webclient.spec
+++ b/kolab-webclient/kolab-webclient.spec
@@ -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