diff --git a/apps/files/console/scan.php b/apps/files/console/scan.php new file mode 100644 index 0000000000..70183fc888 --- /dev/null +++ b/apps/files/console/scan.php @@ -0,0 +1,31 @@ +" . PHP_EOL; + echo " will rescan all files of the given user" . PHP_EOL; + echo " files:scan --all" . PHP_EOL; + echo " will rescan all files of all known users" . PHP_EOL; + return; +} + +function scanFiles($user) { + $scanner = new \OC\Files\Utils\Scanner($user); + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) { + echo "Scanning $path" . PHP_EOL; + }); + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) { + echo "Scanning $path" . PHP_EOL; + }); + $scanner->scan(''); +} + +if ($argv[1] === '--all') { + $users = OC_User::getUsers(); +} else { + $users = array($argv[1]); +} + +foreach ($users as $user) { + scanFiles($user); +} diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index c16d32e9c2..e87872a4a0 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -1,12 +1,12 @@ "Nelze přesunout %s - existuje soubor se stejným názvem", +"Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem", "Could not move %s" => "Nelze přesunout %s", "Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.", "Invalid Token" => "Neplatný token", -"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba", +"No file was uploaded. Unknown error" => "Žádný soubor nebyl odeslán. Neznámá chyba", "There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný ve formuláři HTML", "The uploaded file was only partially uploaded" => "Soubor byl odeslán pouze částečně", "No file was uploaded" => "Žádný soubor nebyl odeslán", "Missing a temporary folder" => "Chybí adresář pro dočasné soubory", @@ -14,11 +14,11 @@ "Not enough storage available" => "Nedostatek dostupného úložného prostoru", "Invalid directory." => "Neplatný adresář", "Files" => "Soubory", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů", -"Not enough space available" => "Nedostatek dostupného místa", +"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů", +"Not enough space available" => "Nedostatek volného místa", "Upload cancelled." => "Odesílání zrušeno.", -"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.", -"URL cannot be empty." => "URL nemůže být prázdná", +"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", +"URL cannot be empty." => "URL nemůže být prázdná.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno", "Error" => "Chyba", "Share" => "Sdílet", @@ -31,7 +31,7 @@ "suggest name" => "navrhnout název", "cancel" => "zrušit", "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}", -"undo" => "zpět", +"undo" => "vrátit zpět", "perform delete operation" => "provést smazání", "1 file uploading" => "odesílá se 1 soubor", "files uploading" => "soubory se odesílají", @@ -40,15 +40,16 @@ "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.", "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.", "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)", -"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud", +"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud", "Name" => "Název", "Size" => "Velikost", "Modified" => "Upraveno", "1 folder" => "1 složka", -"{count} folders" => "{count} složky", +"{count} folders" => "{count} složek", "1 file" => "1 soubor", -"{count} files" => "{count} soubory", +"{count} files" => "{count} souborů", +"%s could not be renamed" => "%s nemůže být přejmenován", "Upload" => "Odeslat", "File handling" => "Zacházení se soubory", "Maximum upload size" => "Maximální velikost pro odesílání", @@ -72,6 +73,8 @@ "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.", "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.", "Current scanning" => "Aktuální prohledávání", +"directory" => "adresář", +"directories" => "adresáře", "file" => "soubor", "files" => "soubory", "Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..." diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index b2a17f6bca..741df166b7 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -238,6 +238,7 @@ class Hooks { */ public static function preShared($params) { + $l = new \OC_L10N('files_encryption'); $users = array(); $view = new \OC\Files\View('/public-keys/'); @@ -250,21 +251,18 @@ class Hooks { break; } - $error = false; + $notConfigured = array(); foreach ($users as $user) { if (!$view->file_exists($user . '.public.key')) { - $error = true; - break; + $notConfigured[] = $user; } } - if ($error) // Set flag var 'run' to notify emitting - // script that hook execution failed - { - $params['run']->run = false; + if (count($notConfigured) > 0) { + $params['run'] = false; + $params['error'] = $l->t('Following users are not set up for encryption:') . ' ' . join(', ' , $notConfigured); } - // TODO: Make sure files_sharing provides user - // feedback on failed share + } /** diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php index 7b2ce2d65c..4dd06280d8 100644 --- a/apps/files_encryption/l10n/cs_CZ.php +++ b/apps/files_encryption/l10n/cs_CZ.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno zvně systému ownCloud (např. ve vašem firemním adresáři). Můžete opravit vaše heslo soukromého klíče ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.", "Missing requirements." => "Nesplněné závislosti.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP verze PHP 5.3.3 s nainstalovaným a správně nastaveným rozšířením OpenSSL. Prozatím byla šifrovací aplikace zablokována.", +"Following users are not set up for encryption:" => "Následující uživatelé nejsou připraveni k zakódování:", "Saving..." => "Ukládám...", "Your private key is not valid! Maybe the your password was changed from outside." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno zvenčí.", "You can unlock your private key in your " => "Můžete odemknout váš soukromý klíč ve vašem", diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php index d8265906db..69b15aa00a 100644 --- a/apps/files_encryption/l10n/de.php +++ b/apps/files_encryption/l10n/de.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen.", "Missing requirements." => "Fehlende Vorraussetzungen", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert ist und die OpenSSL-PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung wurde vorerst deaktiviert.", +"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", "Saving..." => "Speichern...", "Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Eventuell wurde Ihr Passwort von außerhalb geändert.", "You can unlock your private key in your " => "Du kannst den privaten Schlüssel ändern und zwar in deinem", diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php index db6f57bb36..7b3ad52673 100644 --- a/apps/files_encryption/l10n/gl.php +++ b/apps/files_encryption/l10n/gl.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros", "Missing requirements." => "Non se cumpren os requisitos.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado.", +"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:", "Saving..." => "Gardando...", "Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ", "You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus", diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php index 8d15d1ced3..db1a1b1709 100644 --- a/apps/files_encryption/l10n/it.php +++ b/apps/files_encryption/l10n/it.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.", "Missing requirements." => "Requisiti mancanti.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.", +"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:", "Saving..." => "Salvataggio in corso...", "Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.", "You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue", diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php index 1563243c99..3404ce4a54 100644 --- a/apps/files_encryption/l10n/pt_BR.php +++ b/apps/files_encryption/l10n/pt_BR.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.", "Missing requirements." => "Requisitos em falta.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.", +"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:", "Saving..." => "Salvando...", "Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.", "You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas", diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php index d3cf596fda..15a9ee6de6 100644 --- a/apps/files_encryption/l10n/pt_PT.php +++ b/apps/files_encryption/l10n/pt_PT.php @@ -5,15 +5,25 @@ "Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desactivar a chave de recuperação. Por favor verifique a password da chave de recuperação.", "Password successfully changed." => "Password alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.", +"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta.", "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada não é válida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretório corporativo). Pode atualizar password da chave privada em configurações personalizadas para recuperar o acesso aos seus arquivos encriptados.", +"Missing requirements." => "Faltam alguns requisitos.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está ativada e corretamente configurada. Por agora, a encripitação está desativado.", "Saving..." => "A guardar...", "personal settings" => "configurações personalizadas ", "Encryption" => "Encriptação", +"Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):", +"Recovery key password" => "Chave de recuperação da conta", "Enabled" => "Activado", "Disabled" => "Desactivado", +"Change recovery key password:" => "Alterar a chave de recuperação:", +"Old Recovery key password" => "Chave anterior de recuperação da conta", +"New Recovery key password" => "Nova chave de recuperação da conta", "Change Password" => "Mudar a Password", +"Old log-in password" => "Password anterior da conta", +"Current log-in password" => "Password actual da conta", "Enable password recovery:" => "ativar recuperação do password:", +"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao activar esta opção, tornar-lhe-a possível a obtenção de acesso aos seus ficheiros encriptados caso perca a password.", "File recovery settings updated" => "Actualizadas as definições de recuperação de ficheiros", "Could not update file recovery" => "Não foi possível actualizar a recuperação de ficheiros" ); diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php index 8b28ba0115..016937c141 100644 --- a/apps/files_encryption/l10n/sl.php +++ b/apps/files_encryption/l10n/sl.php @@ -8,6 +8,8 @@ "Private key password successfully updated." => "Zasebni ključ za geslo je bil uspešno posodobljen.", "Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.", "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah.", +"Missing requirements." => "Manjkajoče zahteve", +"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Preverite, da imate na strežniku nameščen PHP 5.3.3 ali novejši in da je omogočen in pravilno nastavljen PHP OpenSSL . Zaenkrat je šifriranje onemogočeno.", "Saving..." => "Poteka shranjevanje ...", "Your private key is not valid! Maybe the your password was changed from outside." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno.", "You can unlock your private key in your " => "Svoj zasebni ključ lahko odklenite v", diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php index 2cef6686fc..785d46cdc7 100644 --- a/apps/files_encryption/l10n/sv.php +++ b/apps/files_encryption/l10n/sv.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.", "Missing requirements." => "Krav som saknas", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och rätt inställd. Kryperingsappen är därför tillsvidare inaktiverad.", +"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:", "Saving..." => "Sparar...", "Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.", "You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina", diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index ebf678da78..5f3d500509 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -881,8 +881,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { \OC_FileProxy::$enabled = $proxyStatus; // share the file - \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL); - + try { + \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL); + } catch (Exception $e) { + $this->assertEquals(0, strpos($e->getMessage(), "Following users are not set up for encryption")); + } + + // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php index 34d19af0ee..8783896d28 100644 --- a/apps/files_external/l10n/uk.php +++ b/apps/files_external/l10n/uk.php @@ -6,6 +6,7 @@ "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive", "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Попередження: Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його.", "Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Попередження: Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її.", +"Warning: The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "Попередження: Підтримка CURL в PHP не увімкнута чи не встановлена. Під'єднанатися OwnCloud / WebDav або Google Drive неможливе. Попрохайте системного адміністратора встановити її.", "External Storage" => "Зовнішні сховища", "Folder name" => "Ім'я теки", "External storage" => "Зовнішнє сховище", diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index f2dd6108b1..f4d1940b18 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -33,10 +33,25 @@ use Aws\S3\Exception\S3Exception; class AmazonS3 extends \OC\Files\Storage\Common { + /** + * @var \Aws\S3\S3Client + */ private $connection; + /** + * @var string + */ private $bucket; + /** + * @var array + */ private static $tmpFiles = array(); + /** + * @var bool + */ private $test = false; + /** + * @var int + */ private $timeout = 15; private function normalizePath($path) { @@ -96,6 +111,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { )); $this->testTimeout(); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); throw new \Exception("Creation of bucket failed."); } } @@ -129,6 +145,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { )); $this->testTimeout(); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -150,6 +167,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { $path ); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -184,6 +202,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { )); $this->testTimeout(); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -221,6 +240,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { return opendir('fakedir://amazons3' . $path); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } } @@ -249,6 +269,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { return $stat; } catch(S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } } @@ -269,6 +290,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { return 'dir'; } } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -293,6 +315,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { )); $this->testTimeout(); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -315,6 +338,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { 'SaveAs' => $tmpFile )); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -361,6 +385,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { 'Key' => $path )); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -398,6 +423,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { $this->testTimeout(); } } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -417,6 +443,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { )); $this->testTimeout(); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } } else { @@ -432,6 +459,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { )); $this->testTimeout(); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } @@ -514,6 +542,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { unlink($tmpFile); } catch (S3Exception $e) { + \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR); return false; } } diff --git a/apps/files_sharing/css/404.css b/apps/files_sharing/css/404.css new file mode 100644 index 0000000000..2ed81df3b8 --- /dev/null +++ b/apps/files_sharing/css/404.css @@ -0,0 +1,12 @@ + +#body-login .error-broken-link{ + text-align:left;color:#fff; +} + +#body-login .error-broken-link ul{ + margin:10px 0 10px 0; +} + +#body-login .error-broken-link ul li{ + list-style: disc;list-style-position:inside;cursor:default; +} diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php index 9d2ab5031c..ccf7fc28ec 100644 --- a/apps/files_sharing/l10n/ca.php +++ b/apps/files_sharing/l10n/ca.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.", "Password" => "Contrasenya", "Submit" => "Envia", +"Sorry, this link doesn’t seem to work anymore." => "Aquest enllaç sembla que no funciona.", +"Reasons might be:" => "Les raons podrien ser:", +"the item was removed" => "l'element ha estat eliminat", +"the link expired" => "l'enllaç ha vençut", +"sharing is disabled" => "s'ha desactivat la compartició", +"For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.", "%s shared the folder %s with you" => "%s ha compartit la carpeta %s amb vós", "%s shared the file %s with you" => "%s ha compartit el fitxer %s amb vós", "Download" => "Baixa", diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php index cf041726ab..3eebb39e7e 100644 --- a/apps/files_sharing/l10n/cs_CZ.php +++ b/apps/files_sharing/l10n/cs_CZ.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.", "Password" => "Heslo", "Submit" => "Odeslat", +"Sorry, this link doesn’t seem to work anymore." => "Je nám líto, ale tento odkaz již není funkční.", +"Reasons might be:" => "Možné důvody:", +"the item was removed" => "položka byla odebrána", +"the link expired" => "odkazu vypršela platnost", +"sharing is disabled" => "sdílení je zakázané", +"For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.", "%s shared the folder %s with you" => "%s s Vámi sdílí složku %s", "%s shared the file %s with you" => "%s s Vámi sdílí soubor %s", "Download" => "Stáhnout", diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php index cf82e93d4a..f9ee949484 100644 --- a/apps/files_sharing/l10n/da.php +++ b/apps/files_sharing/l10n/da.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.", "Password" => "Kodeord", "Submit" => "Send", +"Sorry, this link doesn’t seem to work anymore." => "Desværre, dette link ser ikke ud til at fungerer længere.", +"Reasons might be:" => "Årsagen kan være:", +"the item was removed" => "Filen blev fjernet", +"the link expired" => "linket udløb", +"sharing is disabled" => "deling er deaktiveret", +"For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ", "%s shared the folder %s with you" => "%s delte mappen %s med dig", "%s shared the file %s with you" => "%s delte filen %s med dig", "Download" => "Download", diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php index ad2d171aa9..9b0184f310 100644 --- a/apps/files_sharing/l10n/de.php +++ b/apps/files_sharing/l10n/de.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.", "Password" => "Passwort", "Submit" => "Absenden", +"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", +"Reasons might be:" => "Gründe könnten sein:", +"the item was removed" => "Die Elemente wurden entfernt", +"the link expired" => "Der Link ist abgelaufen", +"sharing is disabled" => "Teilen ist deaktiviert", +"For more info, please ask the person who sent this link." => "Für mehr Informationen, frage bitte die Person, die dir diesen Link geschickt hat.", "%s shared the folder %s with you" => "%s hat den Ordner %s mit Dir geteilt", "%s shared the file %s with you" => "%s hat die Datei %s mit Dir geteilt", "Download" => "Download", diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php index cac7b7591d..8661e3ee94 100644 --- a/apps/files_sharing/l10n/de_DE.php +++ b/apps/files_sharing/l10n/de_DE.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", "Password" => "Passwort", "Submit" => "Bestätigen", +"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", +"Reasons might be:" => "Gründe könnten sein:", +"the item was removed" => "Das Element wurde entfernt", +"the link expired" => "Der Link ist abgelaufen", +"sharing is disabled" => "Teilen ist deaktiviert", +"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", "%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt", "%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt", "Download" => "Herunterladen", diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php index 1b65cf0c19..2a006630ab 100644 --- a/apps/files_sharing/l10n/es.php +++ b/apps/files_sharing/l10n/es.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" => "Contraseña", "Submit" => "Enviar", +"Sorry, this link doesn’t seem to work anymore." => "Este enlace parece no funcionar más.", +"Reasons might be:" => "Las causas podrían ser:", +"the item was removed" => "el elemento fue eliminado", +"the link expired" => "el enlace expiró", +"sharing is disabled" => "compartir está desactivado", +"For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.", "%s shared the folder %s with you" => "%s compartió la carpeta %s contigo", "%s shared the file %s with you" => "%s compartió el fichero %s contigo", "Download" => "Descargar", diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php index 370cbd9874..59c951b724 100644 --- a/apps/files_sharing/l10n/fi_FI.php +++ b/apps/files_sharing/l10n/fi_FI.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.", "Password" => "Salasana", "Submit" => "Lähetä", +"Sorry, this link doesn’t seem to work anymore." => "Valitettavasti linkki ei vaikuta enää toimivan.", +"Reasons might be:" => "Mahdollisia syitä:", +"the item was removed" => "kohde poistettiin", +"the link expired" => "linkki vanheni", +"sharing is disabled" => "jakaminen on poistettu käytöstä", +"For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.", "%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi", "%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi", "Download" => "Lataa", diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php index 2d8de8e101..c90f5b0760 100644 --- a/apps/files_sharing/l10n/gl.php +++ b/apps/files_sharing/l10n/gl.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.", "Password" => "Contrasinal", "Submit" => "Enviar", +"Sorry, this link doesn’t seem to work anymore." => "Semella que esta ligazón non funciona.", +"Reasons might be:" => "As razóns poderían ser:", +"the item was removed" => "o elemento foi retirado", +"the link expired" => "a ligazón caducou", +"sharing is disabled" => "foi desactivada a compartición", +"For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.", "%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede", "%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede", "Download" => "Descargar", diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php index cf25c53ca3..5bd1879571 100644 --- a/apps/files_sharing/l10n/it.php +++ b/apps/files_sharing/l10n/it.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "La password è errata. Prova ancora.", "Password" => "Password", "Submit" => "Invia", +"Sorry, this link doesn’t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere più attivo.", +"Reasons might be:" => "I motivi potrebbero essere:", +"the item was removed" => "l'elemento è stato rimosso", +"the link expired" => "il collegamento è scaduto", +"sharing is disabled" => "la condivisione è disabilitata", +"For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.", "%s shared the folder %s with you" => "%s ha condiviso la cartella %s con te", "%s shared the file %s with you" => "%s ha condiviso il file %s con te", "Download" => "Scarica", diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php index 39039da77b..3f72403116 100644 --- a/apps/files_sharing/l10n/pl.php +++ b/apps/files_sharing/l10n/pl.php @@ -1,6 +1,13 @@ "To hasło jest niewłaściwe. Spróbuj ponownie.", "Password" => "Hasło", "Submit" => "Wyślij", +"Sorry, this link doesn’t seem to work anymore." => "Przepraszamy ale wygląda na to, że ten link już nie działa.", +"Reasons might be:" => "Możliwe powody:", +"the item was removed" => "element został usunięty", +"the link expired" => "link wygasł", +"sharing is disabled" => "Udostępnianie jest wyłączone", +"For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.", "%s shared the folder %s with you" => "%s współdzieli folder z tobą %s", "%s shared the file %s with you" => "%s współdzieli z tobą plik %s", "Download" => "Pobierz", diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php index c82989857a..ffd068f4fc 100644 --- a/apps/files_sharing/l10n/pt_BR.php +++ b/apps/files_sharing/l10n/pt_BR.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Senha incorreta. Tente novamente.", "Password" => "Senha", "Submit" => "Submeter", +"Sorry, this link doesn’t seem to work anymore." => "Desculpe, este link parece não mais funcionar.", +"Reasons might be:" => "As razões podem ser:", +"the item was removed" => "o item foi removido", +"the link expired" => "o link expirou", +"sharing is disabled" => "compartilhamento está desativada", +"For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.", "%s shared the folder %s with you" => "%s compartilhou a pasta %s com você", "%s shared the file %s with you" => "%s compartilhou o arquivo %s com você", "Download" => "Baixar", diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php index 77332c183f..601518e705 100644 --- a/apps/files_sharing/l10n/ru.php +++ b/apps/files_sharing/l10n/ru.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.", "Password" => "Пароль", "Submit" => "Отправить", +"Sorry, this link doesn’t seem to work anymore." => "К сожалению, эта ссылка, похоже не будет работать больше.", +"Reasons might be:" => "Причиной может быть:", +"the item was removed" => "объект был удалён", +"the link expired" => "срок ссылки истёк", +"sharing is disabled" => "обмен отключен", +"For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, спросите того кто отослал данную ссылку.", "%s shared the folder %s with you" => "%s открыл доступ к папке %s для Вас", "%s shared the file %s with you" => "%s открыл доступ к файлу %s для Вас", "Download" => "Скачать", diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php index dac5e33ec5..434a81ac28 100644 --- a/apps/files_sharing/l10n/sv.php +++ b/apps/files_sharing/l10n/sv.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Lösenordet är fel. Försök igen.", "Password" => "Lösenord", "Submit" => "Skicka", +"Sorry, this link doesn’t seem to work anymore." => "Tyvärr, denna länk verkar inte fungera längre.", +"Reasons might be:" => "Orsaker kan vara:", +"the item was removed" => "objektet togs bort", +"the link expired" => "giltighet för länken har gått ut", +"sharing is disabled" => "delning är inaktiverat", +"For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.", "%s shared the folder %s with you" => "%s delade mappen %s med dig", "%s shared the file %s with you" => "%s delade filen %s med dig", "Download" => "Ladda ner", diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 650fa6a7c2..b3d713097d 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -237,6 +237,12 @@ if (isset($path)) { } else { OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG); } + +$errorTemplate = new OCP\Template('files_sharing', 'part.404', ''); +$errorContent = $errorTemplate->fetchPage(); + header('HTTP/1.0 404 Not Found'); +OCP\Util::addStyle('files_sharing', '404'); $tmpl = new OCP\Template('', '404', 'guest'); +$tmpl->assign('content', $errorContent); $tmpl->printPage(); diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php new file mode 100644 index 0000000000..b5152e1511 --- /dev/null +++ b/apps/files_sharing/templates/part.404.php @@ -0,0 +1,12 @@ +
t('Sorry, this link doesn’t seem to work anymore.')) ?>
+t('Reasons might be:')); ?>
+t('For more info, please ask the person who sent this link.')); ?>
+