steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.20, 1.21

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv22727/kolab-resource-handlers/kolab-resource-handlers/freebusy

Modified Files:
	freebusy.php 
Log Message:
fixed issues with freebusy upload

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- freebusy.php	1 Sep 2004 21:32:53 -0000	1.20
+++ freebusy.php	9 Sep 2004 21:05:09 -0000	1.21
@@ -1,5 +1,9 @@
 <?php
 
+// Report all errors except E_NOTICE
+//error_reporting(E_ALL ^ E_NOTICE);
+error_reporting(E_ALL);
+
 $params = array();
 require_once '@l_prefix@/etc/resmgr/freebusy.conf';
 
@@ -358,13 +362,6 @@
 $user = preg_replace( "'/'", '', urldecode($_GET['uid']));
 
 $ldap = ldapConnect();
-$ldapsearch = @ldap_search($ldap, $params['base_dn'], "(uid=$user)");
-testLDAPError();
-$ldapresults = @ldap_get_entries($ldap, $ldapsearch);
-testLDAPError();
-if ( is_array($ldapresults) && count($ldapresults)>0 && array_key_exists('mail', $ldapresults[0])) {
-  $user = $ldapresults[0]['mail'][0];
-}
 
 if (empty($user) || $user == $scriptname) {
     notFound('No user specified');
@@ -439,6 +436,13 @@
 $fullmbox = $server . $mailbox;
 
 $imapuser = $_SERVER['PHP_AUTH_USER'];
+$ldapsearch = @ldap_search($ldap, $params['base_dn'], "(uid=$imapuser)");
+testLDAPError();
+$ldapresults = @ldap_get_entries($ldap, $ldapsearch);
+testLDAPError();
+if ( is_array($ldapresults) && $ldapresults['count']>0 && array_key_exists('mail', $ldapresults[0])) {
+  $imapuser = $ldapresults[0]['mail'][0];
+}
 $imappw = $_SERVER['PHP_AUTH_PW'];
 
 if ($_SERVER['REQUEST_METHOD'] == 'PUT') {