Merge branch 'spidev' into 'master'

Kalender Update

See merge request fronk/thetool!1325

application/Calendar/CalendarModel.php

@@ -199,6 +199,7 @@ class CalendarModel
         }
         $visibleCalendars = $r->visibleCalendars;
         $visibleCalendarTypes = $r->visibleCalendarTypes;
+
         if ($visibleCalendars) {
             $where .= " AND calendar_id IN (" . implode(",", $visibleCalendars) . ")";
             $whereTimeRecording = " AND `Calendar`.`go_calendar_id` IN (" . implode(",", $visibleCalendars) . ")";
@@ -206,6 +207,10 @@ class CalendarModel
         if ($visibleCalendarTypes) {
             $where .= " AND event_type IN (" . implode(",", $visibleCalendarTypes) . ")";
         }
+        if ($r->visibleCancellation != 1) {
+            $where .= " AND canceld = '0' ";
+
+        }
 
 
         $sql = "SELECT `cal_events`.id,`cal_events`.categories, uuid, calendar_id, `cal_events`.user_id, start_time, end_time, timezone, all_day_event, `cal_events`.name,`cal_calendars`.name calendar_name, description, location, repeat_end_time, reminder, ctime,cname, mtime,mname, muser_id, busy, status, resource_event_id, private, rrule, `cal_events`.background, `cal_events`.files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, is_organizer,event_type,busy,recurrence,rrule_events FROM cal_events INNER JOIN `cal_calendars` ON (`cal_calendars`.`id`=`cal_events`.`calendar_id`) WHERE 1=1 $where ORDER BY start_time DESC";
@@ -998,7 +1003,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
         die();
     }
 
-    public static function cancelCalendarEvent($r,$me)
+    public static function cancelCalendarEvent($r, $me)
     {
         $id = $r->id;
         $users = $r->users;