Changeset 6891 for sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

07/27/12 14:47:35 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Notificao e resposta de tasks / codec de normalizacao impressao de eventos

File:

• sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php

@@ -820 +820 @@
     
     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)
@@ -939 +939 @@
 
      public function createDefaultGroup(&$uri, &$result, &$criteria, $original) {
-        $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);
-
+        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);
+            }
 
         }