steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.29, 1.30

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv11675/kolab-resource-handlers/resmgr

Modified Files:
	resmgr.php 
Log Message:
res improvements

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- resmgr.php	6 Oct 2004 20:19:56 -0000	1.29
+++ resmgr.php	7 Oct 2004 12:37:54 -0000	1.30
@@ -239,9 +239,9 @@
 /**
  * Look up action and encrypted password from LDAP and decrypt it
  */
-function getLDAPData()
+function getLDAPData($resource)
 {
-    global $resource, $params, $sender;
+    global $params, $sender;
 
     // Connect to the LDAP server and retrieve the users' password
     $ldap = ldap_connect($params['ldap_uri']);
@@ -279,8 +279,7 @@
         while ($msg = openssl_error_string())
             myLog("Error decrypting password: $msg");
 	ldap_free_result( $result );
-	ldap_close($ldap);
-        return false;
+	$cleartext = false;
     }
 
     openssl_free_key($pkey);
@@ -870,10 +869,16 @@
 $conf['server']['name'] = $params['email_domain'];
 
 // Set some parameters
-$params['calendar_user'] = $resource;
-$params['calendar_uid'] = getResourceUid();
-$ldapdata = &getLDAPData();
-$params['calendar_pass'] = $ldapdata['password'];
+$ldapdata = &getLDAPData($resource);
+if( $ldapdata['password'] === false ) {
+  // No decryptable password, use calendar user
+  $params['calendar_uid'] = getResourceUid();  
+} else {
+  $params['calendar_user'] = $resource;
+  $params['calendar_uid'] = getResourceUid();
+  $params['calendar_pass'] = $ldapdata['password'];
+}
+
 $params['action'] = $ldapdata['action'];
 myLog("Action for $sender is ".$params['action'], RM_LOG_DEBUG);
 if( !$params['action'] ) {