[Master] upstream sync

apps/comments/js/commentstabview.js

@@ -337,10 +337,10 @@
 					$comment.data('commentEl').remove();
 					$comment.remove();
 				},
-				error: function(msg) {
+				error: function() {
 					$loading.addClass('hidden');
 					$comment.removeClass('disabled');
-					OC.Notification.showTemporary(msg);
+					OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with id {id}', {id: commentId}));
 				}
 			});
 
@@ -388,12 +388,12 @@
 							.html(self._formatMessage(model.get('message')));
 						$row.remove();
 					},
-					error: function(msg) {
+					error: function() {
 						$submit.removeClass('hidden');
 						$loading.addClass('hidden');
 						$textArea.prop('disabled', false);
 
-						OC.Notification.showTemporary(msg);
+						OC.Notification.showTemporary(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}));
 					}
 				});
 			} else {
@@ -413,12 +413,12 @@
 						$loading.addClass('hidden');
 						$textArea.val('').prop('disabled', false);
 					},
-					error: function(msg) {
+					error: function() {
 						$submit.removeClass('hidden');
 						$loading.addClass('hidden');
 						$textArea.prop('disabled', false);
 
-						OC.Notification.showTemporary(msg);
+						OC.Notification.showTemporary(t('comments', 'Error occurred while posting comment'));
 					}
 				});
 			}

apps/comments/l10n/bg_BG.js

@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Type in a new comment..." : "Напиши нов коментар...",
     "Delete comment" : "Изтрий коментар",
+    "Post" : "Публикация",
     "Cancel" : "Отказ",
     "Edit comment" : "Редактирай коментра",
     "[Deleted user]" : "[Изтрит потребител]",

apps/comments/l10n/bg_BG.json

@@ -1,6 +1,7 @@
 { "translations": {
     "Type in a new comment..." : "Напиши нов коментар...",
     "Delete comment" : "Изтрий коментар",
+    "Post" : "Публикация",
     "Cancel" : "Отказ",
     "Edit comment" : "Редактирай коментра",
     "[Deleted user]" : "[Изтрит потребител]",

apps/comments/l10n/cs_CZ.js

@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Více komentářů...",
     "Save" : "Uložit",
     "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
+    "Error occurred while retrieving comment with id {id}" : "Došlo k chybě při načítání komentáře s id {id}",
+    "Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
+    "Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
     "{count} unread comments" : "{count} nepřečtených komentářů",
     "Comment" : "Komentář",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>",

apps/comments/l10n/cs_CZ.json

@@ -10,6 +10,9 @@
     "More comments..." : "Více komentářů...",
     "Save" : "Uložit",
     "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
+    "Error occurred while retrieving comment with id {id}" : "Došlo k chybě při načítání komentáře s id {id}",
+    "Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
+    "Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
     "{count} unread comments" : "{count} nepřečtených komentářů",
     "Comment" : "Komentář",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>",

apps/comments/l10n/de.js

@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Weitere Kommentare...",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "{count} unread comments" : "{count} ungelesene Kommentare",
     "Comment" : "Kommentar",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",

apps/comments/l10n/de.json

@@ -10,6 +10,9 @@
     "More comments..." : "Weitere Kommentare...",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "{count} unread comments" : "{count} ungelesene Kommentare",
     "Comment" : "Kommentar",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",

apps/comments/l10n/de_DE.js

@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Weitere Kommentare...",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "{count} unread comments" : "[count] ungelesene Kommentare",
     "Comment" : "Kommentar",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",

apps/comments/l10n/de_DE.json

@@ -10,6 +10,9 @@
     "More comments..." : "Weitere Kommentare...",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "{count} unread comments" : "[count] ungelesene Kommentare",
     "Comment" : "Kommentar",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",

apps/comments/l10n/he.js

@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "תגובות נוספות...",
     "Save" : "שמירה",
     "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
+    "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
+    "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
+    "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
     "{count} unread comments" : "{count} תגובות שלא נקראו",
     "Comment" : "תגובה",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>תגובות</strong> עבור קבצים <em>(תמיד נרשמים בהזרמת מדיה)</em>",

apps/comments/l10n/he.json

@@ -10,6 +10,9 @@
     "More comments..." : "תגובות נוספות...",
     "Save" : "שמירה",
     "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
+    "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
+    "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
+    "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
     "{count} unread comments" : "{count} תגובות שלא נקראו",
     "Comment" : "תגובה",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>תגובות</strong> עבור קבצים <em>(תמיד נרשמים בהזרמת מדיה)</em>",

apps/comments/l10n/it.js

@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Altri commenti...",
     "Save" : "Salva",
     "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
+    "Error occurred while retrieving comment with id {id}" : "Si è verificato un errore durante il tentativo di recupero del commento con id {id}",
+    "Error occurred while updating comment with id {id}" : "Si è verificato un errore durante il tentativo di aggiornamento del commento con id {id}",
+    "Error occurred while posting comment" : "Si è verificato un errore durante la pubblicazione del commento.",
     "{count} unread comments" : "{count} commenti non letti",
     "Comment" : "Commento",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>",

apps/comments/l10n/it.json

@@ -10,6 +10,9 @@
     "More comments..." : "Altri commenti...",
     "Save" : "Salva",
     "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
+    "Error occurred while retrieving comment with id {id}" : "Si è verificato un errore durante il tentativo di recupero del commento con id {id}",
+    "Error occurred while updating comment with id {id}" : "Si è verificato un errore durante il tentativo di aggiornamento del commento con id {id}",
+    "Error occurred while posting comment" : "Si è verificato un errore durante la pubblicazione del commento.",
     "{count} unread comments" : "{count} commenti non letti",
     "Comment" : "Commento",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>",

apps/comments/l10n/lb.js

@@ -2,6 +2,7 @@ OC.L10N.register(
     "comments",
     {
     "Cancel" : "Ofbriechen",
-    "Save" : "Späicheren"
+    "Save" : "Späicheren",
+    "Comment" : "Kommentar"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/lb.json

@@ -1,5 +1,6 @@
 { "translations": {
     "Cancel" : "Ofbriechen",
-    "Save" : "Späicheren"
+    "Save" : "Späicheren",
+    "Comment" : "Kommentar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/sq.js

@@ -12,6 +12,9 @@ OC.L10N.register(
     "More comments..." : "Më tepër komente…",
     "Save" : "Ruaje",
     "Allowed characters {count} of {max}" : "Shenja të lejuara {count} nga {max}",
+    "Error occurred while retrieving comment with id {id}" : "Ndodhi një gabim teksa merrej komenti me id{id}",
+    "Error occurred while updating comment with id {id}" : "Ndodhi një gabim teksa përditësohej komenti me id{id}",
+    "Error occurred while posting comment" : "Ndodhi një gabim teksa postohej komenti",
     "{count} unread comments" : "{count} komente të palexuar",
     "Comment" : "Koment",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komente</strong> për kartela <em>(përherë të pranishme në rrjedhë)</em>",

apps/comments/l10n/sq.json

@@ -10,6 +10,9 @@
     "More comments..." : "Më tepër komente…",
     "Save" : "Ruaje",
     "Allowed characters {count} of {max}" : "Shenja të lejuara {count} nga {max}",
+    "Error occurred while retrieving comment with id {id}" : "Ndodhi një gabim teksa merrej komenti me id{id}",
+    "Error occurred while updating comment with id {id}" : "Ndodhi një gabim teksa përditësohej komenti me id{id}",
+    "Error occurred while posting comment" : "Ndodhi një gabim teksa postohej komenti",
     "{count} unread comments" : "{count} komente të palexuar",
     "Comment" : "Koment",
     "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komente</strong> për kartela <em>(përherë të pranishme në rrjedhë)</em>",

apps/dav/appinfo/v1/carddav.php

@@ -75,6 +75,7 @@
 }
 
 $server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
+$server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(\OC::$server->getLogger()));
 $server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->getLogger()));
 
 // And off we go!

apps/dav/lib/AppInfo/Application.php

@@ -136,7 +136,8 @@ public function __construct (array $urlParams=array()) {
 	public function setupContactsProvider(IManager $contactsManager, $userID) {
 		/** @var ContactsManager $cm */
 		$cm = $this->getContainer()->query('ContactsManager');
-		$cm->setupContactsProvider($contactsManager, $userID);
+		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
 	}
 
 	public function registerHooks() {

apps/dav/lib/CardDAV/AddressBookImpl.php

@@ -24,6 +24,7 @@
 
 use OCP\Constants;
 use OCP\IAddressBook;
+use OCP\IURLGenerator;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Property\Text;
 use Sabre\VObject\Reader;
@@ -40,21 +41,27 @@ class AddressBookImpl implements IAddressBook {
 	/** @var AddressBook */
 	private $addressBook;
 
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
 	/**
 	 * AddressBookImpl constructor.
 	 *
 	 * @param AddressBook $addressBook
 	 * @param array $addressBookInfo
 	 * @param CardDavBackend $backend
+	 * @param IUrlGenerator $urlGenerator
 	 */
 	public function __construct(
 			AddressBook $addressBook,
 			array $addressBookInfo,
-			CardDavBackend $backend) {
+			CardDavBackend $backend,
+			IURLGenerator $urlGenerator) {
 
 		$this->addressBook = $addressBook;
 		$this->addressBookInfo = $addressBookInfo;
 		$this->backend = $backend;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -83,11 +90,11 @@ public function getDisplayName() {
 	 * @since 5.0.0
 	 */
 	public function search($pattern, $searchProperties, $options) {
-		$result = $this->backend->search($this->getKey(), $pattern, $searchProperties);
+		$results = $this->backend->search($this->getKey(), $pattern, $searchProperties);
 
 		$vCards = [];
-		foreach ($result as $cardData) {
-			$vCards[] = $this->vCard2Array($this->readCard($cardData));
+		foreach ($results as $result) {
+			$vCards[] = $this->vCard2Array($result['uri'], $this->readCard($result['carddata']));
 		}
 
 		return $vCards;
@@ -100,13 +107,12 @@ public function search($pattern, $searchProperties, $options) {
 	 */
 	public function createOrUpdate($properties) {
 		$update = false;
-		if (!isset($properties['UID'])) { // create a new contact
+		if (!isset($properties['URI'])) { // create a new contact
 			$uid = $this->createUid();
 			$uri = $uid . '.vcf';
 			$vCard = $this->createEmptyVCard($uid);
 		} else { // update existing contact
-			$uid = $properties['UID'];
-			$uri = $uid . '.vcf';
+			$uri = $properties['URI'];
 			$vCardData = $this->backend->getCard($this->getKey(), $uri);
 			$vCard = $this->readCard($vCardData['carddata']);
 			$update = true;
@@ -122,7 +128,7 @@ public function createOrUpdate($properties) {
 			$this->backend->createCard($this->getKey(), $uri, $vCard->serialize());
 		}
 
-		return $this->vCard2Array($vCard);
+		return $this->vCard2Array($uri, $vCard);
 
 	}
 
@@ -207,13 +213,31 @@ protected function createEmptyVCard($uid) {
 	/**
 	 * create array with all vCard properties
 	 *
+	 * @param string $uri
 	 * @param VCard $vCard
 	 * @return array
 	 */
-	protected function vCard2Array(VCard $vCard) {
-		$result = [];
+	protected function vCard2Array($uri, VCard $vCard) {
+		$result = [
+			'URI' => $uri,
+		];
+
 		foreach ($vCard->children as $property) {
 			$result[$property->name] = $property->getValue();
+			if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
+				$url = $this->urlGenerator->getAbsoluteURL(
+					$this->urlGenerator->linkTo('', 'remote.php') . '/dav/');
+				$url .= implode('/', [
+					'addressbooks',
+					substr($this->addressBookInfo['principaluri'], 11), //cut off 'principals/'
+					$this->addressBookInfo['uri'],
+					$uri
+				]) . '?photo';
+
+				$result['PHOTO'] = 'VALUE=uri:' . $url;
+			} else {
+				$result[$property->name] = $property->getValue();
+			}
 		}
 		if ($this->addressBookInfo['principaluri'] === 'principals/system/system' &&
 			$this->addressBookInfo['uri'] === 'system') {

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -780,16 +780,18 @@ public function search($addressBookId, $pattern, $searchProperties) {
 		}
 		$query2->andWhere($query2->expr()->eq('cp.addressbookid', $query->createNamedParameter($addressBookId)));
 
-		$query->select('c.carddata')->from($this->dbCardsTable, 'c')
+		$query->select('c.carddata', 'c.uri')->from($this->dbCardsTable, 'c')
 			->where($query->expr()->in('c.id', $query->createFunction($query2->getSQL())));
 
 		$result = $query->execute();
 		$cards = $result->fetchAll();
 
 		$result->closeCursor();
 
-		return array_map(function($array) {return $this->readBlob($array['carddata']);}, $cards);
-
+		return array_map(function($array) {
+			$array['carddata'] = $this->readBlob($array['carddata']);
+			return $array;
+		}, $cards);
 	}
 
 	/**

apps/dav/lib/CardDAV/ContactsManager.php

@@ -22,6 +22,7 @@
 namespace OCA\DAV\CardDAV;
 
 use OCP\Contacts\IManager;
+use OCP\IURLGenerator;
 
 class ContactsManager {
 
@@ -37,26 +38,29 @@ public function __construct(CardDavBackend $backend) {
 	/**
 	 * @param IManager $cm
 	 * @param string $userId
+	 * @param IURLGenerator $urlGenerator
 	 */
-	public function setupContactsProvider(IManager $cm, $userId) {
+	public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
 		$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
-		$this->register($cm, $addressBooks);
+		$this->register($cm, $addressBooks, $urlGenerator);
 		$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
-		$this->register($cm, $addressBooks);
+		$this->register($cm, $addressBooks, $urlGenerator);
 	}
 
 	/**
 	 * @param IManager $cm
 	 * @param $addressBooks
+	 * @param IURLGenerator $urlGenerator
 	 */
-	private function register(IManager $cm, $addressBooks) {
+	private function register(IManager $cm, $addressBooks, $urlGenerator) {
 		foreach ($addressBooks as $addressBookInfo) {
 			$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo);
 			$cm->registerAddressBook(
 				new AddressBookImpl(
 					$addressBook,
 					$addressBookInfo,
-					$this->backend
+					$this->backend,
+					$urlGenerator
 				)
 			);
 		}