diff options
Diffstat (limited to 'apps/files_external')
86 files changed, 489 insertions, 69 deletions
diff --git a/apps/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php index 5ae91c8e182..7f1b4dc9221 100644 --- a/apps/files_external/ajax/applicable.php +++ b/apps/files_external/ajax/applicable.php @@ -2,6 +2,7 @@ /** * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/ajax/oauth1.php b/apps/files_external/ajax/oauth1.php index ca339aeec58..3d6736b3b59 100644 --- a/apps/files_external/ajax/oauth1.php +++ b/apps/files_external/ajax/oauth1.php @@ -4,8 +4,8 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Volkan Gezer <volkangezer@gmail.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php index 0a202e3ddcb..e3e32c4b912 100644 --- a/apps/files_external/ajax/oauth2.php +++ b/apps/files_external/ajax/oauth2.php @@ -6,6 +6,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Volkan Gezer <volkangezer@gmail.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index f33012b5f09..aa39d79a85e 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -1,18 +1,14 @@ <?php /** * @author Christian Berendt <berendt@b1-systems.de> - * @author fibsifan <fi@volans.uberspace.de> * @author Jan-Christoph Borchardt <hey@jancborchardt.net> * @author j-ed <juergen@eisfair.org> - * @author Martin Mattel <martin.mattel@diemattels.at> * @author Michael Gapczynski <GapczynskiM@gmail.com> - * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Ross Nicoll <jrn@jrn.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> - * @author Volkan Gezer <volkangezer@gmail.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php index 3a222141fb5..c7deaaf270e 100644 --- a/apps/files_external/appinfo/application.php +++ b/apps/files_external/appinfo/application.php @@ -1,9 +1,10 @@ <?php /** * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Ross Nicoll <jrn@jrn.me.uk> * @author Vincent Petry <pvince81@owncloud.com> - * @author Robin McCorkell <rmccorkell@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php index a371273e74e..a98a63c711d 100644 --- a/apps/files_external/appinfo/routes.php +++ b/apps/files_external/appinfo/routes.php @@ -3,6 +3,8 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Ross Nicoll <jrn@jrn.me.uk> * @author Vincent Petry <pvince81@owncloud.com> * diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php index c285cd34e70..b278d66c1c0 100644 --- a/apps/files_external/controller/ajaxcontroller.php +++ b/apps/files_external/controller/ajaxcontroller.php @@ -1,6 +1,7 @@ <?php /** * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Ross Nicoll <jrn@jrn.me.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php index 3c1f2022505..e36d1fb2c03 100644 --- a/apps/files_external/controller/globalstoragescontroller.php +++ b/apps/files_external/controller/globalstoragescontroller.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php index 6a01112f8c5..f754565f628 100644 --- a/apps/files_external/controller/storagescontroller.php +++ b/apps/files_external/controller/storagescontroller.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php index f39f8a85d2d..71d1f7cca46 100644 --- a/apps/files_external/controller/userstoragescontroller.php +++ b/apps/files_external/controller/userstoragescontroller.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index bd4aa124ee1..afedf29dc03 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -22,14 +22,20 @@ OC.L10N.register( "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", + "Access key" : "Zugangsschlüssel", + "Secret key" : "Geheimer Schlüssel", "None" : "Keine", + "OAuth1" : "OAuth1", "App key" : "App-Schlüssel", "App secret" : "Geheime Zeichenkette der App", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", + "OpenStack" : "OpenStack", "Username" : "Benutzername", "Password" : "Passwort", "API key" : "API-Schlüssel", + "Username and password" : "Benutzername und Passwort", + "RSA public key" : "RSA öffentlicher Schlüssel", "Public key" : "Öffentlicher Schlüssel", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -43,14 +49,19 @@ OC.L10N.register( "Remote subfolder" : "Entfernter Unterordner", "Secure https://" : "Sicherer HTTPS://", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Host", "Secure ftps://" : "Sicherer ftps://", + "Google Drive" : "Google Drive", "Local" : "Lokal", "Location" : "Ort", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Root", "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Share", + "Domain" : "Domain", "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login", "Username as share" : "Benutzername als Freigabe", "OpenStack Object Storage" : "Openstack-Objektspeicher", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index f09172d814c..ef96bdcf0e5 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -20,14 +20,20 @@ "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", "Saved" : "Gespeichert", + "Access key" : "Zugangsschlüssel", + "Secret key" : "Geheimer Schlüssel", "None" : "Keine", + "OAuth1" : "OAuth1", "App key" : "App-Schlüssel", "App secret" : "Geheime Zeichenkette der App", "Client ID" : "Client-ID", "Client secret" : "Geheime Zeichenkette des Client", + "OpenStack" : "OpenStack", "Username" : "Benutzername", "Password" : "Passwort", "API key" : "API-Schlüssel", + "Username and password" : "Benutzername und Passwort", + "RSA public key" : "RSA öffentlicher Schlüssel", "Public key" : "Öffentlicher Schlüssel", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -41,14 +47,19 @@ "Remote subfolder" : "Entfernter Unterordner", "Secure https://" : "Sicherer HTTPS://", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Host", "Secure ftps://" : "Sicherer ftps://", + "Google Drive" : "Google Drive", "Local" : "Lokal", "Location" : "Ort", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Root", "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Share", + "Domain" : "Domain", "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login", "Username as share" : "Benutzername als Freigabe", "OpenStack Object Storage" : "Openstack-Objektspeicher", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index 3d9add9c2ec..21e9476f77a 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -36,9 +36,11 @@ OC.L10N.register( "Client secret" : "Cliente secreto", "Username" : "Nombre de usuario", "Password" : "Contraseña", + "Tenant name" : "Nombre del inquilino", "API key" : "Clave API", "Username and password" : "Nombre de usuario y contraseña", "Session credentials" : "Credenciales de la sesión", + "RSA public key" : "Clave pública RSA", "Public key" : "Clave pública", "Amazon S3" : "Amazon S3", "Bucket" : "Depósito", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index 60ae72faf72..5f89e008ed5 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -34,9 +34,11 @@ "Client secret" : "Cliente secreto", "Username" : "Nombre de usuario", "Password" : "Contraseña", + "Tenant name" : "Nombre del inquilino", "API key" : "Clave API", "Username and password" : "Nombre de usuario y contraseña", "Session credentials" : "Credenciales de la sesión", + "RSA public key" : "Clave pública RSA", "Public key" : "Clave pública", "Amazon S3" : "Amazon S3", "Bucket" : "Depósito", diff --git a/apps/files_external/l10n/nds.js b/apps/files_external/l10n/nds.js new file mode 100644 index 00000000000..717417fdc2b --- /dev/null +++ b/apps/files_external/l10n/nds.js @@ -0,0 +1,102 @@ +OC.L10N.register( + "files_external", + { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Holen des Requesttokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Holen des Zugrifftokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.", + "Please provide a valid app key and secret." : "Bitte verwende für deine App einen gültigen Schüssel und ein gültiges Secret.", + "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Exception: %s", + "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Exception: %s", + "External storage" : "Externer Speicher", + "Storage with id \"%i\" not found" : "Speicher mit der ID \"%i\" wurde nicht gefunden", + "Invalid backend or authentication mechanism class" : "Ungültige Klasse für das Backend oder für den Authentifizierungsmechanismus", + "Invalid mount point" : "Ungültiger Einhängepunkt", + "Objectstore forbidden" : "Objectstore nicht erlaubt", + "Invalid storage backend \"%s\"" : "Ungültiges Speicherbackend \"%s\"", + "Not permitted to use backend \"%s\"" : "Verwendung des Backends \"%s\" nicht erlaubt", + "Not permitted to use authentication mechanism \"%s\"" : "Verwendung des Authentifizierungsmechanismus \"%s\" nicht erlaubt", + "Unsatisfied backend parameters" : "Nicht bediente Backendparameter", + "Unsatisfied authentication mechanism parameters" : "Nicht bediente Authentifizierungsmechanismusparamter", + "Personal" : "Persönlich", + "System" : "System", + "Grant access" : "Erlaube Zugriff", + "Access granted" : "Zugriff erlaubt", + "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1", + "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", + "Generate keys" : "Generiere Schlüssel", + "Error generating key pair" : "Fehler beim Generieren des Schlüsselpaars", + "Enable encryption" : "Verschlüsselung aktivieren", + "Enable previews" : "Vorschau aktivieren", + "Check for changes" : "Auf Änderungen prüfen", + "Never" : "Nie", + "Once every direct access" : "Einmal bei jedem direkten Zugriff", + "Every time the filesystem is used" : "Bei jeder Verwendung des Dateisystems", + "All users. Type to select user or group." : "Alle Benutzer. Tippe, um eine Benutzergruppe auszuwählen.", + "(group)" : "(Gruppe)", + "Saved" : "Gespeichert", + "Access key" : "Schlüssel für Zugriff", + "Secret key" : "Geheimer Schlüssel", + "Builtin" : "Eingebaut", + "None" : "Keine(r)", + "OAuth1" : "OAuth1", + "App key" : "App Schlüssel", + "App secret" : "App Secret", + "OAuth2" : "OAuth2", + "Client ID" : "Client ID", + "Client secret" : "Client Geheimnis", + "OpenStack" : "OpenStack", + "Username" : "Benutzername", + "Password" : "Passwort", + "API key" : "API Schlüssel", + "Username and password" : "Benutzername und Passwort", + "Session credentials" : "Anmeldedaten der Sitzung", + "RSA public key" : "Öffentlicher RSA Schlüssel", + "Public key" : "Öffentlicher Schlüssel", + "Amazon S3" : "Amazon S3", + "Hostname" : "Hostname", + "Port" : "Port", + "Region" : "Region", + "Enable SSL" : "SSL aktivieren", + "Enable Path Style" : "Path Style aktivieren", + "WebDAV" : "WebDAV", + "URL" : "URL", + "Remote subfolder" : "Entfernter Unterordner", + "Secure https://" : "Sicheres https://", + "Dropbox" : "Dropbox", + "FTP" : "FTP", + "Host" : "Host", + "Secure ftps://" : "Sicheres fpts://", + "Google Drive" : "Google Drive", + "Local" : "Lokal", + "Location" : "Ort", + "ownCloud" : "ownCloud", + "SFTP" : "SFTP", + "Root" : "Root", + "SFTP with secret key login" : "SFTP mit Anmeldung über geheimen Schlüssel", + "SMB / CIFS" : "SMB / CIFS", + "Share" : "Teilen", + "Domain" : "Domäne", + "SMB / CIFS using OC login" : "SMB / DIFS mit OC Anmeldung", + "Username as share" : "Benutzername als Freigabe", + "Service name" : "Name des Dienstes", + "Request timeout (seconds)" : "Zeitüberschreitung der Anfrage (Sekunden)", + "<b>Note:</b> " : "<b>Notiz:</b>", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die cURL-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die FTP-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> \"%s\" ist nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.", + "No external storage configured" : "Kein externer Speicher konfiguriert", + "You can add external storages in the personal settings" : "Du kannst externe Speicher in deinen persönlichen Einstellungen hinzufügen", + "Name" : "Name", + "Storage type" : "Speicherart", + "Scope" : "Bereich", + "External Storage" : "Externer Speicher", + "Folder name" : "Ordnername", + "Authentication" : "Authentifizierung", + "Configuration" : "Konfiguration", + "Available for" : "Verfügbar für", + "Advanced settings" : "Erweiterte Einstellungen", + "Delete" : "Löschen", + "Add storage" : "Speicher hinzufügen", + "Enable User External Storage" : "Externen Speicher für Nutzer aktivieren", + "Allow users to mount the following external storage" : "Erlaube Benutzern folgenden externen Speicher einzuhängen" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_external/l10n/nds.json b/apps/files_external/l10n/nds.json new file mode 100644 index 00000000000..b7c196ef64c --- /dev/null +++ b/apps/files_external/l10n/nds.json @@ -0,0 +1,100 @@ +{ "translations": { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Holen des Requesttokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Holen des Zugrifftokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.", + "Please provide a valid app key and secret." : "Bitte verwende für deine App einen gültigen Schüssel und ein gültiges Secret.", + "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Exception: %s", + "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Exception: %s", + "External storage" : "Externer Speicher", + "Storage with id \"%i\" not found" : "Speicher mit der ID \"%i\" wurde nicht gefunden", + "Invalid backend or authentication mechanism class" : "Ungültige Klasse für das Backend oder für den Authentifizierungsmechanismus", + "Invalid mount point" : "Ungültiger Einhängepunkt", + "Objectstore forbidden" : "Objectstore nicht erlaubt", + "Invalid storage backend \"%s\"" : "Ungültiges Speicherbackend \"%s\"", + "Not permitted to use backend \"%s\"" : "Verwendung des Backends \"%s\" nicht erlaubt", + "Not permitted to use authentication mechanism \"%s\"" : "Verwendung des Authentifizierungsmechanismus \"%s\" nicht erlaubt", + "Unsatisfied backend parameters" : "Nicht bediente Backendparameter", + "Unsatisfied authentication mechanism parameters" : "Nicht bediente Authentifizierungsmechanismusparamter", + "Personal" : "Persönlich", + "System" : "System", + "Grant access" : "Erlaube Zugriff", + "Access granted" : "Zugriff erlaubt", + "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1", + "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2", + "Generate keys" : "Generiere Schlüssel", + "Error generating key pair" : "Fehler beim Generieren des Schlüsselpaars", + "Enable encryption" : "Verschlüsselung aktivieren", + "Enable previews" : "Vorschau aktivieren", + "Check for changes" : "Auf Änderungen prüfen", + "Never" : "Nie", + "Once every direct access" : "Einmal bei jedem direkten Zugriff", + "Every time the filesystem is used" : "Bei jeder Verwendung des Dateisystems", + "All users. Type to select user or group." : "Alle Benutzer. Tippe, um eine Benutzergruppe auszuwählen.", + "(group)" : "(Gruppe)", + "Saved" : "Gespeichert", + "Access key" : "Schlüssel für Zugriff", + "Secret key" : "Geheimer Schlüssel", + "Builtin" : "Eingebaut", + "None" : "Keine(r)", + "OAuth1" : "OAuth1", + "App key" : "App Schlüssel", + "App secret" : "App Secret", + "OAuth2" : "OAuth2", + "Client ID" : "Client ID", + "Client secret" : "Client Geheimnis", + "OpenStack" : "OpenStack", + "Username" : "Benutzername", + "Password" : "Passwort", + "API key" : "API Schlüssel", + "Username and password" : "Benutzername und Passwort", + "Session credentials" : "Anmeldedaten der Sitzung", + "RSA public key" : "Öffentlicher RSA Schlüssel", + "Public key" : "Öffentlicher Schlüssel", + "Amazon S3" : "Amazon S3", + "Hostname" : "Hostname", + "Port" : "Port", + "Region" : "Region", + "Enable SSL" : "SSL aktivieren", + "Enable Path Style" : "Path Style aktivieren", + "WebDAV" : "WebDAV", + "URL" : "URL", + "Remote subfolder" : "Entfernter Unterordner", + "Secure https://" : "Sicheres https://", + "Dropbox" : "Dropbox", + "FTP" : "FTP", + "Host" : "Host", + "Secure ftps://" : "Sicheres fpts://", + "Google Drive" : "Google Drive", + "Local" : "Lokal", + "Location" : "Ort", + "ownCloud" : "ownCloud", + "SFTP" : "SFTP", + "Root" : "Root", + "SFTP with secret key login" : "SFTP mit Anmeldung über geheimen Schlüssel", + "SMB / CIFS" : "SMB / CIFS", + "Share" : "Teilen", + "Domain" : "Domäne", + "SMB / CIFS using OC login" : "SMB / DIFS mit OC Anmeldung", + "Username as share" : "Benutzername als Freigabe", + "Service name" : "Name des Dienstes", + "Request timeout (seconds)" : "Zeitüberschreitung der Anfrage (Sekunden)", + "<b>Note:</b> " : "<b>Notiz:</b>", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die cURL-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die FTP-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> \"%s\" ist nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.", + "No external storage configured" : "Kein externer Speicher konfiguriert", + "You can add external storages in the personal settings" : "Du kannst externe Speicher in deinen persönlichen Einstellungen hinzufügen", + "Name" : "Name", + "Storage type" : "Speicherart", + "Scope" : "Bereich", + "External Storage" : "Externer Speicher", + "Folder name" : "Ordnername", + "Authentication" : "Authentifizierung", + "Configuration" : "Konfiguration", + "Available for" : "Verfügbar für", + "Advanced settings" : "Erweiterte Einstellungen", + "Delete" : "Löschen", + "Add storage" : "Speicher hinzufügen", + "Enable User External Storage" : "Externen Speicher für Nutzer aktivieren", + "Allow users to mount the following external storage" : "Erlaube Benutzern folgenden externen Speicher einzuhängen" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index e4415e2e2b3..7e4bfc18730 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -1,16 +1,27 @@ OC.L10N.register( "files_external", { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов запроса. Проверьте корректность ключа и секрета приложения.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов доступа. Проверьте корректность ключа и секрета приложения.", + "Please provide a valid app key and secret." : "Пожалуйста укажите корректные ключ и секрет приложения.", "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s", "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s", "External storage" : "Внешнее хранилище", "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено", + "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд", "Invalid mount point" : "Неправильная точка входа", + "Objectstore forbidden" : "Хранение объектов запрещено", "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"", + "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда \"%s\"", + "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации \"%s\"", + "Unsatisfied backend parameters" : "Недопустимые настройки бэкенда", + "Unsatisfied authentication mechanism parameters" : "Недопустимые настройки механизма авторизации", "Personal" : "Личное", "System" : "Система", "Grant access" : "Предоставить доступ", "Access granted" : "Доступ предоставлен", + "Error configuring OAuth1" : "Ошибка настройки OAuth1", + "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", "Error generating key pair" : "Ошибка создания ключевой пары", "Enable encryption" : "Включить шифрование", @@ -22,14 +33,26 @@ OC.L10N.register( "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.", "(group)" : "(группа)", "Saved" : "Сохранено", + "Access key" : "Ключ доступа", + "Secret key" : "Секретный ключ", + "Builtin" : "Встроенный", "None" : "Отсутствует", + "OAuth1" : "OAuth1", "App key" : "Ключ приложения", "App secret" : "Секретный ключ ", + "OAuth2" : "OAuth2", "Client ID" : "Идентификатор клиента", "Client secret" : "Клиентский ключ ", + "OpenStack" : "OpenStack", "Username" : "Имя пользователя", "Password" : "Пароль", + "Tenant name" : "Имя арендатора", + "Identity endpoint URL" : "Удостоверение конечной точки URL", + "Rackspace" : "Rackspace", "API key" : "Ключ API", + "Username and password" : "Имя пользователя и пароль", + "Session credentials" : "Учетные данные сессии", + "RSA public key" : "Открытый ключ RSA", "Public key" : "Открытый ключ", "Amazon S3" : "Amazon S3", "Bucket" : "Корзина", @@ -43,17 +66,24 @@ OC.L10N.register( "Remote subfolder" : "Удаленный подкаталог", "Secure https://" : "Безопасный https://", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Сервер", "Secure ftps://" : "Защищённый ftps://", + "Google Drive" : "Google Drive", "Local" : "Локально", "Location" : "Местоположение", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Корневой каталог", "SFTP with secret key login" : "SFTP с помощью секретного ключа", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Общий доступ", + "Domain" : "Домен", "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC", "Username as share" : "Имя пользователя в качестве имени общего ресурса", "OpenStack Object Storage" : "Хранилище объектов OpenStack", + "Service name" : "Название сервиса", + "Request timeout (seconds)" : "Таймаут запроса (секунды)", "<b>Note:</b> " : "<b>Примечание:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.", @@ -65,6 +95,7 @@ OC.L10N.register( "Scope" : "Область", "External Storage" : "Внешнее хранилище", "Folder name" : "Имя каталога", + "Authentication" : "Авторизация", "Configuration" : "Конфигурация", "Available for" : "Доступно для", "Advanced settings" : "Расширенные настройки", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 1ea452f5408..50754b309ec 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -1,14 +1,25 @@ { "translations": { + "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов запроса. Проверьте корректность ключа и секрета приложения.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов доступа. Проверьте корректность ключа и секрета приложения.", + "Please provide a valid app key and secret." : "Пожалуйста укажите корректные ключ и секрет приложения.", "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s", "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s", "External storage" : "Внешнее хранилище", "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено", + "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд", "Invalid mount point" : "Неправильная точка входа", + "Objectstore forbidden" : "Хранение объектов запрещено", "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"", + "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда \"%s\"", + "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации \"%s\"", + "Unsatisfied backend parameters" : "Недопустимые настройки бэкенда", + "Unsatisfied authentication mechanism parameters" : "Недопустимые настройки механизма авторизации", "Personal" : "Личное", "System" : "Система", "Grant access" : "Предоставить доступ", "Access granted" : "Доступ предоставлен", + "Error configuring OAuth1" : "Ошибка настройки OAuth1", + "Error configuring OAuth2" : "Ошибка настройки OAuth2", "Generate keys" : "Создать ключи", "Error generating key pair" : "Ошибка создания ключевой пары", "Enable encryption" : "Включить шифрование", @@ -20,14 +31,26 @@ "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.", "(group)" : "(группа)", "Saved" : "Сохранено", + "Access key" : "Ключ доступа", + "Secret key" : "Секретный ключ", + "Builtin" : "Встроенный", "None" : "Отсутствует", + "OAuth1" : "OAuth1", "App key" : "Ключ приложения", "App secret" : "Секретный ключ ", + "OAuth2" : "OAuth2", "Client ID" : "Идентификатор клиента", "Client secret" : "Клиентский ключ ", + "OpenStack" : "OpenStack", "Username" : "Имя пользователя", "Password" : "Пароль", + "Tenant name" : "Имя арендатора", + "Identity endpoint URL" : "Удостоверение конечной точки URL", + "Rackspace" : "Rackspace", "API key" : "Ключ API", + "Username and password" : "Имя пользователя и пароль", + "Session credentials" : "Учетные данные сессии", + "RSA public key" : "Открытый ключ RSA", "Public key" : "Открытый ключ", "Amazon S3" : "Amazon S3", "Bucket" : "Корзина", @@ -41,17 +64,24 @@ "Remote subfolder" : "Удаленный подкаталог", "Secure https://" : "Безопасный https://", "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Сервер", "Secure ftps://" : "Защищённый ftps://", + "Google Drive" : "Google Drive", "Local" : "Локально", "Location" : "Местоположение", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "Root" : "Корневой каталог", "SFTP with secret key login" : "SFTP с помощью секретного ключа", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Общий доступ", + "Domain" : "Домен", "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC", "Username as share" : "Имя пользователя в качестве имени общего ресурса", "OpenStack Object Storage" : "Хранилище объектов OpenStack", + "Service name" : "Название сервиса", + "Request timeout (seconds)" : "Таймаут запроса (секунды)", "<b>Note:</b> " : "<b>Примечание:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.", @@ -63,6 +93,7 @@ "Scope" : "Область", "External Storage" : "Внешнее хранилище", "Folder name" : "Имя каталога", + "Authentication" : "Авторизация", "Configuration" : "Конфигурация", "Available for" : "Доступно для", "Advanced settings" : "Расширенные настройки", diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js index b0fed7b5657..6eada0b32f3 100644 --- a/apps/files_external/l10n/tr.js +++ b/apps/files_external/l10n/tr.js @@ -1,18 +1,20 @@ OC.L10N.register( "files_external", { - "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", - "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", + "Fetching request tokens failed. Verify that your app key and secret are correct." : "İstek jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Erişim jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.", "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s", "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s", "External storage" : "Harici depolama", "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı", - "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı", + "Invalid backend or authentication mechanism class" : "Geçersiz arka uç veya kimlik doğrulama mekanizma sınıfı", "Invalid mount point" : "Geçersiz bağlama noktası", "Objectstore forbidden" : "Nesne deposu yasaktır", "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"", - "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri", + "Not permitted to use backend \"%s\"" : "\"%s\" arka ucu kullanımına izin verilmiyor", + "Not permitted to use authentication mechanism \"%s\"" : "\"%s\" kimlik doğrulama mekanizmasına izin verilmiyor", + "Unsatisfied backend parameters" : "Yetersiz arka uç parametreleri", "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri", "Personal" : "Kişisel", "System" : "Sistem", @@ -41,11 +43,16 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "İstemci kimliği", "Client secret" : "İstemci parolası", + "OpenStack" : "OpenStack", "Username" : "Kullanıcı Adı", "Password" : "Parola", + "Tenant name" : "Kiracı adı", + "Identity endpoint URL" : "Kimlik uç nokta URL'si", + "Rackspace" : "Rackspace", "API key" : "API anahtarı", "Username and password" : "Kullanıcı adı ve parola", "Session credentials" : "Oturum bilgileri", + "RSA public key" : "RSA ortak anahtarı", "Public key" : "Ortak anahtar", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -71,9 +78,12 @@ OC.L10N.register( "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP", "SMB / CIFS" : "SMB / CIFS", "Share" : "Paylaş", + "Domain" : "Alan adı", "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS", "Username as share" : "Paylaşım olarak kullanıcı adı", "OpenStack Object Storage" : "OpenStack Nesne Depolama", + "Service name" : "Hizmet adı", + "Request timeout (seconds)" : "İstek zamanaşımı (saniye)", "<b>Note:</b> " : "<b>Not:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json index 2a7d69832f8..7fd764d0165 100644 --- a/apps/files_external/l10n/tr.json +++ b/apps/files_external/l10n/tr.json @@ -1,16 +1,18 @@ { "translations": { - "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", - "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", + "Fetching request tokens failed. Verify that your app key and secret are correct." : "İstek jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", + "Fetching access tokens failed. Verify that your app key and secret are correct." : "Erişim jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.", "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.", "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s", "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s", "External storage" : "Harici depolama", "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı", - "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı", + "Invalid backend or authentication mechanism class" : "Geçersiz arka uç veya kimlik doğrulama mekanizma sınıfı", "Invalid mount point" : "Geçersiz bağlama noktası", "Objectstore forbidden" : "Nesne deposu yasaktır", "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"", - "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri", + "Not permitted to use backend \"%s\"" : "\"%s\" arka ucu kullanımına izin verilmiyor", + "Not permitted to use authentication mechanism \"%s\"" : "\"%s\" kimlik doğrulama mekanizmasına izin verilmiyor", + "Unsatisfied backend parameters" : "Yetersiz arka uç parametreleri", "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri", "Personal" : "Kişisel", "System" : "Sistem", @@ -39,11 +41,16 @@ "OAuth2" : "OAuth2", "Client ID" : "İstemci kimliği", "Client secret" : "İstemci parolası", + "OpenStack" : "OpenStack", "Username" : "Kullanıcı Adı", "Password" : "Parola", + "Tenant name" : "Kiracı adı", + "Identity endpoint URL" : "Kimlik uç nokta URL'si", + "Rackspace" : "Rackspace", "API key" : "API anahtarı", "Username and password" : "Kullanıcı adı ve parola", "Session credentials" : "Oturum bilgileri", + "RSA public key" : "RSA ortak anahtarı", "Public key" : "Ortak anahtar", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -69,9 +76,12 @@ "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP", "SMB / CIFS" : "SMB / CIFS", "Share" : "Paylaş", + "Domain" : "Alan adı", "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS", "Username as share" : "Paylaşım olarak kullanıcı adı", "OpenStack Object Storage" : "OpenStack Nesne Depolama", + "Service name" : "Hizmet adı", + "Request timeout (seconds)" : "İstek zamanaşımı (saniye)", "<b>Note:</b> " : "<b>Not:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.", diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 24a0346df63..00915140bab 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -7,6 +7,7 @@ * @author Christopher T. Johnson <ctjctj@gmail.com> * @author Johan Björk <johanimon@gmail.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Martin Mattel <martin.mattel@diemattels.at> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> diff --git a/apps/files_external/lib/api.php b/apps/files_external/lib/api.php index 015c15c41ff..af9b802e522 100644 --- a/apps/files_external/lib/api.php +++ b/apps/files_external/lib/api.php @@ -2,6 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/auth/amazons3/accesskey.php index 9e3aab374b9..d265db6279f 100644 --- a/apps/files_external/lib/auth/amazons3/accesskey.php +++ b/apps/files_external/lib/auth/amazons3/accesskey.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php index 2ab34ed0105..e695cbbebd5 100644 --- a/apps/files_external/lib/auth/authmechanism.php +++ b/apps/files_external/lib/auth/authmechanism.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/builtin.php b/apps/files_external/lib/auth/builtin.php index ee28a4e8a5c..8fb4c901cbc 100644 --- a/apps/files_external/lib/auth/builtin.php +++ b/apps/files_external/lib/auth/builtin.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/nullmechanism.php b/apps/files_external/lib/auth/nullmechanism.php index 1765fc67396..399c8301c5a 100644 --- a/apps/files_external/lib/auth/nullmechanism.php +++ b/apps/files_external/lib/auth/nullmechanism.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/auth/oauth1/oauth1.php index 3fb1b16aa6d..7bdd01d4c16 100644 --- a/apps/files_external/lib/auth/oauth1/oauth1.php +++ b/apps/files_external/lib/auth/oauth1/oauth1.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/auth/oauth2/oauth2.php index 73faa85a44e..7123f8c16e3 100644 --- a/apps/files_external/lib/auth/oauth2/oauth2.php +++ b/apps/files_external/lib/auth/oauth2/oauth2.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/auth/openstack/openstack.php index faf356bcf2e..757fdab9ea6 100644 --- a/apps/files_external/lib/auth/openstack/openstack.php +++ b/apps/files_external/lib/auth/openstack/openstack.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/auth/openstack/rackspace.php index 9268f3aad87..395b58e6fae 100644 --- a/apps/files_external/lib/auth/openstack/rackspace.php +++ b/apps/files_external/lib/auth/openstack/rackspace.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/password/password.php b/apps/files_external/lib/auth/password/password.php index 96ad4b496d4..d3444cb1419 100644 --- a/apps/files_external/lib/auth/password/password.php +++ b/apps/files_external/lib/auth/password/password.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/password/sessioncredentials.php b/apps/files_external/lib/auth/password/sessioncredentials.php index 37cfd97a176..8e36ff5f1d8 100644 --- a/apps/files_external/lib/auth/password/sessioncredentials.php +++ b/apps/files_external/lib/auth/password/sessioncredentials.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php index f40136dda01..4e19f90c83b 100644 --- a/apps/files_external/lib/auth/publickey/rsa.php +++ b/apps/files_external/lib/auth/publickey/rsa.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/backend/amazons3.php index 1cf62d7cb09..538b53637e3 100644 --- a/apps/files_external/lib/backend/amazons3.php +++ b/apps/files_external/lib/backend/amazons3.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php index 68585cf377e..9868519ed4f 100644 --- a/apps/files_external/lib/backend/backend.php +++ b/apps/files_external/lib/backend/backend.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/backend/dav.php index c4f446548e1..abc5103c70f 100644 --- a/apps/files_external/lib/backend/dav.php +++ b/apps/files_external/lib/backend/dav.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php index 3e595cb0a9c..01b7a62edbe 100644 --- a/apps/files_external/lib/backend/dropbox.php +++ b/apps/files_external/lib/backend/dropbox.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/backend/ftp.php index 1caf3a8fcb8..8f3dfffc77b 100644 --- a/apps/files_external/lib/backend/ftp.php +++ b/apps/files_external/lib/backend/ftp.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php index bc0b52c464b..14b2815b6e5 100644 --- a/apps/files_external/lib/backend/google.php +++ b/apps/files_external/lib/backend/google.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php index 83a5b45940d..5ebf143f749 100644 --- a/apps/files_external/lib/backend/legacybackend.php +++ b/apps/files_external/lib/backend/legacybackend.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/backend/local.php index a80b437fab7..7827055eeac 100644 --- a/apps/files_external/lib/backend/local.php +++ b/apps/files_external/lib/backend/local.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/owncloud.php b/apps/files_external/lib/backend/owncloud.php index d06625de241..d10f0b3bd0b 100644 --- a/apps/files_external/lib/backend/owncloud.php +++ b/apps/files_external/lib/backend/owncloud.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/backend/sftp.php index c0bcd27c54b..d3fcd41d520 100644 --- a/apps/files_external/lib/backend/sftp.php +++ b/apps/files_external/lib/backend/sftp.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php index 13f45f1140c..8db5761c1b2 100644 --- a/apps/files_external/lib/backend/sftp_key.php +++ b/apps/files_external/lib/backend/sftp_key.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php index 7865b44d689..aa91cf51e85 100644 --- a/apps/files_external/lib/backend/smb.php +++ b/apps/files_external/lib/backend/smb.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php index 9fc17400884..b84b0b9dcb1 100644 --- a/apps/files_external/lib/backend/smb_oc.php +++ b/apps/files_external/lib/backend/smb_oc.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php index 2e14855206c..8c64c791ad8 100644 --- a/apps/files_external/lib/backend/swift.php +++ b/apps/files_external/lib/backend/swift.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 457fd58f0f8..d9fdb748fcd 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -1,10 +1,10 @@ <?php /** + * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Björn Schießle <schiessle@owncloud.com> * @author Frank Karlitschek <frank@owncloud.org> * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php index fb36e011655..3a04512e8a8 100644 --- a/apps/files_external/lib/config/configadapter.php +++ b/apps/files_external/lib/config/configadapter.php @@ -2,7 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/dependencytrait.php index f0d6d6080e5..f112f6c2e66 100644 --- a/apps/files_external/lib/dependencytrait.php +++ b/apps/files_external/lib/dependencytrait.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/failedstorage.php b/apps/files_external/lib/failedstorage.php index 22ee5326491..c3181fd6b02 100644 --- a/apps/files_external/lib/failedstorage.php +++ b/apps/files_external/lib/failedstorage.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/frontenddefinitiontrait.php index a5fb1a3f62f..d3b78aa56d4 100644 --- a/apps/files_external/lib/frontenddefinitiontrait.php +++ b/apps/files_external/lib/frontenddefinitiontrait.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 94f954178c0..eba2ee7f9b5 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -10,6 +10,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * diff --git a/apps/files_external/lib/identifiertrait.php b/apps/files_external/lib/identifiertrait.php index 7f36144e474..913e1899db8 100644 --- a/apps/files_external/lib/identifiertrait.php +++ b/apps/files_external/lib/identifiertrait.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php b/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php index dd4cd75df12..f77667cb70a 100644 --- a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php +++ b/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/legacydependencycheckpolyfill.php index 7bb137fb3e1..bd0095debcd 100644 --- a/apps/files_external/lib/legacydependencycheckpolyfill.php +++ b/apps/files_external/lib/legacydependencycheckpolyfill.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/personalmount.php index d177f1a1ad0..26f68ba32db 100644 --- a/apps/files_external/lib/personalmount.php +++ b/apps/files_external/lib/personalmount.php @@ -2,6 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/sessionstoragewrapper.php b/apps/files_external/lib/sessionstoragewrapper.php index f8f5aba53a2..e45589c4472 100644 --- a/apps/files_external/lib/sessionstoragewrapper.php +++ b/apps/files_external/lib/sessionstoragewrapper.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index 921e7283c66..5dcc7686ca3 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -7,6 +7,7 @@ * @author Lennart Rosam <lennart.rosam@medien-systempartner.de> * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Ross Nicoll <jrn@jrn.me.uk> * @author SA <stephen@mthosting.net> diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/storageconfig.php index aeb8f527078..70aaa186783 100644 --- a/apps/files_external/lib/storageconfig.php +++ b/apps/files_external/lib/storageconfig.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/lib/storagemodifiertrait.php b/apps/files_external/lib/storagemodifiertrait.php index 3af0bb234d9..6d31ce8999a 100644 --- a/apps/files_external/lib/storagemodifiertrait.php +++ b/apps/files_external/lib/storagemodifiertrait.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 20d2b8f4988..b9454b8d671 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -5,6 +5,7 @@ * @author Christian Berendt <berendt@b1-systems.de> * @author Felix Moeller <mail@felixmoeller.de> * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Martin Mattel <martin.mattel@diemattels.at> * @author Morris Jobke <hey@morrisjobke.de> * @author Philipp Kapfer <philipp.kapfer@gmx.at> * @author Robin Appelman <icewind@owncloud.com> diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php index f048d65540b..df15c3bd258 100644 --- a/apps/files_external/personal.php +++ b/apps/files_external/personal.php @@ -5,6 +5,7 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php index 49ffea43d1b..ec9b8e782fa 100644 --- a/apps/files_external/service/globalstoragesservice.php +++ b/apps/files_external/service/globalstoragesservice.php @@ -1,7 +1,7 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php index 83a82de0bed..41bb0ca9b80 100644 --- a/apps/files_external/service/storagesservice.php +++ b/apps/files_external/service/storagesservice.php @@ -1,7 +1,7 @@ <?php /** * @author Lukas Reschke <lukas@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. @@ -550,6 +550,21 @@ abstract class StoragesService { $this->writeConfig($allStorages); $this->triggerHooks($deletedStorage, Filesystem::signal_delete_mount); + + // delete oc_storages entries and oc_filecache + try { + $rustyStorageId = $this->getRustyStorageIdFromConfig($deletedStorage); + \OC\Files\Cache\Storage::remove($rustyStorageId); + } catch (\Exception $e) { + // can happen either for invalid configs where the storage could not + // be instantiated or whenever $user vars where used, in which case + // the storage id could not be computed + \OCP\Util::writeLog( + 'files_external', + 'Exception: "' . $e->getMessage() . '"', + \OCP\Util::ERROR + ); + } } /** @@ -570,4 +585,30 @@ abstract class StoragesService { return (max(array_keys($allStorages)) + 1); } + /** + * Returns the rusty storage id from oc_storages from the given storage config. + * + * @param StorageConfig $storageConfig + * @return string rusty storage id + */ + private function getRustyStorageIdFromConfig(StorageConfig $storageConfig) { + // if any of the storage options contains $user, it is not possible + // to compute the possible storage id as we don't know which users + // mounted it already (and we certainly don't want to iterate over ALL users) + foreach ($storageConfig->getBackendOptions() as $value) { + if (strpos($value, '$user') !== false) { + throw new \Exception('Cannot compute storage id for deletion due to $user vars in the configuration'); + } + } + + // note: similar to ConfigAdapter->prepateStorageConfig() + $storageConfig->getAuthMechanism()->manipulateStorageConfig($storageConfig); + $storageConfig->getBackend()->manipulateStorageConfig($storageConfig); + + $class = $storageConfig->getBackend()->getStorageClass(); + $storageImpl = new $class($storageConfig->getBackendOptions()); + + return $storageImpl->getId(); + } + } diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php index 7c60bc6d497..afe77e1e059 100644 --- a/apps/files_external/service/userglobalstoragesservice.php +++ b/apps/files_external/service/userglobalstoragesservice.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php index 6e3c327c09c..a8cdf60ad9c 100644 --- a/apps/files_external/service/userstoragesservice.php +++ b/apps/files_external/service/userstoragesservice.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/service/usertrait.php b/apps/files_external/service/usertrait.php index 4f84543565c..924f358f939 100644 --- a/apps/files_external/service/usertrait.php +++ b/apps/files_external/service/usertrait.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php index f82ab035c1c..03ed363bdb2 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -7,7 +7,7 @@ * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> - * @author Vincent Petry <pvince81@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/auth/authmechanismtest.php b/apps/files_external/tests/auth/authmechanismtest.php index b09d65a02df..6933cc988b1 100644 --- a/apps/files_external/tests/auth/authmechanismtest.php +++ b/apps/files_external/tests/auth/authmechanismtest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/backend/backendtest.php b/apps/files_external/tests/backend/backendtest.php index 4956a923e94..9e0e27c824b 100644 --- a/apps/files_external/tests/backend/backendtest.php +++ b/apps/files_external/tests/backend/backendtest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php index d57810de29b..6c977522e9e 100644 --- a/apps/files_external/tests/backend/legacybackendtest.php +++ b/apps/files_external/tests/backend/legacybackendtest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/backends/amazons3.php b/apps/files_external/tests/backends/amazons3.php index 7e88f3d0b74..c16581a4495 100644 --- a/apps/files_external/tests/backends/amazons3.php +++ b/apps/files_external/tests/backends/amazons3.php @@ -1,10 +1,10 @@ <?php /** * @author Joas Schilling <nickvergessen@owncloud.com> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Michael Gapczynski <GapczynskiM@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/backends/sftp_key.php b/apps/files_external/tests/backends/sftp_key.php index c83d12251aa..6e8ac9f7239 100644 --- a/apps/files_external/tests/backends/sftp_key.php +++ b/apps/files_external/tests/backends/sftp_key.php @@ -2,6 +2,7 @@ /** * @author Morris Jobke <hey@morrisjobke.de> * @author Ross Nicoll <jrn@jrn.me.uk> + * @author Viktor Szépe <viktor@szepe.net> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/controller/globalstoragescontrollertest.php b/apps/files_external/tests/controller/globalstoragescontrollertest.php index 6b020198bd8..37b5fed1481 100644 --- a/apps/files_external/tests/controller/globalstoragescontrollertest.php +++ b/apps/files_external/tests/controller/globalstoragescontrollertest.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php index 5e1deb821f4..8a7acf81009 100644 --- a/apps/files_external/tests/controller/storagescontrollertest.php +++ b/apps/files_external/tests/controller/storagescontrollertest.php @@ -1,7 +1,7 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> - * @author Robin McCorkell <rmccorkell@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php index 33ef274c87c..acb25d11d09 100644 --- a/apps/files_external/tests/controller/userstoragescontrollertest.php +++ b/apps/files_external/tests/controller/userstoragescontrollertest.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/tests/definitionparameterttest.php b/apps/files_external/tests/definitionparameterttest.php index 22e0b842254..3983a805dad 100644 --- a/apps/files_external/tests/definitionparameterttest.php +++ b/apps/files_external/tests/definitionparameterttest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/frontenddefinitiontraittest.php index d92d02b9854..d446813fe92 100644 --- a/apps/files_external/tests/frontenddefinitiontraittest.php +++ b/apps/files_external/tests/frontenddefinitiontraittest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/legacydependencycheckpolyfilltest.php b/apps/files_external/tests/legacydependencycheckpolyfilltest.php index 49d825d77aa..41109b63c1e 100644 --- a/apps/files_external/tests/legacydependencycheckpolyfilltest.php +++ b/apps/files_external/tests/legacydependencycheckpolyfilltest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php index 414a9eee2ec..5097b479a5f 100644 --- a/apps/files_external/tests/service/backendservicetest.php +++ b/apps/files_external/tests/service/backendservicetest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/service/globalstoragesservicetest.php index 94c34c221fc..c129365913f 100644 --- a/apps/files_external/tests/service/globalstoragesservicetest.php +++ b/apps/files_external/tests/service/globalstoragesservicetest.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php index ddf52e6272e..7487ba459af 100644 --- a/apps/files_external/tests/service/storagesservicetest.php +++ b/apps/files_external/tests/service/storagesservicetest.php @@ -1,7 +1,7 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> - * @author Robin McCorkell <rmccorkell@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 @@ -216,18 +216,57 @@ abstract class StoragesServiceTest extends \Test\TestCase { $this->service->updateStorage($storage); } - public function testDeleteStorage() { + public function deleteStorageDataProvider() { + return [ + // regular case, can properly delete the oc_storages entry + [ + [ + 'share' => 'share', + 'host' => 'example.com', + 'user' => 'test', + 'password' => 'testPassword', + 'root' => 'someroot', + ], + 'smb::test@example.com//share//someroot/', + 0 + ], + // special case with $user vars, cannot auto-remove the oc_storages entry + [ + [ + 'share' => 'share', + 'host' => 'example.com', + 'user' => '$user', + 'password' => 'testPassword', + 'root' => 'someroot', + ], + 'smb::someone@example.com//share//someroot/', + 1 + ], + ]; + } + + /** + * @dataProvider deleteStorageDataProvider + */ + public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion) { $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB'); $authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism'); $storage = new StorageConfig(255); $storage->setMountPoint('mountpoint'); $storage->setBackend($backend); $storage->setAuthMechanism($authMechanism); - $storage->setBackendOptions(['password' => 'testPassword']); + $storage->setBackendOptions($backendOptions); $newStorage = $this->service->addStorage($storage); $this->assertEquals(1, $newStorage->getId()); + // manually trigger storage entry because normally it happens on first + // access, which isn't possible within this test + $storageCache = new \OC\Files\Cache\Storage($rustyStorageId); + + // get numeric id for later check + $numericId = $storageCache->getNumericId(); + $newStorage = $this->service->removeStorage(1); $caught = false; @@ -238,6 +277,13 @@ abstract class StoragesServiceTest extends \Test\TestCase { } $this->assertTrue($caught); + + // storage id was removed from oc_storages + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + $storageCheckQuery = $qb->select('*') + ->from('storages') + ->where($qb->expr()->eq('numeric_id', $qb->expr()->literal($numericId))); + $this->assertCount($expectedCountAfterDeletion, $storageCheckQuery->execute()->fetchAll()); } /** diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php index b6dc952605d..7c2516f0477 100644 --- a/apps/files_external/tests/service/userglobalstoragesservicetest.php +++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php @@ -1,6 +1,6 @@ <?php /** - * @author Robin McCorkell <rmccorkell@owncloud.com> + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/service/userstoragesservicetest.php index 8bbfbe5a050..78f9231c3d1 100644 --- a/apps/files_external/tests/service/userstoragesservicetest.php +++ b/apps/files_external/tests/service/userstoragesservicetest.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. @@ -137,8 +138,11 @@ class UserStoragesServiceTest extends StoragesServiceTest { $this->assertEmpty(self::$hookCalls); } - public function testDeleteStorage() { - parent::testDeleteStorage(); + /** + * @dataProvider deleteStorageDataProvider + */ + public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion) { + parent::testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion); // hook called once for user (first one was during test creation) $this->assertHookCall( diff --git a/apps/files_external/tests/storageconfigtest.php b/apps/files_external/tests/storageconfigtest.php index dba5105d7db..c987f7a84e2 100644 --- a/apps/files_external/tests/storageconfigtest.php +++ b/apps/files_external/tests/storageconfigtest.php @@ -1,5 +1,6 @@ <?php /** + * @author Robin McCorkell <rmccorkell@karoshi.org.uk> * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. |