Request 2315 (accepted)

Overview

Request 2315 (accepted)

Update kolab-freebusy

Created by vanmeeuwen over 5 years ago
In state accepted

Submit kolab-freebusy

Submit package Kolab:Winterfell / kolab-freebusy to package Kolab:16 / kolab-freebusy

kolab-freebusy.spec Changed

debian.changelog Changed

kolab-freebusy-1.1.0.tar.gz/lib/Kolab/FreeBusy/SourceIMAP.php -> kolab-freebusy-1.1.1.tar.gz/lib/Kolab/FreeBusy/SourceIMAP.php Changed

@@ -118,11 +118,13 @@
 
 			$query = array(array('dtstart','<=',$dtend), array('dtend','>=',$dtstart));
 			foreach ($folders as $folder) {
-				$count = 0;
+				$count     = 0;
+				$namespace = $folder->get_namespace();
+
 				$log->debug('Reading Kolab folder: ' . $folder->name, $folder->get_folder_info());
 
 				// skip other user's shared calendars
-				if (!$read_all && $folder->get_namespace() == 'other') {
+				if (!$read_all && $namespace == 'other') {
 					continue;
 				}
 
@@ -139,6 +141,8 @@
 						continue;
 					}
 
+					$event['namespace'] = $namespace;
+
 					// only consider shared namespace events if user is a confirmed participant (or organizer)
 					// skip declined events
 					if (!$this->check_participation($event, $user_email, $status)
@@ -184,6 +188,7 @@
 						// consider recurrence exceptions
 						if (is_array($event['recurrence']['EXCEPTIONS'])) {
 							foreach ($event['recurrence']['EXCEPTIONS'] as $i => $exception) {
+								$exception['namespace'] = $namespace;
 								// register exdate for this occurrence
 								if ($exception['recurrence_date'] instanceof \DateTime) {
 									$exdates[] = $exception['recurrence_date'];
@@ -224,7 +229,7 @@
 					$log->debug("Adding event for processing:\n" . $ve->serialize());
 				}
 
-				$log->addInfo("Added $count events from folder" . $folder->name);
+				$log->addInfo("Added $count events from folder " . $folder->name);
 			}
 
 			$this->imap_disconnect($imap, $config, $folders);
@@ -333,19 +338,11 @@
 	{
 		if (is_array($event['organizer']) && !empty($event['organizer']['email'])) {
 			if (in_array($event['organizer']['email'], $user_email)) {
-				$status = 'ACCEPTED';
-				if ($event['free_busy'] == 'tentative') {
-					$status = 'TENTATIVE';
-				}
-				else if (!empty($event['status'])) {
-					$status = $event['status'];
-				}
-
-				return true;
+				$is_organizer = true;
 			}
 		}
 
-		if (is_array($event['attendees'])) {
+		if (!$is_organizer && is_array($event['attendees'])) {
 			foreach ($event['attendees'] as $attendee) {
 				if (in_array($attendee['email'], $user_email)) {
 					$status = $attendee['status'];
@@ -354,6 +351,18 @@
 			}
 		}
 
+		if ($is_organizer || $event['namespace'] == 'personal') {
+			$status = 'ACCEPTED';
+			if ($event['free_busy'] == 'tentative') {
+				$status = 'TENTATIVE';
+			}
+			else if (!empty($event['status'])) {
+				$status = $event['status'];
+			}
+
+			return true;
+		}
+
 		return false;
 	}
 }

kolab-freebusy.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2315 0

Request History

vanmeeuwen created request over 5 years ago

Update kolab-freebusy

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago