Fix calendar assignment to sections.

Don't include system calendars in shared calendar section or resource calendars in system calendar section.
horde · Apr 22, 2015 · 51b739e · mrubinsk · Apr 22, 2015 · 51b739e
1 parent ea3e416
commit 51b739e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php
@@ -223,6 +223,10 @@ public function sidebar($sidebar)
             ),
         );
         foreach (Kronolith::listInternalCalendars() as $id => $calendar) {
+            if ($GLOBALS['registry']->isAdmin() &&
+                empty($calendar->get('owner'))) {
+                continue;
+            }
             $row = array(
                 'selected' => in_array($id, $GLOBALS['calendar_manager']->get(Kronolith::DISPLAY_CALENDARS)),
                 'url' => $url->copy()->add('toggle_calendar', $id),
@@ -240,6 +244,9 @@ public function sidebar($sidebar)
 
         if ($GLOBALS['registry']->isAdmin()) {
             foreach ($GLOBALS['injector']->getInstance('Kronolith_Shares')->listSystemShares() as $id => $calendar) {
+                if ($calendar->get('type') != Kronolith::SHARE_TYPE_USER) {
+                    continue;
+                }
                 $row = array(
                     'selected' => in_array($id, $GLOBALS['calendar_manager']->get(Kronolith::DISPLAY_CALENDARS)),
                     'url' => $url->copy()->add('toggle_calendar', $id),