steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.68, 1.69
cvs at intevation.de
cvs at intevation.de
Tue May 31 02:20:03 CEST 2005
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv22277/kolab-resource-handlers/resmgr
Modified Files:
resmgr.php
Log Message:
disable creation of SID
Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- resmgr.php 12 May 2005 20:18:57 -0000 1.68
+++ resmgr.php 31 May 2005 00:20:01 -0000 1.69
@@ -684,6 +684,13 @@
return $imap;
}
+function expire_events( $imap, $when )
+{
+ // PENDING(steffen): Think about how to add event expiry
+ // without serious overhead and without deleting events from
+ // normal user accounts
+}
+
function iCalDate2Kolab($ical_date)
{
// $ical_date should be a timestamp
@@ -707,8 +714,9 @@
$kolab_node = $kolab_event->append_child($kolab_xml->create_element('uid'));
$kolab_node->append_child($kolab_xml->create_text_node($uid));
- $kolab_node = $kolab_event->append_child($kolab_xml->create_element('scheduling-id'));
- $kolab_node->append_child($kolab_xml->create_text_node($sid));
+ // No SID anymore
+ //$kolab_node = $kolab_event->append_child($kolab_xml->create_element('scheduling-id'));
+ //$kolab_node->append_child($kolab_xml->create_text_node($sid));
$kolab_node = $kolab_event->append_child($kolab_xml->create_element('organizer'));
$org_params = $itip->getAttribute('ORGANIZER', true);
@@ -1055,11 +1063,9 @@
myLog("Processing $method method for $resource", RM_LOG_DEBUG);
// This is assumed to be constant across event creation/modification/deletipn
- $sid = $itip->getAttributeDefault('UID', '');
+ $uid = $itip->getAttributeDefault('UID', '');
myLog("Event has UID $sid", RM_LOG_DEBUG);
-
- // Generate a new UID in case we need it
- $uid = 'kolab-'.md5( ''.mt_rand().time().$resource.$params['email_domain'] );
+ $sid = $uid;
// Who is the organiser?
$organiser = preg_replace('/^mailto:\s*/i', '', $itip->getAttributeDefault('ORGANIZER', ''));
More information about the commits
mailing list