summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/composer/composer/autoload_classmap.php1
-rw-r--r--lib/composer/composer/autoload_static.php1
-rw-r--r--lib/l10n/cs.js2
-rw-r--r--lib/l10n/cs.json2
-rw-r--r--lib/l10n/de_DE.js2
-rw-r--r--lib/l10n/de_DE.json2
-rw-r--r--lib/l10n/fi.js2
-rw-r--r--lib/l10n/fi.json2
-rw-r--r--lib/l10n/tr.js2
-rw-r--r--lib/l10n/tr.json2
-rw-r--r--lib/l10n/zh_HK.js2
-rw-r--r--lib/l10n/zh_HK.json2
-rw-r--r--lib/l10n/zh_TW.js2
-rw-r--r--lib/l10n/zh_TW.json2
-rw-r--r--lib/private/Session/CryptoSessionData.php7
-rw-r--r--lib/private/legacy/OC_Image.php4
-rw-r--r--lib/private/legacy/OC_Util.php2
17 files changed, 36 insertions, 3 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 397f36e660b..65df6735b47 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -121,6 +121,7 @@ return array(
'OCP\\Calendar\\ICalendarProvider' => $baseDir . '/lib/public/Calendar/ICalendarProvider.php',
'OCP\\Calendar\\ICalendarQuery' => $baseDir . '/lib/public/Calendar/ICalendarQuery.php',
'OCP\\Calendar\\ICreateFromString' => $baseDir . '/lib/public/Calendar/ICreateFromString.php',
+ 'OCP\\Calendar\\IHandleImipMessage' => $baseDir . '/lib/public/Calendar/IHandleImipMessage.php',
'OCP\\Calendar\\IManager' => $baseDir . '/lib/public/Calendar/IManager.php',
'OCP\\Calendar\\IMetadataProvider' => $baseDir . '/lib/public/Calendar/IMetadataProvider.php',
'OCP\\Calendar\\Resource\\IBackend' => $baseDir . '/lib/public/Calendar/Resource/IBackend.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 4c430720ef1..f99cc5c4111 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -154,6 +154,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
'OCP\\Calendar\\ICalendarProvider' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarProvider.php',
'OCP\\Calendar\\ICalendarQuery' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarQuery.php',
'OCP\\Calendar\\ICreateFromString' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICreateFromString.php',
+ 'OCP\\Calendar\\IHandleImipMessage' => __DIR__ . '/../../..' . '/lib/public/Calendar/IHandleImipMessage.php',
'OCP\\Calendar\\IManager' => __DIR__ . '/../../..' . '/lib/public/Calendar/IManager.php',
'OCP\\Calendar\\IMetadataProvider' => __DIR__ . '/../../..' . '/lib/public/Calendar/IMetadataProvider.php',
'OCP\\Calendar\\Resource\\IBackend' => __DIR__ . '/../../..' . '/lib/public/Calendar/Resource/IBackend.php',
diff --git a/lib/l10n/cs.js b/lib/l10n/cs.js
index bba52d71e3f..a01adac3c11 100644
--- a/lib/l10n/cs.js
+++ b/lib/l10n/cs.js
@@ -127,6 +127,8 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do PostgreSQL",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "macOS není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
"For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Zdá se, že tato instance %s je provozována v 32bitovém prostředí PHP. Pro Nextcloud verze 26 a novější je zapotřebí 64bitového.",
+ "Please switch to 64-bit PHP." : "Přejděte na 64bitové PHP",
"Set an admin username." : "Nastavte uživatelské jméno správce.",
"Set an admin password." : "Nastavte heslo pro účet správce.",
"Cannot create or write into the data directory %s" : "Nedaří se vytvořit nebo zapisovat do datového adresáře %s",
diff --git a/lib/l10n/cs.json b/lib/l10n/cs.json
index 152863bbf76..1952d8d5ecb 100644
--- a/lib/l10n/cs.json
+++ b/lib/l10n/cs.json
@@ -125,6 +125,8 @@
"PostgreSQL username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do PostgreSQL",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "macOS není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
"For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Zdá se, že tato instance %s je provozována v 32bitovém prostředí PHP. Pro Nextcloud verze 26 a novější je zapotřebí 64bitového.",
+ "Please switch to 64-bit PHP." : "Přejděte na 64bitové PHP",
"Set an admin username." : "Nastavte uživatelské jméno správce.",
"Set an admin password." : "Nastavte heslo pro účet správce.",
"Cannot create or write into the data directory %s" : "Nedaří se vytvořit nebo zapisovat do datového adresáře %s",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 07c30fd2a08..c20aa5212a8 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -127,6 +127,8 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!",
"For the best results, please consider using a GNU/Linux server instead." : "Zur Gewährleistung eines optimalen Betriebs sollte stattdessen ein GNU/Linux-Server verwendet werden.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Diese %s-Instanz scheint auf einem 32 Bit PHP-System zu laufen. Ab Nextcloud 26 sind 64 Bit erforderlich.",
+ "Please switch to 64-bit PHP." : "Bitte wechseln Sie zu 64 Bit PHP",
"Set an admin username." : "Einen Administrations-Benutzernamen setzen.",
"Set an admin password." : "Ein Administrationspasswort setzen.",
"Cannot create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder es kann darin nicht geschrieben werden.",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index c82ed2e866d..15600a481f8 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -125,6 +125,8 @@
"PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X wird nicht unterstützt und %s wird auf dieser Plattform nicht richtig funktionieren. Die Benutzung erfolgt auf eigene Gefahr!",
"For the best results, please consider using a GNU/Linux server instead." : "Zur Gewährleistung eines optimalen Betriebs sollte stattdessen ein GNU/Linux-Server verwendet werden.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Diese %s-Instanz scheint auf einem 32 Bit PHP-System zu laufen. Ab Nextcloud 26 sind 64 Bit erforderlich.",
+ "Please switch to 64-bit PHP." : "Bitte wechseln Sie zu 64 Bit PHP",
"Set an admin username." : "Einen Administrations-Benutzernamen setzen.",
"Set an admin password." : "Ein Administrationspasswort setzen.",
"Cannot create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder es kann darin nicht geschrieben werden.",
diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js
index bcf75cd7d55..54b8a78c0c2 100644
--- a/lib/l10n/fi.js
+++ b/lib/l10n/fi.js
@@ -111,6 +111,8 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
"For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Vaikuttaa siltä, että %s-instanssi toimii 32-bittisessä PHP-ympäristössä. 64-bittinen PHP on vaadittu versiolle 26 ja sitä uudemmille.",
+ "Please switch to 64-bit PHP." : "Vaihda PHP:n 64-bittiseen versioon.",
"Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
"Set an admin password." : "Aseta ylläpitäjän salasana.",
"Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt",
diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json
index eff8ef3fa0b..43d4b393f05 100644
--- a/lib/l10n/fi.json
+++ b/lib/l10n/fi.json
@@ -109,6 +109,8 @@
"PostgreSQL username and/or password not valid" : "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
"For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Vaikuttaa siltä, että %s-instanssi toimii 32-bittisessä PHP-ympäristössä. 64-bittinen PHP on vaadittu versiolle 26 ja sitä uudemmille.",
+ "Please switch to 64-bit PHP." : "Vaihda PHP:n 64-bittiseen versioon.",
"Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
"Set an admin password." : "Aseta ylläpitäjän salasana.",
"Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index 9edb9a2cbb3..3f58613c2ad 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -127,6 +127,8 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "PostgreSQL kullanıcı adı ya da parolası geçersiz",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kullanmaktan doğacak riskler size aittir!",
"For the best results, please consider using a GNU/Linux server instead." : "En iyi sonucu almak için GNU/Linux sunucusu kullanın.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Bu %s kopyası 32 bit PHP ortamında çalışıyor. 26 ve üzerindeki sürümler için 64 bit gereklidir.",
+ "Please switch to 64-bit PHP." : "Lütfen PHP kurulumunu 64 bit olarak değiştirin. ",
"Set an admin username." : "Bir yönetici kullanıcı adı yazın.",
"Set an admin password." : "Bir yönetici parolası yazın.",
"Cannot create or write into the data directory %s" : "%s veri klasörü oluşturulamadı ya da içine yazılamadı",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 7878140726e..112235de5df 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -125,6 +125,8 @@
"PostgreSQL username and/or password not valid" : "PostgreSQL kullanıcı adı ya da parolası geçersiz",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kullanmaktan doğacak riskler size aittir!",
"For the best results, please consider using a GNU/Linux server instead." : "En iyi sonucu almak için GNU/Linux sunucusu kullanın.",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "Bu %s kopyası 32 bit PHP ortamında çalışıyor. 26 ve üzerindeki sürümler için 64 bit gereklidir.",
+ "Please switch to 64-bit PHP." : "Lütfen PHP kurulumunu 64 bit olarak değiştirin. ",
"Set an admin username." : "Bir yönetici kullanıcı adı yazın.",
"Set an admin password." : "Bir yönetici parolası yazın.",
"Cannot create or write into the data directory %s" : "%s veri klasörü oluşturulamadı ya da içine yazılamadı",
diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js
index 876a9099078..7336b80abc4 100644
--- a/lib/l10n/zh_HK.js
+++ b/lib/l10n/zh_HK.js
@@ -125,6 +125,8 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險後使用！",
"For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以獲得最佳體驗",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "此 %s 站台似乎是使用 32 位元的 PHP 執行的。26 或更新版本必須使用 64 位元的版本。",
+ "Please switch to 64-bit PHP." : "請切換為 64 位元版本的 PHP",
"Set an admin username." : "設定管理員帳號",
"Set an admin password." : "設定管理員密碼",
"Cannot create or write into the data directory %s" : "無法建立或寫入資料目錄 %s",
diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json
index ac8d18c7299..f08e7936e3b 100644
--- a/lib/l10n/zh_HK.json
+++ b/lib/l10n/zh_HK.json
@@ -123,6 +123,8 @@
"PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險後使用！",
"For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以獲得最佳體驗",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "此 %s 站台似乎是使用 32 位元的 PHP 執行的。26 或更新版本必須使用 64 位元的版本。",
+ "Please switch to 64-bit PHP." : "請切換為 64 位元版本的 PHP",
"Set an admin username." : "設定管理員帳號",
"Set an admin password." : "設定管理員密碼",
"Cannot create or write into the data directory %s" : "無法建立或寫入資料目錄 %s",
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
index 6174b471eb0..e125172a3b9 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -127,6 +127,8 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險後使用！",
"For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以獲得最佳體驗",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "此 %s 站台似乎是使用 32 位元的 PHP 執行的。26 或更新版本必須使用 64 位元的版本。",
+ "Please switch to 64-bit PHP." : "請切換為 64 位元版本的 PHP",
"Set an admin username." : "設定管理員帳號",
"Set an admin password." : "設定管理員密碼",
"Cannot create or write into the data directory %s" : "無法建立或寫入資料目錄 %s",
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index 009f0213007..501fd0f4321 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -125,6 +125,8 @@
"PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險後使用！",
"For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以獲得最佳體驗",
+ "It seems that this %s instance is running on a 32-bit PHP environment. 64-bit is required for 26 and higher." : "此 %s 站台似乎是使用 32 位元的 PHP 執行的。26 或更新版本必須使用 64 位元的版本。",
+ "Please switch to 64-bit PHP." : "請切換為 64 位元版本的 PHP",
"Set an admin username." : "設定管理員帳號",
"Set an admin password." : "設定管理員密碼",
"Cannot create or write into the data directory %s" : "無法建立或寫入資料目錄 %s",
diff --git a/lib/private/Session/CryptoSessionData.php b/lib/private/Session/CryptoSessionData.php
index b01887e39e2..df810d5b30c 100644
--- a/lib/private/Session/CryptoSessionData.php
+++ b/lib/private/Session/CryptoSessionData.php
@@ -143,7 +143,6 @@ class CryptoSessionData implements \ArrayAccess, ISession {
$reopened = $this->reopen();
$this->isModified = true;
unset($this->sessionValues[$key]);
- $this->session->remove(self::encryptedSessionName);
if ($reopened) {
$this->close();
}
@@ -163,7 +162,11 @@ class CryptoSessionData implements \ArrayAccess, ISession {
}
public function reopen(): bool {
- return $this->session->reopen();
+ $reopened = $this->session->reopen();
+ if ($reopened) {
+ $this->initializeSession();
+ }
+ return $reopened;
}
/**
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index a212d639084..45584b7209a 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -290,6 +290,8 @@ class OC_Image implements \OCP\IImage {
$retVal = imagegif($this->resource, $filePath);
break;
case IMAGETYPE_JPEG:
+ /** @psalm-suppress InvalidScalarArgument */
+ imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
$retVal = imagejpeg($this->resource, $filePath, $this->getJpegQuality());
break;
case IMAGETYPE_PNG:
@@ -379,6 +381,8 @@ class OC_Image implements \OCP\IImage {
$res = imagepng($this->resource);
break;
case "image/jpeg":
+ /** @psalm-suppress InvalidScalarArgument */
+ imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
$quality = $this->getJpegQuality();
if ($quality !== null) {
$res = imagejpeg($this->resource, null, $quality);
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
index 4778fe33097..429f7ed5d05 100644
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -255,7 +255,7 @@ class OC_Util {
closedir($dir);
return;
}
- stream_copy_to_stream($sourceStream, $child->fopen('w'));
+ $child->putContent($sourceStream);
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 07:02:44 +0000