diff options
Diffstat (limited to 'apps/files_external')
58 files changed, 222 insertions, 71 deletions
diff --git a/apps/files_external/3rdparty/.gitignore b/apps/files_external/3rdparty/.gitignore index a7913dd4308..ce8b521ff54 100644 --- a/apps/files_external/3rdparty/.gitignore +++ b/apps/files_external/3rdparty/.gitignore @@ -1,6 +1,7 @@ example.php icewind/smb/tests icewind/smb/install_libsmbclient.sh +icewind/smb/Makefile icewind/smb/.travis.yml icewind/smb/.scrutinizer.yml icewind/streams/tests diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json index b556de7c395..9655a8f1564 100644 --- a/apps/files_external/3rdparty/composer.json +++ b/apps/files_external/3rdparty/composer.json @@ -8,8 +8,7 @@ "classmap-authoritative": true }, "require": { - "icewind/smb": "2.0.4", - "icewind/streams": "0.5.2" + "icewind/streams": "0.5.2", + "icewind/smb": "2.0.5" } } - diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock index 2ec6ee94c8d..f3987e2c1e3 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#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "8b87ff18cd1c30945c631607fbfbf8b7", + "content-hash": "53a1e7ab19e98c20c720cab0340bc56a", "packages": [ { "name": "icewind/smb", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd" + "reference": "b888dd81bd05532677e1469849d9065011256a33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/f258947a6f840cc9655ba81744872f9bb292a7dd", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/b888dd81bd05532677e1469849d9065011256a33", + "reference": "b888dd81bd05532677e1469849d9065011256a33", "shasum": "" }, "require": { @@ -45,7 +45,7 @@ } ], "description": "php wrapper for smbclient and libsmbclient-php", - "time": "2018-01-19T14:36:36+00:00" + "time": "2018-03-28T13:51:31+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 d51895234b4..b4a1d64eb0f 100644 --- a/apps/files_external/3rdparty/composer/autoload_classmap.php +++ b/apps/files_external/3rdparty/composer/autoload_classmap.php @@ -72,20 +72,21 @@ return array( 'Icewind\\Streams\\PathWrapper' => $vendorDir . '/icewind/streams/src/PathWrapper.php', 'Icewind\\Streams\\RetryWrapper' => $vendorDir . '/icewind/streams/src/RetryWrapper.php', 'Icewind\\Streams\\SeekableWrapper' => $vendorDir . '/icewind/streams/src/SeekableWrapper.php', - 'Icewind\\Streams\\Tests\\CallbackWrapper' => $vendorDir . '/icewind/streams/tests/CallbackWrapper.php', + 'Icewind\\Streams\\Tests\\CallbackWrapperTest' => $vendorDir . '/icewind/streams/tests/CallbackWrapperTest.php', + 'Icewind\\Streams\\Tests\\CountWrapperTest' => $vendorDir . '/icewind/streams/tests/CountWrapperTest.php', 'Icewind\\Streams\\Tests\\DirectoryFilter' => $vendorDir . '/icewind/streams/tests/DirectoryFilter.php', 'Icewind\\Streams\\Tests\\DirectoryWrapper' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperDummy' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperNull' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\FailWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\IteratorDirectory' => $vendorDir . '/icewind/streams/tests/IteratorDirectory.php', - 'Icewind\\Streams\\Tests\\NullWrapper' => $vendorDir . '/icewind/streams/tests/NullWrapper.php', + 'Icewind\\Streams\\Tests\\NullWrapperTest' => $vendorDir . '/icewind/streams/tests/NullWrapperTest.php', 'Icewind\\Streams\\Tests\\PartialWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\PathWrapper' => $vendorDir . '/icewind/streams/tests/PathWrapper.php', - 'Icewind\\Streams\\Tests\\RetryWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', + 'Icewind\\Streams\\Tests\\RetryWrapperTest' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\SeekableWrapper' => $vendorDir . '/icewind/streams/tests/SeekableWrapper.php', 'Icewind\\Streams\\Tests\\UrlCallBack' => $vendorDir . '/icewind/streams/tests/UrlCallBack.php', - 'Icewind\\Streams\\Tests\\Wrapper' => $vendorDir . '/icewind/streams/tests/Wrapper.php', + 'Icewind\\Streams\\Tests\\WrapperTest' => $vendorDir . '/icewind/streams/tests/WrapperTest.php', 'Icewind\\Streams\\Url' => $vendorDir . '/icewind/streams/src/Url.php', 'Icewind\\Streams\\UrlCallback' => $vendorDir . '/icewind/streams/src/UrlCallBack.php', 'Icewind\\Streams\\Wrapper' => $vendorDir . '/icewind/streams/src/Wrapper.php', diff --git a/apps/files_external/3rdparty/composer/autoload_static.php b/apps/files_external/3rdparty/composer/autoload_static.php index 51739b6b6cd..68698ad1bf8 100644 --- a/apps/files_external/3rdparty/composer/autoload_static.php +++ b/apps/files_external/3rdparty/composer/autoload_static.php @@ -102,20 +102,21 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3 'Icewind\\Streams\\PathWrapper' => __DIR__ . '/..' . '/icewind/streams/src/PathWrapper.php', 'Icewind\\Streams\\RetryWrapper' => __DIR__ . '/..' . '/icewind/streams/src/RetryWrapper.php', 'Icewind\\Streams\\SeekableWrapper' => __DIR__ . '/..' . '/icewind/streams/src/SeekableWrapper.php', - 'Icewind\\Streams\\Tests\\CallbackWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/CallbackWrapper.php', + 'Icewind\\Streams\\Tests\\CallbackWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/CallbackWrapperTest.php', + 'Icewind\\Streams\\Tests\\CountWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/CountWrapperTest.php', 'Icewind\\Streams\\Tests\\DirectoryFilter' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryFilter.php', 'Icewind\\Streams\\Tests\\DirectoryWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperDummy' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\DirectoryWrapperNull' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php', 'Icewind\\Streams\\Tests\\FailWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\IteratorDirectory' => __DIR__ . '/..' . '/icewind/streams/tests/IteratorDirectory.php', - 'Icewind\\Streams\\Tests\\NullWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/NullWrapper.php', + 'Icewind\\Streams\\Tests\\NullWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/NullWrapperTest.php', 'Icewind\\Streams\\Tests\\PartialWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\PathWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/PathWrapper.php', - 'Icewind\\Streams\\Tests\\RetryWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', + 'Icewind\\Streams\\Tests\\RetryWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php', 'Icewind\\Streams\\Tests\\SeekableWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/SeekableWrapper.php', 'Icewind\\Streams\\Tests\\UrlCallBack' => __DIR__ . '/..' . '/icewind/streams/tests/UrlCallBack.php', - 'Icewind\\Streams\\Tests\\Wrapper' => __DIR__ . '/..' . '/icewind/streams/tests/Wrapper.php', + 'Icewind\\Streams\\Tests\\WrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/WrapperTest.php', 'Icewind\\Streams\\Url' => __DIR__ . '/..' . '/icewind/streams/src/Url.php', 'Icewind\\Streams\\UrlCallback' => __DIR__ . '/..' . '/icewind/streams/src/UrlCallBack.php', 'Icewind\\Streams\\Wrapper' => __DIR__ . '/..' . '/icewind/streams/src/Wrapper.php', diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json index 640bebc9175..0ae6be99ffd 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": "v2.0.4", - "version_normalized": "2.0.4.0", + "version": "v2.0.5", + "version_normalized": "2.0.5.0", "source": { "type": "git", "url": "https://github.com/icewind1991/SMB.git", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd" + "reference": "b888dd81bd05532677e1469849d9065011256a33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/icewind1991/SMB/zipball/f258947a6f840cc9655ba81744872f9bb292a7dd", - "reference": "f258947a6f840cc9655ba81744872f9bb292a7dd", + "url": "https://api.github.com/repos/icewind1991/SMB/zipball/b888dd81bd05532677e1469849d9065011256a33", + "reference": "b888dd81bd05532677e1469849d9065011256a33", "shasum": "" }, "require": { @@ -21,9 +21,9 @@ "require-dev": { "phpunit/phpunit": "^4.8" }, - "time": "2018-01-19T14:36:36+00:00", + "time": "2018-03-28T13:51:31+00:00", "type": "library", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-4": { "Icewind\\SMB\\": "src/", diff --git a/apps/files_external/3rdparty/icewind/smb/src/Connection.php b/apps/files_external/3rdparty/icewind/smb/src/Connection.php index 0196231b082..661a361ec54 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Connection.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Connection.php @@ -34,10 +34,14 @@ class Connection extends RawConnection { parent::write($input . PHP_EOL); } + /** + * @throws ConnectException + */ public function clearTillPrompt() { $this->write(''); do { $promptLine = $this->readLine(); + $this->parser->checkConnectionError($promptLine); } while (!$this->isPrompt($promptLine)); $this->write(''); $this->readLine(); diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidArgumentException.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidArgumentException.php new file mode 100644 index 00000000000..f12bb3a3489 --- /dev/null +++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidArgumentException.php @@ -0,0 +1,10 @@ +<?php +/** + * Copyright (c) 2014 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 InvalidArgumentException extends InvalidRequestException {} diff --git a/apps/files_external/3rdparty/icewind/smb/src/Parser.php b/apps/files_external/3rdparty/icewind/smb/src/Parser.php index c6515002657..a30032178b1 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Parser.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Parser.php @@ -81,6 +81,7 @@ class Parser { * @throws AuthenticationException * @throws InvalidHostException * @throws NoLoginServerException + * @throws AccessDeniedException */ public function checkConnectionError($line) { $line = rtrim($line, ')'); @@ -99,6 +100,9 @@ class Parser { if (substr($line, -26) === ErrorCodes::NoLogonServers) { throw new NoLoginServerException('No login server'); } + if (substr($line, -23) === ErrorCodes::AccessDenied) { + throw new AccessDeniedException('Access denied'); + } } public function parseMode($mode) { @@ -133,7 +137,7 @@ class Parser { return [ 'mtime' => strtotime($data['write_time']), 'mode' => hexdec(substr($data['attributes'], strpos($data['attributes'], '('), -1)), - 'size' => isset($data['stream']) ? (int)explode(' ', $data['stream'])[1] : 0 + 'size' => isset($data['stream']) ? (int)(explode(' ', $data['stream'])[1]) : 0 ]; } diff --git a/apps/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php index 4ee922b63ac..a946962a293 100644 --- a/apps/files_external/ajax/applicable.php +++ b/apps/files_external/ajax/applicable.php @@ -21,10 +21,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -OCP\JSON::checkAppEnabled('files_external'); -OCP\JSON::callCheck(); +\OC_JSON::checkAppEnabled('files_external'); +\OC_JSON::callCheck(); -OCP\JSON::checkAdminUser(); +\OC_JSON::checkAdminUser(); $pattern = ''; $limit = null; @@ -51,4 +51,4 @@ foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $of $results = array('groups' => $groups, 'users' => $users); -\OCP\JSON::success($results); +\OC_JSON::success($results); diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php index 9a3f2e0af6a..8a6af8f8a40 100644 --- a/apps/files_external/ajax/oauth2.php +++ b/apps/files_external/ajax/oauth2.php @@ -22,9 +22,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -OCP\JSON::checkAppEnabled('files_external'); -OCP\JSON::checkLoggedIn(); -OCP\JSON::callCheck(); +\OC_JSON::checkAppEnabled('files_external'); +\OC_JSON::checkLoggedIn(); +\OC_JSON::callCheck(); $l = \OC::$server->getL10N('files_external'); // TODO: implement redirect to which storage backend requested this diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index ffe1e972071..983348397d1 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -48,6 +48,12 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE = ' <label for="mountOptionsEncoding">{{mountOptionsEncodingLabel}}</label>'+ ' </span>'+ ' </li>'+ + ' <li class="optionRow">' + + ' <span class="menuitem">' + + ' <input id="mountOptionsReadOnly" class="checkbox" name="readonly" type="checkbox" value="true"/>' + + ' <label for="mountOptionsReadOnly">{{t "files_external" "Read only"}}</label>' + + ' </span>' + + ' </li>' + ' </ul>'+ '</div>'; @@ -916,7 +922,8 @@ MountConfigListView.prototype = _.extend({ 'previews': true, 'enable_sharing': false, 'filesystem_check_changes': 1, - 'encoding_compatibility': false + 'encoding_compatibility': false, + 'readonly': false, })); } @@ -1303,7 +1310,8 @@ MountConfigListView.prototype = _.extend({ 'previews', 'filesystem_check_changes', 'enable_sharing', - 'encoding_compatibility' + 'encoding_compatibility', + 'readonly' ]; if (this._encryptionEnabled) { visibleOptions.push('encrypt'); diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index 6fafc3e5489..eefbbe8c409 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Auf Änderungen prüfen", "Never" : "Nie", "Once every direct access" : "Einmal bei jedem Direktzugriff", + "Read only" : "Schreibgeschützt", "Folder name" : "Ordnername", "External storage" : "Externer Speicher", "Authentication" : "Authentifizierung", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index 89f089605b9..50c07260636 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -110,6 +110,7 @@ "Check for changes" : "Auf Änderungen prüfen", "Never" : "Nie", "Once every direct access" : "Einmal bei jedem Direktzugriff", + "Read only" : "Schreibgeschützt", "Folder name" : "Ordnername", "External storage" : "Externer Speicher", "Authentication" : "Authentifizierung", diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index ca2d37523b2..13e44ab0cb9 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Auf Änderungen prüfen", "Never" : "Nie", "Once every direct access" : "Einmal bei jedem Direktzugriff", + "Read only" : "Schreibgeschützt", "Folder name" : "Ordnername", "External storage" : "Externer Speicher", "Authentication" : "Authentifizierung", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index 4ab53e25cbc..1f19a325427 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -110,6 +110,7 @@ "Check for changes" : "Auf Änderungen prüfen", "Never" : "Nie", "Once every direct access" : "Einmal bei jedem Direktzugriff", + "Read only" : "Schreibgeschützt", "Folder name" : "Ordnername", "External storage" : "Externer Speicher", "Authentication" : "Authentifizierung", diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js index 72b59981ec8..d32c4a23785 100644 --- a/apps/files_external/l10n/el.js +++ b/apps/files_external/l10n/el.js @@ -54,8 +54,10 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "ID πελάτη", "Client secret" : "Μυστικό πελάτη", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Όνομα \"ένοικου\"", "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης", + "OpenStack v3" : "OpenStack v3", "Domain" : "Τομέας", "Rackspace" : "Rackspace", "API key" : "Κλειδί API", diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json index c998f5b9dd5..a25735ba42a 100644 --- a/apps/files_external/l10n/el.json +++ b/apps/files_external/l10n/el.json @@ -52,8 +52,10 @@ "OAuth2" : "OAuth2", "Client ID" : "ID πελάτη", "Client secret" : "Μυστικό πελάτη", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Όνομα \"ένοικου\"", "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης", + "OpenStack v3" : "OpenStack v3", "Domain" : "Τομέας", "Rackspace" : "Rackspace", "API key" : "Κλειδί API", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index f607c38b6d7..bc2328f274e 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Comprobar si hay cambios", "Never" : "Nunca", "Once every direct access" : "Una vez cada acceso directo", + "Read only" : "Solo lectura", "Folder name" : "Nombre de la carpeta", "External storage" : "Almacenamiento externo", "Authentication" : "Autentificación", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index 90800745fee..d959071bdde 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -110,6 +110,7 @@ "Check for changes" : "Comprobar si hay cambios", "Never" : "Nunca", "Once every direct access" : "Una vez cada acceso directo", + "Read only" : "Solo lectura", "Folder name" : "Nombre de la carpeta", "External storage" : "Almacenamiento externo", "Authentication" : "Autentificación", diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js index 3a5084dc55d..aa2f5e6fd7e 100644 --- a/apps/files_external/l10n/es_MX.js +++ b/apps/files_external/l10n/es_MX.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Verificar si hay cambios", "Never" : "Nunca", "Once every direct access" : "Una vez cada acceso directo", + "Read only" : "Sólo lectura", "Folder name" : "Nombre de la carpeta", "External storage" : "Almacenamiento externo", "Authentication" : "Autenticación", diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json index 084edf9a09b..db983dff3aa 100644 --- a/apps/files_external/l10n/es_MX.json +++ b/apps/files_external/l10n/es_MX.json @@ -110,6 +110,7 @@ "Check for changes" : "Verificar si hay cambios", "Never" : "Nunca", "Once every direct access" : "Una vez cada acceso directo", + "Read only" : "Sólo lectura", "Folder name" : "Nombre de la carpeta", "External storage" : "Almacenamiento externo", "Authentication" : "Autenticación", diff --git a/apps/files_external/l10n/fi.js b/apps/files_external/l10n/fi.js index 75ae596099d..c02e671b01d 100644 --- a/apps/files_external/l10n/fi.js +++ b/apps/files_external/l10n/fi.js @@ -1,7 +1,7 @@ OC.L10N.register( "files_external", { - "External storages" : "Ulkoiset tallennustilat", + "External storages" : "Erilliset tallennustilat", "Personal" : "Henkilökohtainen", "System" : "Järjestelmä", "Grant access" : "Salli pääsy", @@ -14,6 +14,7 @@ OC.L10N.register( "(group)" : "(ryhmä)", "Compatibility with Mac NFD encoding (slow)" : "Yhteensopivuus Mac NFD -enkoodauksen kanssa (hidas)", "Admin defined" : "Ylläpitäjän määrittämä", + "Are you sure you want to delete this external storage?" : "Haluatko varmasti poistaa tämän erillisen tallennustilan?", "Delete storage?" : "Poistetaanko tallennustila?", "Saved" : "Tallennettu", "Saving..." : "Tallennetaan...", @@ -23,8 +24,8 @@ OC.L10N.register( "Couldn't get the information from the remote server: {code} {type}" : "Tietojen saaminen etäpalvelimelta epäonnistui: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Erillisten liitospisteiden listauksen noutaminen epäonnistui: {type}", "There was an error with message: " : "Tapahtui virhe viestillä:", - "External mount error" : "Ulkoinen liitosvirhe", - "external-storage" : "ulkoinen taltio", + "External mount error" : "Erillisen liitosvirhe", + "external-storage" : "external-storage", "Couldn't fetch list of Windows network drive mount points: Empty response from server" : "Ei voitu noutaa listaa Windows-verkkoasemien liitoskohdista: tyhjä vastaus palvelimelta", "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Jotkin määritetyt erilliset liitospisteet eivät ole yhdistettynä. Napsauta punaisia rivejä saadaksesi lisätietoja", "Please enter the credentials for the {mount} mount" : "Anna kirjautumistiedot liitokselle {mount}", @@ -55,8 +56,10 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "Asiakkaan tunniste", "Client secret" : "Asiakassalaisuus", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Tenant nimi", "Identity endpoint URL" : "Määritä URL-päätepiste", + "OpenStack v3" : "OpenStack v3", "Domain" : "Domaini", "Rackspace" : "Rackspace", "API key" : "API-avain", @@ -99,6 +102,7 @@ OC.L10N.register( "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "FTP tuki PHPsta ei ole aktivoitu tai asennettu. Kohteen %s liittäminen ei ole mahdollista. Ota yhteyttä järjestelmänvalvojaan asentaaksesi puuttuvan osan.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.", "External storage support" : "Erillisen tallennustilan tuki", + "No external storage configured or you don't have the permission to configure them" : "Erillistä tallennustilaa ei ole määritelty tai sinulla ei ole oikeuksia määrittää erillisiä tallennustiloja", "Name" : "Nimi", "Storage type" : "Tallennustilan tyyppi", "Scope" : "Näkyvyysalue", @@ -108,8 +112,9 @@ OC.L10N.register( "Check for changes" : "Tarkista muutokset", "Never" : "Ei koskaan", "Once every direct access" : "Kerran aina suoran käytön yhteydessä", + "Read only" : "Vain luku", "Folder name" : "Kansion nimi", - "External storage" : "Ulkoinen tallennustila", + "External storage" : "Erillinen tallennustila", "Authentication" : "Tunnistautuminen", "Configuration" : "Asetukset", "Available for" : "Saatavuus", @@ -118,6 +123,8 @@ OC.L10N.register( "Delete" : "Poista", "Allow users to mount external storage" : "Salli käyttäjien liittää erillisiä tallennustiloja", "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet", + "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s", + "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s", "Dropbox App Configuration" : "Dropbox-sovelluksen määritykset", "Google Drive App Configuration" : "Google Drive -sovelluksen määritykset", "OpenStack" : "OpenStack", diff --git a/apps/files_external/l10n/fi.json b/apps/files_external/l10n/fi.json index 90da30e76fb..e0a7035f105 100644 --- a/apps/files_external/l10n/fi.json +++ b/apps/files_external/l10n/fi.json @@ -1,5 +1,5 @@ { "translations": { - "External storages" : "Ulkoiset tallennustilat", + "External storages" : "Erilliset tallennustilat", "Personal" : "Henkilökohtainen", "System" : "Järjestelmä", "Grant access" : "Salli pääsy", @@ -12,6 +12,7 @@ "(group)" : "(ryhmä)", "Compatibility with Mac NFD encoding (slow)" : "Yhteensopivuus Mac NFD -enkoodauksen kanssa (hidas)", "Admin defined" : "Ylläpitäjän määrittämä", + "Are you sure you want to delete this external storage?" : "Haluatko varmasti poistaa tämän erillisen tallennustilan?", "Delete storage?" : "Poistetaanko tallennustila?", "Saved" : "Tallennettu", "Saving..." : "Tallennetaan...", @@ -21,8 +22,8 @@ "Couldn't get the information from the remote server: {code} {type}" : "Tietojen saaminen etäpalvelimelta epäonnistui: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Erillisten liitospisteiden listauksen noutaminen epäonnistui: {type}", "There was an error with message: " : "Tapahtui virhe viestillä:", - "External mount error" : "Ulkoinen liitosvirhe", - "external-storage" : "ulkoinen taltio", + "External mount error" : "Erillisen liitosvirhe", + "external-storage" : "external-storage", "Couldn't fetch list of Windows network drive mount points: Empty response from server" : "Ei voitu noutaa listaa Windows-verkkoasemien liitoskohdista: tyhjä vastaus palvelimelta", "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Jotkin määritetyt erilliset liitospisteet eivät ole yhdistettynä. Napsauta punaisia rivejä saadaksesi lisätietoja", "Please enter the credentials for the {mount} mount" : "Anna kirjautumistiedot liitokselle {mount}", @@ -53,8 +54,10 @@ "OAuth2" : "OAuth2", "Client ID" : "Asiakkaan tunniste", "Client secret" : "Asiakassalaisuus", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Tenant nimi", "Identity endpoint URL" : "Määritä URL-päätepiste", + "OpenStack v3" : "OpenStack v3", "Domain" : "Domaini", "Rackspace" : "Rackspace", "API key" : "API-avain", @@ -97,6 +100,7 @@ "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "FTP tuki PHPsta ei ole aktivoitu tai asennettu. Kohteen %s liittäminen ei ole mahdollista. Ota yhteyttä järjestelmänvalvojaan asentaaksesi puuttuvan osan.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.", "External storage support" : "Erillisen tallennustilan tuki", + "No external storage configured or you don't have the permission to configure them" : "Erillistä tallennustilaa ei ole määritelty tai sinulla ei ole oikeuksia määrittää erillisiä tallennustiloja", "Name" : "Nimi", "Storage type" : "Tallennustilan tyyppi", "Scope" : "Näkyvyysalue", @@ -106,8 +110,9 @@ "Check for changes" : "Tarkista muutokset", "Never" : "Ei koskaan", "Once every direct access" : "Kerran aina suoran käytön yhteydessä", + "Read only" : "Vain luku", "Folder name" : "Kansion nimi", - "External storage" : "Ulkoinen tallennustila", + "External storage" : "Erillinen tallennustila", "Authentication" : "Tunnistautuminen", "Configuration" : "Asetukset", "Available for" : "Saatavuus", @@ -116,6 +121,8 @@ "Delete" : "Poista", "Allow users to mount external storage" : "Salli käyttäjien liittää erillisiä tallennustiloja", "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet", + "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s", + "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s", "Dropbox App Configuration" : "Dropbox-sovelluksen määritykset", "Google Drive App Configuration" : "Google Drive -sovelluksen määritykset", "OpenStack" : "OpenStack", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index 7533b976a14..a3b12150d45 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Rechercher les modifications", "Never" : "Jamais", "Once every direct access" : "Une fois à chaque accès direct", + "Read only" : "Lecture seule", "Folder name" : "Nom du dossier", "External storage" : "Stockage externe", "Authentication" : "Authentification", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index 73b8bc28c5b..8b0bc077c0e 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -110,6 +110,7 @@ "Check for changes" : "Rechercher les modifications", "Never" : "Jamais", "Once every direct access" : "Une fois à chaque accès direct", + "Read only" : "Lecture seule", "Folder name" : "Nom du dossier", "External storage" : "Stockage externe", "Authentication" : "Authentification", diff --git a/apps/files_external/l10n/hu.js b/apps/files_external/l10n/hu.js index 93c15e40760..f5960a1fca4 100644 --- a/apps/files_external/l10n/hu.js +++ b/apps/files_external/l10n/hu.js @@ -14,6 +14,7 @@ OC.L10N.register( "(group)" : "(csoport)", "Compatibility with Mac NFD encoding (slow)" : "Kompatibilitás a Mac NFD kódolással (lassú)", "Admin defined" : "Adminisztrátor definiálva", + "Are you sure you want to delete this external storage?" : "Biztosan törlöd ezt a külső tárolót?", "Delete storage?" : "Tároló törlése?", "Saved" : "Elmentve", "Saving..." : "Mentés...", diff --git a/apps/files_external/l10n/hu.json b/apps/files_external/l10n/hu.json index b2e1eb711f0..041a9f6ecd8 100644 --- a/apps/files_external/l10n/hu.json +++ b/apps/files_external/l10n/hu.json @@ -12,6 +12,7 @@ "(group)" : "(csoport)", "Compatibility with Mac NFD encoding (slow)" : "Kompatibilitás a Mac NFD kódolással (lassú)", "Admin defined" : "Adminisztrátor definiálva", + "Are you sure you want to delete this external storage?" : "Biztosan törlöd ezt a külső tárolót?", "Delete storage?" : "Tároló törlése?", "Saved" : "Elmentve", "Saving..." : "Mentés...", diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js index 7f210eda5dc..0e4468deba8 100644 --- a/apps/files_external/l10n/is.js +++ b/apps/files_external/l10n/is.js @@ -14,6 +14,7 @@ OC.L10N.register( "(group)" : "(hópur)", "Compatibility with Mac NFD encoding (slow)" : "Samhæfni við Mac NFD kóðun (hægvirkt)", "Admin defined" : "Skilgreindur kerfisstjóri", + "Are you sure you want to delete this external storage?" : "Ertu viss um að þú viljir eyða þessari ytri geymslu?", "Delete storage?" : "Eyða geymslu?", "Saved" : "Vistað", "Saving..." : "Er að vista ...", @@ -55,8 +56,10 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "Biðlaraauðkenni", "Client secret" : "Leynilykill biðlara", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Nafn handhafa (tenant)", "Identity endpoint URL" : "Endapunktur auðkennisslóðar (identity endpoint URL)", + "OpenStack v3" : "OpenStack v3", "Domain" : "Lén", "Rackspace" : "Rackspace", "API key" : "API-lykill", @@ -74,6 +77,7 @@ OC.L10N.register( "Region" : "Svæði", "Enable SSL" : "Virkja SSL", "Enable Path Style" : "Virkja slóðastíl", + "Legacy (v2) authentication" : "Eldri (v2) auðkenning", "WebDAV" : "WebDAV", "URL" : "Slóð (URL)", "Remote subfolder" : "Fjartengd undirmappa", @@ -97,6 +101,8 @@ OC.L10N.register( "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Stuðningur við cURL í PHP er ekki virkjaður eða ekki uppsettur. Tenging %s í skráakerfi er ekki möguleg. Biddu kerfisstjórann þinn um að setja þetta upp.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Stuðningur við FTP í PHP er ekki virkjaður eða ekki uppsettur. Tenging %s í skráakerfi er ekki möguleg. Biddu kerfisstjórann þinn um að setja þetta upp.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" er ekki uppsett. Tenging %s í skráakerfi er ekki möguleg. Biddu kerfisstjórann þinn um að setja þetta upp.", + "External storage support" : "Stuðningur við utanaðkomandi gagnageymslur", + "No external storage configured or you don't have the permission to configure them" : "Engin utanaðkomandi gagnageymsla er uppsett eða að þú hefur ekki heimild til að stilla slíkt", "Name" : "Nafn", "Storage type" : "Tegund gagnageymslu", "Scope" : "Umfang", @@ -111,12 +117,21 @@ OC.L10N.register( "Authentication" : "Auðkenning", "Configuration" : "Uppsetning", "Available for" : "Tiltækt fyrir", + "Click to recheck the configuration" : "Smelltu til að yfirfara aftur uppsetninguna", "Add storage" : "Bæta við gagnahirslu", "Advanced settings" : "Ítarlegri valkostir", "Delete" : "Eyða", "Allow users to mount external storage" : "Leyfa notendum að tengja ytri gagnageymslur í skráakerfi", "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi", + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Mistókst að ná í beiðniteikn (request token). Gakktu úr skugga um að forritslykill og leynilykill séu réttir.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Mistókst að ná í aðgangsteikn (access token). Gakktu úr skugga um að forritslykill og leynilykill séu réttir.", + "Step 1 failed. Exception: %s" : "Skref 1 mistókst. Undantekning: %s", + "Step 2 failed. Exception: %s" : "Skref 2 mistókst. Undantekning: %s", + "Dropbox App Configuration" : "Uppsetning Dropbox forrits", + "Google Drive App Configuration" : "Uppsetning Google Drive forrits", "OpenStack" : "OpenStack", + "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "Engin ytri-gagnageymsla stillt", "You can add external storages in the personal settings" : "Þú getur bætt við ytri gagnageymslum í einkastillingunum þínum", "Are you sure you want to delete this external storage" : "Ertu viss um að þú viljir eyða þessari ytri geymslu?" diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json index ee60db7edb4..f9aa30cfdec 100644 --- a/apps/files_external/l10n/is.json +++ b/apps/files_external/l10n/is.json @@ -12,6 +12,7 @@ "(group)" : "(hópur)", "Compatibility with Mac NFD encoding (slow)" : "Samhæfni við Mac NFD kóðun (hægvirkt)", "Admin defined" : "Skilgreindur kerfisstjóri", + "Are you sure you want to delete this external storage?" : "Ertu viss um að þú viljir eyða þessari ytri geymslu?", "Delete storage?" : "Eyða geymslu?", "Saved" : "Vistað", "Saving..." : "Er að vista ...", @@ -53,8 +54,10 @@ "OAuth2" : "OAuth2", "Client ID" : "Biðlaraauðkenni", "Client secret" : "Leynilykill biðlara", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Nafn handhafa (tenant)", "Identity endpoint URL" : "Endapunktur auðkennisslóðar (identity endpoint URL)", + "OpenStack v3" : "OpenStack v3", "Domain" : "Lén", "Rackspace" : "Rackspace", "API key" : "API-lykill", @@ -72,6 +75,7 @@ "Region" : "Svæði", "Enable SSL" : "Virkja SSL", "Enable Path Style" : "Virkja slóðastíl", + "Legacy (v2) authentication" : "Eldri (v2) auðkenning", "WebDAV" : "WebDAV", "URL" : "Slóð (URL)", "Remote subfolder" : "Fjartengd undirmappa", @@ -95,6 +99,8 @@ "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Stuðningur við cURL í PHP er ekki virkjaður eða ekki uppsettur. Tenging %s í skráakerfi er ekki möguleg. Biddu kerfisstjórann þinn um að setja þetta upp.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Stuðningur við FTP í PHP er ekki virkjaður eða ekki uppsettur. Tenging %s í skráakerfi er ekki möguleg. Biddu kerfisstjórann þinn um að setja þetta upp.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" er ekki uppsett. Tenging %s í skráakerfi er ekki möguleg. Biddu kerfisstjórann þinn um að setja þetta upp.", + "External storage support" : "Stuðningur við utanaðkomandi gagnageymslur", + "No external storage configured or you don't have the permission to configure them" : "Engin utanaðkomandi gagnageymsla er uppsett eða að þú hefur ekki heimild til að stilla slíkt", "Name" : "Nafn", "Storage type" : "Tegund gagnageymslu", "Scope" : "Umfang", @@ -109,12 +115,21 @@ "Authentication" : "Auðkenning", "Configuration" : "Uppsetning", "Available for" : "Tiltækt fyrir", + "Click to recheck the configuration" : "Smelltu til að yfirfara aftur uppsetninguna", "Add storage" : "Bæta við gagnahirslu", "Advanced settings" : "Ítarlegri valkostir", "Delete" : "Eyða", "Allow users to mount external storage" : "Leyfa notendum að tengja ytri gagnageymslur í skráakerfi", "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi", + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Mistókst að ná í beiðniteikn (request token). Gakktu úr skugga um að forritslykill og leynilykill séu réttir.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Mistókst að ná í aðgangsteikn (access token). Gakktu úr skugga um að forritslykill og leynilykill séu réttir.", + "Step 1 failed. Exception: %s" : "Skref 1 mistókst. Undantekning: %s", + "Step 2 failed. Exception: %s" : "Skref 2 mistókst. Undantekning: %s", + "Dropbox App Configuration" : "Uppsetning Dropbox forrits", + "Google Drive App Configuration" : "Uppsetning Google Drive forrits", "OpenStack" : "OpenStack", + "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "Engin ytri-gagnageymsla stillt", "You can add external storages in the personal settings" : "Þú getur bætt við ytri gagnageymslum í einkastillingunum þínum", "Are you sure you want to delete this external storage" : "Ertu viss um að þú viljir eyða þessari ytri geymslu?" diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js index 26cf94da6d5..f8ac97f6f68 100644 --- a/apps/files_external/l10n/it.js +++ b/apps/files_external/l10n/it.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Controlla le modifiche", "Never" : "Mai", "Once every direct access" : "Una volta per ogni accesso diretto", + "Read only" : "Sola lettura", "Folder name" : "Nome della cartella", "External storage" : "Archiviazione esterna", "Authentication" : "Autenticazione", diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json index a8151db2395..6495f32fc8d 100644 --- a/apps/files_external/l10n/it.json +++ b/apps/files_external/l10n/it.json @@ -110,6 +110,7 @@ "Check for changes" : "Controlla le modifiche", "Never" : "Mai", "Once every direct access" : "Una volta per ogni accesso diretto", + "Read only" : "Sola lettura", "Folder name" : "Nome della cartella", "External storage" : "Archiviazione esterna", "Authentication" : "Autenticazione", diff --git a/apps/files_external/l10n/nb.js b/apps/files_external/l10n/nb.js index c5020364ad8..711208d2d95 100644 --- a/apps/files_external/l10n/nb.js +++ b/apps/files_external/l10n/nb.js @@ -14,6 +14,7 @@ OC.L10N.register( "(group)" : "(gruppe)", "Compatibility with Mac NFD encoding (slow)" : "Kompatibelt med Mac NFD koding (treg)", "Admin defined" : "Admin-definert", + "Are you sure you want to delete this external storage?" : "Er du sikker på at du ønsker å slette dette eksterne lageret?", "Delete storage?" : "Slett lagringsplass", "Saved" : "Lagret", "Saving..." : "Lagrer…", @@ -55,8 +56,10 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "Klient-ID", "Client secret" : "Klient-hemmelighet", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Prosjektnavn", "Identity endpoint URL" : "URL for identitets-endepunkt", + "OpenStack v3" : "OpenStack v3", "Domain" : "Domene", "Rackspace" : "Rackspace", "API key" : "API-nøkkel", @@ -113,6 +116,7 @@ OC.L10N.register( "Authentication" : "Autentisering", "Configuration" : "Oppsett", "Available for" : "Tilgjengelig for", + "Click to recheck the configuration" : "Klikk for å sjekke oppsettet igjen", "Add storage" : "Legg til lagringsplass", "Advanced settings" : "Avanserte innstillinger", "Delete" : "Slett", diff --git a/apps/files_external/l10n/nb.json b/apps/files_external/l10n/nb.json index 2e0e3e16469..cc67c004768 100644 --- a/apps/files_external/l10n/nb.json +++ b/apps/files_external/l10n/nb.json @@ -12,6 +12,7 @@ "(group)" : "(gruppe)", "Compatibility with Mac NFD encoding (slow)" : "Kompatibelt med Mac NFD koding (treg)", "Admin defined" : "Admin-definert", + "Are you sure you want to delete this external storage?" : "Er du sikker på at du ønsker å slette dette eksterne lageret?", "Delete storage?" : "Slett lagringsplass", "Saved" : "Lagret", "Saving..." : "Lagrer…", @@ -53,8 +54,10 @@ "OAuth2" : "OAuth2", "Client ID" : "Klient-ID", "Client secret" : "Klient-hemmelighet", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Prosjektnavn", "Identity endpoint URL" : "URL for identitets-endepunkt", + "OpenStack v3" : "OpenStack v3", "Domain" : "Domene", "Rackspace" : "Rackspace", "API key" : "API-nøkkel", @@ -111,6 +114,7 @@ "Authentication" : "Autentisering", "Configuration" : "Oppsett", "Available for" : "Tilgjengelig for", + "Click to recheck the configuration" : "Klikk for å sjekke oppsettet igjen", "Add storage" : "Legg til lagringsplass", "Advanced settings" : "Avanserte innstillinger", "Delete" : "Slett", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index 9b7dce2396a..5d83036fa53 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -14,6 +14,7 @@ OC.L10N.register( "(group)" : "(grupa)", "Compatibility with Mac NFD encoding (slow)" : "Zgodność z kodowaniem Mac NFD (powolny)", "Admin defined" : "Zdefiniowane przez Administratora", + "Are you sure you want to delete this external storage?" : "Czy na pewno chcesz usunąć zewnętrzny magazyn?", "Delete storage?" : "Usunąć magazyn?", "Saved" : "Zapisano", "Saving..." : "Zapisywanie...", @@ -55,8 +56,10 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "ID klienta", "Client secret" : "Hasło klienta", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Nazwa dzierżawcy", "Identity endpoint URL" : "Adres końcówki identyfikującej", + "OpenStack v3" : "OpenStack v3", "Domain" : "Domena", "Rackspace" : "Rackspace", "API key" : "Klucz API", @@ -98,6 +101,8 @@ OC.L10N.register( "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Obsługa cURL w PHP jest wyłączona lub nie jest zainstalowana. Zamontowanie %s jest niemożliwe. Proszę poprosić swojego administratora systemu, żeby ją zainstalował.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Obsługa FTP w PHP jest wyłączona lub nie jest zainstalowana. Zamontowanie %s jest niemożliwe. Proszę poprosić swojego administratora systemu, żeby ją zainstalował.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" nie jest zainstalowane. Zamontowanie %s jest niemożliwe. Proszę poprosić swojego administratora systemu, żeby dokonał instalacji.", + "External storage support" : "Wsparcie zewnętrznego magazynu", + "No external storage configured or you don't have the permission to configure them" : "Brak magazynów zewnętrznych lub nie masz uprawnień do ich konfiguracji", "Name" : "Nazwa", "Storage type" : "Typ magazynu", "Scope" : "Zakres", @@ -112,6 +117,7 @@ OC.L10N.register( "Authentication" : "Poświadczenie", "Configuration" : "Konfiguracja", "Available for" : "Dostępne dla", + "Click to recheck the configuration" : "Kliknij aby ponownie sprawdzić konfigurację", "Add storage" : "Dodaj zewnętrzne magazyny", "Advanced settings" : "Ustawienia zaawansowane", "Delete" : "Usuń", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index cb509d198ab..8c20d980390 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -12,6 +12,7 @@ "(group)" : "(grupa)", "Compatibility with Mac NFD encoding (slow)" : "Zgodność z kodowaniem Mac NFD (powolny)", "Admin defined" : "Zdefiniowane przez Administratora", + "Are you sure you want to delete this external storage?" : "Czy na pewno chcesz usunąć zewnętrzny magazyn?", "Delete storage?" : "Usunąć magazyn?", "Saved" : "Zapisano", "Saving..." : "Zapisywanie...", @@ -53,8 +54,10 @@ "OAuth2" : "OAuth2", "Client ID" : "ID klienta", "Client secret" : "Hasło klienta", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "Nazwa dzierżawcy", "Identity endpoint URL" : "Adres końcówki identyfikującej", + "OpenStack v3" : "OpenStack v3", "Domain" : "Domena", "Rackspace" : "Rackspace", "API key" : "Klucz API", @@ -96,6 +99,8 @@ "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Obsługa cURL w PHP jest wyłączona lub nie jest zainstalowana. Zamontowanie %s jest niemożliwe. Proszę poprosić swojego administratora systemu, żeby ją zainstalował.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Obsługa FTP w PHP jest wyłączona lub nie jest zainstalowana. Zamontowanie %s jest niemożliwe. Proszę poprosić swojego administratora systemu, żeby ją zainstalował.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" nie jest zainstalowane. Zamontowanie %s jest niemożliwe. Proszę poprosić swojego administratora systemu, żeby dokonał instalacji.", + "External storage support" : "Wsparcie zewnętrznego magazynu", + "No external storage configured or you don't have the permission to configure them" : "Brak magazynów zewnętrznych lub nie masz uprawnień do ich konfiguracji", "Name" : "Nazwa", "Storage type" : "Typ magazynu", "Scope" : "Zakres", @@ -110,6 +115,7 @@ "Authentication" : "Poświadczenie", "Configuration" : "Konfiguracja", "Available for" : "Dostępne dla", + "Click to recheck the configuration" : "Kliknij aby ponownie sprawdzić konfigurację", "Add storage" : "Dodaj zewnętrzne magazyny", "Advanced settings" : "Ustawienia zaawansowane", "Delete" : "Usuń", diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index f1624a0f9ea..a04fc14c8a3 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Verifique se há alterações", "Never" : "Nunca", "Once every direct access" : "Uma vez a cada acesso direto", + "Read only" : "Somente leitura", "Folder name" : "Nome da pasta", "External storage" : "Armazenamento Externo", "Authentication" : "Autenticação", diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index 80d6ba18e09..bfe10a37539 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -110,6 +110,7 @@ "Check for changes" : "Verifique se há alterações", "Never" : "Nunca", "Once every direct access" : "Uma vez a cada acesso direto", + "Read only" : "Somente leitura", "Folder name" : "Nome da pasta", "External storage" : "Armazenamento Externo", "Authentication" : "Autenticação", diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index 57f9ce60306..fbb90ba4a89 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -17,7 +17,7 @@ OC.L10N.register( "Are you sure you want to delete this external storage?" : "Действительно удалить это внешнее хранилище?", "Delete storage?" : "Удалить хранилище?", "Saved" : "Сохранено", - "Saving..." : "Сохранение...", + "Saving..." : "Сохранение…", "Save" : "Сохранить", "Empty response from the server" : "Получен пустой ответ сервера", "Couldn't access. Please log out and in again to activate this mount point" : "Не удалось получить доступ. Для активации этой точки подключения выйдите и снова войдите в систему", @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Проверять изменения", "Never" : "Никогда", "Once every direct access" : "Каждый раз при прямом доступе", + "Read only" : "Только чтение", "Folder name" : "Имя папки", "External storage" : "Внешнее хранилище", "Authentication" : "Способ авторизации", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 3897c16dd26..ff6df5b9a55 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -15,7 +15,7 @@ "Are you sure you want to delete this external storage?" : "Действительно удалить это внешнее хранилище?", "Delete storage?" : "Удалить хранилище?", "Saved" : "Сохранено", - "Saving..." : "Сохранение...", + "Saving..." : "Сохранение…", "Save" : "Сохранить", "Empty response from the server" : "Получен пустой ответ сервера", "Couldn't access. Please log out and in again to activate this mount point" : "Не удалось получить доступ. Для активации этой точки подключения выйдите и снова войдите в систему", @@ -110,6 +110,7 @@ "Check for changes" : "Проверять изменения", "Never" : "Никогда", "Once every direct access" : "Каждый раз при прямом доступе", + "Read only" : "Только чтение", "Folder name" : "Имя папки", "External storage" : "Внешнее хранилище", "Authentication" : "Способ авторизации", diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js index 94277458b2e..83eeded4bde 100644 --- a/apps/files_external/l10n/sk.js +++ b/apps/files_external/l10n/sk.js @@ -119,8 +119,11 @@ OC.L10N.register( "Delete" : "Zmazať", "Allow users to mount external storage" : "Povoliť používateľom pripojiť externé úložiská", "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská", + "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s", + "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s", "OpenStack" : "OpenStack", "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach", "Are you sure you want to delete this external storage" : "Naozaj chcete zmazať toto externé úložisko?" diff --git a/apps/files_external/l10n/sk.json b/apps/files_external/l10n/sk.json index 8fc84346148..0a84c569dfb 100644 --- a/apps/files_external/l10n/sk.json +++ b/apps/files_external/l10n/sk.json @@ -117,8 +117,11 @@ "Delete" : "Zmazať", "Allow users to mount external storage" : "Povoliť používateľom pripojiť externé úložiská", "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská", + "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s", + "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s", "OpenStack" : "OpenStack", "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované", "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach", "Are you sure you want to delete this external storage" : "Naozaj chcete zmazať toto externé úložisko?" diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js index c6ad3082af2..d303a83b6b5 100644 --- a/apps/files_external/l10n/sr.js +++ b/apps/files_external/l10n/sr.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Проверавај за измене", "Never" : "никад", "Once every direct access" : "једном при сваком директном приступу", + "Read only" : "Само за читање", "Folder name" : "Назив фасцикле", "External storage" : "Спољашње складиште", "Authentication" : "Провера идентитета", diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json index 3a7795e0ff5..3c779a8b3d6 100644 --- a/apps/files_external/l10n/sr.json +++ b/apps/files_external/l10n/sr.json @@ -110,6 +110,7 @@ "Check for changes" : "Проверавај за измене", "Never" : "никад", "Once every direct access" : "једном при сваком директном приступу", + "Read only" : "Само за читање", "Folder name" : "Назив фасцикле", "External storage" : "Спољашње складиште", "Authentication" : "Провера идентитета", diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js index 9d854556b97..bcc1c64cc0c 100644 --- a/apps/files_external/l10n/tr.js +++ b/apps/files_external/l10n/tr.js @@ -112,6 +112,7 @@ OC.L10N.register( "Check for changes" : "Değişiklikleri denetle", "Never" : "Asla", "Once every direct access" : "Her doğrudan erişimde bir kez", + "Read only" : "Salt okunur", "Folder name" : "Klasör adı", "External storage" : "Dış depolama", "Authentication" : "Kimlik Doğrulama", diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json index 4376d41228c..73ebf0c7759 100644 --- a/apps/files_external/l10n/tr.json +++ b/apps/files_external/l10n/tr.json @@ -110,6 +110,7 @@ "Check for changes" : "Değişiklikleri denetle", "Never" : "Asla", "Once every direct access" : "Her doğrudan erişimde bir kez", + "Read only" : "Salt okunur", "Folder name" : "Klasör adı", "External storage" : "Dış depolama", "Authentication" : "Kimlik Doğrulama", diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js index 8a385504875..2f16919e000 100644 --- a/apps/files_external/l10n/zh_CN.js +++ b/apps/files_external/l10n/zh_CN.js @@ -14,6 +14,7 @@ OC.L10N.register( "(group)" : "(分组)", "Compatibility with Mac NFD encoding (slow)" : "兼用 Mac NFD 编码 (慢)", "Admin defined" : "管理员定义", + "Are you sure you want to delete this external storage?" : "你确定要删除这个外部存储吗？", "Delete storage?" : "删除存储？", "Saved" : "已保存", "Saving..." : "正在保存...", @@ -55,8 +56,10 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "Client ID", "Client secret" : "客户端密钥", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "租户名称", "Identity endpoint URL" : "身份识别 URL", + "OpenStack v3" : "OpenStack v3", "Domain" : "域名", "Rackspace" : "Rackspace", "API key" : "API密匙", @@ -97,6 +100,7 @@ OC.L10N.register( "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "没有安装或启用 PHP 中的 cURL 支持. 无法挂载 %s. 请联系您的系统管理员安装.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "没有安装或启用 PHP 中的 FTP 支持. 无法挂载 %s. 请联系您的系统管理员安装.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "没有安装 \"%s\". 无法挂载 %s. 请联系您的系统管理员安装.", + "External storage support" : "外部存储支持", "Name" : "名称", "Storage type" : "存储类型", "Scope" : "适用范围", @@ -116,7 +120,11 @@ OC.L10N.register( "Delete" : "删除", "Allow users to mount external storage" : "允许用户挂载外部存储", "Allow users to mount the following external storage" : "允许用户挂载以下外部存储", + "Dropbox App Configuration" : "Dropbox 配置", + "Google Drive App Configuration" : "Google Drive 配置", "OpenStack" : "OpenStack", + "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "没有配置外部存储", "You can add external storages in the personal settings" : "您可以在个人设置中添加外部存储", "Are you sure you want to delete this external storage" : "是否要删除该外部存储" diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json index 327e922b12b..b4b25202635 100644 --- a/apps/files_external/l10n/zh_CN.json +++ b/apps/files_external/l10n/zh_CN.json @@ -12,6 +12,7 @@ "(group)" : "(分组)", "Compatibility with Mac NFD encoding (slow)" : "兼用 Mac NFD 编码 (慢)", "Admin defined" : "管理员定义", + "Are you sure you want to delete this external storage?" : "你确定要删除这个外部存储吗？", "Delete storage?" : "删除存储？", "Saved" : "已保存", "Saving..." : "正在保存...", @@ -53,8 +54,10 @@ "OAuth2" : "OAuth2", "Client ID" : "Client ID", "Client secret" : "客户端密钥", + "OpenStack v2" : "OpenStack v2", "Tenant name" : "租户名称", "Identity endpoint URL" : "身份识别 URL", + "OpenStack v3" : "OpenStack v3", "Domain" : "域名", "Rackspace" : "Rackspace", "API key" : "API密匙", @@ -95,6 +98,7 @@ "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "没有安装或启用 PHP 中的 cURL 支持. 无法挂载 %s. 请联系您的系统管理员安装.", "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "没有安装或启用 PHP 中的 FTP 支持. 无法挂载 %s. 请联系您的系统管理员安装.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "没有安装 \"%s\". 无法挂载 %s. 请联系您的系统管理员安装.", + "External storage support" : "外部存储支持", "Name" : "名称", "Storage type" : "存储类型", "Scope" : "适用范围", @@ -114,7 +118,11 @@ "Delete" : "删除", "Allow users to mount external storage" : "允许用户挂载外部存储", "Allow users to mount the following external storage" : "允许用户挂载以下外部存储", + "Dropbox App Configuration" : "Dropbox 配置", + "Google Drive App Configuration" : "Google Drive 配置", "OpenStack" : "OpenStack", + "Dropbox" : "Dropbox", + "Google Drive" : "Google Drive", "No external storage configured" : "没有配置外部存储", "You can add external storages in the personal settings" : "您可以在个人设置中添加外部存储", "Are you sure you want to delete this external storage" : "是否要删除该外部存储" diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php index efb2669e281..89bdcf5e5d6 100644 --- a/apps/files_external/lib/Command/ListCommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -192,7 +192,8 @@ class ListCommand extends Base { 'previews' => true, 'filesystem_check_changes' => 1, 'enable_sharing' => false, - 'encoding_compatibility' => false + 'encoding_compatibility' => false, + 'readonly' => false, ]; $rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) { $storageConfig = $config->getBackendOptions(); diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index e9986f45c6c..097b196b2d4 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -412,7 +412,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { } case 'w': case 'wb': - $tmpFile = \OCP\Files::tmpFile(); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); $handle = fopen($tmpFile, 'w'); return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { @@ -433,7 +433,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { } else { $ext = ''; } - $tmpFile = \OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); if ($this->file_exists($path)) { $source = $this->readObject($path); file_put_contents($tmpFile, $source); diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php index 17afb1fcf95..dc4ab9cb0e1 100644 --- a/apps/files_external/lib/Lib/Storage/FTP.php +++ b/apps/files_external/lib/Lib/Storage/FTP.php @@ -128,7 +128,7 @@ class FTP extends StreamWrapper{ } else { $ext=''; } - $tmpFile=\OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); if ($this->file_exists($path)) { $this->getFile($path, $tmpFile); } diff --git a/apps/files_external/lib/Lib/Storage/OwnCloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php index d56e6b66145..3ee2b70ef22 100644 --- a/apps/files_external/lib/Lib/Storage/OwnCloud.php +++ b/apps/files_external/lib/Lib/Storage/OwnCloud.php @@ -73,4 +73,8 @@ class OwnCloud extends \OC\Files\Storage\DAV{ parent::__construct($params); } + + public function needsPartFile() { + return false; + } } diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index f8fd37a4d48..a533298c06d 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -52,6 +52,7 @@ use OCP\Files\Notify\IChange; use OCP\Files\Notify\IRenameChange; use OCP\Files\Storage\INotifyStorage; use OCP\Files\StorageNotAvailableException; +use OCP\ILogger; use OCP\Util; class SMB extends Common implements INotifyStorage { @@ -202,7 +203,7 @@ class SMB extends Common implements INotifyStorage { $this->remove($target); $result = $this->share->rename($absoluteSource, $absoluteTarget); } catch (\Exception $e) { - \OC::$server->getLogger()->logException($e, ['level' => Util::WARN]); + \OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN]); return false; } unset($this->statCache[$absoluteSource], $this->statCache[$absoluteTarget]); @@ -353,7 +354,7 @@ class SMB extends Common implements INotifyStorage { if (!$this->isCreatable(dirname($path))) { return false; } - $tmpFile = \OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); } $source = fopen($tmpFile, $mode); $share = $this->share; diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index a638169dcb2..689fd700253 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -45,6 +45,7 @@ use Icewind\Streams\CallbackWrapper; use Icewind\Streams\IteratorDirectory; use OC\Files\ObjectStore\SwiftFactory; use OCP\Files\StorageBadConfigException; +use OCP\ILogger; use OpenStack\Common\Error\BadResponseError; use OpenStack\ObjectStore\v1\Models\StorageObject; @@ -132,7 +133,7 @@ class Swift extends \OC\Files\Storage\Common { // Expected response is "404 Not Found", so only log if it isn't if ($e->getResponse()->getStatusCode() !== 404) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); } @@ -194,7 +195,11 @@ class Swift extends \OC\Files\Storage\Common { $this->params = $params; // FIXME: private class... $this->objectCache = new \OC\Cache\CappedMemoryCache(); - $this->connectionFactory = new SwiftFactory(\OC::$server->getMemCacheFactory()->createDistributed('swift/'), $this->params); + $this->connectionFactory = new SwiftFactory( + \OC::$server->getMemCacheFactory()->createDistributed('swift/'), + $this->params, + \OC::$server->getLogger() + ); $this->objectStore = new \OC\Files\ObjectStore\Swift($this->params, $this->connectionFactory); $this->bucket = $params['bucket']; } @@ -221,7 +226,7 @@ class Swift extends \OC\Files\Storage\Common { $this->objectCache->remove($path); } catch (BadResponseError $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return false; @@ -265,7 +270,7 @@ class Swift extends \OC\Files\Storage\Common { $this->objectCache->remove($path . '/'); } catch (BadResponseError $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return false; @@ -303,7 +308,7 @@ class Swift extends \OC\Files\Storage\Common { return IteratorDirectory::wrap($files); } catch (\Exception $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return false; @@ -327,7 +332,7 @@ class Swift extends \OC\Files\Storage\Common { } } catch (BadResponseError $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return false; @@ -381,7 +386,7 @@ class Swift extends \OC\Files\Storage\Common { } catch (BadResponseError $e) { if ($e->getResponse()->getStatusCode() !== 404) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); throw $e; @@ -405,7 +410,7 @@ class Swift extends \OC\Files\Storage\Common { return $this->objectStore->readObject($path); } catch (BadResponseError $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return false; @@ -424,7 +429,7 @@ class Swift extends \OC\Files\Storage\Common { } else { $ext = ''; } - $tmpFile = \OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); // Fetch existing file if required if ($mode[0] !== 'w' && $this->file_exists($path)) { if ($mode[0] === 'x') { @@ -492,7 +497,7 @@ class Swift extends \OC\Files\Storage\Common { $this->objectCache->remove($path2 . '/'); } catch (BadResponseError $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return false; @@ -509,7 +514,7 @@ class Swift extends \OC\Files\Storage\Common { $this->objectCache->remove($path2 . '/'); } catch (BadResponseError $e) { \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return false; diff --git a/apps/files_external/lib/Service/LegacyStoragesService.php b/apps/files_external/lib/Service/LegacyStoragesService.php index 65880514911..2b681757806 100644 --- a/apps/files_external/lib/Service/LegacyStoragesService.php +++ b/apps/files_external/lib/Service/LegacyStoragesService.php @@ -25,6 +25,7 @@ namespace OCA\Files_External\Service; use OCA\Files_External\Lib\StorageConfig; +use OCP\ILogger; /** * Read mount config from legacy mount.json @@ -140,11 +141,7 @@ abstract class LegacyStoragesService { $parts = explode('/', ltrim($rootMountPath, '/'), 3); if (count($parts) < 3) { // something went wrong, skip - \OCP\Util::writeLog( - 'files_external', - 'Could not parse mount point "' . $rootMountPath . '"', - \OCP\Util::ERROR - ); + \OC::$server->getLogger()->error('Could not parse mount point "' . $rootMountPath . '"', ['app' => 'files_external']); continue; } $relativeMountPath = rtrim($parts[2], '/'); @@ -194,7 +191,7 @@ abstract class LegacyStoragesService { // don't die if a storage backend doesn't exist \OC::$server->getLogger()->logException($e, [ 'message' => 'Could not load storage.', - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); } diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php index 89458b70c0c..79eb03cea21 100644 --- a/apps/files_external/lib/Service/StoragesService.php +++ b/apps/files_external/lib/Service/StoragesService.php @@ -37,6 +37,7 @@ use \OCA\Files_External\Lib\Backend\Backend; use \OCA\Files_External\Lib\Auth\AuthMechanism; use OCP\Files\Config\IUserMountCache; use \OCP\Files\StorageNotAvailableException; +use OCP\ILogger; /** * Service class to manage external storages @@ -104,14 +105,14 @@ abstract class StoragesService { // don't die if a storage backend doesn't exist \OC::$server->getLogger()->logException($e, [ 'message' => 'Could not load storage.', - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return null; } catch (\InvalidArgumentException $e) { \OC::$server->getLogger()->logException($e, [ 'message' => 'Could not load storage.', - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); return null; @@ -479,7 +480,7 @@ abstract class StoragesService { // be instantiated or whenever $user vars where used, in which case // the storage id could not be computed \OC::$server->getLogger()->logException($e, [ - 'level' => \OCP\Util::ERROR, + 'level' => ILogger::ERROR, 'app' => 'files_external', ]); } diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 895be719ab4..236faf37d6d 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -12,6 +12,7 @@ $l->t("Check for changes"); $l->t("Never"); $l->t("Once every direct access"); + $l->t('Read only'); script('files_external', 'settings'); style('files_external', 'settings'); diff --git a/apps/files_external/tests/js/settingsSpec.js b/apps/files_external/tests/js/settingsSpec.js index 56bdcff8345..fbbb341c307 100644 --- a/apps/files_external/tests/js/settingsSpec.js +++ b/apps/files_external/tests/js/settingsSpec.js @@ -376,7 +376,8 @@ describe('OCA.External.Settings tests', function() { previews: true, enable_sharing: false, filesystem_check_changes: 0, - encoding_compatibility: false + encoding_compatibility: false, + readonly: false }); }); }); |