diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/Directory.php | 26 | ||||
| -rw-r--r-- | apps/files/lib/Search/FilesSearchProvider.php | 5 | ||||
| -rw-r--r-- | apps/settings/l10n/gl.js | 1 | ||||
| -rw-r--r-- | apps/settings/l10n/gl.json | 1 | ||||
| -rw-r--r-- | apps/settings/l10n/it.js | 1 | ||||
| -rw-r--r-- | apps/settings/l10n/it.json | 1 | ||||
| -rw-r--r-- | apps/settings/l10n/pl.js | 1 | ||||
| -rw-r--r-- | apps/settings/l10n/pl.json | 1 | ||||
| -rw-r--r-- | apps/settings/l10n/zh_CN.js | 1 | ||||
| -rw-r--r-- | apps/settings/l10n/zh_CN.json | 1 |
10 files changed, 36 insertions, 3 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index ede81703968..cb9a4121d1b 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -51,7 +51,7 @@ use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\IFile; use Sabre\DAV\INode; -class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { +class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget, \Sabre\DAV\ICopyTarget { /** * Cached directory content @@ -394,7 +394,7 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists'); } - list($sourceDir,) = \Sabre\Uri\split($sourceNode->getPath()); + [$sourceDir,] = \Sabre\Uri\split($sourceNode->getPath()); $destinationDir = $this->getPath(); $sourcePath = $sourceNode->getPath(); @@ -449,4 +449,26 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol return true; } + + + public function copyInto($targetName, $sourcePath, INode $sourceNode) { + if ($sourceNode instanceof File) { + $destinationPath = $this->getPath() . '/' . $targetName; + $sourcePath = $sourceNode->getPath(); + + if (!$this->fileView->isCreatable($this->getPath())) { + throw new \Sabre\DAV\Exception\Forbidden(); + } + + try { + $this->fileView->verifyPath($this->getPath(), $targetName); + } catch (InvalidPathException $ex) { + throw new InvalidPath($ex->getMessage()); + } + + return $this->fileView->copy($sourcePath, $destinationPath); + } + + return false; + } } diff --git a/apps/files/lib/Search/FilesSearchProvider.php b/apps/files/lib/Search/FilesSearchProvider.php index 5c97e771ab7..a3c6120ef13 100644 --- a/apps/files/lib/Search/FilesSearchProvider.php +++ b/apps/files/lib/Search/FilesSearchProvider.php @@ -110,13 +110,16 @@ class FilesSearchProvider implements IProvider { ? $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]) : ''; - return new SearchResultEntry( + $searchResultEntry = new SearchResultEntry( $thumbnailUrl, $result->name, $this->formatSubline($result), $this->urlGenerator->getAbsoluteURL($result->link), $result->type === 'folder' ? 'icon-folder' : $this->mimeTypeDetector->mimeTypeIcon($result->mime_type) ); + $searchResultEntry->addAttribute('fileId', (string)$result->id); + $searchResultEntry->addAttribute('path', $result->path); + return $searchResultEntry; }, $this->fileSearch->search($query->getTerm())) ); } diff --git a/apps/settings/l10n/gl.js b/apps/settings/l10n/gl.js index 54692cc4393..985d493c3d2 100644 --- a/apps/settings/l10n/gl.js +++ b/apps/settings/l10n/gl.js @@ -68,6 +68,7 @@ OC.L10N.register( "installing and updating apps via the app store or Federated Cloud Sharing" : "instalando e actualizando aplicacións mediante a tenda de aplicacións ou da nube federada compartida", "Federated Cloud Sharing" : "Nube federada compartida", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL está utilizando unha versión obsoleta %1$s (%2$s). Actualice o seu sistema operativo, caso contrario características como %3$s non funcionarán de xeito fiábel.", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "Non foi posíbel determinar se a versión TLS de cURL está desactualizada ou non porque se produciu un erro durante a solicitude HTTPS contra https://nextcloud.com. Consulte o ficheiro de rexistro de Nextcloud para obter máis detalles.", "Invalid SMTP password." : "Contrasinal SMTP incorrecta.", "Email setting test" : "Proba do axuste do correo", "Well done, %s!" : "Ben feito, %s!", diff --git a/apps/settings/l10n/gl.json b/apps/settings/l10n/gl.json index 1970bc45ef2..e0ee2ac2253 100644 --- a/apps/settings/l10n/gl.json +++ b/apps/settings/l10n/gl.json @@ -66,6 +66,7 @@ "installing and updating apps via the app store or Federated Cloud Sharing" : "instalando e actualizando aplicacións mediante a tenda de aplicacións ou da nube federada compartida", "Federated Cloud Sharing" : "Nube federada compartida", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL está utilizando unha versión obsoleta %1$s (%2$s). Actualice o seu sistema operativo, caso contrario características como %3$s non funcionarán de xeito fiábel.", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "Non foi posíbel determinar se a versión TLS de cURL está desactualizada ou non porque se produciu un erro durante a solicitude HTTPS contra https://nextcloud.com. Consulte o ficheiro de rexistro de Nextcloud para obter máis detalles.", "Invalid SMTP password." : "Contrasinal SMTP incorrecta.", "Email setting test" : "Proba do axuste do correo", "Well done, %s!" : "Ben feito, %s!", diff --git a/apps/settings/l10n/it.js b/apps/settings/l10n/it.js index 523cb9fcd9c..b137fd45116 100644 --- a/apps/settings/l10n/it.js +++ b/apps/settings/l10n/it.js @@ -68,6 +68,7 @@ OC.L10N.register( "installing and updating apps via the app store or Federated Cloud Sharing" : "installazione e aggiornamento delle applicazioni tramite il negozio delle applicazioni o condivisione cloud federata", "Federated Cloud Sharing" : "Condivisione cloud federata", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL sta utilizzando una versione di %1$s datata (%2$s). Aggiorna il tuo sistema operativo o funzionalità come %3$s non funzioneranno correttamente.", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "Impossibile determinare se la versione TLS di cURL è obsoleta o meno perché si è verificato un errore durante la richiesta HTTPS su https://nextcloud.com. Controlla il file di registro di nextcloud per maggiori dettagli.", "Invalid SMTP password." : "Password SMTP non valida.", "Email setting test" : "Prova impostazioni email", "Well done, %s!" : "Ben fatto, %s!", diff --git a/apps/settings/l10n/it.json b/apps/settings/l10n/it.json index b8bd45f244b..a43c06c06c0 100644 --- a/apps/settings/l10n/it.json +++ b/apps/settings/l10n/it.json @@ -66,6 +66,7 @@ "installing and updating apps via the app store or Federated Cloud Sharing" : "installazione e aggiornamento delle applicazioni tramite il negozio delle applicazioni o condivisione cloud federata", "Federated Cloud Sharing" : "Condivisione cloud federata", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL sta utilizzando una versione di %1$s datata (%2$s). Aggiorna il tuo sistema operativo o funzionalità come %3$s non funzioneranno correttamente.", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "Impossibile determinare se la versione TLS di cURL è obsoleta o meno perché si è verificato un errore durante la richiesta HTTPS su https://nextcloud.com. Controlla il file di registro di nextcloud per maggiori dettagli.", "Invalid SMTP password." : "Password SMTP non valida.", "Email setting test" : "Prova impostazioni email", "Well done, %s!" : "Ben fatto, %s!", diff --git a/apps/settings/l10n/pl.js b/apps/settings/l10n/pl.js index 32ea973c759..e014a2308c1 100644 --- a/apps/settings/l10n/pl.js +++ b/apps/settings/l10n/pl.js @@ -68,6 +68,7 @@ OC.L10N.register( "installing and updating apps via the app store or Federated Cloud Sharing" : "instalowanie i aktualizowanie aplikacji za pośrednictwem sklepu z aplikacjami lub Udostępnionej Chmury Federacyjnej", "Federated Cloud Sharing" : "Udostępnianie Chmury Federacyjnej", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL używa nieaktualnej %1$s wersji (%2$s). Zaktualizuj system operacyjny lub funkcje takie jak %3$s nie będą działać prawidłowo.", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "Nie można określić, czy wersja TLS cURL jest aktualna, ponieważ wystąpił błąd podczas żądania HTTPS skierowanego do https://nextcloud.com. Aby uzyskać więcej informacji, sprawdź plik dziennika nextcloud.", "Invalid SMTP password." : "Nieprawidłowe hasło SMTP.", "Email setting test" : "Test ustawień e-mail", "Well done, %s!" : "Dobra robota, %s!", diff --git a/apps/settings/l10n/pl.json b/apps/settings/l10n/pl.json index 75640d642fe..ed004eadd2e 100644 --- a/apps/settings/l10n/pl.json +++ b/apps/settings/l10n/pl.json @@ -66,6 +66,7 @@ "installing and updating apps via the app store or Federated Cloud Sharing" : "instalowanie i aktualizowanie aplikacji za pośrednictwem sklepu z aplikacjami lub Udostępnionej Chmury Federacyjnej", "Federated Cloud Sharing" : "Udostępnianie Chmury Federacyjnej", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL używa nieaktualnej %1$s wersji (%2$s). Zaktualizuj system operacyjny lub funkcje takie jak %3$s nie będą działać prawidłowo.", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "Nie można określić, czy wersja TLS cURL jest aktualna, ponieważ wystąpił błąd podczas żądania HTTPS skierowanego do https://nextcloud.com. Aby uzyskać więcej informacji, sprawdź plik dziennika nextcloud.", "Invalid SMTP password." : "Nieprawidłowe hasło SMTP.", "Email setting test" : "Test ustawień e-mail", "Well done, %s!" : "Dobra robota, %s!", diff --git a/apps/settings/l10n/zh_CN.js b/apps/settings/l10n/zh_CN.js index 8a2ef95545e..2e38691f57c 100644 --- a/apps/settings/l10n/zh_CN.js +++ b/apps/settings/l10n/zh_CN.js @@ -68,6 +68,7 @@ OC.L10N.register( "installing and updating apps via the app store or Federated Cloud Sharing" : "通过应用程序商店或联合云共享安装和更新应用程序", "Federated Cloud Sharing" : "联合云共享", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL正使用一个过时的%1$s 版本 (%2$s)。请升级您的操作系统，否则像 %3$s 这样的特性将无法可靠地工作。", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "不能确定 cURL 的 TLS 版本是否已过时，因为在HTTPS请求 https://nextcloud.com 时发生了错误。请检查 nextcloud 日志文件以了解详情。", "Invalid SMTP password." : "无效的 SMTP 密码", "Email setting test" : "电子邮件设置测试", "Well done, %s!" : "已完成，%s！", diff --git a/apps/settings/l10n/zh_CN.json b/apps/settings/l10n/zh_CN.json index 14796b12d8e..3f09dc0dde3 100644 --- a/apps/settings/l10n/zh_CN.json +++ b/apps/settings/l10n/zh_CN.json @@ -66,6 +66,7 @@ "installing and updating apps via the app store or Federated Cloud Sharing" : "通过应用程序商店或联合云共享安装和更新应用程序", "Federated Cloud Sharing" : "联合云共享", "cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably." : "cURL正使用一个过时的%1$s 版本 (%2$s)。请升级您的操作系统，否则像 %3$s 这样的特性将无法可靠地工作。", + "Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details." : "不能确定 cURL 的 TLS 版本是否已过时，因为在HTTPS请求 https://nextcloud.com 时发生了错误。请检查 nextcloud 日志文件以了解详情。", "Invalid SMTP password." : "无效的 SMTP 密码", "Email setting test" : "电子邮件设置测试", "Well done, %s!" : "已完成，%s！", |