summaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_external')
-rw-r--r--apps/files_external/css/settings.css4
-rw-r--r--apps/files_external/js/statusmanager.js2
-rw-r--r--apps/files_external/l10n/es.js2
-rw-r--r--apps/files_external/l10n/es.json2
-rw-r--r--apps/files_external/l10n/mk.js1
-rw-r--r--apps/files_external/l10n/mk.json1
-rw-r--r--apps/files_external/l10n/tr.js8
-rw-r--r--apps/files_external/l10n/tr.json8
-rw-r--r--apps/files_external/lib/dropbox.php10
-rw-r--r--apps/files_external/lib/sftp.php4
-rw-r--r--apps/files_external/service/globalstoragesservice.php2
-rw-r--r--apps/files_external/service/legacystoragesservice.php2
-rw-r--r--apps/files_external/service/storagesservice.php4
-rw-r--r--apps/files_external/service/userstoragesservice.php2
-rw-r--r--apps/files_external/templates/settings.php4
15 files changed, 39 insertions, 17 deletions
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index c96c0cb97b9..9338b8d3ee7 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -12,8 +12,8 @@
}
td.mountPoint, td.backend { width:160px; }
-#externalStorage td>img.action { visibility:hidden; padding-top:7px; }
-#externalStorage tr:hover>td>img.action { visibility:visible; cursor:pointer; }
+#externalStorage td>img { padding-top:7px; opacity: 0.5; }
+#externalStorage td>img:hover { padding-top:7px; cursor:pointer; opacity: 1; }
#addMountPoint>td { border:none; }
#addMountPoint>td.applicable { visibility:hidden; }
#addMountPoint>td.hidden { visibility:hidden; }
diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js
index 33d2ea104be..118ec17d246 100644
--- a/apps/files_external/js/statusmanager.js
+++ b/apps/files_external/js/statusmanager.js
@@ -497,7 +497,7 @@ OCA.External.StatusManager.Utils = {
if (folder instanceof $) {
trFolder = folder;
} else {
- // cant use here FileList.findFileEl(OCA.External.StatusManager.Utils.jqSelEscape(folder)); return incorrect instance of filelist
+ // can't use here FileList.findFileEl(OCA.External.StatusManager.Utils.jqSelEscape(folder)); return incorrect instance of filelist
trFolder = $('#fileList tr[data-file=\"' + OCA.External.StatusManager.Utils.jqSelEscape(folder) + '\"]');
}
trFolder.removeClass('externalErroredRow').removeClass('externalDisabledRow');
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index 0e337eb5907..f46eb9c651e 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -29,7 +29,7 @@ OC.L10N.register(
"Error generating key pair" : "Error al generar el par de claves",
"Enable encryption" : "Habilitar cifrado",
"Enable previews" : "Habilitar previsualizaciones",
- "Enable sharing" : "Habilitar comparto",
+ "Enable sharing" : "Habilitar el uso compartido",
"Check for changes" : "Comprobar si hay cambios",
"Never" : "Nunca",
"Once every direct access" : "Una vez cada acceso directo",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index 68fb52391eb..3dfc2736ec0 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -27,7 +27,7 @@
"Error generating key pair" : "Error al generar el par de claves",
"Enable encryption" : "Habilitar cifrado",
"Enable previews" : "Habilitar previsualizaciones",
- "Enable sharing" : "Habilitar comparto",
+ "Enable sharing" : "Habilitar el uso compartido",
"Check for changes" : "Comprobar si hay cambios",
"Never" : "Nunca",
"Once every direct access" : "Una vez cada acceso directo",
diff --git a/apps/files_external/l10n/mk.js b/apps/files_external/l10n/mk.js
index 70d9b5a755f..0f0677c2d55 100644
--- a/apps/files_external/l10n/mk.js
+++ b/apps/files_external/l10n/mk.js
@@ -4,6 +4,7 @@ OC.L10N.register(
"Personal" : "Лично",
"Grant access" : "Дозволи пристап",
"Access granted" : "Пристапот е дозволен",
+ "Enable encryption" : "Овозможи енкрипција",
"Saved" : "Снимено",
"Username" : "Корисничко име",
"Password" : "Лозинка",
diff --git a/apps/files_external/l10n/mk.json b/apps/files_external/l10n/mk.json
index d97c5b872ba..b6437b19640 100644
--- a/apps/files_external/l10n/mk.json
+++ b/apps/files_external/l10n/mk.json
@@ -2,6 +2,7 @@
"Personal" : "Лично",
"Grant access" : "Дозволи пристап",
"Access granted" : "Пристапот е дозволен",
+ "Enable encryption" : "Овозможи енкрипција",
"Saved" : "Снимено",
"Username" : "Корисничко име",
"Password" : "Лозинка",
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index dfbbef593ae..14e86c5868f 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -43,8 +43,15 @@ OC.L10N.register(
"Couldn't get the list of external mount points: {type}" : "Harici bağlama noktalarının listesi alınamadı: {type}",
"There was an error with message: " : "Şu mesajla bir hata oluştu:",
"External mount error" : "Harici bağlama hatası",
+ "external-storage" : "harici-depolama",
+ "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows ağ sürücüsü bağlama nokta listesi alınamadı: sunucudan boş yanıt",
+ "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Yapılandırılmış harici bağlama noktalarından bazıları bağlı değil. Lütfen daha fazla bilgi için kırmızı satırlara tıklayın",
+ "Please enter the credentials for the {mount} mount" : "{mount} bağlaması için kimlik bilgilerini girin",
"Username" : "Kullanıcı Adı",
"Password" : "Parola",
+ "Credentials saved" : "Kimlik bilgileri kaydedildi",
+ "Credentials saving failed" : "Kimlik bilgileri kaydedilemedi",
+ "Credentials required" : "Kimlik bilgileri gerekli",
"Save" : "Kaydet",
"Access key" : "Erişim anahtarı",
"Secret key" : "Gizli anahtar",
@@ -62,6 +69,7 @@ OC.L10N.register(
"Rackspace" : "Rackspace",
"API key" : "API anahtarı",
"Username and password" : "Kullanıcı adı ve parola",
+ "Log-in credentials, save in session" : "Oturum kimlik bilgileri, oturumda kaydet",
"RSA public key" : "RSA ortak anahtarı",
"Public key" : "Ortak anahtar",
"Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index 2b1296e3c6f..cc015c380fe 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -41,8 +41,15 @@
"Couldn't get the list of external mount points: {type}" : "Harici bağlama noktalarının listesi alınamadı: {type}",
"There was an error with message: " : "Şu mesajla bir hata oluştu:",
"External mount error" : "Harici bağlama hatası",
+ "external-storage" : "harici-depolama",
+ "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows ağ sürücüsü bağlama nokta listesi alınamadı: sunucudan boş yanıt",
+ "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Yapılandırılmış harici bağlama noktalarından bazıları bağlı değil. Lütfen daha fazla bilgi için kırmızı satırlara tıklayın",
+ "Please enter the credentials for the {mount} mount" : "{mount} bağlaması için kimlik bilgilerini girin",
"Username" : "Kullanıcı Adı",
"Password" : "Parola",
+ "Credentials saved" : "Kimlik bilgileri kaydedildi",
+ "Credentials saving failed" : "Kimlik bilgileri kaydedilemedi",
+ "Credentials required" : "Kimlik bilgileri gerekli",
"Save" : "Kaydet",
"Access key" : "Erişim anahtarı",
"Secret key" : "Gizli anahtar",
@@ -60,6 +67,7 @@
"Rackspace" : "Rackspace",
"API key" : "API anahtarı",
"Username and password" : "Kullanıcı adı ve parola",
+ "Log-in credentials, save in session" : "Oturum kimlik bilgileri, oturumda kaydet",
"RSA public key" : "RSA ortak anahtarı",
"Public key" : "Ortak anahtar",
"Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index f59b5a460e1..8381ccbae59 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -29,7 +29,9 @@
namespace OC\Files\Storage;
+use GuzzleHttp\Exception\RequestException;
use Icewind\Streams\IteratorDirectory;
+use Icewind\Streams\RetryWrapper;
require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
@@ -257,10 +259,9 @@ class Dropbox extends \OC\Files\Storage\Common {
$client = \OC::$server->getHTTPClientService()->newClient();
try {
- $tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
- $client->get($downloadUrl, [
+ $response = $client->get($downloadUrl, [
'headers' => $headers,
- 'save_to' => $tmpFile,
+ 'stream' => true,
]);
} catch (RequestException $e) {
if (!is_null($e->getResponse())) {
@@ -274,7 +275,8 @@ class Dropbox extends \OC\Files\Storage\Common {
}
}
- return fopen($tmpFile, 'r');
+ $handle = $response->getBody();
+ return RetryWrapper::wrap($handle);
} catch (\Exception $exception) {
\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
return false;
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index f6b2873cf49..c44ee9f908e 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -32,6 +32,7 @@
namespace OC\Files\Storage;
use Icewind\Streams\IteratorDirectory;
+use Icewind\Streams\RetryWrapper;
use phpseclib\Net\SFTP\Stream;
/**
@@ -374,7 +375,8 @@ class SFTP extends \OC\Files\Storage\Common {
case 'c':
case 'c+':
$context = stream_context_create(array('sftp' => array('session' => $this->getConnection())));
- return fopen($this->constructUrl($path), $mode, false, $context);
+ $handle = fopen($this->constructUrl($path), $mode, false, $context);
+ return RetryWrapper::wrap($handle);
}
} catch (\Exception $e) {
}
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php
index 312d8417a92..62da314c5fa 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/service/globalstoragesservice.php
@@ -72,7 +72,7 @@ class GlobalStoragesService extends StoragesService {
/**
* Triggers signal_create_mount or signal_delete_mount to
- * accomodate for additions/deletions in applicableUsers
+ * accommodate for additions/deletions in applicableUsers
* and applicableGroups fields.
*
* @param StorageConfig $oldStorage old storage config
diff --git a/apps/files_external/service/legacystoragesservice.php b/apps/files_external/service/legacystoragesservice.php
index bab1008e561..158fc2b5137 100644
--- a/apps/files_external/service/legacystoragesservice.php
+++ b/apps/files_external/service/legacystoragesservice.php
@@ -188,7 +188,7 @@ abstract class LegacyStoragesService {
$storagesWithConfigHash[$configId] = $currentStorage;
}
} catch (\UnexpectedValueException $e) {
- // dont die if a storage backend doesn't exist
+ // don't die if a storage backend doesn't exist
\OCP\Util::writeLog(
'files_external',
'Could not load storage: "' . $e->getMessage() . '"',
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 1762b55a06c..6542be146d6 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -96,7 +96,7 @@ abstract class StoragesService {
$config->setId((int)$mount['mount_id']);
return $config;
} catch (\UnexpectedValueException $e) {
- // dont die if a storage backend doesn't exist
+ // don't die if a storage backend doesn't exist
\OCP\Util::writeLog(
'files_external',
'Could not load storage: "' . $e->getMessage() . '"',
@@ -352,7 +352,7 @@ abstract class StoragesService {
/**
* Triggers signal_create_mount or signal_delete_mount to
- * accomodate for additions/deletions in applicableUsers
+ * accommodate for additions/deletions in applicableUsers
* and applicableGroups fields.
*
* @param StorageConfig $oldStorage old storage data
diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php
index d4b04de609d..c46846e76d6 100644
--- a/apps/files_external/service/userstoragesservice.php
+++ b/apps/files_external/service/userstoragesservice.php
@@ -82,7 +82,7 @@ class UserStoragesService extends StoragesService {
/**
* Triggers signal_create_mount or signal_delete_mount to
- * accomodate for additions/deletions in applicableUsers
+ * accommodate for additions/deletions in applicableUsers
* and applicableGroups fields.
*
* @param StorageConfig $oldStorage old storage data
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 697a145131c..feccd2a4e45 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -124,7 +124,7 @@
</td>
<?php endif; ?>
<td class="mountOptionsToggle hidden">
- <img class="svg action"
+ <img class="svg"
title="<?php p($l->t('Advanced settings')); ?>"
alt="<?php p($l->t('Advanced settings')); ?>"
src="<?php print_unescaped(image_path('core', 'actions/settings.svg')); ?>"
@@ -132,7 +132,7 @@
<input type="hidden" class="mountOptions" value="" />
</td>
<td class="hidden">
- <img class="svg action"
+ <img class="svg"
alt="<?php p($l->t('Delete')); ?>"
title="<?php p($l->t('Delete')); ?>"
src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 23:44:37 +0000