Changeset 4497

Timestamp:

10/27/06 14:57:20 (2 years ago)

Author:

rambo

Message:

version bump, bulletproofing to notifications handling, ical dump of event attached to notifications

Files:

• trunk/src/org.openpsa.calendar/calendar_midcomdba.php (modified) (14 diffs)
• trunk/src/org.openpsa.calendar/config/manifest.inc (modified) (1 diff)
• trunk/src/org.openpsa.calendar/documentation/CHANGES (modified) (1 diff)
• trunk/src/org.openpsa.calendar/participant_midcomdba.php (modified) (9 diffs)

trunk/src/org.openpsa.calendar/calendar_midcomdba.php

@@ -508 +508 @@
-        $this->_get_em('old_');
-
+        /*
-        debug_add("this->participants\n===\n" .  sprint_r($this->participants) . "===\n");
-        debug_add("this->old_participants\n===\n" .  sprint_r($this->old_participants) . "===\n");
-        debug_add("this->_carried_participants_obj\n===\n" .  sprint_r($this->_carried_participants_obj) . "===\n");
+        */
-
-        $this->_update_em($repeat_handler);
@@ -520 +522 @@
-    function _on_updated()
-    {
+        debug_push_class(__CLASS__, __FUNCTION__);
+
+        debug_add("this->participants\n===\n" .  sprint_r($this->participants) . "===\n");
+        debug_add("this->old_participants\n===\n" .  sprint_r($this->old_participants) . "===\n");
+        debug_add("this->_carried_participants_obj\n===\n" .  sprint_r($this->_carried_participants_obj) . "===\n");
+
-        foreach ($this->_carried_participants_obj as $resObj)
-        {
+            debug_add("Notifying participant #{$resObj->id}");
-            if ($this->notify_force_add)
-            {
@@ -533 +542 @@
-        foreach ($this->_carried_resources_obj as $resObj)
-        {
+            debug_add("Notifying resource #{$resObj->id}");
-            if ($this->notify_force_add)
-            {
@@ -568 +578 @@
-        $this->get_suspected_task_links();
-        $this->get_suspected_sales_links();
+        debug_pop();
-        return true;
-    }
@@ -573 +584 @@
-    function _get_member_by_personid($id, $type='participant')
-    {
+        debug_push_class(__CLASS__, __FUNCTION__);
-        switch ($type)
-        {
@@ -582 +594 @@
-            default:
-                //Other values are disallowed
+                debug_add("Type '{$type}' is invalid, aborting", MIDCOM_LOG_ERROR);
+                debug_pop();
-                return false;
-            break;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -872 +893 @@
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-        //We need sudo to see busys in events we normally don't see and to rob resources from tentative events
-        $_MIDCOM->auth->request_sudo();
-        //If this event is tentative always disallow robbing resources from other tentative events
-        if ($this->tentative)
-        {
-            $rob_tentative=false;
-        }
-        //If we're not busy it's not worth checking
-        if (!$this->busy) {
@@ -885 +899 @@
-            return false;
-        }
+        //If this event is tentative always disallow robbing resources from other tentative events
+        if ($this->tentative)
+        {
+            $rob_tentative = false;
+        }
+        //We need sudo to see busys in events we normally don't see and to rob resources from tentative events
+        $_MIDCOM->auth->request_sudo();
-        
-        //Storage for events that have been modified due the course of this method
@@ -1133 +1154 @@
-     * Creates/removes eventmembers based on $this->resources and $this->participants
-     */
-=
+ = 
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-        //There is probably a better way...
-!=
-
-=
-
-
+ != 
+
+ = 
+
+
-        $ret = array();
-        $ret['resources'] = array();
@@ -1165 +1186 @@
-            $this->old_participants = array();
-        }
-
+
-        // ** Start with resources
-        $added_resources = $this->resource_diff($this->resources, $this->old_resources);
@@ -1176 +1197 @@
-            $resObj->uid = $resourceId;
-            $resObj->eid = $this->id;
+            $resObj->orgOpenpsaObtype = ORG_OPENPSA_OBTYPE_EVENTRESOURCE;
-            $ret['resources']['added'][$resObj->uid] = $resObj->create($this->send_notify, &$this);
-        }
-
+
-        foreach ($removed_resources as $resourceId => $bool)
-        {
@@ -1185 +1207 @@
-            {
-                $ret['resources']['removed'][$resObj->uid] = $resObj->delete($this->send_notify, &$this);
-
-
-
-
+
+
+
+
+
+
-        foreach ($carried_resources as $resourceId => $bool)
-        {
-            //Find the correct eventmember by person ID
-            $resObj = $this->_get_member_by_personid($resourceId, 'resource');
-
-
-
-
-
+
+
+
+
+
+
+
+
-        // ** Done with resources
-
+
-        // ** Start with participants        
-        $added_participants = $this->resource_diff($this->participants, $this->old_participants);
@@ -1210 +1237 @@
-            $resObj->uid = $participantId;
-            $resObj->eid = $this->id;
+            $resObj->orgOpenpsaObtype = ORG_OPENPSA_OBTYPE_EVENTPARTICIPANT;
-            $ret['participants']['added'][$resObj->uid] = $resObj->create($this->send_notify, &$this);
-        }
-
+
-        foreach ($removed_participants as $participantId => $bool)
-        {
-            $resObj = $this->_get_member_by_personid($participantId, 'participant');
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        foreach ($carried_participants as $participantId => $bool)
-        {
-            $partObj = $this->_get_member_by_personid($participantId, 'participant');
-
-
-
-
-
+
+
+
+
+
+
+
+
-        // ** Done with participants
-        /*
-        debug_add("added_participants\n===\n" .  sprint_r($added_participants) . "===\n");
-        debug_add("removed_participants\n===\n" .  sprint_r($removed_participants) . "===\n");
-        debug_add("carried_participants\n===\n" .  sprint_r($carried_participants) . "===\n");
-        debug_add("this->participants\n===\n" .  sprint_r($this->participants) . "===\n");
-        debug_add("this->old_participants\n===\n" .  sprint_r($this->old_participants) . "===\n");
+        debug_add("carried_participants\n===\n" .  sprint_r($carried_participants) . "===\n");
-        debug_add("this->_carried_participants_obj\n===\n" .  sprint_r($this->_carried_participants_obj) . "===\n");
-        */
-
-.sprint_r($ret).
-    
-        
+
+ . sprint_r($ret) . 
+
+
-    }
-
@@ -1332 +1367 @@
-        return $str;
-    }
-
-
-
-    /**

trunk/src/org.openpsa.calendar/config/manifest.inc

@@ -6 +6 @@
-),
-'class_definitions' => Array('midcom_dba_classes.inc'),
-9
+10
-'state' => 'stable',
-'package.xml' => Array(

trunk/src/org.openpsa.calendar/documentation/CHANGES

@@ -6 +6 @@
-  which might even break existing functionality. 
-- All items marked with "+" represent completly new features.
+
+2006-10-27 rambo
+  - bulletproofing in notifications handling
+  + iCal files attached to notifications
+  - version bump
-
-2006-10-05 rambo

trunk/src/org.openpsa.calendar/participant_midcomdba.php

@@ -67 +67 @@
-    function notify($repeat_handler='this', $event=false)
-    {
+        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_add('This method must be overridden in a subclass', MIDCOM_LOG_ERROR);
+        debug_pop();
-        return false;
-    }
@@ -128 +131 @@
-    }
-
+    function _on_loaded()
+    {
+        // Make sure we have correct class
+        switch($this->orgOpenpsaObtype)
+        {
+            case ORG_OPENPSA_OBTYPE_EVENTRESOURCE:
+                $this = new org_openpsa_calendar_eventresource($this->id);
+                break;
+            default:
+            case ORG_OPENPSA_OBTYPE_EVENTPARTICIPANT:
+                $this = new org_openpsa_calendar_eventparticipant($this->id);
+                break;
+        }
+        return true;
+    }
-}
-
@@ -157 +175 @@
-    var $participant;
-    
-
+
+
-        if (parent::_constructor($identifier))
-        {
@@ -171 +190 @@
-        return false;
-    }
-
-
+
+
+
+
+
+
-    //TODO: Rewrite
-
+
+
-        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_add("called with options: '{$type}', '{$event}', '{$nl}'");
-        $l10n =& $_MIDCOM->i18n->get_l10n('org.openpsa.calendar');
-        $recipient =& $this->get_person_obj();
@@ -195 +220 @@
-        {
-            //Do not send notification to current user
-
+ notify
-            debug_pop();
-            return false;
@@ -232 +257 @@
-                $message['content'] = sprintf($l10n->get('event "%s" (%s) was cancelled.'), $event->title, $event->format_timeframe());
-            break;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return org_openpsa_notifications::notify($action, $recipient->guid, $message);
-    }
@@ -245 +294 @@
- * Wrapper class for eventmembers as resources to an event.
- */
-
+
+
-    //More meaningfull aliases for some fields
-    var $resource;
@@ -251 +301 @@
-    var $notes;
-      
-
+
+
-        if (parent::_constructor($identifier))
-        {
@@ -266 +317 @@
-    }
-
+    function _on_loaded()
+    {
+        return true;
+    }
+
-    function update($notify=true, $event=false)
-    {