summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/de_DE.js1
-rw-r--r--lib/l10n/de_DE.json1
-rw-r--r--lib/l10n/is.js8
-rw-r--r--lib/l10n/is.json8
-rw-r--r--lib/l10n/pl.js1
-rw-r--r--lib/l10n/pl.json1
-rw-r--r--lib/private/Activity/EventMerger.php8
-rw-r--r--lib/private/Files/Cache/Cache.php8
-rw-r--r--lib/private/Files/Storage/Local.php5
-rw-r--r--lib/private/Template/JSCombiner.php7
-rw-r--r--lib/private/Template/SCSSCacher.php11
-rw-r--r--lib/private/legacy/response.php4
-rw-r--r--lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php1
13 files changed, 56 insertions, 8 deletions
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 9c89793808f..76b58951580 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -45,6 +45,7 @@ OC.L10N.register(
"Help" : "Hilfe",
"Apps" : "Apps",
"Personal" : "Persönlich",
+ "Log out" : "Abmelden",
"Users" : "Benutzer",
"Admin" : "Administrator",
"APCu" : "APCu",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 2688ec4579f..ddea99752de 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -43,6 +43,7 @@
"Help" : "Hilfe",
"Apps" : "Apps",
"Personal" : "Persönlich",
+ "Log out" : "Abmelden",
"Users" : "Benutzer",
"Admin" : "Administrator",
"APCu" : "APCu",
diff --git a/lib/l10n/is.js b/lib/l10n/is.js
index b3802c3c674..ceadf0bb098 100644
--- a/lib/l10n/is.js
+++ b/lib/l10n/is.js
@@ -38,6 +38,7 @@ OC.L10N.register(
"Help" : "Hjálp",
"Apps" : "Forrit",
"Personal" : "Einka",
+ "Log out" : "Skrá út",
"Users" : "Notendur",
"Admin" : "Stjórnun",
"APCu" : "APCu",
@@ -158,9 +159,16 @@ OC.L10N.register(
"Cannot write into \"apps\" directory" : "Get ekki skrifað í \"apps\" möppuna",
"Cannot create \"data\" directory (%s)" : "Get ekki búið til \"data\" möppu (%s)",
"Setting locale to %s failed" : "Mistókst að setja upp staðfærsluna %s",
+ "Please install one of these locales on your system and restart your webserver." : "Settu upp eina af þessum staðfærslum og endurræstu vefþjóninn.",
"Please ask your server administrator to install the module." : "Biddu kerfisstjórann þinn um að setja eininguna upp.",
"PHP module %s not installed." : "PHP-einingin %s er ekki uppsett.",
"PHP setting \"%s\" is not set to \"%s\"." : "PHP-stillingin \"%s\" er ekki sett á \"%s\".",
+ "Adjusting this setting in php.ini will make Nextcloud run again" : "Ef þessi stilling er löguð í php.ini mun Nextcloud keyra aftur",
+ "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload er stillt á \"%s\" í stað gildisins \"0\" eins og vænst var",
+ "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Til að laga þetta vandamál ættirðu að setja <code>mbstring.func_overload</code> sem <code>0</code> í php.ini",
+ "libxml2 2.7.0 is at least required. Currently %s is installed." : "Krafist er libxml2 2.7.0 hið minnsta. Núna er %s uppsett.",
+ "To fix this issue update your libxml2 version and restart your web server." : "Til að laga þetta vandamál ættirðu að uppfæra útgáfu þína af libxml2 og endurræsa vefþjóninn.",
+ "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP virðist vera sett upp to fjarlægja innantextablokkir (inline doc blocks). Þetta mun gera ýmis kjarnaforrit óaðgengileg.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Þessu veldur væntanlega biðminni/hraðall á borð við Zend OPcache eða eAccelerator.",
"Please ask your server administrator to restart the web server." : "Biddu kerfisstjórann þinn um að endurræsa vefþjóninn.",
"PostgreSQL >= 9 required" : "Krefst PostgreSQL >= 9",
diff --git a/lib/l10n/is.json b/lib/l10n/is.json
index 6681f9cc6c0..b1a26f38640 100644
--- a/lib/l10n/is.json
+++ b/lib/l10n/is.json
@@ -36,6 +36,7 @@
"Help" : "Hjálp",
"Apps" : "Forrit",
"Personal" : "Einka",
+ "Log out" : "Skrá út",
"Users" : "Notendur",
"Admin" : "Stjórnun",
"APCu" : "APCu",
@@ -156,9 +157,16 @@
"Cannot write into \"apps\" directory" : "Get ekki skrifað í \"apps\" möppuna",
"Cannot create \"data\" directory (%s)" : "Get ekki búið til \"data\" möppu (%s)",
"Setting locale to %s failed" : "Mistókst að setja upp staðfærsluna %s",
+ "Please install one of these locales on your system and restart your webserver." : "Settu upp eina af þessum staðfærslum og endurræstu vefþjóninn.",
"Please ask your server administrator to install the module." : "Biddu kerfisstjórann þinn um að setja eininguna upp.",
"PHP module %s not installed." : "PHP-einingin %s er ekki uppsett.",
"PHP setting \"%s\" is not set to \"%s\"." : "PHP-stillingin \"%s\" er ekki sett á \"%s\".",
+ "Adjusting this setting in php.ini will make Nextcloud run again" : "Ef þessi stilling er löguð í php.ini mun Nextcloud keyra aftur",
+ "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload er stillt á \"%s\" í stað gildisins \"0\" eins og vænst var",
+ "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Til að laga þetta vandamál ættirðu að setja <code>mbstring.func_overload</code> sem <code>0</code> í php.ini",
+ "libxml2 2.7.0 is at least required. Currently %s is installed." : "Krafist er libxml2 2.7.0 hið minnsta. Núna er %s uppsett.",
+ "To fix this issue update your libxml2 version and restart your web server." : "Til að laga þetta vandamál ættirðu að uppfæra útgáfu þína af libxml2 og endurræsa vefþjóninn.",
+ "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP virðist vera sett upp to fjarlægja innantextablokkir (inline doc blocks). Þetta mun gera ýmis kjarnaforrit óaðgengileg.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Þessu veldur væntanlega biðminni/hraðall á borð við Zend OPcache eða eAccelerator.",
"Please ask your server administrator to restart the web server." : "Biddu kerfisstjórann þinn um að endurræsa vefþjóninn.",
"PostgreSQL >= 9 required" : "Krefst PostgreSQL >= 9",
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index 4e6f5954cda..bd9113027c3 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -45,6 +45,7 @@ OC.L10N.register(
"Help" : "Pomoc",
"Apps" : "Aplikacje",
"Personal" : "Osobiste",
+ "Log out" : "Wyloguj",
"Users" : "Użytkownicy",
"Admin" : "Administracja",
"APCu" : "APCu",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index b8322967bd6..8673a21fb46 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -43,6 +43,7 @@
"Help" : "Pomoc",
"Apps" : "Aplikacje",
"Personal" : "Osobiste",
+ "Log out" : "Wyloguj",
"Users" : "Użytkownicy",
"Admin" : "Administracja",
"APCu" : "APCu",
diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php
index 91e79068665..04aa41b2690 100644
--- a/lib/private/Activity/EventMerger.php
+++ b/lib/private/Activity/EventMerger.php
@@ -201,25 +201,25 @@ class EventMerger implements IEventMerger {
case 2:
$replacement = $this->l10n->t(
'%1$s and %2$s',
- ['{' . $parameter . '1}', '{' . $parameter . '2}']
+ ['{' . $parameter . '2}', '{' . $parameter . '1}']
);
break;
case 3:
$replacement = $this->l10n->t(
'%1$s, %2$s and %3$s',
- ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}']
+ ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
);
break;
case 4:
$replacement = $this->l10n->t(
'%1$s, %2$s, %3$s and %4$s',
- ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}', '{' . $parameter . '4}']
+ ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
);
break;
case 5:
$replacement = $this->l10n->t(
'%1$s, %2$s, %3$s, %4$s and %5$s',
- ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}', '{' . $parameter . '4}', '{' . $parameter . '5}']
+ ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
);
break;
default:
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 9b2cff62627..2b04226f20e 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -500,6 +500,7 @@ class Cache implements ICache {
* @param string $sourcePath
* @param string $targetPath
* @throws \OC\DatabaseException
+ * @throws \Exception if the given storages have an invalid id
*/
public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
if ($sourceCache instanceof Cache) {
@@ -514,6 +515,13 @@ class Cache implements ICache {
list($sourceStorageId, $sourcePath) = $sourceCache->getMoveInfo($sourcePath);
list($targetStorageId, $targetPath) = $this->getMoveInfo($targetPath);
+ if (is_null($sourceStorageId) || $sourceStorageId === false) {
+ throw new \Exception('Invalid source storage id: ' . $sourceStorageId);
+ }
+ if (is_null($targetStorageId) || $targetStorageId === false) {
+ throw new \Exception('Invalid target storage id: ' . $targetStorageId);
+ }
+
// sql for final update
$moveSql = 'UPDATE `*PREFIX*filecache` SET `storage` = ?, `path` = ?, `path_hash` = ?, `name` = ?, `parent` =? WHERE `fileid` = ?';
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 80d48680be1..5597c0c64cc 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -369,9 +369,10 @@ class Local extends \OC\Files\Storage\Common {
}
if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
return $fullPath;
- } else {
- throw new ForbiddenException("Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", false);
}
+
+ \OCP\Util::writeLog('core', "Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", \OCP\Util::ERROR);
+ throw new ForbiddenException('Following symlinks is not allowed', false);
}
/**
diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index 9f92813f905..0f30fb915f7 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -155,8 +155,15 @@ class JSCombiner {
}
try {
+ $gzipFile = $folder->getFile($fileName . '.gz');
+ } catch (NotFoundException $e) {
+ $gzipFile = $folder->newFile($fileName . '.gz');
+ }
+
+ try {
$cachedfile->putContent($res);
$depFile->putContent(json_encode($deps));
+ $gzipFile->putContent(gzencode($res, 9));
return true;
} catch (NotPermittedException $e) {
return false;
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index c12d8771513..df2e0232508 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -186,9 +186,18 @@ class SCSSCacher {
return false;
}
+ // Gzip file
try {
- $cachedfile->putContent($this->rebaseUrls($compiledScss, $webDir));
+ $gzipFile = $folder->getFile($fileNameCSS . '.gz');
+ } catch (NotFoundException $e) {
+ $gzipFile = $folder->newFile($fileNameCSS . '.gz');
+ }
+
+ try {
+ $data = $this->rebaseUrls($compiledScss, $webDir);
+ $cachedfile->putContent($data);
$depFile->putContent(json_encode($scss->getParsedFiles()));
+ $gzipFile->putContent(gzencode($data, 9));
$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
return true;
} catch(NotPermittedException $e) {
diff --git a/lib/private/legacy/response.php b/lib/private/legacy/response.php
index 8937b56a707..115eb5baa68 100644
--- a/lib/private/legacy/response.php
+++ b/lib/private/legacy/response.php
@@ -253,7 +253,9 @@ class OC_Response {
. 'img-src * data: blob:; '
. 'font-src \'self\' data:; '
. 'media-src *; '
- . 'connect-src *';
+ . 'connect-src *; '
+ . 'object-src \'none\'; '
+ . 'base-uri \'self\'; ';
header('Content-Security-Policy:' . $policy);
header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
index c53b5b2146c..09eb5a1c151 100644
--- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
+++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
@@ -336,6 +336,7 @@ class EmptyContentSecurityPolicy {
public function buildPolicy() {
$policy = "default-src 'none';";
$policy .= "base-uri 'none';";
+ $policy .= "manifest-src 'self';";
if(!empty($this->allowedScriptDomains) || $this->inlineScriptAllowed || $this->evalScriptAllowed) {
$policy .= 'script-src ';
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 10:31:13 +0000