gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.4.2.8, 1.32.2.4.2.9
cvs at kolab.org
cvs at kolab.org
Thu Jun 4 11:42:07 CEST 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv2207/patches/horde-webmail/1.2.0
Modified Files:
Tag: suc_branch
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Allow hiding teh organizer attribute when downloading ics data.
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.4.2.8
retrieving revision 1.32.2.4.2.9
diff -u -d -r1.32.2.4.2.8 -r1.32.2.4.2.9
--- horde-webmail-1.2.0_kolab_openpkg.patch 28 May 2009 14:26:36 -0000 1.32.2.4.2.8
+++ horde-webmail-1.2.0_kolab_openpkg.patch 4 Jun 2009 09:42:04 -0000 1.32.2.4.2.9
@@ -26928,9 +26928,9 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- horde-webmail/config/kolab.php | 4 ++
- horde-webmail/kronolith/ics_kolab.php | 95 +++++++++++++++++++++++++++++++++
- 2 files changed, 99 insertions(+), 0 deletions(-)
+ horde-webmail/config/kolab.php | 4 +
+ horde-webmail/kronolith/ics_kolab.php | 110 +++++++++++++++++++++++++++++++++
+ 2 files changed, 114 insertions(+), 0 deletions(-)
diff --git a/horde-webmail/config/kolab.php b/horde-webmail/config/kolab.php
index ed41da4..118788a 100644
@@ -26949,10 +26949,10 @@
}
diff --git a/horde-webmail/kronolith/ics_kolab.php b/horde-webmail/kronolith/ics_kolab.php
new file mode 100644
-index 0000000..bb26d64
+index 0000000..2b81832
--- /dev/null
+++ b/horde-webmail/kronolith/ics_kolab.php
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,110 @@
+<?php
+/**
+ * $Horde: kronolith/ics.php,v 1.5.2.10 2008/01/10 16:16:49 jan Exp $
@@ -26965,6 +26965,12 @@
+ * @author Chuck Hagenbuch <chuck at horde.org>
+ */
+
++function logout()
++{
++ Auth::clearAuth();
++ @session_destroy();
++}
++
+ at define('AUTH_HANDLER', true);
+ at define('HORDE_BASE', dirname(__FILE__) . '/..');
+require_once HORDE_BASE . '/lib/base.php';
@@ -26985,6 +26991,7 @@
+ && isset($conf['ics']['default_pass'])) {
+ $user = $conf['ics']['default_user'];
+ $pass = $conf['ics']['default_pass'];
++ $proxied = true;
+ }
+} else {
+ $user = $_SERVER['PHP_AUTH_USER'];
@@ -27007,6 +27014,9 @@
+if (is_a($share, 'PEAR_Error')) {
+ header('HTTP/1.0 400 Bad Request');
+ echo '400 Bad Request';
++ if ($proxied) {
++ logout();
++ }
+ exit;
+}
+
@@ -27033,7 +27043,11 @@
+ if (is_a($event, 'PEAR_Error')) {
+ continue;
+ }
-+ $iCal->addComponent($event->toiCalendar($iCal));
++ $iCalEvent = $event->toiCalendar($iCal);
++ if (!empty($conf['ics']['hide_organizer'])) {
++ $iCalEvent->removeAttribute('ORGANIZER');
++ }
++ $iCal->addComponent($iCalEvent);
+ }
+
+ $ics = $iCal->exportvCalendar();
@@ -27046,13 +27060,20 @@
+ strlen($ics));
+echo $ics;
+
-+Auth::clearAuth();
-+ at session_destroy();
++if ($proxied) {
++ logout();
++}
--
tg: (b5749f0..) t/kronolith/HK/GW/AnonymousiCalDownload (depends on: t/dimp/H/GW/AclView)
--
TOPGIT patch commit log
=======================
+
+commit 4ac58a4d646865d74ac26c0439f29ceacfdfea82
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Thu Jun 4 09:40:25 2009 +0200
+
+ Allow to hide the organizer.
commit 0df1aefd621efbe8a2d7e306fbc79dace5760280
Author: Gunnar Wrobel <p at rdus.de>
More information about the commits
mailing list