steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy pfb.php, 1.16, 1.17
cvs at intevation.de
cvs at intevation.de
Mon Feb 21 10:49:25 CET 2005
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv30779/kolab-resource-handlers/freebusy
Modified Files:
pfb.php
Log Message:
Issue638 (redirect to homeserver)
Index: pfb.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pfb.php 1 Feb 2005 11:55:45 -0000 1.16
+++ pfb.php 21 Feb 2005 09:49:23 -0000 1.17
@@ -46,7 +46,26 @@
$userinfo = $ldap->userInfo( $imapuser );
if( $userinfo ) {
if( $userinfo['MAIL'] ) $imapuser = $userinfo['MAIL'];
- $homeserver = $userinfo['HOMESERVER'];
+ //$homeserver = $userinfo['HOMESERVER'];
+}
+
+$folder = array_values(array_filter(explode('/', $req_folder )));
+if( count($folder) < 1 ) {
+ // error
+ notFound( _('No such folder ').htmlentities($req_folder) );
+}
+$uinfo = $ldap->userInfo($folder[0]);
+$owner = $uinfo['MAIL'];
+$homeserver = $uinfo['HOMESERVER'];
+if( empty($owner) || false===strpos($owner,'@')) {
+ // try guessing the domain
+ $idx = strpos( $imapuser, '@' );
+ if( $idx !== false ) {
+ $domain = substr( $imapuser, $idx+1 );
+ myLog("Trying to append $domain to ".$folder[0], RM_LOG_DEBUG);
+ $uinfo = $ldap->userInfo($folder[0].'@'.$domain);
+ $owner = $uinfo['MAIL'];
+ }
}
if( $homeserver && $homeserver != $params['server'] ) {
@@ -102,23 +121,6 @@
}
require_once('freebusy/freebusy.class.php');
- $folder = array_values(array_filter(explode('/', $req_folder )));
- if( count($folder) < 1 ) {
- // error
- notFound( _('No such folder ').htmlentities($req_folder) );
- }
- $uinfo = $ldap->userInfo($folder[0]);
- $owner = $uinfo['MAIL'];
- if( empty($owner) || false===strpos($owner,'@')) {
- // try guessing the domain
- $idx = strpos( $imapuser, '@' );
- if( $idx !== false ) {
- $domain = substr( $imapuser, $idx+1 );
- myLog("Trying to append $domain to ".$folder[0], RM_LOG_DEBUG);
- $uinfo = $ldap->userInfo($folder[0].'@'.$domain);
- $owner = $uinfo['MAIL'];
- }
- }
if( empty($owner) ) {
notFound( _('No such account ').htmlentities($folder[0]));
return false;
More information about the commits
mailing list