steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.3, 1.4
cvs at intevation.de
cvs at intevation.de
Fri Jul 9 14:24:28 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv15980/kolab-resource-handlers/freebusy
Modified Files:
freebusy.php
Log Message:
fixes
Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freebusy.php 7 Jul 2004 16:08:54 -0000 1.3
+++ freebusy.php 9 Jul 2004 12:24:26 -0000 1.4
@@ -87,6 +87,7 @@
}
$errortext .= 'IMAP Error: ' . join("\nIMAP Error: ", $errors);
+ trigger_error( $errortext, E_USER_WARNING );
$err = array_pop($errors);
if ( $err == 'Permission denied' || $err == 'Invalid credentials' || $err == 'Login aborted' ) {
@@ -106,6 +107,7 @@
}
$error = ldap_err2str($errno);
+ trigger_error( "LDAP Error: $error", E_USER_WARNING );
notFound("LDAP Error $errno: $error");
}
@@ -312,7 +314,7 @@
// Open an IMAP connection to the requested users' calendar
$imap = @imap_open($fullmbox, $imapuser, $imappw);
if ( !$imap ) {
- // Login error, try to fall back to cache
+ // Login error, check the cache
} else {
testIMAPError();
@@ -341,6 +343,11 @@
}
if( !$vfb ) {
+ if( !file_exists( $fbfilename ) || $imapuser == $user ) {
+ header('WWW-Authenticate: Basic realm="My Realm"');
+ header('HTTP/1.0 401 Unauthorized');
+ exit;
+ }
$vfb = file_get_contents( $fbfilename );
if( !$vfb ) notFound( "File not found on disk" );
$ts = filectime( $fbfilename );
More information about the commits
mailing list