summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/FilesPlugin.php8
-rw-r--r--apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php4
-rw-r--r--apps/files/l10n/tr.js1
-rw-r--r--apps/files/l10n/tr.json1
-rw-r--r--apps/files_external/3rdparty/composer.json2
-rw-r--r--apps/files_external/3rdparty/composer.lock12
-rw-r--r--apps/files_external/3rdparty/composer/autoload_classmap.php2
-rw-r--r--apps/files_external/3rdparty/composer/autoload_static.php2
-rw-r--r--apps/files_external/3rdparty/composer/installed.json12
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionAbortedException.php11
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionResetException.php11
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php12
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Native/NativeState.php11
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Native/NativeStream.php8
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Native/NativeWriteStream.php11
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php3
-rw-r--r--apps/files_external/lib/Command/Notify.php6
-rw-r--r--apps/files_external/lib/Lib/Storage/SFTP.php6
-rw-r--r--apps/files_sharing/l10n/el.js1
-rw-r--r--apps/files_sharing/l10n/el.json1
-rw-r--r--apps/files_sharing/l10n/tr.js3
-rw-r--r--apps/files_sharing/l10n/tr.json3
-rw-r--r--apps/files_sharing/lib/Controller/ShareController.php2
-rw-r--r--apps/files_sharing/lib/Exceptions/BrokenPath.php2
-rw-r--r--apps/files_sharing/tests/ApiTest.php2
-rw-r--r--apps/files_versions/lib/Expiration.php6
-rw-r--r--apps/settings/l10n/el.js4
-rw-r--r--apps/settings/l10n/el.json4
-rw-r--r--apps/settings/l10n/tr.js11
-rw-r--r--apps/settings/l10n/tr.json11
-rw-r--r--apps/settings/lib/Controller/CheckSetupController.php6
-rw-r--r--apps/theming/templates/settings-admin.php2
-rw-r--r--apps/updatenotification/l10n/zh_TW.js3
-rw-r--r--apps/updatenotification/l10n/zh_TW.json3
-rw-r--r--apps/user_ldap/lib/Access.php14
-rw-r--r--apps/user_ldap/lib/Group_LDAP.php14
-rw-r--r--apps/user_ldap/lib/Mapping/AbstractMapping.php6
-rw-r--r--apps/user_ldap/lib/Mapping/GroupMapping.php12
-rw-r--r--apps/user_ldap/lib/Mapping/UserMapping.php6
-rw-r--r--apps/user_ldap/lib/User_LDAP.php24
40 files changed, 174 insertions, 89 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index fd432a21377..82f3c3b6ccd 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -299,10 +299,10 @@ class FilesPlugin extends ServerPlugin {
* so users were unable to navigate into folders where one subitem
* is blocked by the files_accesscontrol app, see:
* https://github.com/nextcloud/files_accesscontrol/issues/65
- if (!$node->getFileInfo()->isReadable()) {
- // avoid detecting files through this means
- throw new NotFound();
- }
+ * if (!$node->getFileInfo()->isReadable()) {
+ * // avoid detecting files through this means
+ * throw new NotFound();
+ * }
*/
$propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
index 0f990cd8ca6..ebe5beb7275 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
@@ -221,8 +221,8 @@ class IMipPluginTest extends TestCase {
}
/**
- * @dataProvider dataIncludeResponseButtons
- */
+ * @dataProvider dataIncludeResponseButtons
+ */
public function testIncludeResponseButtons(string $config_setting, string $recipient, bool $has_buttons ) {
$message = $this->_testMessage([],$recipient);
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index dc76ed9d455..389b7939f3b 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -168,6 +168,7 @@ OC.L10N.register(
"Settings" : "Ayarlar",
"Show hidden files" : "Gizli dosyaları görüntüle",
"WebDAV" : "WebDAV",
+ "Use this address to access your Files via WebDAV" : "Dosyalarınıza WebDAV üzerinden erişmek için bu adresi kullanın",
"Toggle grid view" : "Tablo görünümünü değiştir",
"No files in here" : "Burada herhangi bir dosya yok",
"Upload some content or sync with your devices!" : "Bir şeyler yükleyin ya da aygıtlarınızla eşitleyin!",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index 43359118448..15182ef5ca4 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -166,6 +166,7 @@
"Settings" : "Ayarlar",
"Show hidden files" : "Gizli dosyaları görüntüle",
"WebDAV" : "WebDAV",
+ "Use this address to access your Files via WebDAV" : "Dosyalarınıza WebDAV üzerinden erişmek için bu adresi kullanın",
"Toggle grid view" : "Tablo görünümünü değiştir",
"No files in here" : "Burada herhangi bir dosya yok",
"Upload some content or sync with your devices!" : "Bir şeyler yükleyin ya da aygıtlarınızla eşitleyin!",
diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json
index 9cf429eb5c2..0ee0c268bb0 100644
--- a/apps/files_external/3rdparty/composer.json
+++ b/apps/files_external/3rdparty/composer.json
@@ -9,6 +9,6 @@
},
"require": {
"icewind/streams": "0.7.1",
- "icewind/smb": "3.2.1"
+ "icewind/smb": "3.2.3"
}
}
diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock
index c486854d6a9..e0716141c5f 100644
--- a/apps/files_external/3rdparty/composer.lock
+++ b/apps/files_external/3rdparty/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "adc3b3531ee8503b485092e60c569b42",
+ "content-hash": "ef0d9929f5f25696e010d5733eb51fbb",
"packages": [
{
"name": "icewind/smb",
- "version": "v3.2.1",
+ "version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/SMB.git",
- "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878"
+ "reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/icewind1991/SMB/zipball/5330edcc579a2dcc4759b8e5779eb5aa3385a878",
- "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878",
+ "url": "https://api.github.com/repos/icewind1991/SMB/zipball/db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
+ "reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
"shasum": ""
},
"require": {
@@ -46,7 +46,7 @@
}
],
"description": "php wrapper for smbclient and libsmbclient-php",
- "time": "2020-03-24T18:19:18+00:00"
+ "time": "2020-04-08T15:20:22+00:00"
},
{
"name": "icewind/streams",
diff --git a/apps/files_external/3rdparty/composer/autoload_classmap.php b/apps/files_external/3rdparty/composer/autoload_classmap.php
index 5b0c682cbce..a563765eb9b 100644
--- a/apps/files_external/3rdparty/composer/autoload_classmap.php
+++ b/apps/files_external/3rdparty/composer/autoload_classmap.php
@@ -16,8 +16,10 @@ return array(
'Icewind\\SMB\\Exception\\AlreadyExistsException' => $vendorDir . '/icewind/smb/src/Exception/AlreadyExistsException.php',
'Icewind\\SMB\\Exception\\AuthenticationException' => $vendorDir . '/icewind/smb/src/Exception/AuthenticationException.php',
'Icewind\\SMB\\Exception\\ConnectException' => $vendorDir . '/icewind/smb/src/Exception/ConnectException.php',
+ 'Icewind\\SMB\\Exception\\ConnectionAbortedException' => $vendorDir . '/icewind/smb/src/Exception/ConnectionAbortedException.php',
'Icewind\\SMB\\Exception\\ConnectionException' => $vendorDir . '/icewind/smb/src/Exception/ConnectionException.php',
'Icewind\\SMB\\Exception\\ConnectionRefusedException' => $vendorDir . '/icewind/smb/src/Exception/ConnectionRefusedException.php',
+ 'Icewind\\SMB\\Exception\\ConnectionResetException' => $vendorDir . '/icewind/smb/src/Exception/ConnectionResetException.php',
'Icewind\\SMB\\Exception\\DependencyException' => $vendorDir . '/icewind/smb/src/Exception/DependencyException.php',
'Icewind\\SMB\\Exception\\Exception' => $vendorDir . '/icewind/smb/src/Exception/Exception.php',
'Icewind\\SMB\\Exception\\FileInUseException' => $vendorDir . '/icewind/smb/src/Exception/FileInUseException.php',
diff --git a/apps/files_external/3rdparty/composer/autoload_static.php b/apps/files_external/3rdparty/composer/autoload_static.php
index b8eb6ebbfe8..fc6e68f8be4 100644
--- a/apps/files_external/3rdparty/composer/autoload_static.php
+++ b/apps/files_external/3rdparty/composer/autoload_static.php
@@ -46,8 +46,10 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
'Icewind\\SMB\\Exception\\AlreadyExistsException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/AlreadyExistsException.php',
'Icewind\\SMB\\Exception\\AuthenticationException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/AuthenticationException.php',
'Icewind\\SMB\\Exception\\ConnectException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/ConnectException.php',
+ 'Icewind\\SMB\\Exception\\ConnectionAbortedException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/ConnectionAbortedException.php',
'Icewind\\SMB\\Exception\\ConnectionException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/ConnectionException.php',
'Icewind\\SMB\\Exception\\ConnectionRefusedException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/ConnectionRefusedException.php',
+ 'Icewind\\SMB\\Exception\\ConnectionResetException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/ConnectionResetException.php',
'Icewind\\SMB\\Exception\\DependencyException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/DependencyException.php',
'Icewind\\SMB\\Exception\\Exception' => __DIR__ . '/..' . '/icewind/smb/src/Exception/Exception.php',
'Icewind\\SMB\\Exception\\FileInUseException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/FileInUseException.php',
diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json
index e3609f5af4e..e2b841f206a 100644
--- a/apps/files_external/3rdparty/composer/installed.json
+++ b/apps/files_external/3rdparty/composer/installed.json
@@ -1,17 +1,17 @@
[
{
"name": "icewind/smb",
- "version": "v3.2.1",
- "version_normalized": "3.2.1.0",
+ "version": "v3.2.3",
+ "version_normalized": "3.2.3.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/SMB.git",
- "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878"
+ "reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/icewind1991/SMB/zipball/5330edcc579a2dcc4759b8e5779eb5aa3385a878",
- "reference": "5330edcc579a2dcc4759b8e5779eb5aa3385a878",
+ "url": "https://api.github.com/repos/icewind1991/SMB/zipball/db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
+ "reference": "db50bb51bd0a0e55506e82cf439a9ecd232f64d4",
"shasum": ""
},
"require": {
@@ -22,7 +22,7 @@
"friendsofphp/php-cs-fixer": "^2.13",
"phpunit/phpunit": "^7.0"
},
- "time": "2020-03-24T18:19:18+00:00",
+ "time": "2020-04-08T15:20:22+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionAbortedException.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionAbortedException.php
new file mode 100644
index 00000000000..59363ca7ba9
--- /dev/null
+++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionAbortedException.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2020 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Licensed under the MIT license:
+ * http://opensource.org/licenses/MIT
+ */
+
+namespace Icewind\SMB\Exception;
+
+class ConnectionAbortedException extends ConnectException {
+}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionResetException.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionResetException.php
new file mode 100644
index 00000000000..d5ac10d32dc
--- /dev/null
+++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/ConnectionResetException.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2020 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Licensed under the MIT license:
+ * http://opensource.org/licenses/MIT
+ */
+
+namespace Icewind\SMB\Exception;
+
+class ConnectionResetException extends ConnectException {
+}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php
index 26e7adb019d..e829be28bf0 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeShare.php
@@ -197,12 +197,14 @@ class NativeShare extends AbstractShare {
*/
public function put($source, $target) {
$sourceHandle = fopen($source, 'rb');
- $targetHandle = $this->getState()->create($this->buildUrl($target));
+ $targetUrl = $this->buildUrl($target);
+
+ $targetHandle = $this->getState()->create($targetUrl);
while ($data = fread($sourceHandle, NativeReadStream::CHUNK_SIZE)) {
- $this->getState()->write($targetHandle, $data);
+ $this->getState()->write($targetHandle, $data, $targetUrl);
}
- $this->getState()->close($targetHandle);
+ $this->getState()->close($targetHandle, $targetUrl);
return true;
}
@@ -236,14 +238,14 @@ class NativeShare extends AbstractShare {
} else {
$reason = 'Unknown error';
}
- $this->getState()->close($sourceHandle);
+ $this->getState()->close($sourceHandle, $this->buildUrl($source));
throw new InvalidResourceException('Failed opening local file "' . $target . '" for writing: ' . $reason);
}
while ($data = $this->getState()->read($sourceHandle, NativeReadStream::CHUNK_SIZE)) {
fwrite($targetHandle, $data);
}
- $this->getState()->close($sourceHandle);
+ $this->getState()->close($sourceHandle, $this->buildUrl($source));
return true;
}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeState.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeState.php
index 0792b2f9d7f..3bfb1c3da24 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeState.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeState.php
@@ -16,6 +16,7 @@ use Icewind\SMB\Exception\ForbiddenException;
use Icewind\SMB\Exception\HostDownException;
use Icewind\SMB\Exception\InvalidArgumentException;
use Icewind\SMB\Exception\InvalidTypeException;
+use Icewind\SMB\Exception\ConnectionAbortedException;
use Icewind\SMB\Exception\NoRouteToHostException;
use Icewind\SMB\Exception\NotEmptyException;
use Icewind\SMB\Exception\NotFoundException;
@@ -49,6 +50,7 @@ class NativeState {
22 => InvalidArgumentException::class,
28 => OutOfSpaceException::class,
39 => NotEmptyException::class,
+ 103 => ConnectionAbortedException::class,
104 => ConnectionResetException::class,
110 => TimedOutException::class,
111 => ConnectionRefusedException::class,
@@ -238,13 +240,14 @@ class NativeState {
/**
* @param resource $file
* @param string $data
+ * @param string $path
* @param int $length
* @return int
*/
- public function write($file, $data, $length = null) {
+ public function write($file, $data, $path, $length = null) {
$result = @smbclient_write($this->state, $file, $data, $length);
- $this->testResult($result, $file);
+ $this->testResult($result, $path);
return $result;
}
@@ -273,10 +276,10 @@ class NativeState {
return $result;
}
- public function close($file) {
+ public function close($file, $path) {
$result = @smbclient_close($this->state, $file);
- $this->testResult($result, $file);
+ $this->testResult($result, $path);
return $result;
}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeStream.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeStream.php
index dd92edcbf5e..c75afaa5f1d 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeStream.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeStream.php
@@ -61,7 +61,11 @@ class NativeStream implements File {
}
public function stream_close() {
- return $this->state->close($this->handle);
+ try {
+ return $this->state->close($this->handle, $this->url);
+ } catch (\Exception $e) {
+ return false;
+ }
}
public function stream_eof() {
@@ -110,7 +114,7 @@ class NativeStream implements File {
}
public function stream_write($data) {
- return $this->state->write($this->handle, $data);
+ return $this->state->write($this->handle, $data, $this->url);
}
public function stream_truncate($size) {
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeWriteStream.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeWriteStream.php
index 39eca8175a9..4e90e5a655d 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeWriteStream.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeWriteStream.php
@@ -61,7 +61,7 @@ class NativeWriteStream extends NativeStream {
private function flushWrite() {
rewind($this->writeBuffer);
- $this->state->write($this->handle, stream_get_contents($this->writeBuffer));
+ $this->state->write($this->handle, stream_get_contents($this->writeBuffer), $this->url);
$this->writeBuffer = fopen('php://memory', 'r+');
$this->bufferSize = 0;
}
@@ -79,8 +79,13 @@ class NativeWriteStream extends NativeStream {
}
public function stream_close() {
- $this->flushWrite();
- return parent::stream_close();
+ try {
+ $this->flushWrite();
+ $flushResult = true;
+ } catch (\Exception $e) {
+ $flushResult = false;
+ }
+ return parent::stream_close() && $flushResult;
}
public function stream_tell() {
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
index 18ee5c1db97..e0df1f60326 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
@@ -14,11 +14,14 @@ use Icewind\SMB\Exception\DependencyException;
use Icewind\SMB\Exception\FileInUseException;
use Icewind\SMB\Exception\InvalidTypeException;
use Icewind\SMB\Exception\NotFoundException;
+use Icewind\SMB\Exception\InvalidRequestException;
use Icewind\SMB\IFileInfo;
use Icewind\SMB\INotifyHandler;
use Icewind\SMB\IServer;
use Icewind\SMB\ISystem;
use Icewind\Streams\CallbackWrapper;
+use Icewind\SMB\Native\NativeShare;
+use Icewind\SMB\Native\NativeServer;
class Share extends AbstractShare {
/**
diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php
index 8c0ed41005a..84966b4ee7b 100644
--- a/apps/files_external/lib/Command/Notify.php
+++ b/apps/files_external/lib/Command/Notify.php
@@ -208,7 +208,7 @@ class Notify extends Base {
/**
* @param int $mountId
* @return array
- */
+ */
private function getStorageIds($mountId) {
$qb = $this->connection->getQueryBuilder();
return $qb
@@ -223,7 +223,7 @@ class Notify extends Base {
* @param array $storageIds
* @param string $parent
* @return int
- */
+ */
private function updateParent($storageIds, $parent) {
$pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
$qb = $this->connection->getQueryBuilder();
@@ -237,7 +237,7 @@ class Notify extends Base {
/**
* @return \OCP\IDBConnection
- */
+ */
private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output) {
try {
$connection->close();
diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php
index 180458b2b33..3e6c8ddbde0 100644
--- a/apps/files_external/lib/Lib/Storage/SFTP.php
+++ b/apps/files_external/lib/Lib/Storage/SFTP.php
@@ -41,9 +41,9 @@ use Icewind\Streams\RetryWrapper;
use phpseclib\Net\SFTP\Stream;
/**
-* Uses phpseclib's Net\SFTP class and the Net\SFTP\Stream stream wrapper to
-* provide access to SFTP servers.
-*/
+ * Uses phpseclib's Net\SFTP class and the Net\SFTP\Stream stream wrapper to
+ * provide access to SFTP servers.
+ */
class SFTP extends \OC\Files\Storage\Common {
private $host;
private $user;
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 07a7952c6dc..6ddf5f76049 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -26,6 +26,7 @@ OC.L10N.register(
"Something happened. Unable to accept the share." : "Κάτι συνέβη. Δεν μπορεί να γίνει η αποδοχή.",
"Reject share" : "Απόρριψη κοινόχρηστου",
"Something happened. Unable to reject the share." : "Κάτι συνέβη. Δεν μπορεί να απορριφθεί το κοινόχρηστο",
+ "Waiting…" : "Αναμονή...",
"error" : "σφάλμα ",
"finished" : "ολοκληρώθηκε",
"This will stop your current uploads." : "Αυτό θα σταματήσει τις τρέχουσες μεταφορτώσεις.",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 9675f3443fc..9b77f12889f 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -24,6 +24,7 @@
"Something happened. Unable to accept the share." : "Κάτι συνέβη. Δεν μπορεί να γίνει η αποδοχή.",
"Reject share" : "Απόρριψη κοινόχρηστου",
"Something happened. Unable to reject the share." : "Κάτι συνέβη. Δεν μπορεί να απορριφθεί το κοινόχρηστο",
+ "Waiting…" : "Αναμονή...",
"error" : "σφάλμα ",
"finished" : "ολοκληρώθηκε",
"This will stop your current uploads." : "Αυτό θα σταματήσει τις τρέχουσες μεταφορτώσεις.",
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index 86e2ee1ccce..15d83c57487 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -26,7 +26,9 @@ OC.L10N.register(
"Something happened. Unable to accept the share." : "Bir sorun çıktı. Paylaşım kabul edilemedi.",
"Reject share" : "Paylaşımı reddet",
"Something happened. Unable to reject the share." : "Bir sorun çıktı. Paylaşım reddedilemedi.",
+ "Waiting…" : "Bekleniyor…",
"error" : "sorun",
+ "finished" : "tamamlandı",
"This will stop your current uploads." : "Bu işlem geçerli yüklemeleri durduracak.",
"Move or copy" : "Taşı ya da kopyala",
"Download" : "İndir",
@@ -223,6 +225,7 @@ OC.L10N.register(
"Upload files to %s" : "Dosyaları %s konumuna yükle",
"Note" : "Not",
"Select or drop files" : "Dosyaları seçin ya da sürükleyip bırakın",
+ "Uploading files" : "Dosyalar yükleniyor",
"Uploaded files:" : "Yüklenmiş dosyalar:",
"By uploading files, you agree to the %1$sterms of service%2$s." : "Dosya yükleyerek %1$shizmet koşullarını%2$s kabul etmiş olursunuz.",
"could not delete share" : "paylaşım kaldırılamadı",
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index 5121b6ff773..5829cab5adb 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -24,7 +24,9 @@
"Something happened. Unable to accept the share." : "Bir sorun çıktı. Paylaşım kabul edilemedi.",
"Reject share" : "Paylaşımı reddet",
"Something happened. Unable to reject the share." : "Bir sorun çıktı. Paylaşım reddedilemedi.",
+ "Waiting…" : "Bekleniyor…",
"error" : "sorun",
+ "finished" : "tamamlandı",
"This will stop your current uploads." : "Bu işlem geçerli yüklemeleri durduracak.",
"Move or copy" : "Taşı ya da kopyala",
"Download" : "İndir",
@@ -221,6 +223,7 @@
"Upload files to %s" : "Dosyaları %s konumuna yükle",
"Note" : "Not",
"Select or drop files" : "Dosyaları seçin ya da sürükleyip bırakın",
+ "Uploading files" : "Dosyalar yükleniyor",
"Uploaded files:" : "Yüklenmiş dosyalar:",
"By uploading files, you agree to the %1$sterms of service%2$s." : "Dosya yükleyerek %1$shizmet koşullarını%2$s kabul etmiş olursunuz.",
"could not delete share" : "paylaşım kaldırılamadı",
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 616b9754634..1cf798c9750 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -300,7 +300,7 @@ class ShareController extends AuthPublicShareController {
* @PublicPage
* @NoCSRFRequired
*
-
+ *
* @param string $path
* @return TemplateResponse
* @throws NotFoundException
diff --git a/apps/files_sharing/lib/Exceptions/BrokenPath.php b/apps/files_sharing/lib/Exceptions/BrokenPath.php
index 33fb242a36a..37db10bcb31 100644
--- a/apps/files_sharing/lib/Exceptions/BrokenPath.php
+++ b/apps/files_sharing/lib/Exceptions/BrokenPath.php
@@ -27,7 +27,7 @@ namespace OCA\Files_Sharing\Exceptions;
* Expected path with a different root
* Possible Error Codes:
* 10 - Path not relative to data/ and point to the users file directory
-
+ *
*/
class BrokenPath extends \Exception {
}
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
index 789902bdcd6..654ca3b450b 100644
--- a/apps/files_sharing/tests/ApiTest.php
+++ b/apps/files_sharing/tests/ApiTest.php
@@ -305,7 +305,7 @@ class ApiTest extends TestCase {
/**
* @medium
- */
+ */
function testSharePermissions() {
// sharing file to a user should work if shareapi_exclude_groups is set
// to no
diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php
index 9f3f524ec12..6959de6a943 100644
--- a/apps/files_versions/lib/Expiration.php
+++ b/apps/files_versions/lib/Expiration.php
@@ -129,9 +129,9 @@ class Expiration {
}
/**
- * Read versions_retention_obligation, validate it
- * and set private members accordingly
- */
+ * Read versions_retention_obligation, validate it
+ * and set private members accordingly
+ */
private function parseRetentionObligation(){
$splitValues = explode(',', $this->retentionObligation);
if (!isset($splitValues[0])) {
diff --git a/apps/settings/l10n/el.js b/apps/settings/l10n/el.js
index 987e20fce5c..79445c67f0e 100644
--- a/apps/settings/l10n/el.js
+++ b/apps/settings/l10n/el.js
@@ -243,15 +243,19 @@ OC.L10N.register(
"All languages" : "Όλες οι γλώσσες",
"Password change is disabled because the master key is disabled" : "Η αλλαγή κωδικού είναι απενεργοποιημένη επειδή το κεντρικό κλειδί είναι απενεργοποιημένο",
"Passwordless authentication requires a secure connection." : "Η σύνδεση χωρίς κωδικό πρόσβασης απαιτεί ασφαλή σύνδεση.",
+ "Add WebAuthn device" : "Προσθήκη συσκευής WebAuthn ",
"Please authorize your WebAuthn device." : "Παρακαλώ εξουσιοδοτήστε την συσκευή σας WebAuthn.",
"Name your device" : "Ονομάστε την συσκευή σας",
"Add" : "Προσθήκη",
"Adding your device …" : "Πρόσθεση της συσκευής σας ...",
+ "Server error while trying to add WebAuthn device" : "Σφάλμα διακομιστή κατά την προσθήκη συσκευής webAuthn",
+ "Server error while trying to complete WebAuthn device registration" : "Σφάλμα διακομιστή κατά την εγγραφή συσκευής WebAuthn",
"Unnamed device" : "Ανώνυμη συσκευή",
"Passwordless Authentication" : "Πιστοποίηση χωρίς Κωδικό Πρόσβασης",
"Set up your account for passwordless authentication following the FIDO2 standard." : "Ρυθμίστε τον λογαριασμό σας για πιστοποίηση χωρίς κωδικό ακολουθώντας τα πρότυπα του FIDO2.",
"No devices configured." : "Καμιά συσκευή δεν ρυθμίστηκε.",
"The following devices are configured for your account:" : "Οι ακόλουθες συσκευές ρυθμίστηκαν για τον λογαριασμό σας:",
+ "Your browser does not support WebAuthn." : "Ο περιηγητής σας δεν υποστηρίζει το WebAuthn.",
"Your apps" : "Οι εφαρμογές σας",
"Active apps" : "Ενεργές εφαρμογές",
"Disabled apps" : "Απενεργοποιημένες εφαρμογές",
diff --git a/apps/settings/l10n/el.json b/apps/settings/l10n/el.json
index 717d03cf6dc..5640cd0a7ca 100644
--- a/apps/settings/l10n/el.json
+++ b/apps/settings/l10n/el.json
@@ -241,15 +241,19 @@
"All languages" : "Όλες οι γλώσσες",
"Password change is disabled because the master key is disabled" : "Η αλλαγή κωδικού είναι απενεργοποιημένη επειδή το κεντρικό κλειδί είναι απενεργοποιημένο",
"Passwordless authentication requires a secure connection." : "Η σύνδεση χωρίς κωδικό πρόσβασης απαιτεί ασφαλή σύνδεση.",
+ "Add WebAuthn device" : "Προσθήκη συσκευής WebAuthn ",
"Please authorize your WebAuthn device." : "Παρακαλώ εξουσιοδοτήστε την συσκευή σας WebAuthn.",
"Name your device" : "Ονομάστε την συσκευή σας",
"Add" : "Προσθήκη",
"Adding your device …" : "Πρόσθεση της συσκευής σας ...",
+ "Server error while trying to add WebAuthn device" : "Σφάλμα διακομιστή κατά την προσθήκη συσκευής webAuthn",
+ "Server error while trying to complete WebAuthn device registration" : "Σφάλμα διακομιστή κατά την εγγραφή συσκευής WebAuthn",
"Unnamed device" : "Ανώνυμη συσκευή",
"Passwordless Authentication" : "Πιστοποίηση χωρίς Κωδικό Πρόσβασης",
"Set up your account for passwordless authentication following the FIDO2 standard." : "Ρυθμίστε τον λογαριασμό σας για πιστοποίηση χωρίς κωδικό ακολουθώντας τα πρότυπα του FIDO2.",
"No devices configured." : "Καμιά συσκευή δεν ρυθμίστηκε.",
"The following devices are configured for your account:" : "Οι ακόλουθες συσκευές ρυθμίστηκαν για τον λογαριασμό σας:",
+ "Your browser does not support WebAuthn." : "Ο περιηγητής σας δεν υποστηρίζει το WebAuthn.",
"Your apps" : "Οι εφαρμογές σας",
"Active apps" : "Ενεργές εφαρμογές",
"Disabled apps" : "Απενεργοποιημένες εφαρμογές",
diff --git a/apps/settings/l10n/tr.js b/apps/settings/l10n/tr.js
index 85aaad5abec..b55bffc4485 100644
--- a/apps/settings/l10n/tr.js
+++ b/apps/settings/l10n/tr.js
@@ -242,10 +242,20 @@ OC.L10N.register(
"Common languages" : "Sık kullanılan diller",
"All languages" : "Tüm diller",
"Password change is disabled because the master key is disabled" : "Ana anahtar devre dışı bırakıldığından parola değişikliği devre dışı bırakıldı.",
+ "Passwordless authentication requires a secure connection." : "Parolasız kimlik doğrulama özelliği güvenli bir bağlantı üzerinden kullanılabilir.",
+ "Add WebAuthn device" : "WebAuthn aygıtı ekle",
+ "Please authorize your WebAuthn device." : "Lütfen WebAuthn aygıtınızın kimliğini doğrulayın.",
"Name your device" : "Aygıtınıza bir ad verin",
"Add" : "Ekle",
"Adding your device …" : "Aygıtınız ekleniyor …",
+ "Server error while trying to add WebAuthn device" : "WebAuthn aygıtı eklenirken sunucu sorunu çıktı",
+ "Server error while trying to complete WebAuthn device registration" : "WebAuthn aygıtı kaydedilirken sunucu sorunu çıktı",
"Unnamed device" : "Adsız aygıt",
+ "Passwordless Authentication" : "Parolasız Kimlik Doğrulaması",
+ "Set up your account for passwordless authentication following the FIDO2 standard." : "Hesabınız için FIDO2 standardına uygun parolasız kimlik doğrulamasını kurun.",
+ "No devices configured." : "Herhangi bir aygıt yapılandırılmamış.",
+ "The following devices are configured for your account:" : "Hesabınız için şu aygıtlar yapılandırılmış:",
+ "Your browser does not support WebAuthn." : "Web tarayıcınız WebAuthn desteklemiyor.",
"Your apps" : "Uygulamalarınız",
"Active apps" : "Etkin uygulamalar",
"Disabled apps" : "Devre Dışı Uygulamalar",
@@ -362,6 +372,7 @@ OC.L10N.register(
"Exclude groups from sharing" : "Gruplar paylaşıma katılmasın",
"These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar paylaşımları alabilir ancak başlatamaz.",
"Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered." : "Bu seçenek etkinleştirildiğinde, paylaşma penceresindeki kullanıcı adı otomatik olarak tamamlanır. Devre dışı bırakıldığında tam kullanıcı adının ya da e-posta adresinin yazılması gerekir.",
+ "Restrict username autocompletion to users within the same groups" : "Aynı gruplardaki kullanıcıların kullanıcı adlarının otomatik tamamlanması kısıtlansın",
"Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Herkese açık bağlantı yükleme sayfasındaki sorumluluk reddi bildirim metni (yalnız dosya listesi gizli iken görüntülenir).",
"This text will be shown on the public link upload page when the file list is hidden." : "Dosya listesi gizli iken herkese açık bağlantı yükleme sayfasında görüntülenecek sorumluluk reddi bildirimi metni.",
"Default share permissions" : "Varsayılan paylaşım izinleri",
diff --git a/apps/settings/l10n/tr.json b/apps/settings/l10n/tr.json
index 963528b68bc..852dc6b9e88 100644
--- a/apps/settings/l10n/tr.json
+++ b/apps/settings/l10n/tr.json
@@ -240,10 +240,20 @@
"Common languages" : "Sık kullanılan diller",
"All languages" : "Tüm diller",
"Password change is disabled because the master key is disabled" : "Ana anahtar devre dışı bırakıldığından parola değişikliği devre dışı bırakıldı.",
+ "Passwordless authentication requires a secure connection." : "Parolasız kimlik doğrulama özelliği güvenli bir bağlantı üzerinden kullanılabilir.",
+ "Add WebAuthn device" : "WebAuthn aygıtı ekle",
+ "Please authorize your WebAuthn device." : "Lütfen WebAuthn aygıtınızın kimliğini doğrulayın.",
"Name your device" : "Aygıtınıza bir ad verin",
"Add" : "Ekle",
"Adding your device …" : "Aygıtınız ekleniyor …",
+ "Server error while trying to add WebAuthn device" : "WebAuthn aygıtı eklenirken sunucu sorunu çıktı",
+ "Server error while trying to complete WebAuthn device registration" : "WebAuthn aygıtı kaydedilirken sunucu sorunu çıktı",
"Unnamed device" : "Adsız aygıt",
+ "Passwordless Authentication" : "Parolasız Kimlik Doğrulaması",
+ "Set up your account for passwordless authentication following the FIDO2 standard." : "Hesabınız için FIDO2 standardına uygun parolasız kimlik doğrulamasını kurun.",
+ "No devices configured." : "Herhangi bir aygıt yapılandırılmamış.",
+ "The following devices are configured for your account:" : "Hesabınız için şu aygıtlar yapılandırılmış:",
+ "Your browser does not support WebAuthn." : "Web tarayıcınız WebAuthn desteklemiyor.",
"Your apps" : "Uygulamalarınız",
"Active apps" : "Etkin uygulamalar",
"Disabled apps" : "Devre Dışı Uygulamalar",
@@ -360,6 +370,7 @@
"Exclude groups from sharing" : "Gruplar paylaşıma katılmasın",
"These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar paylaşımları alabilir ancak başlatamaz.",
"Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered." : "Bu seçenek etkinleştirildiğinde, paylaşma penceresindeki kullanıcı adı otomatik olarak tamamlanır. Devre dışı bırakıldığında tam kullanıcı adının ya da e-posta adresinin yazılması gerekir.",
+ "Restrict username autocompletion to users within the same groups" : "Aynı gruplardaki kullanıcıların kullanıcı adlarının otomatik tamamlanması kısıtlansın",
"Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Herkese açık bağlantı yükleme sayfasındaki sorumluluk reddi bildirim metni (yalnız dosya listesi gizli iken görüntülenir).",
"This text will be shown on the public link upload page when the file list is hidden." : "Dosya listesi gizli iken herkese açık bağlantı yükleme sayfasında görüntülenecek sorumluluk reddi bildirimi metni.",
"Default share permissions" : "Varsayılan paylaşım izinleri",
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index 6f3bb539eff..e386f29a94e 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -146,9 +146,9 @@ class CheckSetupController extends Controller {
}
/**
- * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
- * @return bool
- */
+ * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
+ * @return bool
+ */
private function isSiteReachable($sitename) {
$httpSiteName = 'http://' . $sitename . '/';
$httpsSiteName = 'https://' . $sitename . '/';
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
index d7de5b75053..d6bbd77dc3b 100644
--- a/apps/theming/templates/settings-admin.php
+++ b/apps/theming/templates/settings-admin.php
@@ -1,6 +1,6 @@
<?php
/**
-
+ *
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Jan-Christoph Borchardt <hey@jancborchardt.net>
diff --git a/apps/updatenotification/l10n/zh_TW.js b/apps/updatenotification/l10n/zh_TW.js
index 6bf1387c363..f9cb310d65b 100644
--- a/apps/updatenotification/l10n/zh_TW.js
+++ b/apps/updatenotification/l10n/zh_TW.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"The selected update channel does not support updates of the server." : "所選的更新頻道不提供伺服器軟體的更新",
"Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "請確定您的 config.php 設定檔中並沒有將<samp>appstoreenabled</samp>的值設定為 false",
"Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "無法連線至應用程式商店,或者應用程式商店回應無任何更新,請您手動搜尋更新,或者修復您伺服器的網際網路連線,讓它可以連線至應用程式商店。",
- "View changelog" : "檢視版本更新紀錄"
+ "View changelog" : "檢視版本更新紀錄",
+ "Beta" : "Beta 測試版"
},
"nplurals=1; plural=0;");
diff --git a/apps/updatenotification/l10n/zh_TW.json b/apps/updatenotification/l10n/zh_TW.json
index 12496029f5b..9e65aadf9ef 100644
--- a/apps/updatenotification/l10n/zh_TW.json
+++ b/apps/updatenotification/l10n/zh_TW.json
@@ -22,6 +22,7 @@
"The selected update channel does not support updates of the server." : "所選的更新頻道不提供伺服器軟體的更新",
"Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "請確定您的 config.php 設定檔中並沒有將<samp>appstoreenabled</samp>的值設定為 false",
"Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "無法連線至應用程式商店,或者應用程式商店回應無任何更新,請您手動搜尋更新,或者修復您伺服器的網際網路連線,讓它可以連線至應用程式商店。",
- "View changelog" : "檢視版本更新紀錄"
+ "View changelog" : "檢視版本更新紀錄",
+ "Beta" : "Beta 測試版"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index fecc3b4d4de..e23aa6b4549 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -90,8 +90,8 @@ class Access extends LDAPUtility {
protected $userMapper;
/**
- * @var AbstractMapping $userMapper
- */
+ * @var AbstractMapping $userMapper
+ */
protected $groupMapper;
/**
@@ -1453,11 +1453,11 @@ class Access extends LDAPUtility {
}
/**
- * escapes (user provided) parts for LDAP filter
- * @param string $input, the provided value
- * @param bool $allowAsterisk whether in * at the beginning should be preserved
- * @return string the escaped string
- */
+ * escapes (user provided) parts for LDAP filter
+ * @param string $input, the provided value
+ * @param bool $allowAsterisk whether in * at the beginning should be preserved
+ * @return string the escaped string
+ */
public function escapeFilterPart($input, $allowAsterisk = false) {
$asterisk = '';
if($allowAsterisk && strlen($input) > 0 && $input[0] === '*') {
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
index f119780f2c6..11fd0b462d9 100644
--- a/apps/user_ldap/lib/Group_LDAP.php
+++ b/apps/user_ldap/lib/Group_LDAP.php
@@ -1129,13 +1129,13 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD
}
/**
- * Check if backend implements actions
- * @param int $actions bitwise-or'ed actions
- * @return boolean
- *
- * Returns the supported actions as int to be
- * compared with GroupInterface::CREATE_GROUP etc.
- */
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
+ *
+ * Returns the supported actions as int to be
+ * compared with GroupInterface::CREATE_GROUP etc.
+ */
public function implementsActions($actions) {
return (bool)((GroupInterface::COUNT_USERS |
$this->groupPluginManager->getImplementedActions()) & $actions);
diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
index e16829e09d9..14075da5c0e 100644
--- a/apps/user_ldap/lib/Mapping/AbstractMapping.php
+++ b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -27,9 +27,9 @@
namespace OCA\User_LDAP\Mapping;
/**
-* Class AbstractMapping
-* @package OCA\User_LDAP\Mapping
-*/
+ * Class AbstractMapping
+ * @package OCA\User_LDAP\Mapping
+ */
abstract class AbstractMapping {
/**
* @var \OCP\IDBConnection $dbc
diff --git a/apps/user_ldap/lib/Mapping/GroupMapping.php b/apps/user_ldap/lib/Mapping/GroupMapping.php
index 6922a010533..cc779817f1a 100644
--- a/apps/user_ldap/lib/Mapping/GroupMapping.php
+++ b/apps/user_ldap/lib/Mapping/GroupMapping.php
@@ -24,15 +24,15 @@
namespace OCA\User_LDAP\Mapping;
/**
-* Class UserMapping
-* @package OCA\User_LDAP\Mapping
-*/
+ * Class UserMapping
+ * @package OCA\User_LDAP\Mapping
+ */
class GroupMapping extends AbstractMapping {
/**
- * returns the DB table name which holds the mappings
- * @return string
- */
+ * returns the DB table name which holds the mappings
+ * @return string
+ */
protected function getTableName() {
return '*PREFIX*ldap_group_mapping';
}
diff --git a/apps/user_ldap/lib/Mapping/UserMapping.php b/apps/user_ldap/lib/Mapping/UserMapping.php
index 9fde960959f..31ac8a05326 100644
--- a/apps/user_ldap/lib/Mapping/UserMapping.php
+++ b/apps/user_ldap/lib/Mapping/UserMapping.php
@@ -24,9 +24,9 @@
namespace OCA\User_LDAP\Mapping;
/**
-* Class UserMapping
-* @package OCA\User_LDAP\Mapping
-*/
+ * Class UserMapping
+ * @package OCA\User_LDAP\Mapping
+ */
class UserMapping extends AbstractMapping {
/**
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index b4ceb8f1f40..917a2aaf84c 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -365,11 +365,11 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
}
/**
- * returns whether a user was deleted in LDAP
- *
- * @param string $uid The username of the user to delete
- * @return bool
- */
+ * returns whether a user was deleted in LDAP
+ *
+ * @param string $uid The username of the user to delete
+ * @return bool
+ */
public function deleteUser($uid) {
if ($this->userPluginManager->canDeleteUser()) {
$status = $this->userPluginManager->deleteUser($uid);
@@ -522,13 +522,13 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
}
/**
- * Check if backend implements actions
- * @param int $actions bitwise-or'ed actions
- * @return boolean
- *
- * Returns the supported actions as int to be
- * compared with \OC\User\Backend::CREATE_USER etc.
- */
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
+ *
+ * Returns the supported actions as int to be
+ * compared with \OC\User\Backend::CREATE_USER etc.
+ */
public function implementsActions($actions) {
return (bool)((Backend::CHECK_PASSWORD
| Backend::GET_HOME