Changeset 7028 for trunk/prototype/services/iCal.php

Timestamp:

08/15/12 16:35:27 (12 years ago)

Author:

acoutinho

Message:

Ticket #3032 - Nao e enviado email de confirmacao de participacao de participante externo em tarefa

File:

• trunk/prototype/services/iCal.php (modified) (11 diffs)

trunk/prototype/services/iCal.php

@@ -107 +107 @@
 
                             $vevent->setProperty('uid', $v['uid']);  
-                            
-                            break;
-            case TASK_ID:
+                            break;
+            case TODO_ID:
 
                 $todo = $ical->newComponent('todo');
@@ -138 +137 @@
                 }
 
-                if(isset($v['due']) && $v['due'] != ''){
+                if(isset($v['due']) && $v['due'] != '' && (int)$v['due'] > 0){
                     $dueTime = new DateTime('@' . (int) ($v['due'] / 1000), $timezone);
                     $dueTime->setTimezone($apTimezoneOBJ);
 
                     $todo->setProperty('due', $dueTime->format(DATE_RFC822), array('TZID' => $apTimezone));
-                }
-                
-                $todo->setProperty('due', $dueTime->format(DATE_RFC822), array('TZID' => $apTimezone));
+                    $todo->setProperty('dueTime', $dueTime->format(DATE_RFC822), array('TZID' => $apTimezone));
+                }                
                        
                 if (isset($v['participants']) && is_array($v['participants']) && count($v['participants']) > 0)
@@ -186 +184 @@
                 }       
 
-        
                 return $ical->createCalendar();
     }
@@ -269 +266 @@
                             break;
                         
-        case TASK_ID:
+        case TODO_ID:
 
             $todo = $ical->newComponent('todo');
@@ -298 +295 @@
             }
 
-            if(isset($v['due']) && $v['due'] != ''){
+            if(isset($v['due']) && $v['due'] != '' && (int)$v['due'] > 0){
                 $dueTime = new DateTime('@' . (int) ($v['due'] / 1000), $timezone);
                 $dueTime->setTimezone($apTimezoneOBJ);
@@ -304 +301 @@
                 $todo->setProperty('due', $dueTime->format(DATE_RFC822), array('TZID' => $apTimezone));
             }
-            
-            $todo->setProperty('due', $dueTime->format(DATE_RFC822), array('TZID' => $apTimezone));
                    
             if (isset($v['participants']) && is_array($v['participants']) && count($v['participants']) > 0)
@@ -838 +833 @@
                                $user = Controller::Read(array('concept' => 'user'), false, array('filter' => array('=', 'id', $params['owner'])) );                     
                                 $pID = self::_getParticipantByMail($user[0]['mail'], $schedulable['participants']);
-                            }else
+                            }else{
                                 $pID = self::_getParticipantByMail(Config::me('mail'), $schedulable['participants']);
-                            //Verifica a importação de eventos em que não participo
-                            if ($pID) {
-                                $interation['participant://' . $pID]['status'] = $params['status'];
+                                //Verifica a importação de tarefas em que não participo
+                                if ($pID) {
+                                    $pID =  mt_rand() . '2(Formatter)';
+                                    $interation['participant://' . $pID]['status'] = $params['status'];
+                                    $interation['participant://' . $pID]['user'] = $params['owner'];
+                                    $interation['participant://' . $pID]['isOrganizer'] = '0';
+                                    $interation['participant://' . $pID]['schedulable'] = $schedulable['id'];
+                                }else
+                                    $interation['participant://' . $pID]['status'] = $params['status'];
                             }
                         }
                     }
                 } else { // Importar tarefa
-                    $interation = self::_makeVEVENT(array(), $component, $params);
+                    $interation = self::_makeVTODO(array(), $component, $params);
 
                     if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notificação para fora
@@ -915 +916 @@
             if ($percentage = $component->getProperty('percent-complete', false, false))
                 $sc['percentage'] = mb_convert_encoding(str_ireplace(array('\n', '\t'), array("\n", "\t"), $percentage), 'UTF-8', 'UTF-8,ISO-8859-1');
-
-            $todo->setProperty('priority', $v['priority']);
-            $todo->setProperty('percent-complete', $v['percentage']);
-            $todo->setProperty('status', $this->_getStatusTodo($v['status']));
 
                         /* Definindo location */
@@ -1331 +1328 @@
     );
 
-    return isset($a[$id]) ? $a[$id] : 'STATUS_TODO_NEED_ACTION';
+    return isset($a[$action]) ? $a[$action] : 'STATUS_TODO_NEED_ACTION';
     
     }
@@ -1834 +1831 @@
 
             $participantID = ($tpID = self::_getParticipantByMail($mailUser, $schedulable['participants'])) ? $tpID : mt_rand() . '2(Formatter)';
-            $participant['schedulable'] = $eventID;
+            $participant['schedulable'] = $todoID;
 
             if (isset($params['status']) && $mailUser == Config::me('mail'))
@@ -1874 +1871 @@
             $participantID = mt_rand() . '2(Formatter)';
 
-            $participant['schedulable'] = $eventID;
+            $participant['schedulable'] = $todoID;
             $participant['status'] = (isset($property['params']['PARTSTAT']) && constant('STATUS_' . $property['params']['PARTSTAT']) !== null ) ? constant('STATUS_' . $property['params']['PARTSTAT']) : STATUS_UNANSWERED;
             $participant['isOrganizer'] = '1';