aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/Command/App/ListApps.php2
-rw-r--r--core/Command/Base.php2
-rw-r--r--core/Command/Encryption/ChangeKeyStorageRoot.php2
-rw-r--r--core/Command/Maintenance/Install.php2
-rw-r--r--core/Command/User/Info.php2
-rw-r--r--core/l10n/de.js1
-rw-r--r--core/l10n/de.json1
-rw-r--r--core/l10n/de_DE.js1
-rw-r--r--core/l10n/de_DE.json1
-rw-r--r--core/l10n/es.js1
-rw-r--r--core/l10n/es.json1
-rw-r--r--core/l10n/nb.js1
-rw-r--r--core/l10n/nb.json1
-rw-r--r--core/l10n/zh_CN.js3
-rw-r--r--core/l10n/zh_CN.json3
-rw-r--r--core/templates/layout.base.php2
-rw-r--r--core/templates/layout.guest.php2
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--core/templates/login.php4
19 files changed, 24 insertions, 10 deletions
diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php
index c933a2519ef..78b7dd40fe3 100644
--- a/core/Command/App/ListApps.php
+++ b/core/Command/App/ListApps.php
@@ -87,7 +87,7 @@ class ListApps extends Base {
sort($enabledApps);
foreach ($enabledApps as $app) {
- $apps['enabled'][$app] = (isset($versions[$app])) ? $versions[$app] : true;
+ $apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
}
sort($disabledApps);
diff --git a/core/Command/Base.php b/core/Command/Base.php
index 15878a807d8..536de20711c 100644
--- a/core/Command/Base.php
+++ b/core/Command/Base.php
@@ -121,7 +121,7 @@ class Base extends Command implements CompletionAwareInterface {
} else if ($value === true) {
return 'true';
} else if ($value === null) {
- return ($returnNull) ? null : 'null';
+ return $returnNull ? null : 'null';
} else {
return $value;
}
diff --git a/core/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php
index 97709d54bdd..7c6ad5d6126 100644
--- a/core/Command/Encryption/ChangeKeyStorageRoot.php
+++ b/core/Command/Encryption/ChangeKeyStorageRoot.php
@@ -118,7 +118,7 @@ class ChangeKeyStorageRoot extends Command {
$output->writeln("Start to move keys:");
- if ($this->rootView->is_dir(($oldRoot)) === false) {
+ if ($this->rootView->is_dir($oldRoot) === false) {
$output->writeln("No old keys found: Nothing needs to be moved");
return false;
}
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index be6a2da22c8..262def99c5f 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -90,7 +90,7 @@ class Install extends Command {
// ignore the OS X setup warning
if(count($errors) !== 1 ||
- (string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
+ (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
return 1;
}
}
diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php
index b23ddd942a0..f1b5579eb94 100644
--- a/core/Command/User/Info.php
+++ b/core/Command/User/Info.php
@@ -76,7 +76,7 @@ class Info extends Base {
$data = [
'user_id' => $user->getUID(),
'display_name' => $user->getDisplayName(),
- 'email' => ($user->getEMailAddress()) ? $user->getEMailAddress() : '',
+ 'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
'cloud_id' => $user->getCloudId(),
'enabled' => $user->isEnabled(),
'groups' => $groups,
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 386a710edcf..571026bc82e 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"Search contacts …" : "Kontakte suchen…",
"No contacts found" : "Keine Kontakte gefunden",
"Show all contacts …" : "Zeige alle Kontakte…",
+ "Could not load your contacts" : "Deine Kontakte konnten nicht geladen werden",
"Loading your contacts …" : "Lade Deine Kontakte…",
"Looking for {term} …" : "Suche nach {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Bei der Code-Integritätsprüfung sind Probleme aufgetreten. Mehr Informationen…</a>",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 0ab1a7da964..b4b0464618b 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -54,6 +54,7 @@
"Search contacts …" : "Kontakte suchen…",
"No contacts found" : "Keine Kontakte gefunden",
"Show all contacts …" : "Zeige alle Kontakte…",
+ "Could not load your contacts" : "Deine Kontakte konnten nicht geladen werden",
"Loading your contacts …" : "Lade Deine Kontakte…",
"Looking for {term} …" : "Suche nach {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Bei der Code-Integritätsprüfung sind Probleme aufgetreten. Mehr Informationen…</a>",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 99a4095ac3f..d6698ba8c0e 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"Search contacts …" : "Kontakte suchen…",
"No contacts found" : "Keine Kontakte gefunden",
"Show all contacts …" : "Zeige alle Kontakte…",
+ "Could not load your contacts" : "Ihre Kontakte konnten nicht geladen werden",
"Loading your contacts …" : "Lade Ihre Kontakte…",
"Looking for {term} …" : "Suche nach {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Bei der Code-Integritätsprüfung sind Probleme aufgetreten. Mehr Informationen…</a>",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 8b8d0aa8e8b..3dd30aa2b99 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -54,6 +54,7 @@
"Search contacts …" : "Kontakte suchen…",
"No contacts found" : "Keine Kontakte gefunden",
"Show all contacts …" : "Zeige alle Kontakte…",
+ "Could not load your contacts" : "Ihre Kontakte konnten nicht geladen werden",
"Loading your contacts …" : "Lade Ihre Kontakte…",
"Looking for {term} …" : "Suche nach {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Bei der Code-Integritätsprüfung sind Probleme aufgetreten. Mehr Informationen…</a>",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 8163d69b020..b88a2c88bf4 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"Search contacts …" : "Buscar contactos...",
"No contacts found" : "No se han encontrado contactos",
"Show all contacts …" : "Mostrar todos los contactos...",
+ "Could not load your contacts" : "No se han podido cargar los contactos",
"Loading your contacts …" : "Cargando tus contactos...",
"Looking for {term} …" : "Buscando {term}...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Ha habido problemas durante la comprobación de la integridad del código. Más información…</a>",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 16421ea1bbc..2fdf0576759 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -54,6 +54,7 @@
"Search contacts …" : "Buscar contactos...",
"No contacts found" : "No se han encontrado contactos",
"Show all contacts …" : "Mostrar todos los contactos...",
+ "Could not load your contacts" : "No se han podido cargar los contactos",
"Loading your contacts …" : "Cargando tus contactos...",
"Looking for {term} …" : "Buscando {term}...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Ha habido problemas durante la comprobación de la integridad del código. Más información…</a>",
diff --git a/core/l10n/nb.js b/core/l10n/nb.js
index 954df3e3d5a..4be953e5f4f 100644
--- a/core/l10n/nb.js
+++ b/core/l10n/nb.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"Search contacts …" : "Søk etter kontakter…",
"No contacts found" : "Fant ingen kontakter",
"Show all contacts …" : "Vis alle kontakter…",
+ "Could not load your contacts" : "Kunne ikke laste inn kontaktene dine",
"Loading your contacts …" : "Laster inn kontaktene dine…",
"Looking for {term} …" : "Ser etter {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det oppstod problemer med sjekk av kode-integritet. Mer informasjon…</a>",
diff --git a/core/l10n/nb.json b/core/l10n/nb.json
index 4611e8d818c..29700fb738b 100644
--- a/core/l10n/nb.json
+++ b/core/l10n/nb.json
@@ -54,6 +54,7 @@
"Search contacts …" : "Søk etter kontakter…",
"No contacts found" : "Fant ingen kontakter",
"Show all contacts …" : "Vis alle kontakter…",
+ "Could not load your contacts" : "Kunne ikke laste inn kontaktene dine",
"Loading your contacts …" : "Laster inn kontaktene dine…",
"Looking for {term} …" : "Ser etter {term}…",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Det oppstod problemer med sjekk av kode-integritet. Mer informasjon…</a>",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 5bfe680c185..0ba6a4ae905 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"Search contacts …" : "搜索联系人 ...",
"No contacts found" : "无法找到联系人",
"Show all contacts …" : "显示所有联系人...",
+ "Could not load your contacts" : "无法加载您的联系人",
"Loading your contacts …" : "加载您的联系人...",
"Looking for {term} …" : "查找 {term} ...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常, 点击查看详细信息...</a>",
@@ -114,8 +115,10 @@ OC.L10N.register(
"No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置，为了提升使用体验，请尽量配置内存缓存。更多信息请参见<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">文档</a>。",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "PHP 无法访问 /dev/urandom，出于安全原因这是强烈不推荐的。更多信息请参见<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">文档</a>。",
"You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "您当前正在运行 PHP 版本 {version}。我们建议您尽快在您的发行版支持新版本的时候进行升级，以获得<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">来自 PHP 官方的性能和安全</a>的提升。",
+ "You are currently running PHP 5.6. The current major version of Nextcloud is the last that is supported on PHP 5.6. It is recommended to upgrade the PHP version to 7.0+ to be able to upgrade to Nextcloud 14." : "您目前正在运行PHP 5.6。 Nextcloud的当前主要版本是最后一个支持PHP 5.6的版本。 建议将PHP版本升级到7.0以便能够升级到Nextcloud 14。",
"Error occurred while checking server setup" : "检查服务器设置时出错",
"Shared" : "已共享",
+ "Shared with" : "分享给",
"Error setting expiration date" : "设置过期日期时出错",
"The public link will expire no later than {days} days after it is created" : "该共享链接将在创建后 {days} 天失效",
"Set expiration date" : "设置过期日期",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 1dc340f616b..72a97d6f1be 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -54,6 +54,7 @@
"Search contacts …" : "搜索联系人 ...",
"No contacts found" : "无法找到联系人",
"Show all contacts …" : "显示所有联系人...",
+ "Could not load your contacts" : "无法加载您的联系人",
"Loading your contacts …" : "加载您的联系人...",
"Looking for {term} …" : "查找 {term} ...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常, 点击查看详细信息...</a>",
@@ -112,8 +113,10 @@
"No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置，为了提升使用体验，请尽量配置内存缓存。更多信息请参见<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">文档</a>。",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation</a>." : "PHP 无法访问 /dev/urandom，出于安全原因这是强烈不推荐的。更多信息请参见<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">文档</a>。",
"You are currently running PHP {version}. Upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "您当前正在运行 PHP 版本 {version}。我们建议您尽快在您的发行版支持新版本的时候进行升级，以获得<a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{phpLink}\">来自 PHP 官方的性能和安全</a>的提升。",
+ "You are currently running PHP 5.6. The current major version of Nextcloud is the last that is supported on PHP 5.6. It is recommended to upgrade the PHP version to 7.0+ to be able to upgrade to Nextcloud 14." : "您目前正在运行PHP 5.6。 Nextcloud的当前主要版本是最后一个支持PHP 5.6的版本。 建议将PHP版本升级到7.0以便能够升级到Nextcloud 14。",
"Error occurred while checking server setup" : "检查服务器设置时出错",
"Shared" : "已共享",
+ "Shared with" : "分享给",
"Error setting expiration date" : "设置过期日期时出错",
"The public link will expire no later than {days} days after it is created" : "该共享链接将在创建后 {days} 天失效",
"Set expiration date" : "设置过期日期",
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 7c1fe79e79d..a5096b87b93 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -17,7 +17,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="body-public">
- <?php include('layout.noscript.warning.php'); ?>
+ <?php include 'layout.noscript.warning.php'; ?>
<?php print_unescaped($_['content']); ?>
</body>
</html>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 4d06fc294d5..e208af3c507 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -19,7 +19,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
- <?php include('layout.noscript.warning.php'); ?>
+ <?php include 'layout.noscript.warning.php'; ?>
<div class="wrapper">
<div class="v-align">
<?php if ($_['bodyid'] === 'body-login' ): ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 32762e2c240..c6885f692d5 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -26,7 +26,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
- <?php include('layout.noscript.warning.php'); ?>
+ <?php include 'layout.noscript.warning.php'; ?>
<div id="notification-container">
<div id="notification"></div>
</div>
diff --git a/core/templates/login.php b/core/templates/login.php
index 82594481d87..1d9b24901e7 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -10,7 +10,7 @@ script('core', 'merged-login');
<?php if (!empty($_['redirect_url'])) {
print_unescaped('<input type="hidden" name="redirect_url" value="' . \OCP\Util::sanitizeHTML($_['redirect_url']) . '">');
} ?>
- <?php if (isset($_['apacheauthfailed']) && ($_['apacheauthfailed'])): ?>
+ <?php if (isset($_['apacheauthfailed']) && $_['apacheauthfailed']): ?>
<div class="warning">
<?php p($l->t('Server side authentication failed!')); ?><br>
<small><?php p($l->t('Please contact your administrator.')); ?></small>
@@ -21,7 +21,7 @@ script('core', 'merged-login');
<?php p($message); ?><br>
</div>
<?php endforeach; ?>
- <?php if (isset($_['internalexception']) && ($_['internalexception'])): ?>
+ <?php if (isset($_['internalexception']) && $_['internalexception']): ?>
<div class="warning">
<?php p($l->t('An internal error occurred.')); ?><br>
<small><?php p($l->t('Please try again or contact your administrator.')); ?></small>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 11:38:55 +0000