Cleaner session handling for the export.2.2-feature-suc

4 files changed, 65 insertions, 27 deletions

diff --git a/kolab-webclient/ChangeLog b/kolab-webclient/ChangeLog
index 39a663a..8a5da40 100644
--- a/kolab-webclient/ChangeLog
+++ b/kolab-webclient/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-09  Gunnar Wrobel  <p@rdus.de>
+
+	* kolab-webclient.spec: Cleaner session handling for the export.
+
 2009-10-07  Gunnar Wrobel  <p@rdus.de>
 
 	* kolab-webclient.spec: Added functionality for anonymous
diff --git a/kolab-webclient/kolab-webclient.spec b/kolab-webclient/kolab-webclient.spec
index 05aef59..619df55 100644
--- a/kolab-webclient/kolab-webclient.spec
+++ b/kolab-webclient/kolab-webclient.spec
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 10
-%define         V_day   07
+%define         V_day   09
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1
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 14bd784..1039706 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
@@ -27132,18 +27132,18 @@ STATUS: OPEN
 Signed-off-by: Gunnar Wrobel <p@rdus.de>
 
 ---
- horde-webmail/kronolith/imple_kolab.php         |   92 +++++++++
+ horde-webmail/kronolith/imple_kolab.php         |   96 +++++++++
  horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
  horde-webmail/kronolith/themes/embed.css        |   51 +++++-
  horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
- 4 files changed, 386 insertions(+), 2 deletions(-)
+ 4 files changed, 390 insertions(+), 2 deletions(-)
 
 diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
 new file mode 100644
-index 0000000..f18d2ad
+index 0000000..65db938
 --- /dev/null
 +++ b/horde-webmail/kronolith/imple_kolab.php
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,96 @@
 +<?php
 +/**
 + * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
@@ -27155,27 +27155,31 @@ index 0000000..f18d2ad
 + *
 + * @author Michael Slusarz <slusarz@horde.org>
 + */
-+if (!defined('HORDE_BASE')) {
-+    define('HORDE_BASE', dirname(__FILE__) . '/..');
-+}
 +
-+/* Load the Horde Framework core, and set up inclusion paths. */
-+require_once HORDE_BASE . '/lib/core.php';
++function impleLogout() 
++{
++    Auth::clearAuth();
++    @session_destroy();
++}
 +
 +@define('AUTH_HANDLER', true);
-+/* Registry. */
-+$session_control = 'none';
-+$registry = &Registry::singleton(HORDE_SESSION_NONE);
++@define('HORDE_BASE', dirname(__FILE__) . '/..');
++require_once HORDE_BASE . '/lib/base.php';
 +
-+$auth = &Auth::singleton($conf['auth']['driver']);
++// We want to always generate UTF-8 iCalendar data.
++NLS::setCharset('UTF-8');
++
++$auth = &Auth::singleton('kolab');
 +
 +if (isset($conf['ics']['default_user'])
 +    && isset($conf['ics']['default_pass'])) {
 +    $user = $conf['ics']['default_user'];
 +    $pass = $conf['ics']['default_pass'];
++    $_SESSION = array();
 +    $auth->authenticate($user,
 +                        array('password' =>
 +                              $pass));
++    register_shutdown_function('impleLogout');
 +}   
 +
 +@define('KRONOLITH_BASE', dirname(__FILE__));
@@ -27236,6 +27240,7 @@ index 0000000..f18d2ad
 +default:
 +    echo $result;
 +}
+\ No newline at end of file
 diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
 new file mode 100644
 index 0000000..420a984
@@ -27564,6 +27569,18 @@ tg: (2f74c4c..) t/kronolith/HK/GW/ExportEventList (depends on: t/dimp/H/BL/Close
 TOPGIT patch commit log
 =======================
 
+commit 8d3a749ccd7f8512708a16f196220e46d7a5cb16
+Author: Gunnar Wrobel <p@rdus.de>
+Date:   Fri Oct 9 09:18:48 2009 +0200
+
+    Clean logout.
+
+commit c471608f1adfa116123b913959498d5b7f8defc6
+Author: Gunnar Wrobel <p@rdus.de>
+Date:   Fri Oct 9 08:45:58 2009 +0200
+
+    Cleaner session handling.
+
 commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
 Author: Gunnar Wrobel <p@rdus.de>
 Date:   Wed Oct 7 22:22:07 2009 +0200
diff --git a/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_ExportEventList.diff b/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_ExportEventList.diff
index 28bf727..c606f79 100644
--- a/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_ExportEventList.diff
+++ b/patches/horde-webmail/1.2.0/tg/t_kronolith_HK_GW_ExportEventList.diff
@@ -8,18 +8,18 @@ STATUS: OPEN
 Signed-off-by: Gunnar Wrobel <p@rdus.de>
 
 ---
- horde-webmail/kronolith/imple_kolab.php         |   92 +++++++++
+ horde-webmail/kronolith/imple_kolab.php         |   96 +++++++++
  horde-webmail/kronolith/lib/Block/eventlist.php |  243 +++++++++++++++++++++++
  horde-webmail/kronolith/themes/embed.css        |   51 +++++-
  horde-webmail/lib/Horde/Kolab/Storage/List.php  |    2 +-
- 4 files changed, 386 insertions(+), 2 deletions(-)
+ 4 files changed, 390 insertions(+), 2 deletions(-)
 
 diff --git a/horde-webmail/kronolith/imple_kolab.php b/horde-webmail/kronolith/imple_kolab.php
 new file mode 100644
-index 0000000..f18d2ad
+index 0000000..65db938
 --- /dev/null
 +++ b/horde-webmail/kronolith/imple_kolab.php
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,96 @@
 +<?php
 +/**
 + * $Horde: kronolith/imple.php,v 1.1.2.3 2008/04/25 03:50:58 chuck Exp $
@@ -31,27 +31,31 @@ index 0000000..f18d2ad
 + *
 + * @author Michael Slusarz <slusarz@horde.org>
 + */
-+if (!defined('HORDE_BASE')) {
-+    define('HORDE_BASE', dirname(__FILE__) . '/..');
-+}
 +
-+/* Load the Horde Framework core, and set up inclusion paths. */
-+require_once HORDE_BASE . '/lib/core.php';
++function impleLogout() 
++{
++    Auth::clearAuth();
++    @session_destroy();
++}
 +
 +@define('AUTH_HANDLER', true);
-+/* Registry. */
-+$session_control = 'none';
-+$registry = &Registry::singleton(HORDE_SESSION_NONE);
++@define('HORDE_BASE', dirname(__FILE__) . '/..');
++require_once HORDE_BASE . '/lib/base.php';
++
++// We want to always generate UTF-8 iCalendar data.
++NLS::setCharset('UTF-8');
 +
-+$auth = &Auth::singleton($conf['auth']['driver']);
++$auth = &Auth::singleton('kolab');
 +
 +if (isset($conf['ics']['default_user'])
 +    && isset($conf['ics']['default_pass'])) {
 +    $user = $conf['ics']['default_user'];
 +    $pass = $conf['ics']['default_pass'];
++    $_SESSION = array();
 +    $auth->authenticate($user,
 +                        array('password' =>
 +                              $pass));
++    register_shutdown_function('impleLogout');
 +}   
 +
 +@define('KRONOLITH_BASE', dirname(__FILE__));
@@ -112,6 +116,7 @@ index 0000000..f18d2ad
 +default:
 +    echo $result;
 +}
+\ No newline at end of file
 diff --git a/horde-webmail/kronolith/lib/Block/eventlist.php b/horde-webmail/kronolith/lib/Block/eventlist.php
 new file mode 100644
 index 0000000..420a984
@@ -440,6 +445,18 @@ tg: (2f74c4c..) t/kronolith/HK/GW/ExportEventList (depends on: t/dimp/H/BL/Close
 TOPGIT patch commit log
 =======================
 
+commit 8d3a749ccd7f8512708a16f196220e46d7a5cb16
+Author: Gunnar Wrobel <p@rdus.de>
+Date:   Fri Oct 9 09:18:48 2009 +0200
+
+    Clean logout.
+
+commit c471608f1adfa116123b913959498d5b7f8defc6
+Author: Gunnar Wrobel <p@rdus.de>
+Date:   Fri Oct 9 08:45:58 2009 +0200
+
+    Cleaner session handling.
+
 commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
 Author: Gunnar Wrobel <p@rdus.de>
 Date:   Wed Oct 7 22:22:07 2009 +0200