Merge branch 'dev-1.5' into backend-sequence

2 files changed, 103 insertions, 0 deletions

diff --git a/lib/Service/CalendarService.php b/lib/Service/CalendarService.php
new file mode 100644
index 00000000..f16a3f7e
--- /dev/null
+++ b/lib/Service/CalendarService.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+ *
+ * @author René Gieling <github@dartcafe.de>
+*
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Polls\Service;
+
+use DateTime;
+use OCP\Calendar\IManager as CalendarManager;
+use OCP\Calendar\ICalendar;
+
+class CalendarService {
+
+	private $calendarManager;
+	private $calendars;
+
+	public function __construct(
+		CalendarManager $calendarManager
+	) {
+		$this->calendarManager = $calendarManager;
+		$this->calendars = $this->calendarManager->getCalendars();
+	}
+
+	/**
+	 * getEvents - get events from the user's calendars inside given timespan
+	 * @NoAdminRequired
+	 * @param DateTime $from
+	 * @param DateTime $to
+	 * @return Array
+	 */
+	public function getEvents($from, $to) {
+		$events = [];
+
+		foreach ($this->calendars as $calendar) {
+			$foundEvents = $calendar->search('' ,['SUMMARY'], ['timerange' => ['start' => $from, 'end' => $to]]);
+			foreach ($foundEvents as $event) {
+				array_push($events, [
+					'relatedFrom' => $from->getTimestamp(),
+					'relatedTo' => $to->getTimestamp(),
+					'name' => $calendar->getDisplayName(),
+					'key' => $calendar->getKey(),
+					'displayColor' => $calendar->getDisplayColor(),
+					'permissions' => $calendar->getPermissions(),
+					'eventId' => $event['id'],
+					'UID' => $event['objects'][0]['UID'][0],
+					'summary' => isset($event['objects'][0]['SUMMARY'][0])? $event['objects'][0]['SUMMARY'][0] : '',
+					'description' => isset($event['objects'][0]['DESCRIPTION'][0])? $event['objects'][0]['DESCRIPTION'][0] : '',
+					'location' => isset($event['objects'][0]['LOCATION'][0]) ? $event['objects'][0]['LOCATION'][0] : '',
+					'eventFrom' => isset($event['objects'][0]['DTSTART'][0]) ? $event['objects'][0]['DTSTART'][0]->getTimestamp() : 0,
+					'eventTo' => isset($event['objects'][0]['DTEND'][0] ) ? $event['objects'][0]['DTEND'][0]->getTimestamp() : 0,
+					'calDav' => $event
+				]);
+			}
+		}
+		return $events;
+	}
+
+	/**
+	 * Get user's calendars
+	 * @NoAdminRequired
+	 * @return Array
+	 */
+	public function getCalendars() {
+		return $this->calendars;
+	}
+
+
+}
diff --git a/lib/Service/OptionService.php b/lib/Service/OptionService.php
index 25242c66..4f9be435 100644
--- a/lib/Service/OptionService.php
+++ b/lib/Service/OptionService.php
@@ -106,6 +106,22 @@ class OptionService {
 		}
 	}
 
+	/**
+	 * Get option
+	 * @NoAdminRequired
+	 * @param int $optionId
+	 * @return Option
+	 * @throws NotAuthorizedException
+	 */
+	public function get($optionId) {
+
+		if (!$this->acl->set($this->optionMapper->find($optionId)->getPollId())->getAllowView()) {
+			throw new NotAuthorizedException;
+		}
+
+		return $this->optionMapper->find($optionId);
+	}
+
 
 	/**
 	 * Add a new option