Changeset 6299 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

05/24/12 17:20:30 (12 years ago)

Author:

acoutinho

Message:

Ticket #2797 - Agendas sendo assinadas pelo proprio dono

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

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

@@ -463 +463 @@
     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)
@@ -469 +470 @@
             $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds), $original['criteria']['filter'])));
 
-            if (!is_array($calendar))
-                $result = '';
-
-            $newResult = array();
-            foreach ($calendar as $key => $value) {
-                foreach ($result as $k => $r) {
-
-                    if ($r['calendar'] == $value['id']) {
-                        $r['calendar'] = $value;
-                        array_push($newResult, $r);
+            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));
+
+                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;
+
+                $result = $newResult;
+            }else
+                $result = '';
         }
     }