steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.12, 1.13
cvs at intevation.de
cvs at intevation.de
Fri Jul 16 14:40:16 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv30662/kolab-resource-handlers/kolab-resource-handlers/freebusy
Modified Files:
freebusy.php
Log Message:
bugfixes to make things work again
Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- freebusy.php 15 Jul 2004 22:18:55 -0000 1.12
+++ freebusy.php 16 Jul 2004 12:40:14 -0000 1.13
@@ -445,16 +445,18 @@
if ($_SERVER['REQUEST_METHOD'] != 'PUT' && ($imapuser || $extended)) {
// Open an IMAP connection to the requested users' calendar
$imap = @imap_open($fullmbox, $imapuser, $imappw, OP_HALFOPEN );
- if (!$imap) {
+ if (!$imap ) {
// Login error, check the cache
+ // Dont bail out on error here,
+ // Just proceed to the cache
} else {
testIMAPError();
trigger_error("Trying to reopen mailbox $fullmbox", E_USER_NOTICE);
@imap_reopen($imap, $fullmbox);
if (imap_last_error()) {
- // Login error, check the cache
- testIMAPError();
- //trigger_error("IMAP Error trying to open $fullmbox: " . imap_last_error(), E_USER_WARNING);
+ // Dont bail out on error here,
+ // Just proceed to the cache
+ trigger_error("IMAP Error trying to open $fullmbox: " . imap_last_error(), E_USER_WARNING);
} else {
// Enumerate our calendar events
$messages = @imap_sort($imap, SORTDATE, 0, SE_UID);
More information about the commits
mailing list