gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.4.2.15, 1.32.2.4.2.16

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv566/patches/horde-webmail/1.2.0

Modified Files:
      Tag: suc_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Cleaner session handling for the export.

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.15
retrieving revision 1.32.2.4.2.16
diff -u -d -r1.32.2.4.2.15 -r1.32.2.4.2.16
--- horde-webmail-1.2.0_kolab_openpkg.patch	7 Oct 2009 21:01:46 -0000	1.32.2.4.2.15
+++ horde-webmail-1.2.0_kolab_openpkg.patch	9 Oct 2009 07:37:26 -0000	1.32.2.4.2.16
@@ -27132,18 +27132,18 @@
 Signed-off-by: Gunnar Wrobel <p at 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 @@
 + *
 + * @author Michael Slusarz <slusarz at 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();
++}
 +
 + at define('AUTH_HANDLER', true);
-+/* Registry. */
-+$session_control = 'none';
-+$registry = &Registry::singleton(HORDE_SESSION_NONE);
++ at 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');
 +}   
 +
 + at define('KRONOLITH_BASE', dirname(__FILE__));
@@ -27236,6 +27240,7 @@
 +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
@@ -27563,6 +27568,18 @@
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 8d3a749ccd7f8512708a16f196220e46d7a5cb16
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 09:18:48 2009 +0200
+
+    Clean logout.
+
+commit c471608f1adfa116123b913959498d5b7f8defc6
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Fri Oct 9 08:45:58 2009 +0200
+
+    Cleaner session handling.
 
 commit 992834cabdcc4a7aabbf566c7a5a27df639bef98
 Author: Gunnar Wrobel <p at rdus.de>