Merge remote-tracking branch 'upstream/master' into accept-ocm-to-groups

Author: michielbdejong

.drone.star

@@ -294,7 +294,6 @@ config = {
                 "commands": [
                     "php occ maintenance:singleuser --on",
                     "php occ encryption:enable",
-                    "php occ encryption:select-encryption-type masterkey --yes",
                     "php occ encryption:encrypt-all --yes",
                     "php occ encryption:status",
                     "php occ maintenance:singleuser --off",

CHANGELOG.html

@@ -2,6 +2,7 @@ OC.L10N.register(
     "dav",
     {
     "Contact birthdays" : "Contact birthdays",
+    "User unknown" : "User unknown",
     "User disabled" : "User disabled",
     "Personal" : "Personal",
     "Contacts" : "Contacts",

CHANGELOG.md

@@ -1,5 +1,6 @@
 { "translations": {
     "Contact birthdays" : "Contact birthdays",
+    "User unknown" : "User unknown",
     "User disabled" : "User disabled",
     "Personal" : "Personal",
     "Contacts" : "Contacts",

apps/dav/l10n/en_GB.js

@@ -2,6 +2,7 @@ OC.L10N.register(
     "dav",
     {
     "Contact birthdays" : "Compleanni dei contatti",
+    "User unknown" : "Utente sconosciuto",
     "User disabled" : "Utente disabilitato",
     "Personal" : "Personale",
     "Contacts" : "Contatti",

apps/dav/l10n/en_GB.json

@@ -1,5 +1,6 @@
 { "translations": {
     "Contact birthdays" : "Compleanni dei contatti",
+    "User unknown" : "Utente sconosciuto",
     "User disabled" : "Utente disabilitato",
     "Personal" : "Personale",
     "Contacts" : "Contatti",

apps/dav/l10n/it.js

@@ -2,6 +2,7 @@ OC.L10N.register(
     "dav",
     {
     "Contact birthdays" : "연락처에 등록된 생일",
+    "User unknown" : "알 수 없는 사용자",
     "User disabled" : "사용자 비활성화됨",
     "Personal" : "개인",
     "Contacts" : "연락처",

apps/dav/l10n/it.json

@@ -1,5 +1,6 @@
 { "translations": {
     "Contact birthdays" : "연락처에 등록된 생일",
+    "User unknown" : "알 수 없는 사용자",
     "User disabled" : "사용자 비활성화됨",
     "Personal" : "개인",
     "Contacts" : "연락처",

apps/dav/l10n/ko.js

@@ -49,6 +49,7 @@
 use Sabre\DAV\Exception\Locked as SabreLocked;
 use Sabre\DAV\Exception\NotFound as SabreNotFound;
 use Sabre\DAV\Exception\ServiceUnavailable as SabreServiceUnavailable;
+use Sabre\DAV\Exception\InsufficientStorage as SabreInsufficientStorage;
 use Sabre\DAV\ICollection;
 use Sabre\DAV\IFile;
 use Sabre\DAV\IMoveTarget;
@@ -213,6 +214,17 @@ public function createDirectory($name) {
 				throw new SabreForbidden();
 			}
 
+			$absolutePath = Filesystem::normalizePath($this->fileView->getAbsolutePath($name));
+			list($targetStorage, $targetInternalPath) = Filesystem::resolvePath($absolutePath);
+
+			// We are using == instead of === as the computerFileSize method which is
+			// used to get the quota may return a float type. Note that the same
+			// has been observed for the disk_free_space function in local storage
+			list($used, $free) = $this->getQuotaInfo();
+			if ($free == 0 && ($targetStorage->instanceOfStorage('\OCP\Files\IHomeStorage') === true)) {
+				throw new SabreInsufficientStorage('Creation of empty directories is forbidden in case of no available quota');
+			}
+
 			$this->fileView->verifyPath($this->path, $name);
 			$newPath = $this->path . '/' . $name;
 			if (!$this->fileView->mkdir($newPath)) {