Changeset 7590

Timestamp:

12/03/12 14:37:25 (11 years ago)

Author:

douglas

Message:

Ticket #3209 - Integrar módulo de sincronização Z-push ao Expresso

Location:

trunk/prototype

Files:

• config/schedulable.ini (modified) (1 diff)
• modules/calendar/interceptors/DBMapping.php (modified) (7 diffs)

trunk/prototype/config/schedulable.ini

@@ -25 +25 @@
 [before.update]
 updateCalendar = modules/calendar/interceptors/DBMapping.php
+setLastUpdateSchedulable = modules/calendar/interceptors/DBMapping.php
 encodeUpdateSchedulable = modules/calendar/interceptors/DBMapping.php
 updateEvent = modules/calendar/interceptors/Notifications.php

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -172 +172 @@
 
     public function prepareRepeat(&$uri, &$params, &$criteria, $original) {
-        if (isset($params['startTime']) || isset($params['endTime'])) {
-            
-            if(!isset($params['schedulable']))
-                $params = array_merge($params , Controller::read(array('concept' => 'repeat', 'id' => $params['id']), array('schedulable')));
- 
-            $timezone = Controller::read(array('concept' => 'schedulable', 'id' => $params['schedulable']), array('timezone'));
-
-            if (isset($params['startTime']))
-                $params['startTime'] = self::parseTimeDate($params['startTime'], $timezone['timezone']);
-            if (isset($params['endTime']))
-                $params['endTime'] = self::parseTimeDate($params['endTime'], $timezone['timezone']);
-        }
+        if (isset($params['startTime']) || isset($params['endTime'])) {
+
+            if(!isset($params['schedulable']))
+            $params = array_merge($params , Controller::read(array('concept' => 'repeat', 'id' => $params['id']), array('schedulable')));
+
+            $timezone = Controller::read(array('concept' => 'schedulable', 'id' => $params['schedulable']), array('timezone'));
+
+
+            if ( isset($params['startTime']) && !is_numeric($params['startTime']) )
+                $params['startTime'] = self::parseTimeDate($params['startTime'], $timezone['timezone']);
+            if ( isset($params['endTime']) && !is_numeric($params['endTime']))
+                $params['endTime'] = self::parseTimeDate($params['endTime'], $timezone['timezone']);
+
+        }
     }
 
@@ -509 +511 @@
     }
 
+    public function setLastUpdateSchedulable(&$uri, &$params, &$criteria, $original) {
+        $params['lastUpdate'] = time() * 1000;
+    }
+
         //Encode Update
     public function encodeUpdateSchedulable(&$uri, &$params, &$criteria, $original) {
@@ -903 +909 @@
 
 //TODO: Remover apos suporte a deepness na api
-    public function deepnessReadParticipant( &$uri , &$result , &$criteria , $original ){
+    public static function deepnessReadParticipant( &$uri , &$result , &$criteria , $original ){
         
        if(isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0)
@@ -943 +949 @@
    
     //TODO: Remover apos suporte a deepness na api 
-    public function deepnessFindParticipant( &$uri , &$result , &$criteria , $original ){
+    public static function deepnessFindParticipant( &$uri , &$result , &$criteria , $original ){
        if(isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0)
        {
@@ -991 +997 @@
 
 //Decode Find       
-    public function decodeFindConcept(&$uri, &$result, &$criteria, $original) {
-        if ($result && is_array($result)) {
-            $m = array_flip(self::${$uri['concept'] . 'Map'});
-            $new = array();
-            foreach ($result as $i => $v)
-                $new[$i] = self::parseConcept($result[$i], $m);
-
-
-            $result = $new;
-        }
-    }
+//    public function decodeFindConcept(&$uri, &$result, &$criteria, $original) {
+//      if ($result && is_array($result)) {
+//          $m = array_flip(self::${$uri['concept'] . 'Map'});
+//          $new = array();
+//          foreach ($result as $i => $v)
+//              $new[$i] = self::parseConcept($result[$i], $m);
+//
+//
+//          $result = $new;
+//      }
+//    }
 
     public function addOwner(&$uri, &$params, &$criteria, $original) {
@@ -1008 +1014 @@
     }
 
-    public function decodeFindSchedulable(&$uri, &$result, &$criteria, $original) {
-        if ($result && is_array($result)) {
-            $m = array_flip(self::${$uri['concept'] . 'Map'});
-            $m['calendar_id'] = 'calendar';
-            $new = array();
-            foreach ($result as $i => $v)
-                $new[$i] = self::parseConcept($result[$i], $m);
-
-
-            $result = $new;
-        }
-    }
+//    public function decodeFindSchedulable(&$uri, &$result, &$criteria, $original) {
+//      if ($result && is_array($result)) {
+//          $m = array_flip(self::${$uri['concept'] . 'Map'});
+//          $m['calendar_id'] = 'calendar';
+//          $new = array();
+//          foreach ($result as $i => $v)
+//              $new[$i] = self::parseConcept($result[$i], $m);
+//
+//
+//          $result = $new;
+//      }
+//    }
 
     public function decodeFindAttachment(&$uri, &$result, &$criteria, $original) {
@@ -1547 +1553 @@
     }
 
+    private static function isValidTimeStamp($timestamp)
+    {
+        return ((string) (int) $timestamp === $timestamp)
+            && ($timestamp <= PHP_INT_MAX)
+            && ($timestamp >= ~PHP_INT_MAX);
+    }
 }