summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/l10n/cs.js4
-rw-r--r--apps/dav/l10n/cs.json4
-rw-r--r--apps/dav/lib/Connector/Sabre/File.php8
-rw-r--r--apps/dav/lib/Upload/ChunkingPlugin.php5
4 files changed, 13 insertions, 8 deletions
diff --git a/apps/dav/l10n/cs.js b/apps/dav/l10n/cs.js
index 34157ad58a3..012a3c09b88 100644
--- a/apps/dav/l10n/cs.js
+++ b/apps/dav/l10n/cs.js
@@ -55,11 +55,13 @@ OC.L10N.register(
"Description:" : "Popis:",
"Link:" : "Odkaz:",
"Contacts" : "Kontakty",
+ "WebDAV" : "WebDAV",
"Technical details" : "Technické detaily",
"Remote Address: %s" : "Vzdálená adresa: %s",
"Request ID: %s" : "ID požadavku: %s",
"CalDAV server" : "CalDAV server",
"Send invitations to attendees" : "Poslat pozvánky na adresy účastníků",
- "Please make sure to properly set up the email settings above." : "Ujistěte se, že jste správně nastavili výše uvedená nastavení e-mailu."
+ "Please make sure to properly set up the email settings above." : "Ujistěte se, že jste správně nastavili výše uvedená nastavení e-mailu.",
+ "Automatically generate a birthday calendar" : "Automaticky vytvořit kalendář s narozeninami"
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/dav/l10n/cs.json b/apps/dav/l10n/cs.json
index b3f64bb54cf..09b60937f3a 100644
--- a/apps/dav/l10n/cs.json
+++ b/apps/dav/l10n/cs.json
@@ -53,11 +53,13 @@
"Description:" : "Popis:",
"Link:" : "Odkaz:",
"Contacts" : "Kontakty",
+ "WebDAV" : "WebDAV",
"Technical details" : "Technické detaily",
"Remote Address: %s" : "Vzdálená adresa: %s",
"Request ID: %s" : "ID požadavku: %s",
"CalDAV server" : "CalDAV server",
"Send invitations to attendees" : "Poslat pozvánky na adresy účastníků",
- "Please make sure to properly set up the email settings above." : "Ujistěte se, že jste správně nastavili výše uvedená nastavení e-mailu."
+ "Please make sure to properly set up the email settings above." : "Ujistěte se, že jste správně nastavili výše uvedená nastavení e-mailu.",
+ "Automatically generate a birthday calendar" : "Automaticky vytvořit kalendář s narozeninami"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 597e6ebef90..6a467e9eff2 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -144,6 +144,8 @@ class File extends Node implements IFile {
} else {
// upload file directly as the final path
$partFilePath = $this->path;
+
+ $this->emitPreHooks($exists);
}
// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
@@ -188,11 +190,7 @@ class File extends Node implements IFile {
try {
$view = \OC\Files\Filesystem::getView();
- if ($view) {
- $run = $this->emitPreHooks($exists);
- } else {
- $run = true;
- }
+ $run = ($view && $needsPartFile) ? $this->emitPreHooks($exists) : true;
try {
$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
diff --git a/apps/dav/lib/Upload/ChunkingPlugin.php b/apps/dav/lib/Upload/ChunkingPlugin.php
index a3f6e528c6b..421a2dd519a 100644
--- a/apps/dav/lib/Upload/ChunkingPlugin.php
+++ b/apps/dav/lib/Upload/ChunkingPlugin.php
@@ -97,7 +97,10 @@ class ChunkingPlugin extends ServerPlugin {
return;
}
$actualSize = $this->sourceNode->getSize();
- if ((int)$expectedSize !== $actualSize) {
+
+ // casted to string because cast to float cause equality for non equal numbers
+ // and integer has the problem of limited size on 32 bit systems
+ if ((string)$expectedSize !== (string)$actualSize) {
throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
}
}