summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-06-04 09:42:05 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-06-04 09:42:05 (GMT)
commit8042408cb6918f2de2558388e6443f19372b3d1c (patch)
tree227a8eb91f919ab3eff12d74472eb7b6697dc607
parentf72397843ce4c3c16a13dd6c6207cd997cdcda5c (diff)
downloadserver-8042408cb6918f2de2558388e6443f19372b3d1c.tar.gz
Allow hiding teh organizer attribute when downloading ics data.
-rw-r--r--kolab-webclient/Makefile2
-rw-r--r--kolab-webclient/kolab-webclient.spec6
-rw-r--r--kolab-webclient/webclient-kolab-conf.template4
-rw-r--r--patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch37
-rw-r--r--patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_AnonymousiCalDownload.diff37
5 files changed, 66 insertions, 20 deletions
diff --git a/kolab-webclient/Makefile b/kolab-webclient/Makefile
index 2331e49..16e0c52 100644
--- a/kolab-webclient/Makefile
+++ b/kolab-webclient/Makefile
@@ -26,7 +26,7 @@ PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
SOURCE_VERSION = $(shell grep "%define[ ]*V_source_version" *.spec | sed -e "s/.*V_source_version\s*\([0-9._a-z-]*\).*/\1/")
PASSWD_VERSION = $(shell grep "%define[ ]*V_passwd_version" *.spec | sed -e "s/.*V_passwd_version\s*\([0-9._a-z]*\).*/\1/")
-RELEASE = ${YEAR}${MONTH}${DAY}suc02
+RELEASE = ${YEAR}${MONTH}${DAY}suc01
PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch
TEMPLATES = $(shell find . -name "*.template")
diff --git a/kolab-webclient/kolab-webclient.spec b/kolab-webclient/kolab-webclient.spec
index c786af2..c3f7eff 100644
--- a/kolab-webclient/kolab-webclient.spec
+++ b/kolab-webclient/kolab-webclient.spec
@@ -2,13 +2,13 @@
%define V_horde_name horde-webmail
%define V_package kolab-webclient
%define V_year 2009
-%define V_month 05
-%define V_day 28
+%define V_month 06
+%define V_day 04
%define V_version 1.2.0
%define V_source_version 1.2
%define V_passwd_version 3.0.1
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release %{V_year}%{V_month}%{V_day}suc02
+%define V_release %{V_year}%{V_month}%{V_day}suc01
# Package Information
Name: %{V_package}
diff --git a/kolab-webclient/webclient-kolab-conf.template b/kolab-webclient/webclient-kolab-conf.template
index 1476da8..48e4823 100644
--- a/kolab-webclient/webclient-kolab-conf.template
+++ b/kolab-webclient/webclient-kolab-conf.template
@@ -41,4 +41,8 @@ $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
*/
//$conf['ics']['default_user'] = 'proxy@@@@postfix-mydomain@@@';
//$conf['ics']['default_pass'] = 'proxy';
+/**
+ * Uncomment if you wish to hide the organizer which is currently the proxy user.
+ */
+//$conf['ics']['hide_organizer'] = true;
?>
diff --git a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
index ec1acf8..1ceb591 100644
--- a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
+++ b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
@@ -26928,9 +26928,9 @@ STATUS: HACK
Signed-off-by: Gunnar Wrobel <p@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 @@ index ed41da4..118788a 100644
}
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 @@ index 0000000..bb26d64
+ * @author Chuck Hagenbuch <chuck@horde.org>
+ */
+
++function logout()
++{
++ Auth::clearAuth();
++ @session_destroy();
++}
++
+@define('AUTH_HANDLER', true);
+@define('HORDE_BASE', dirname(__FILE__) . '/..');
+require_once HORDE_BASE . '/lib/base.php';
@@ -26985,6 +26991,7 @@ index 0000000..bb26d64
+ && 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 @@ index 0000000..bb26d64
+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 @@ index 0000000..bb26d64
+ 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,14 +27060,21 @@ index 0000000..bb26d64
+ strlen($ics));
+echo $ics;
+
-+Auth::clearAuth();
-+@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@rdus.de>
+Date: Thu Jun 4 09:40:25 2009 +0200
+
+ Allow to hide the organizer.
+
commit 0df1aefd621efbe8a2d7e306fbc79dace5760280
Author: Gunnar Wrobel <p@rdus.de>
Date: Thu May 28 12:42:44 2009 +0200
diff --git a/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_AnonymousiCalDownload.diff b/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_AnonymousiCalDownload.diff
index a87d547..6efff60 100644
--- a/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_AnonymousiCalDownload.diff
+++ b/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_AnonymousiCalDownload.diff
@@ -10,9 +10,9 @@ STATUS: HACK
Signed-off-by: Gunnar Wrobel <p@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
@@ -31,10 +31,10 @@ index ed41da4..118788a 100644
}
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 $
@@ -47,6 +47,12 @@ index 0000000..bb26d64
+ * @author Chuck Hagenbuch <chuck@horde.org>
+ */
+
++function logout()
++{
++ Auth::clearAuth();
++ @session_destroy();
++}
++
+@define('AUTH_HANDLER', true);
+@define('HORDE_BASE', dirname(__FILE__) . '/..');
+require_once HORDE_BASE . '/lib/base.php';
@@ -67,6 +73,7 @@ index 0000000..bb26d64
+ && isset($conf['ics']['default_pass'])) {
+ $user = $conf['ics']['default_user'];
+ $pass = $conf['ics']['default_pass'];
++ $proxied = true;
+ }
+} else {
+ $user = $_SERVER['PHP_AUTH_USER'];
@@ -89,6 +96,9 @@ index 0000000..bb26d64
+if (is_a($share, 'PEAR_Error')) {
+ header('HTTP/1.0 400 Bad Request');
+ echo '400 Bad Request';
++ if ($proxied) {
++ logout();
++ }
+ exit;
+}
+
@@ -115,7 +125,11 @@ index 0000000..bb26d64
+ 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();
@@ -128,14 +142,21 @@ index 0000000..bb26d64
+ strlen($ics));
+echo $ics;
+
-+Auth::clearAuth();
-+@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@rdus.de>
+Date: Thu Jun 4 09:40:25 2009 +0200
+
+ Allow to hide the organizer.
+
commit 0df1aefd621efbe8a2d7e306fbc79dace5760280
Author: Gunnar Wrobel <p@rdus.de>
Date: Thu May 28 12:42:44 2009 +0200