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

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolabfilter.php resmgr.php 
Log Message:
Dont use kolabEncryptedPassword, use calendar-user only. encryption stuff disabled for now. I dont think it something we even want to support if we are not using it

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kolabfilter.php	31 Oct 2005 11:56:52 -0000	1.29
+++ kolabfilter.php	29 Nov 2005 01:51:06 -0000	1.30
@@ -1,7 +1,7 @@
 #!@l_prefix@/bin/php
 <?php
 /*
- *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *  Copyright (c) 2004-2005 Klaraelvdalens Datakonsult AB
  *
  *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- resmgr.php	30 Aug 2005 19:03:17 -0000	1.70
+++ resmgr.php	29 Nov 2005 01:51:06 -0000	1.71
@@ -33,7 +33,6 @@
 define('RM_ITIP_TENTATIVE',                 3);
 
 require_once 'Net/IMAP.php';
-require_once HORDE_BASE . '/lib/core.php';
 require_once 'Horde/iCalendar.php';
 require_once 'Horde/NLS.php';
 require_once 'Horde/MIME.php';
@@ -163,7 +162,8 @@
 
     $result = ldap_search($ldap, $params['base_dn'],
                           "(&(objectClass=kolabInetOrgPerson)(mail=$resource))",
-                          array("cn", "kolabHomeServer", "kolabEncryptedPassword", "kolabInvitationPolicy" ));
+                          array("cn", "kolabHomeServer", /*"kolabEncryptedPassword",*/
+				"kolabInvitationPolicy" ));
     if (!$result) {
         myLog('Unable to perform LDAP search: ' . ldap_error($ldap));
         return new PEAR_Error('Unable to perform LDAP search: ' . ldap_error($ldap));
@@ -178,9 +178,15 @@
     $cn = $entries[0]['cn'][0];
     $hs = $entries[0]['kolabhomeserver'][0];
     $actions = $entries[0]['kolabinvitationpolicy'];
+
+    /* Encrypted password are not used anymore... */
+    /* TODO: Clean this code out when we're sure
+       we don't want to use it... */
+    $cleartext = false;
+    /*      
     $encpw = base64_decode($entries[0]['kolabencryptedpassword'][0]);
 
-    // Now get private key and decrypt the password
+    # Now get private key and decrypt the password
     $pkd = file_get_contents($params['priv_key_file']);
     $pkey = openssl_pkey_get_private($pkd);
     if ($pkey === false) {
@@ -196,7 +202,8 @@
     }
 
     openssl_free_key($pkey);
-    
+    */
+
     $policies = array();
     $defaultpolicy = false;
     foreach( $actions as $action ) {
@@ -239,7 +246,8 @@
 
 
     ldap_close($ldap);
-    return array( 'cn' => $cn, 'homeserver' => $hs, 'password' => $cleartext, 'action' => $action );
+    return array( 'cn' => $cn, 'homeserver' => $hs, 'password' => $cleartext,
+		  'action' => $action );
 }
 
 function getResourceUid($resource)
@@ -622,6 +630,9 @@
     }
     //$mailbox = "INBOX/Calendar";
     $fullmbox = $server . $mymailbox;
+
+    myLog( sprintf('Logging into %s as user %s to access %s',
+		   $params['server'], $params['calendar_user'], $mymailbox), RM_LOG_DEBUG);
 
     $imap = &new Net_IMAP( $params['server'] );
     if( PEAR::isError($imap) ) {