steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.55, 1.56

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	resmgr.php 
Log Message:
Fix for Issue538 (CN in From header to make OL happy)

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- resmgr.php	18 Nov 2004 23:45:14 -0000	1.55
+++ resmgr.php	26 Nov 2004 22:36:18 -0000	1.56
@@ -164,7 +164,7 @@
 
     $result = ldap_search($ldap, $params['base_dn'],
                           "(&(objectClass=kolabInetOrgPerson)(mail=$resource))",
-                          array("kolabEncryptedPassword", "kolabInvitationPolicy" ));
+                          array("cn", "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));
@@ -175,7 +175,8 @@
         myLog($entries['count']." objects returned for $resource");
         return false;
     }
-
+    
+    $cn = $entries[0]['cn'][0];
     $actions = $entries[0]['kolabinvitationpolicy'];
     $encpw = base64_decode($entries[0]['kolabencryptedpassword'][0]);
 
@@ -238,7 +239,7 @@
 
 
     ldap_close($ldap);
-    return array( 'password' => $cleartext, 'action' => $action );
+    return array( 'cn' => $cn, 'password' => $cleartext, 'action' => $action );
 }
 
 function getResourceUid($resource)
@@ -447,7 +448,7 @@
     }
 }
 
-function sendITipReply($resource, $itip, $type = RM_ITIP_ACCEPT)
+function sendITipReply($cn,$resource, $itip, $type = RM_ITIP_ACCEPT)
 {
     global $organiser, $uid, $sid, $is_update;
 
@@ -555,7 +556,7 @@
     $msg_headers->addReceivedHeader();
     $msg_headers->addMessageIdHeader();
     $msg_headers->addHeader('Date', date('r'));
-    $msg_headers->addHeader('From', $resource);
+    $msg_headers->addHeader('From', "$cn <$resource>");
     $msg_headers->addHeader('To', $organiser);
     $msg_headers->addHeader('Subject', $subject);
     $msg_headers->addMIMEHeaders($mime);
@@ -1000,6 +1001,7 @@
     $params['calendar_pass'] = $ldapdata['password'];
   }
 
+  $cn = $ldapdata['cn'];
   $params['action'] = $ldapdata['action'];
   myLog("Action for $sender is ".$params['action'], RM_LOG_DEBUG);
   if( !$params['action'] ) {
@@ -1061,7 +1063,7 @@
 
   if ($params['action'] == RM_ACT_ALWAYS_REJECT) {
     myLog("Rejecting $method method");
-    sendITipReply($resource,$itip,RM_ITIP_DECLINE);
+    sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE);
     shutdown(0);
   }
 
@@ -1148,7 +1150,7 @@
 	  return true;
 	} else if ($params['action'] == RM_ACT_REJECT_IF_CONFLICTS) {
 	  myLog("Conflict detected; rejecting");
-	  sendITipReply($resource,$itip,RM_ITIP_DECLINE);
+	  sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE);
 	  // Get the resource's free/busy list
 	  // once more so it is up to date
 	  if( $updatefb ) {
@@ -1229,7 +1231,7 @@
       $itip->setAttribute('ATTENDEE', $attendee, $attparams[$i]);
     }
 
-    sendITipReply($resource,$itip,RM_ITIP_ACCEPT);
+    sendITipReply($cn,$resource,$itip,RM_ITIP_ACCEPT);
 
     // Delete any old events that we updated
     if( !empty( $updated_messages ) ) {