Downstream 16-06-11

apps/comments/l10n/bg_BG.js

@@ -1,8 +1,19 @@
 OC.L10N.register(
     "comments",
     {
+    "Type in a new comment..." : "Напиши нов коментар...",
+    "Delete comment" : "Изтрий коментар",
     "Cancel" : "Отказ",
+    "Edit comment" : "Редактирай коментра",
+    "[Deleted user]" : "[Изтрит потребител]",
+    "Comments" : "Коментари",
+    "No other comments available" : "Няма други коментари",
+    "More comments..." : "Още коментари...",
     "Save" : "Запазване",
-    "Comment" : "Коментар"
+    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
+    "{count} unread comments" : "{count} нечетени коментари",
+    "Comment" : "Коментар",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Коментари</strong> на файлове <em>(винаги изписвани в stream-а)</em>",
+    "You commented" : "Вие коментирахте"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/bg_BG.json

@@ -1,6 +1,17 @@
 { "translations": {
+    "Type in a new comment..." : "Напиши нов коментар...",
+    "Delete comment" : "Изтрий коментар",
     "Cancel" : "Отказ",
+    "Edit comment" : "Редактирай коментра",
+    "[Deleted user]" : "[Изтрит потребител]",
+    "Comments" : "Коментари",
+    "No other comments available" : "Няма други коментари",
+    "More comments..." : "Още коментари...",
     "Save" : "Запазване",
-    "Comment" : "Коментар"
+    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
+    "{count} unread comments" : "{count} нечетени коментари",
+    "Comment" : "Коментар",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Коментари</strong> на файлове <em>(винаги изписвани в stream-а)</em>",
+    "You commented" : "Вие коментирахте"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dav/appinfo/database.xml

@@ -272,6 +272,12 @@ CREATE TABLE calendarobjects (
 			<type>text</type>
 			<length>255</length>
 		</field>
+		<field>
+			<comments>0 - public, 1 - private, 2 - confidential</comments>
+			<name>classification</name>
+			<type>integer</type>
+			<default>0</default>
+		</field>
 		<index>
 			<name>calobjects_index</name>
 			<unique>true</unique>

apps/dav/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<description>ownCloud WebDAV endpoint</description>
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
-	<version>0.2.4</version>
+	<version>0.2.5</version>
 	<default_enable/>
 	<types>
 		<filesystem/>
@@ -20,4 +20,9 @@
 	<background-jobs>
 		<job>OCA\DAV\CardDAV\Sync\SyncJob</job>
 	</background-jobs>
+	<repair-steps>
+		<post-migration>
+			<job>OCA\DAV\Migration\Classification</job>
+		</post-migration>
+	</repair-steps>
 </info>

apps/dav/appinfo/v1/publicwebdav.php

@@ -66,19 +66,16 @@
 
 	$share = $authBackend->getShare();
 	$owner = $share->getShareOwner();
-	$isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 	$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
 	$fileId = $share->getNodeId();
 
 	if (!$isReadable) {
 		return false;
 	}
 
-	if (!$isWritable) {
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
-		});
-	}
+	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
+	});
 
 	OC_Util::setupFS($owner);
 	$ownerView = \OC\Files\Filesystem::getView();

apps/dav/lib/AppInfo/Application.php

@@ -31,10 +31,12 @@
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\DAV\GroupPrincipalBackend;
 use OCA\DAV\HookManager;
+use OCA\DAV\Migration\Classification;
 use \OCP\AppFramework\App;
 use OCP\AppFramework\IAppContainer;
 use OCP\Contacts\IManager;
 use OCP\IUser;
+use Sabre\VObject\Reader;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
@@ -106,6 +108,14 @@ public function __construct (array $urlParams=array()) {
 				$g
 			);
 		});
+
+		$container->registerService('OCA\DAV\Migration\Classification', function ($c) {
+			/** @var IAppContainer $c */
+			return new Classification(
+				$c->query('CalDavBackend'),
+				$c->getServer()->getUserManager()
+			);
+		});
 	}
 
 	/**

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -37,10 +37,11 @@
 use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;
 use Sabre\DAV;
 use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\PropPatch;
 use Sabre\HTTP\URLUtil;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\Reader;
-use Sabre\VObject\RecurrenceIterator;
+use Sabre\VObject\Recur\EventIterator;
 
 /**
  * Class CalDavBackend
@@ -61,6 +62,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 */
 	const MAX_DATE = '2038-01-01';
 
+	const CLASSIFICATION_PUBLIC = 0;
+	const CLASSIFICATION_PRIVATE = 1;
+	const CLASSIFICATION_CONFIDENTIAL = 2;
+
 	/**
 	 * List of CalDAV properties, and how they map to database field names
 	 * Add your own properties by simply adding on to this array.
@@ -395,10 +400,10 @@ function createCalendar($principalUri, $calendarUri, array $properties) {
 	 *
 	 * Read the PropPatch documentation for more info and examples.
 	 *
-	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @param PropPatch $propPatch
 	 * @return void
 	 */
-	function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
+	function updateCalendar($calendarId, PropPatch $propPatch) {
 		$supportedProperties = array_keys($this->propertyMap);
 		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
 
@@ -484,7 +489,7 @@ function deleteCalendar($calendarId) {
 	 */
 	function getCalendarObjects($calendarId) {
 		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype'])
+		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
 			->from('calendarobjects')
 			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)));
 		$stmt = $query->execute();
@@ -499,6 +504,7 @@ function getCalendarObjects($calendarId) {
 					'calendarid'   => $row['calendarid'],
 					'size'         => (int)$row['size'],
 					'component'    => strtolower($row['componenttype']),
+					'classification'=> (int)$row['classification']
 			];
 		}
 
@@ -524,7 +530,7 @@ function getCalendarObjects($calendarId) {
 	function getCalendarObject($calendarId, $objectUri) {
 
 		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype'])
+		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
 				->from('calendarobjects')
 				->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
 				->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)));
@@ -542,6 +548,7 @@ function getCalendarObject($calendarId, $objectUri) {
 				'size'          => (int)$row['size'],
 				'calendardata'  => $this->readBlob($row['calendardata']),
 				'component'     => strtolower($row['componenttype']),
+				'classification'=> (int)$row['classification']
 		];
 	}
 
@@ -559,7 +566,7 @@ function getCalendarObject($calendarId, $objectUri) {
 	 */
 	function getMultipleCalendarObjects($calendarId, array $uris) {
 		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype'])
+		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
 				->from('calendarobjects')
 				->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
 				->andWhere($query->expr()->in('uri', $query->createParameter('uri')))
@@ -579,6 +586,7 @@ function getMultipleCalendarObjects($calendarId, array $uris) {
 					'size'         => (int)$row['size'],
 					'calendardata' => $this->readBlob($row['calendardata']),
 					'component'    => strtolower($row['componenttype']),
+					'classification' => (int)$row['classification']
 			];
 
 		}
@@ -618,6 +626,7 @@ function createCalendarObject($calendarId, $objectUri, $calendarData) {
 				'componenttype' => $query->createNamedParameter($extraData['componentType']),
 				'firstoccurence' => $query->createNamedParameter($extraData['firstOccurence']),
 				'lastoccurence' => $query->createNamedParameter($extraData['lastOccurence']),
+				'classification' => $query->createNamedParameter($extraData['classification']),
 				'uid' => $query->createNamedParameter($extraData['uid']),
 			])
 			->execute();
@@ -657,6 +666,7 @@ function updateCalendarObject($calendarId, $objectUri, $calendarData) {
 				->set('componenttype', $query->createNamedParameter($extraData['componentType']))
 				->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
 				->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
+				->set('classification', $query->createNamedParameter($extraData['classification']))
 				->set('uid', $query->createNamedParameter($extraData['uid']))
 			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
 			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
@@ -667,6 +677,23 @@ function updateCalendarObject($calendarId, $objectUri, $calendarData) {
 		return '"' . $extraData['etag'] . '"';
 	}
 
+	/**
+	 * @param int $calendarObjectId
+	 * @param int $classification
+	 */
+	public function setClassification($calendarObjectId, $classification) {
+		if (!in_array($classification, [
+			self::CLASSIFICATION_PUBLIC, self::CLASSIFICATION_PRIVATE, self::CLASSIFICATION_CONFIDENTIAL
+		])) {
+			throw new \InvalidArgumentException();
+		}
+		$query = $this->db->getQueryBuilder();
+		$query->update('calendarobjects')
+			->set('classification', $query->createNamedParameter($classification))
+			->where($query->expr()->eq('id', $query->createNamedParameter($calendarObjectId)))
+			->execute();
+	}
+
 	/**
 	 * Deletes an existing calendar object.
 	 *
@@ -1086,10 +1113,10 @@ function createSubscription($principalUri, $uri, array $properties) {
 	 * Read the PropPatch documentation for more info and examples.
 	 *
 	 * @param mixed $subscriptionId
-	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @param PropPatch $propPatch
 	 * @return void
 	 */
-	function updateSubscription($subscriptionId, DAV\PropPatch $propPatch) {
+	function updateSubscription($subscriptionId, PropPatch $propPatch) {
 		$supportedProperties = array_keys($this->subscriptionPropertyMap);
 		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
 
@@ -1280,14 +1307,15 @@ protected function addChange($calendarId, $objectUri, $operation) {
 	 * @param string $calendarData
 	 * @return array
 	 */
-	protected function getDenormalizedData($calendarData) {
+	public function getDenormalizedData($calendarData) {
 
 		$vObject = Reader::read($calendarData);
 		$componentType = null;
 		$component = null;
-		$firstOccurence = null;
-		$lastOccurence = null;
+		$firstOccurrence = null;
+		$lastOccurrence = null;
 		$uid = null;
+		$classification = self::CLASSIFICATION_PUBLIC;
 		foreach($vObject->getComponents() as $component) {
 			if ($component->name!=='VTIMEZONE') {
 				$componentType = $component->name;
@@ -1299,47 +1327,59 @@ protected function getDenormalizedData($calendarData) {
 			throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
 		}
 		if ($componentType === 'VEVENT' && $component->DTSTART) {
-			$firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
+			$firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
 			// Finding the last occurrence is a bit harder
 			if (!isset($component->RRULE)) {
 				if (isset($component->DTEND)) {
-					$lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
+					$lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
 				} elseif (isset($component->DURATION)) {
 					$endDate = clone $component->DTSTART->getDateTime();
 					$endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
-					$lastOccurence = $endDate->getTimeStamp();
+					$lastOccurrence = $endDate->getTimeStamp();
 				} elseif (!$component->DTSTART->hasTime()) {
 					$endDate = clone $component->DTSTART->getDateTime();
 					$endDate->modify('+1 day');
-					$lastOccurence = $endDate->getTimeStamp();
+					$lastOccurrence = $endDate->getTimeStamp();
 				} else {
-					$lastOccurence = $firstOccurence;
+					$lastOccurrence = $firstOccurrence;
 				}
 			} else {
-				$it = new RecurrenceIterator($vObject, (string)$component->UID);
+				$it = new EventIterator($vObject, (string)$component->UID);
 				$maxDate = new \DateTime(self::MAX_DATE);
 				if ($it->isInfinite()) {
-					$lastOccurence = $maxDate->getTimeStamp();
+					$lastOccurrence = $maxDate->getTimeStamp();
 				} else {
 					$end = $it->getDtEnd();
 					while($it->valid() && $end < $maxDate) {
 						$end = $it->getDtEnd();
 						$it->next();
 
 					}
-					$lastOccurence = $end->getTimeStamp();
+					$lastOccurrence = $end->getTimeStamp();
 				}
 
 			}
 		}
 
+		if ($component->CLASS) {
+			$classification = CalDavBackend::CLASSIFICATION_PRIVATE;
+			switch ($component->CLASS->getValue()) {
+				case 'PUBLIC':
+					$classification = CalDavBackend::CLASSIFICATION_PUBLIC;
+					break;
+				case 'CONFIDENTIAL':
+					$classification = CalDavBackend::CLASSIFICATION_CONFIDENTIAL;
+					break;
+			}
+		}
 		return [
-				'etag' => md5($calendarData),
-				'size' => strlen($calendarData),
-				'componentType' => $componentType,
-				'firstOccurence' => is_null($firstOccurence) ? null : max(0, $firstOccurence),
-				'lastOccurence'  => $lastOccurence,
-				'uid' => $uid,
+			'etag' => md5($calendarData),
+			'size' => strlen($calendarData),
+			'componentType' => $componentType,
+			'firstOccurence' => is_null($firstOccurrence) ? null : max(0, $firstOccurrence),
+			'lastOccurence'  => $lastOccurrence,
+			'uid' => $uid,
+			'classification' => $classification
 		];
 
 	}