Changeset 7228 for branches/2.4/prototype/modules/calendar/interceptors

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• prototype/modules/calendar/interceptors/DBMapping.php (modified) (23 diffs)
• prototype/modules/calendar/interceptors/Notifications.php (modified) (3 diffs)

branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php

@@ -1 +1 @@
 <?php
-        /** 
-    * 
-    * Copyright (C) 2011 Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br) 
-    * 
-    * This program is free software; you can redistribute it and/or modify 
-    * it under the terms of the GNU General Public License as published by 
-    * the Free Software Foundation; either version 3 of the License, or 
-    * any later version. 
-    * 
-    * This program is distributed in the hope that it will be useful, but WITHOUT 
-    * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more 
-    * details. 
-    * 
-    * You should have received a copy of the GNU General Public License 
-    * along with this program; if not, write to the Free Software Foundation, 
-    * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA 
-    * 
-    * You can contact Prognus Software Livre headquarters at Av. Tancredo Neves, 
-    * 6731, PTI, Edifício do Saber, 3º floor, room 306, Foz do Iguaçu - PR - Brasil 
-    * or at e-mail address prognus@prognus.com.br. 
-    * 
-    * Neste arquivo são ser implementadas regras de negócio para consistir e normalizar os dados correspondentes às operações do usuário para o ExpressoCalendar.  
-    * 
-    * @license    http://www.gnu.org/copyleft/gpl.html GPL 
-    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br) 
-    * @version    1.0 
-    * @sponsor    Caixa Econômica Federal 
-    * @since      Arquivo disponibilizado na versão Expresso 2.4.0 
-    */ 
-
+        /**
+        *
+        * Copyright (C) 2011 Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+        *
+        * This program is free software; you can redistribute it and/or modify
+        * it under the terms of the GNU General Public License as published by
+        * the Free Software Foundation; either version 3 of the License, or
+        * any later version.
+        *
+        * This program is distributed in the hope that it will be useful, but WITHOUT
+        * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+        * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+        * details.
+        *
+        * You should have received a copy of the GNU General Public License
+        * along with this program; if not, write to the Free Software Foundation,
+        * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+        *
+        * You can contact Prognus Software Livre headquarters at Av. Tancredo Neves,
+        * 6731, PTI, Edifício do Saber, 3º floor, room 306, Foz do Iguaçu - PR - Brasil
+        * or at e-mail address prognus@prognus.com.br.
+        *
+        * Neste arquivo são ser implementadas regras de negócio para consistir e normalizar os dados correspondentes às operações do usuário para o ExpressoCalendar. 
+        *
+        * @license    http://www.gnu.org/copyleft/gpl.html GPL
+        * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+        * @version    1.0
+        * @sponsor    Caixa Econômica Federal
+        * @since      Arquivo disponibilizado na versão Expresso 2.4.0
+        */
+        
+        
 
 //Definindo Constantes
@@ -39 +40 @@
 use prototype\api\Config as Config;
 
-/** 
-* Classe com implementações das regras de negócio para consistir e normalizar os dados correspondentes às operações do usuário para o ExpressoCalendar. 
-* 
-* @license    http://www.gnu.org/copyleft/gpl.html GPL 
-* @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br) 
-* @sponsor    Caixa Econômica Federal 
-* @version    1.0 
-* @since      Classe disponibilizada na versão Expresso 2.4.0  
-*/ 
+/**
+* Classe com implementações das regras de negócio para consistir e normalizar os dados correspondentes às operações do usuário para o ExpressoCalendar.
+*
+* @license    http://www.gnu.org/copyleft/gpl.html GPL
+* @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+* @sponsor    Caixa Econômica Federal
+* @version    1.0
+* @since      Classe disponibilizada na versão Expresso 2.4.0 
+*/
 
 class DBMapping extends Helpers {
 
-    static function encodeCreateSchedulable(&$uri, &$params, &$criteria, $original) {
-        $params['type_id'] = EVENT_ID;
-
-        if (!is_numeric($params['startTime']))
-            $params['startTime'] = self::parseTimeDate($params['startTime'], $params['timezone']);
-
-        if (!is_numeric($params['endTime'])) {
-            $params['endTime'] = self::parseTimeDate($params['endTime'], $params['timezone']);
-
-            if ($params['allDay'])
-                $params['endTime'] = $params['endTime'] + 86400000;
-        }
-
-        $params['rangeEnd'] = $params['endTime'];
-        $params['rangeStart'] = $params['startTime'];
-
-        ///////////////////////////////////////////////////////////////////
-
-        $params['dtstamp'] = (isset($params['dtstamp'])) ? $params['dtstamp'] : time() . '000';
-        $params['lastUpdate'] = (isset($params['lastUpdate'])) ? $params['lastUpdate'] : time() . '000';
-        $params['type'] = EVENT_ID;
-        $params['uid'] = isset($params['uid']) ? $params['uid'] : self::_makeUid();
-    }
+    static function encodeCreateSchedulable(&$uri, &$params, &$criteria, $original) 
+    {
+
+        if (isset($params['startTime']) && !is_numeric($params['startTime']))
+            $params['startTime'] = self::parseTimeDate($params['startTime'], $params['timezone']);
+        
+        $params['rangeStart'] = $params['startTime'];
+        
+        if (isset($params['endTime']) && !is_numeric($params['endTime'])) {
+            $params['endTime'] = self::parseTimeDate($params['endTime'], $params['timezone']);
+
+            if ($params['allDay'])
+                $params['endTime'] = $params['endTime'] + 86400000;
+            }
+            
+        $params['rangeEnd'] = $params['endTime'];
+        
+
+        if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due']))
+            $params['due'] = self::parseTimeDate($params['due'], $params['timezone']);
+
+        ///////////////////////////////////////////////////////////////////
+
+        $params['dtstamp'] = (isset($params['dtstamp'])) ? $params['dtstamp'] : time() . '000';
+        $params['lastUpdate'] = (isset($params['lastUpdate'])) ? $params['lastUpdate'] : time() . '000';
+        $params['uid'] = isset($params['uid']) ? $params['uid'] : self::_makeUid();
+        }
 
     static function parseTimeDate($time, $timezone) {
@@ -107 +112 @@
         if (isset($params['type']))
             $params['type'] = self::codeAlarmType($params['type']);
+        else{
+            $alarm = Controller::read( array('concept' => 'alarm' , 'id' => $params['id'] ));
+
+            $params['unit'] = $alarm['unit'];
+        }
+        $params['offset'] = $params['time'] * 1000;
+
+
+        switch( strtolower($params['unit']) )
+        {
+            case 'd': $params['offset'] *= 24;
+            case 'h': $params['offset'] *= 60;
+            case 'm': $params['offset'] *= 60;
+        }
+        
     }
 
@@ -160 +180 @@
                 .'calendar_object.dtstart as "startTime", calendar_object.summary as "summary", '
                 .'calendar_object.description as "description", calendar_object.dtend as "endTime" , '
+        .'calendar_object.priority as "priority", calendar_object.due as "due", '
+        .'calendar_object.percentage as "percentage", calendar_object.status as "status", '
                 .'calendar_object.location as "location", calendar_object.allday as "allDay", '
                 .'calendar_object.transp as "transparent", calendar_object.class_id as "class", '
@@ -168 +190 @@
                 .'calendar FROM calendar_to_calendar_object , calendar_object '
                 .'WHERE ( calendar_to_calendar_object.calendar_id IN (\'' . implode('\',\'', $criteria['filter'][2][2]) . '\')) '
-                .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id ';    
+                .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id '
+        .'AND calendar_object.id NOT IN(select calendar_object_task_id from calendar_task_to_activity_object where owner = \'' . Config::me('uidNumber') . '\') ';      
             
             if(isset($criteria['searchEvent']) && $criteria['searchEvent']){
@@ -198 +221 @@
                 $params = array_merge($params, $occ);           
             }
+            $params = self::deepnessFindEvent($uri, $params, $criteria, $original);
+            return false;
+        }
+    }
+
+    public function findTask(&$uri, &$params, &$criteria, $original) {
+
+        if (isset($criteria['filterTasks']) && $criteria['filterTasks']) {
+
+            $sql = ' SELECT calendar_object.id as id ,calendar_object.cal_uid as "uid", calendar_object.type_id as "type", '
+            .'calendar_object.dtstart as "startTime", calendar_object.summary as "summary", '
+            .'calendar_object.description as "description", calendar_object.dtend as "endTime" , '
+            .'calendar_object.priority as "priority", calendar_object.due as "due", '
+            .'calendar_object.percentage as "percentage", calendar_object.status as "status", '
+            .'calendar_object.location as "location", calendar_object.allday as "allDay", '
+            .'calendar_object.transp as "transparent", calendar_object.class_id as "class", '
+            .'calendar_object.repeat as "repeat", calendar_object.range_start as "rangeStart", '
+            .'calendar_object.range_end as "rangeEnd", calendar_object.last_update as "lastUpdate", '
+            .'calendar_object.dtstamp as "dtstamp", calendar_object.sequence as "sequence", '
+            .'calendar_object.tzid as "timezone" ,calendar_to_calendar_object.calendar_id as '
+            .'calendar FROM calendar_to_calendar_object , calendar_object '
+            .'WHERE ( calendar_to_calendar_object.calendar_id IN (\'' . implode('\',\'', $criteria['filter'][3][2]) . '\')) '
+            .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id '
+        .'AND calendar_to_calendar_object.calendar_object_id NOT IN (select calendar_object_activity_id from calendar_task_to_activity_object where owner =  \'' . Config::me("uidNumber") . '\' ) '    
+        .'AND calendar_to_calendar_object.calendar_object_id NOT IN (select calendar_object_task_id from calendar_task_to_activity_object where owner =  \'' . Config::me("uidNumber") . '\' ) ';    
+
+        if(isset($criteria['filter'][4]))
+            $sql .= 'AND (((upper("summary") like upper(\'%'.$criteria['filter'][4][1][2].'%\') OR upper("description") like upper(\'%'.$criteria['filter'][4][1][2].'%\'))))';
+
+            $sql .= 'AND (range_start >= \'' . $criteria['filter'][2][2] . '\' AND type_id <= \'' .  $criteria['filter'][1][2] . '\')';
+
+            $params = Controller::service('PostgreSQL')->execResultSql($sql);
             $params = self::deepnessFindEvent($uri, $params, $criteria, $original);
             return false;
@@ -442 +497 @@
     }
 
-//Encode Update
-
+        //Encode Update
     public function encodeUpdateSchedulable(&$uri, &$params, &$criteria, $original) {
-
-        $event = Controller::read(array('concept' => 'schedulable', 'id' => $params['id']));
-        
-        if (isset($params['startTime'])) {
-
-            if (!is_numeric($params['startTime']))
-                $params['startTime'] = self::parseTimeDate($params['startTime'], $event['timezone']);
-
-            $params['rangeStart'] = $params['startTime'];
-        }if (isset($params['endTime'])) {
-
-            if (!is_numeric($params['endTime'])) {
-                $params['endTime'] = self::parseTimeDate($params['endTime'], $event['timezone']);
-
-            if ((isset($params['allDay']) && $params['allDay']) || ( !isset($params['allDay']) && $event['allDay']))
-                $params['endTime'] = $params['endTime'] + 86400000;
-            }
-            $params['rangeEnd'] = $params['endTime'];
-        }
+        $event = Controller::read(array('concept' => 'schedulable', 'id' => $uri['id']));
+        if (isset($params['startTime'])) {
+
+            if (!is_numeric($params['startTime']))
+                $params['startTime'] = self::parseTimeDate($params['startTime'], $event['timezone']);
+
+            $params['rangeStart'] = $params['startTime'];
+        }
+
+        if (isset($params['endTime'])) {
+
+            if (!is_numeric($params['endTime'])) {
+                        $params['endTime'] = self::parseTimeDate($params['endTime'], $event['timezone']);
+
+                    if ((isset($params['allDay']) && $params['allDay']) || ( !isset($params['allDay']) && $event['allDay']))
+                        $params['endTime'] = $params['endTime'] + 86400000;
+            }
+            $params['rangeEnd'] = $params['endTime'];
+        }
+
+
+        if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due']))
+            $params['due'] = self::parseTimeDate($params['due'], $event['timezone']);
+
+        if($event['type'] == '2'){
+            $criteria['historic'] = $params;
+            $criteria['beforeValue'] = $event;
+
+            if(isset($params['startTime']) && $params['startTime'] == $event['startTime'])
+                unset($criteria['historic']['startTime']);
+            if(isset($params['due']) && $params['due'] == $event['due'])
+                unset($criteria['historic']['due']);
+
+                //necessário para atulizar a atividade de composta pela tarefa aqui sendo atualizada
+                if(isset($criteria['historic']['startTime']) || isset($criteria['historic']['endTime'])){
+                        $taskToActivity = Controller::find(array('concept' => 'taskToActivity'), false, array('filter' => array('AND', array('=', 'task', $uri['id']), array('=', 'owner', Config::me('uidNumber'))), 'deepness' => 2));
+                        if(!empty($taskToActivity)){
+                                $activity = Controller::read(array('concept' => 'schedulable', 'id' => $taskToActivity[0]['activity']), array('startTime', 'endTime', 'rangeStart', 'rangeEnd', 'allDay'));
+                                $isAllDay = 1;
+
+                                if(!empty($activity)){
+                                        $start = $params['startTime'];
+                                        $end = $params['endTime'];
+                                        foreach($taskToActivity as $t){
+                                         if($t['task']['id'] != $params['id']){
+                                                $start = $t['task']['startTime'] < $start ? $t['task']['startTime'] : $start;
+                                                $end = $t['task']['endTime'] > $end ? $t['task']['endTime'] : $end;
+                                                $isAllDay = (($isAllDay == 1) && ($t['task']['allDay'] == '1')) ? 1 : 0; 
+                                         }
+                                        }
+
+                                        if($event['allDay'] == '0' || (isset($params['allDay']) && $params['allDay'] == '0'))
+                                                $isAllDay = 0;
+
+                                        $toUpdate = array();
+
+                                        if($start != $activity['startTime'])
+                                                $toUpdate['startTime'] = $start;
+
+                                        if($end != $activity['endTime']){
+                                                $toUpdate['endTime'] = $end;
+                                                $toUpdate['due'] = $end;
+                                        }
+
+                                        if($isAllDay != $activity['allDay'])
+                                                $toUpdate['allDay'] = $isAllDay;
+
+                                        if(!empty($toUpdate))
+                                                Controller::update(array('concept' => 'schedulable', 'id' => $taskToActivity[0]['activity']), $toUpdate);
+                                }
+                        }
+                }
+
+                unset($criteria['historic']['endTime']);
+                unset($criteria['historic']['rangeEnd']);
+                unset($criteria['historic']['rangeStart']);
+                unset($criteria['historic']['class']);
+                unset($criteria['historic']['type']);
+                unset($criteria['historic']['allDay']);
+                unset($criteria['historic']['id']);            
+        }
     }
 
@@ -494 +610 @@
     }
 
+
+    static function prepareParticipantHistoric(&$uri, &$params, &$criteria, $original){
+       $participant = Controller::read(array('concept' => 'participant', 'id' => $uri['id']));
+       $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $participant['schedulable']));
+
+
+       if($schedulable['type'] == '2')
+            $criteria['historic']['participant']  = $participant;
+    } 
+
+    static function removeParticipantHistoric(&$uri, &$params, &$criteria, $original){
+        if(isset($criteria['historic'])){
+
+            $participant = $criteria['historic']['participant'];
+
+             Controller::create(array('concept' => 'calendarHistoric'), 
+                array('schedulable' => $participant['schedulable'], 
+                    'user' => Config::me('uidNumber'),
+                    'time' => time() . '000',
+                    'attribute' => 'participant',
+                    'beforeValue' => $participant['user'],
+                    'afterValue' => ''
+                    )
+                );
+
+        }
+
+    }
+
+    static function createParticipantHistoric(&$uri, &$params, &$criteria, $original){
+
+        if(isset($original['properties']) && $original['properties']['isOrganizer'] != '1'){
+            if(!isset($criteria['event'])){
+                $event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable']));
+                $criteria['event'] = $event;
+            }else
+                $event = $criteria['event'];
+
+            if($event['type'] == '2'){
+                Controller::create(array('concept' => 'calendarHistoric'), 
+                    array('schedulable' => $original['properties']['schedulable'], 
+                        'user' => Config::me('uidNumber'),
+                        'time' => time() . '000',
+                        'attribute' => 'participant',
+                        'beforeValue' => '',
+                        'afterValue' => $original['properties']['user']
+                        )
+                    );
+            }
+        }
+    }
+
+    static function createHistoric(&$uri, &$result, &$criteria, $original) {
+
+        if(isset($criteria['historic']) && count($criteria['historic'])){
+            $time =  time() . '000';
+
+            foreach($criteria['historic'] as $k => $v){
+                Controller::create(array('concept' => 'calendarHistoric'), 
+                    array('schedulable' => $uri['id'], 
+                        'user' => Config::me('uidNumber'),
+                        'time' => $time,
+                        'attribute' => $k,
+                        'beforeValue' => $criteria['beforeValue'][$k],
+                        'afterValue' => $v
+                        )
+                    );
+            }
+        }    
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -507 +694 @@
     }
 
-    public function createCreateSchedulableToAttachment(&$uri, &$params, &$criteria, $original) {
-        if (array_key_exists('attachments', $original['properties']))
-            foreach ($original['properties']['attachments'] as $key => $value) {
-                if (isset($params['id']))
-                    Controller::create(array('concept' => 'schedulableToAttachment'), array('attachment' => $value['attachment'], 'schedulable' => $params['id']));
-            }
+    //TODO: Remover apos suporte a ManytoMany na api 
+    public function createTasksToActivity(&$uri, &$result, &$criteria, $original) {
+
+        if(isset($original['properties']['taskToActivity']) && $original['properties']['taskToActivity']){
+
+            foreach($original['properties']['taskToActivity'] as $relational)
+
+                Controller::create(array('concept' => 'taskToActivity'), array('task' => $relational['task'], 'owner' => $relational['owner'], 'activity' => $result['id']));
+
+        }
+    }
+
+    public function removeAttachmentHistoric(&$uri, &$params, &$criteria, $original) {
+
+        if(isset($criteria['historic'])){
+            $attachment = $criteria['historic']['attachment'];
+
+            $attachment['attachment'] = Controller::read(array('concept' => 'attachment', 'id' => $attachment['attachment']), array('name'));
+            Controller::create(array('concept' => 'calendarHistoric'), 
+                    array('schedulable' => $attachment['schedulable'], 
+                        'user' => Config::me('uidNumber'),
+                        'time' => time() . '000',
+                        'attribute' => 'attachment',
+                        'beforeValue' => $attachment['attachment']['name'],
+                        'afterValue' => ''
+                        )
+                    );
+
+        }
+    
+    }
+
+    public function createAttachmentHistoric(&$uri, &$params, &$criteria, $original) {
+        $event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable']));
+
+        if($event['type'] == '2'){
+            $attachment = Controller::read(array('concept' => 'attachment', 'id' => $original['properties']['attachment']), array('name'));
+
+            Controller::create(array('concept' => 'calendarHistoric'), 
+                array('schedulable' => $original['properties']['schedulable'], 
+                    'user' => Config::me('uidNumber'),
+                    'time' => time() . '000',
+                    'attribute' => 'attachment',
+                    'beforeValue' => '',
+                    'afterValue' => $attachment['name']
+                    )
+                );
+
+        }
     }
 
     public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) {
-        if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) {
-
-            $calendarIds = array();
-            foreach ($result as $key => $value)
-                array_push($calendarIds, $value['calendar']);
-
-            $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds), $original['criteria']['filter'])));
-
-            if ($calendar && count($calendar) > 0){
-                $newResult = array();
-                foreach ($calendar as $key => $value) {
-                    foreach ($result as $k => $r) {
-
-                        if ($r['calendar'] == $value['id']) {
-                            $r['calendar'] = $value;
-                            array_push($newResult, $r);
-                        }
-                    }
-                }
-
-                foreach ($newResult as $key => &$value) {
-                    if ($value['user'] != 0) {
-                        $user = $value['user'];
-                        $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user));
-
-                        if (!$value['user'])
-                            $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user));
-                    }
-                }
-
-                $result = $newResult;
-            }else
-                $result = '';
-        }
+        if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) {
+
+            $calendarIds = array();
+            foreach ($result as $value)
+                    $calendarIds[] = $value['calendar'];
+
+            $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds))));
+
+            if ($calendar && count($calendar) > 0){
+                $newResult = array();
+                        foreach ($calendar as  $value) {
+                            foreach ($result as  $r) {
+
+                                if ($r['calendar'] == $value['id']) {
+                                    $r['calendar'] = $value;
+                                    $newResult[] = $r;
+                                }
+                            }
+                        }
+
+                        foreach ($newResult as &$value) {
+                            if ($value['user'] != 0) {
+                                $value['user'] = Controller::read(array('concept' => 'user', 'id' => $value['user']));
+
+                                if (!$value['user'])
+                                    $value['user'] = Controller::read(array('concept' => 'group', 'id' => $value['user']));
+                            }
+                    $value['owner'] = Controller::read(array('concept' => 'user', 'id' => $value['owner']));
+                        }
+                        $result = $newResult;
+            }else
+                  $result = '';
+        }
+    }
+
+    //TODO: Remover apos suporte a deepness na api 
+    public function deepnessFindTask(&$uri, &$result, &$criteria, $original) {
+        if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0) 
+           foreach($result as &$value)
+                $value['task'] = Controller::read(array('concept' => 'schedulable', 'id' => $value['task']));
+           
+        
+        return $result;
+    }
+
+    //TODO: Remover apos suporte a deepness na api 
+    public function deepnessFindHistoric(&$uri, &$result, &$criteria, $original) {
+        if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0) {
+            foreach($result as &$v){
+                $v['user'] = Controller::read(array('concept' => 'user', 'id' => $v['user']));
+
+                if($v['attribute'] == 'participant'){
+                    if($v['beforeValue'] != '')
+                        $v['beforeValue'] = Controller::read(array('concept' => 'user', 'id' => $v['beforeValue']));
+
+                    if($v['afterValue'] != '')
+                        $v['afterValue'] = Controller::read(array('concept' => 'user', 'id' => $v['afterValue']));
+                }
+            }
+        }
     }
 
@@ -559 +815 @@
             foreach ($result as $i => $v) {
 
-                if ( isset($v['calendar']) && (!isset($currentTimezone) || $currentTimezone != $original['criteria']['timezones'][$v['calendar']])) {
+                if ( isset($v['calendar']) && (!isset($currentTimezone) || $currentTimezone != $original['criteria']['timezones'][$v['calendar']]))  {
                     $currentTimezone = isset($original['criteria']['timezones'][$v['calendar']]) ? $original['criteria']['timezones'][$v['calendar']] : $v['timezone'];
                     $Time->setTimezone(new DateTimeZone($currentTimezone));
@@ -570 +826 @@
                 $DayLigth['calendar']['endTime'] = $Time->format('I') ? 1 : 0;
 
-                if ($currentTimezone != $v['timezone']) {
+                if (!isset($currentTimezone) || ($currentTimezone != $v['timezone'])) {
                     $currentTimezone = $v['timezone'];
                     $Time->setTimezone(new DateTimeZone($v['timezone']));
@@ -584 +840 @@
 
                 $result[$i]['DayLigth'] = $DayLigth;
+
+        if(((int)$v['type']) == 2){
+
+            $taskToActivity = Controller::find(array('concept' => 'taskToActivity'), false, array('filter' => array('AND', array('=', 'activity', $v['id']), array('=','owner', Config::me('uidNumber'))) , 'deepness' => 2));
+
+            if($taskToActivity)
+                $result[$i]['taskToActivity'] = $taskToActivity;
+
+            $result[$i]['historic'] = Controller::find(array('concept' => 'calendarHistoric'), false, array('filter' => array('=', 'schedulable', $v['id']) , 'deepness' => 2));
+
+        }
 
                 if (isset($v['id'])) {
@@ -649 +916 @@
             } 
             
+       }
+       
+       if(isset($result['id']) && $result['type'] == '2'){
+           $result['historic'] =  Controller::find( array( 'concept' => 'calendarHistoric' ), false, array( 'filter' => array( '=', 'schedulable', $result['id'] ) ) );
        }
    } 
@@ -684 +955 @@
                     //Caso não seja o dono da agenda retorna o objeto permission com as acls
                     if ($result[$i]['isOwner'] == 0) {
-                        $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'user', Config::me('uidNumber')))));
+                        $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'user', Config::me('uidNumber')), 'deepness' => 2)));
 
                         if (!is_array($permission) || !$permission) {
 
-                            $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'type', '1'))));
+                            $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'type', '1')), 'deepness' => 2 ));
                         }
                         $result[$i]['permission'] = $permission[0];
@@ -711 +982 @@
             $result = $new;
         }
+    }
+
+    public function addOwner(&$uri, &$params, &$criteria, $original) {
+        $owner = Controller::read( array( 'concept' => 'calendarSignature' ) , array('user') ,array( 'filter' => array('AND', array('=', 'isOwner'  ,  '1'), array('=', 'calendar', $params['calendar']))));
+        $params['owner'] = $owner[0]['user'];
     }
 
@@ -832 +1108 @@
     
     static private function countMyCalendarsEvent($id, $owner) {
-                $sig = Controller::find(array('concept' => 'calendarSignature'), array('user', 'calendar', 'isOwner'), array('filter' => array('AND', array('=', 'user', $owner), array('=', 'isOwner', '1'))));
+                $sig = Controller::find(array('concept' => 'calendarSignature'), array('user', 'calendar', 'isOwner'), array('filter' => array('AND', array('=', 'isOwner', '1'), array('=', 'user', $owner))));
                 $calendars = array();
                 foreach ($sig as $val)
@@ -848 +1124 @@
         if(isset($criteria['filter']) && $criteria['filter'] && isset($criteria['filter'][1][2])){
             $idSchedulable = $criteria['filter'][1][2];
-                        $idCalendar = $criteria['filter'][2][2];
+            $idCalendar = $criteria['filter'][2][2];
             $owner = $criteria['filter'][3][2];
 
@@ -885 +1161 @@
 
             $uri['id'] = $idSchedulable;
+            
+            if(isset($criteria['filter']) && isset($criteria['filter'][4]) && isset($criteria['filter'][4][2])){
+                Controller::deleteALL(array('concept' => 'taskToActivity'), null, array('filter' => array('=', 'activity', $idSchedulable)));
+            }
         }
         
@@ -935 +1215 @@
             $schedulableAttachment = Controller::read(array('concept' => 'schedulableToAttachment'), false, array('filter' => array( '=', 'attachment' , $original['URI']['id'] )));
             $uri['id'] = $schedulableAttachment[0]['id'];
+
+            $params = $schedulableAttachment[0];
+
+            $event = Controller::read(array('concept' => 'schedulable', 'id' => $params['schedulable']));
+            if($event['type'] == '2')
+                $criteria['historic']['attachment'] = $schedulableAttachment[0];
+
         }
     }
 
     public function deleteAttachmentDependences(&$uri, &$params, &$criteria, $original) {
-        Controller::delete(array('concept' => 'attachment', 'id' => $original['URI']['id']));
+        Controller::delete(array('concept' => 'attachment', 'id' => (isset($params['attachment']) ? $params['attachment'] : $original['URI']['id'])));
     }
     
@@ -949 +1236 @@
     }
 
+
+     public function createDefaultGroup(&$uri, &$result, &$criteria, $original) {
+        if( $original['criteria']['filter'][1][0] == '=' &&
+        $original['criteria']['filter'][1][1] == 'user' &&
+        $original['criteria']['filter'][1][2] == $_SESSION['phpgw_session']['account_id']){
+
+            $existDefaultGroup = false;
+
+            foreach($result as $v){
+                if($v['type'] == 1 && $v['calendar']['type'] == 1)
+                    $existDefaultGroup = true;
+            }
+
+            if(!$existDefaultGroup){
+
+                $cal = array('name' => 'Sem grupo',
+                    'description' => 'Sem grupo',
+                    'timezone' => (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo',
+                    'dtstamp' => time() . '000',
+                    'type' => '1'
+                );
+
+                $calCreated = Controller::create(array('concept' => 'calendar'), $cal);
+
+                $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'],
+                    'calendar' => $calCreated['id'],
+                    'isOwner' => '1',
+                    'dtstamp' => time() . '000',
+                    'fontColor' => 'FFFFFF',
+                    'backgroundColor' => '3366CC',
+                    'borderColor' => '3366CC',
+                    'type' => '1'
+                );
+
+                $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig);
+                $sigCreated = Controller::read(array('concept' => 'calendarSignature', 'id' => $sigCreated['id']), false, array('deepness' => 2 ));
+
+                array_push($result, $sigCreated);
+            }
+
+        }
+
+     }
+
     public function createDefaultSignature(&$uri, &$result, &$criteria, $original) {
+
+    if(count($result) == 0 && isset($criteria['filter'][3]) && isset($criteria['filter'][3]['isRecursion'])){
+        throw new Exception('It was not possible to find to calendar!');
+        return false;
+    }
 
         //Caso uma busca não retorne nenhum resultado e foi buscado pelas assinaturas do usuario logado apenas
@@ -957 +1293 @@
         if (count($result) > 0) {
             foreach ($result as $value) {
-                if (isset($value['isOwner']) && $value['isOwner'] != 0)
-                    $isValidSignature = true;
+                if (isset($value['isOwner']) && $value['isOwner'] != 0 && isset($value['type']) && $value['type'] == 0)
+                    $isValidSignature = true;
             }
         }
@@ -969 +1305 @@
 
             if (Config::module('useCaldav', 'expressoCalendar')) {
-                require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
-
-                $calendario = DAViCalAdapter::findCalendars();
+                require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
+                $calendario = DAViCalAdapter::findCalendars();
             }
 
             if (Config::module('useCaldav', 'expressoCalendar') && is_array($calendario) && count($calendario) > 0) {
-                foreach ($calendario as $i => $v) {
-
-                    $urlA = explode('/', $v->url);
-                    $name = isset($v->displayname) ? $v->displayname : $urlA[(count($urlA) - 2)];
-                    $cal = array('name' => $name,
-                        'description' => isset($v->description) ? $v->description : $name,
-                        'timezone' => isset($v->timezone) ? $v->timezone : (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo',
-                        'dtstamp' => time() . '000',
-                        'location' => $urlA[(count($urlA) - 3)] . '/' . $urlA[(count($urlA) - 2)]
-                    );
-
-                    $calCreated = Controller::create(array('concept' => 'calendar'), $cal);
-
-
-
-                    $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'],
-                        'calendar' => $calCreated['id'],
-                        'isOwner' => '1',
-                        'dtstamp' => time() . '000',
-                        'fontColor' => 'FFFFFF',
-                        'backgroundColor' => '3366CC',
-                        'borderColor' => '3366CC',
-                    );
-
-                    $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig);
-
-
-                    DAViCalAdapter::importCollection($v->url, $calCreated['id']);
-                }
+                foreach ($calendario as $i => $v) {
+
+                    $urlA = explode('/', $v->url);
+                    $name = isset($v->displayname) ? $v->displayname : $urlA[(count($urlA) - 2)];
+                    $cal = array('name' => $name,
+                        'description' => isset($v->description) ? $v->description : $name,
+                        'timezone' => isset($v->timezone) ? $v->timezone : (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo',
+                        'dtstamp' => time() . '000',
+                        'location' => $urlA[(count($urlA) - 3)] . '/' . $urlA[(count($urlA) - 2)]
+                    );
+
+                    $calCreated = Controller::create(array('concept' => 'calendar'), $cal);
+
+                if(!$calCreated){
+                    throw new Exception('Error to create calendar');
+                    return false;
+                }
+
+                    $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'],
+                        'calendar' => $calCreated['id'],
+                        'isOwner' => '1',
+                        'dtstamp' => time() . '000',
+                        'fontColor' => 'FFFFFF',
+                        'backgroundColor' => '3366CC',
+                        'borderColor' => '3366CC',
+                    );
+
+                    $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig);
+
+                if(!$sigCreated){
+                    throw new Exception('Error to create signature');
+                    return false;
+                }
+
+                    DAViCalAdapter::importCollection($v->url, $calCreated['id']);
+                }
             } else {
-                //Criaremos uma agenda padrão
-                $cal = array('name' => 'Calendario',
-                    'description' => 'Calendario Padrão',
-                    'timezone' => (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo',
-                    'dtstamp' => time() . '000'
-                );
-
-                $calCreated = Controller::create(array('concept' => 'calendar'), $cal);
-
-                $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'],
-                    'calendar' => $calCreated['id'],
-                    'isOwner' => '1',
-                    'dtstamp' => time() . '000',
-                    'fontColor' => 'FFFFFF',
-                    'backgroundColor' => '3366CC',
-                    'borderColor' => '3366CC',
-                );
-
-                $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig);
-            }
-
-            $result = Controller::find($original['URI'], $original['properties'] ? $original['properties'] : null, $original['criteria']);
+                //Criaremos uma agenda padrão
+                $cal = array('name' => 'Calendario',
+                    'description' => 'Calendario Padrão',
+                    'timezone' => (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo',
+                    'dtstamp' => time() . '000'
+                );
+
+                $calCreated = Controller::create(array('concept' => 'calendar'), $cal);
+
+                $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'],
+                    'calendar' => $calCreated['id'],
+                    'isOwner' => '1',
+                    'dtstamp' => time() . '000',
+                    'fontColor' => 'FFFFFF',
+                    'backgroundColor' => '3366CC',
+                    'borderColor' => '3366CC',
+                );
+
+                $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig);
+        }
+    
+        $original['criteria']['filter'][] = array('isRecursion' => true);
+        $result = Controller::find($original['URI'], $original['properties'] ? $original['properties'] : null, $original['criteria']);
             return false;
-        }
+        }
     }
 
@@ -1058 +1401 @@
 
     public function davcalCreateCollection(&$uri, &$params, &$criteria, $original) {
-        if (Config::module('useCaldav', 'expressoCalendar')) {
-            require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
-            DAViCalAdapter::mkcalendar($params['location'], $params['name'], isset($params['description']) ? $params['description'] : '' );
-        }
+        if (Config::module('useCaldav', 'expressoCalendar')) {
+            require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
+            DAViCalAdapter::mkcalendar($params['location'], $params['name'], isset($params['description']) ? $params['description'] : '' );
+           }
     }
 
     public function davcalDeleteCollection(&$uri, &$params, &$criteria, $original) {
-        if (Config::module('useCaldav', 'expressoCalendar') && Config::module('onRemoveCascadeCalDav')) {
-            require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
-            $calendar = Controller::read($uri);
-            DAViCalAdapter::rmCalendar($calendar['location']);
-        }
+        if (Config::module('useCaldav', 'expressoCalendar') && Config::module('onRemoveCascadeCalDav')) {
+            require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
+            $calendar = Controller::read($uri);
+            DAViCalAdapter::rmCalendar($calendar['location']);
+        }
     }
 
     public function davcalUpdateCollection(&$uri, &$params, &$criteria, $original) {
-        if (Config::module('useCaldav', 'expressoCalendar')) {
-            require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
-            if (isset($params['location'])) {
-                $calendar = Controller::read($uri);
-                if ($calendar['location'] !== $params['location'])
-                    DAViCalAdapter::mvcalendar($calendar['location'], $params['location']);
-            }
-        }
+        if (Config::module('useCaldav', 'expressoCalendar')) {
+            require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php';
+            if (isset($params['location'])) {
+                $calendar = Controller::read($uri);
+                if ($calendar['location'] !== $params['location'])
+                    DAViCalAdapter::mvcalendar($calendar['location'], $params['location']);
+            }
+        }
     }
 

branches/2.4/prototype/modules/calendar/interceptors/Notifications.php

@@ -475 +475 @@
 
             if (count($part) > 0)
-                self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_cancel_body');
-        }
+                        self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_cancel_body');
+                }
     }
 
@@ -521 +521 @@
         foreach ($params as $i => $v) //Verifica se ouve alteração no evento
             if (isset($schedulableOld[$i]) && $schedulableOld[$i] != $v && $i != 'participants') {
-                $schedulable[$i] = $v;
-                $alt = true;
+                $schedulable[$i] = $v;
+                $alt = true;
             }
 
@@ -539 +539 @@
 
     static private function parseTimeDate($time, $timezone) {
-        return strtotime($time . ' ' . $timezone) . '000';
+        return strtotime($time . ' ' . $timezone) . '000';
     }