summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/de.js5
-rw-r--r--lib/l10n/de.json5
-rw-r--r--lib/l10n/de_DE.js5
-rw-r--r--lib/l10n/de_DE.json5
-rw-r--r--lib/l10n/en_GB.js1
-rw-r--r--lib/l10n/en_GB.json1
-rw-r--r--lib/l10n/es.js5
-rw-r--r--lib/l10n/es.json5
-rw-r--r--lib/l10n/es_MX.js19
-rw-r--r--lib/l10n/es_MX.json19
-rw-r--r--lib/l10n/fr.js5
-rw-r--r--lib/l10n/fr.json5
-rw-r--r--lib/l10n/it.js1
-rw-r--r--lib/l10n/it.json1
-rw-r--r--lib/l10n/pt_BR.js5
-rw-r--r--lib/l10n/pt_BR.json5
-rw-r--r--lib/l10n/sr.js5
-rw-r--r--lib/l10n/sr.json5
-rw-r--r--lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php10
19 files changed, 108 insertions, 4 deletions
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 1bf717dbbe9..5fc9330713d 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
"Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.",
"Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.",
+ "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
"Unknown filetype" : "Unbekannter Dateityp",
"Invalid image" : "Ungültiges Bild",
"Avatar image is not square" : "Benutzerbild ist nicht quadratisch",
@@ -66,6 +67,10 @@ OC.L10N.register(
"Unknown user" : "Unbekannter Benutzer",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Anlegen",
+ "Change" : "Ändern",
+ "Delete" : "Löschen",
+ "Share" : "Teilen",
"Basic settings" : "Grundeinstellungen",
"Sharing" : "Teilen",
"Security" : "Sicherheit",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index d90b44f67b3..00877b62202 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
"Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.",
"Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.",
+ "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
"Unknown filetype" : "Unbekannter Dateityp",
"Invalid image" : "Ungültiges Bild",
"Avatar image is not square" : "Benutzerbild ist nicht quadratisch",
@@ -64,6 +65,10 @@
"Unknown user" : "Unbekannter Benutzer",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Anlegen",
+ "Change" : "Ändern",
+ "Delete" : "Löschen",
+ "Share" : "Teilen",
"Basic settings" : "Grundeinstellungen",
"Sharing" : "Teilen",
"Security" : "Sicherheit",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 5330dcd7ccd..ae456e130ae 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
"Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.",
"Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.",
+ "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
"Unknown filetype" : "Unbekannter Dateityp",
"Invalid image" : "Ungültiges Bild",
"Avatar image is not square" : "Benutzerbild ist nicht quadratisch",
@@ -66,6 +67,10 @@ OC.L10N.register(
"Unknown user" : "Unbekannter Benutzer",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Erstellen",
+ "Change" : "Ändern",
+ "Delete" : "Löschen",
+ "Share" : "Teilen",
"Basic settings" : "Grundeinstellungen",
"Sharing" : "Teilen",
"Security" : "Sicherheit",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 8dc85c49bbb..20919c6da6a 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
"Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.",
"Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.",
+ "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
"Unknown filetype" : "Unbekannter Dateityp",
"Invalid image" : "Ungültiges Bild",
"Avatar image is not square" : "Benutzerbild ist nicht quadratisch",
@@ -64,6 +65,10 @@
"Unknown user" : "Unbekannter Benutzer",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Erstellen",
+ "Change" : "Ändern",
+ "Delete" : "Löschen",
+ "Share" : "Teilen",
"Basic settings" : "Grundeinstellungen",
"Sharing" : "Teilen",
"Security" : "Sicherheit",
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index b28fe47c46b..7e7c77430ae 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "Following platforms are supported: %s",
"Server version %s or higher is required." : "Server version %s or higher is required.",
"Server version %s or lower is required." : "Server version %s or lower is required.",
+ "Logged in user must be an admin" : "Logged in user must be an admin",
"Unknown filetype" : "Unknown filetype",
"Invalid image" : "Invalid image",
"Avatar image is not square" : "Avatar image is not square",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index bf8ea58a8f2..393cf15a33a 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "Following platforms are supported: %s",
"Server version %s or higher is required." : "Server version %s or higher is required.",
"Server version %s or lower is required." : "Server version %s or lower is required.",
+ "Logged in user must be an admin" : "Logged in user must be an admin",
"Unknown filetype" : "Unknown filetype",
"Invalid image" : "Invalid image",
"Avatar image is not square" : "Avatar image is not square",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index a0f23e34d2c..1a50381de6c 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "Las siguientes plataformas están soportadas: %s",
"Server version %s or higher is required." : "Se necesita la versión %s o superior del servidor.",
"Server version %s or lower is required." : "Se necesita la versión %s o inferior del servidor. ",
+ "Logged in user must be an admin" : "El usuario registrado debe ser un administrador",
"Unknown filetype" : "Tipo de archivo desconocido",
"Invalid image" : "Imagen inválida",
"Avatar image is not square" : "La imagen de avatar no es cuadrada",
@@ -66,6 +67,10 @@ OC.L10N.register(
"Unknown user" : "Usuario desconocido",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Crear",
+ "Change" : "Cambiar",
+ "Delete" : "Eliminar",
+ "Share" : "Compartir",
"Basic settings" : "Ajustes básicos",
"Sharing" : "Compartir",
"Security" : "Seguridad",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index ec5252d028f..c626ecc891a 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "Las siguientes plataformas están soportadas: %s",
"Server version %s or higher is required." : "Se necesita la versión %s o superior del servidor.",
"Server version %s or lower is required." : "Se necesita la versión %s o inferior del servidor. ",
+ "Logged in user must be an admin" : "El usuario registrado debe ser un administrador",
"Unknown filetype" : "Tipo de archivo desconocido",
"Invalid image" : "Imagen inválida",
"Avatar image is not square" : "La imagen de avatar no es cuadrada",
@@ -64,6 +65,10 @@
"Unknown user" : "Usuario desconocido",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Crear",
+ "Change" : "Cambiar",
+ "Delete" : "Eliminar",
+ "Share" : "Compartir",
"Basic settings" : "Ajustes básicos",
"Sharing" : "Compartir",
"Security" : "Seguridad",
diff --git a/lib/l10n/es_MX.js b/lib/l10n/es_MX.js
index 47f76fb7755..344eb1bf312 100644
--- a/lib/l10n/es_MX.js
+++ b/lib/l10n/es_MX.js
@@ -66,6 +66,10 @@ OC.L10N.register(
"Unknown user" : "Ususario desconocido",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Crear",
+ "Change" : "Cambiar",
+ "Delete" : "Borrar",
+ "Share" : "Compartir",
"Basic settings" : "Configuraciones básicas",
"Sharing" : "Compartiendo",
"Security" : "Seguridad",
@@ -228,6 +232,19 @@ OC.L10N.register(
"Storage connection error. %s" : "Se presentó un error con la conexión al almacenamiento. %s",
"Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible",
"Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s",
- "Personal" : "Personal"
+ "Personal" : "Personal",
+ "Admin" : "Admin",
+ "DB Error: \"%s\"" : "DB Error: \"%s\"",
+ "Offending command was: \"%s\"" : "El comando infractor fue: \"%s\"",
+ "Offending command was: \"%s\", name: %s, password: %s" : "El comando infractor fue: \"%s\", nombre:%s, contraseña:%s",
+ "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Se presentó una falla al establecer los permisos de %s, porque los permisos excenden los permisos otorgados a %s",
+ "Setting permissions for %s failed, because the item was not found" : "Se presentó una falla al establecer los permisos de %s, porque no se encontró el elemento",
+ "Cannot clear expiration date. Shares are required to have an expiration date." : "No se puede limpíar la fecha de expiración. Se requiere que los elementos compartidos tengan una fecha de expiración.",
+ "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s",
+ "Files can't be shared with delete permissions" : "No se pueden compartir archivos con privilegios para borrar",
+ "Files can't be shared with create permissions" : "No se pueden compartir archivos con privilegios para crear",
+ "Cannot set expiration date more than %s days in the future" : "No se puede establecer la fecha de expiración más alla de %s días en el futuro",
+ "No app name specified" : "No se especificó el nombre de la aplicación",
+ "App '%s' could not be installed!" : "¡No se pudo instalar la aplciación '%s'!"
},
"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_MX.json b/lib/l10n/es_MX.json
index 1d6618782f8..088e85cf549 100644
--- a/lib/l10n/es_MX.json
+++ b/lib/l10n/es_MX.json
@@ -64,6 +64,10 @@
"Unknown user" : "Ususario desconocido",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Crear",
+ "Change" : "Cambiar",
+ "Delete" : "Borrar",
+ "Share" : "Compartir",
"Basic settings" : "Configuraciones básicas",
"Sharing" : "Compartiendo",
"Security" : "Seguridad",
@@ -226,6 +230,19 @@
"Storage connection error. %s" : "Se presentó un error con la conexión al almacenamiento. %s",
"Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible",
"Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s",
- "Personal" : "Personal"
+ "Personal" : "Personal",
+ "Admin" : "Admin",
+ "DB Error: \"%s\"" : "DB Error: \"%s\"",
+ "Offending command was: \"%s\"" : "El comando infractor fue: \"%s\"",
+ "Offending command was: \"%s\", name: %s, password: %s" : "El comando infractor fue: \"%s\", nombre:%s, contraseña:%s",
+ "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Se presentó una falla al establecer los permisos de %s, porque los permisos excenden los permisos otorgados a %s",
+ "Setting permissions for %s failed, because the item was not found" : "Se presentó una falla al establecer los permisos de %s, porque no se encontró el elemento",
+ "Cannot clear expiration date. Shares are required to have an expiration date." : "No se puede limpíar la fecha de expiración. Se requiere que los elementos compartidos tengan una fecha de expiración.",
+ "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s",
+ "Files can't be shared with delete permissions" : "No se pueden compartir archivos con privilegios para borrar",
+ "Files can't be shared with create permissions" : "No se pueden compartir archivos con privilegios para crear",
+ "Cannot set expiration date more than %s days in the future" : "No se puede establecer la fecha de expiración más alla de %s días en el futuro",
+ "No app name specified" : "No se especificó el nombre de la aplicación",
+ "App '%s' could not be installed!" : "¡No se pudo instalar la aplciación '%s'!"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 61d35224fd0..099779265ee 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge : %s",
"Server version %s or higher is required." : "Un serveur de version %s ou supérieure est requis.",
"Server version %s or lower is required." : "Un serveur de version %s ou inférieure est requis.",
+ "Logged in user must be an admin" : "L'utilisateur connecté doit être un administrateur",
"Unknown filetype" : "Type de fichier inconnu",
"Invalid image" : "Image non valable",
"Avatar image is not square" : "L'image d'avatar n'est pas carré",
@@ -66,6 +67,10 @@ OC.L10N.register(
"Unknown user" : "Utilisateur inconnu",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Créer",
+ "Change" : "Modifier",
+ "Delete" : "Supprimer",
+ "Share" : "Partager",
"Basic settings" : "Paramètres de base",
"Sharing" : "Partage",
"Security" : "Sécurité",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 25801b27ac7..77896b495b6 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge : %s",
"Server version %s or higher is required." : "Un serveur de version %s ou supérieure est requis.",
"Server version %s or lower is required." : "Un serveur de version %s ou inférieure est requis.",
+ "Logged in user must be an admin" : "L'utilisateur connecté doit être un administrateur",
"Unknown filetype" : "Type de fichier inconnu",
"Invalid image" : "Image non valable",
"Avatar image is not square" : "L'image d'avatar n'est pas carré",
@@ -64,6 +65,10 @@
"Unknown user" : "Utilisateur inconnu",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Créer",
+ "Change" : "Modifier",
+ "Delete" : "Supprimer",
+ "Share" : "Partager",
"Basic settings" : "Paramètres de base",
"Sharing" : "Partage",
"Security" : "Sécurité",
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index f9c643e9164..b8f07f33e5a 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "Sono supportate le seguenti piattaforme: %s",
"Server version %s or higher is required." : "È richiesta la versione %s o successiva.",
"Server version %s or lower is required." : "È richiesta la versione %s o precedente.",
+ "Logged in user must be an admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore ",
"Unknown filetype" : "Tipo di file sconosciuto",
"Invalid image" : "Immagine non valida",
"Avatar image is not square" : "L'immagine personale non è quadrata",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index 099ee47f9ff..32dbd8c787e 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "Sono supportate le seguenti piattaforme: %s",
"Server version %s or higher is required." : "È richiesta la versione %s o successiva.",
"Server version %s or lower is required." : "È richiesta la versione %s o precedente.",
+ "Logged in user must be an admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore ",
"Unknown filetype" : "Tipo di file sconosciuto",
"Invalid image" : "Immagine non valida",
"Avatar image is not square" : "L'immagine personale non è quadrata",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 6ff70dabf4a..0f292d3aac8 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
"Server version %s or higher is required." : "É requerido um servidor da versão %s ou superior.",
"Server version %s or lower is required." : "É requerido um servidor da versão %s ou abaixo.",
+ "Logged in user must be an admin" : "O usuário conectado deve ser um administrador",
"Unknown filetype" : "Tipo de arquivo desconhecido",
"Invalid image" : "Imagem inválida",
"Avatar image is not square" : "A imagem do avatar não é quadrada",
@@ -66,6 +67,10 @@ OC.L10N.register(
"Unknown user" : "Usuário desconhecido",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Criar",
+ "Change" : "Mudar",
+ "Delete" : "Excluir",
+ "Share" : "Compartilhar",
"Basic settings" : "Configurações básicas",
"Sharing" : "Compartilhamento",
"Security" : "Segurança",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 02c59492bc9..62571d500a3 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
"Server version %s or higher is required." : "É requerido um servidor da versão %s ou superior.",
"Server version %s or lower is required." : "É requerido um servidor da versão %s ou abaixo.",
+ "Logged in user must be an admin" : "O usuário conectado deve ser um administrador",
"Unknown filetype" : "Tipo de arquivo desconhecido",
"Invalid image" : "Imagem inválida",
"Avatar image is not square" : "A imagem do avatar não é quadrada",
@@ -64,6 +65,10 @@
"Unknown user" : "Usuário desconhecido",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Criar",
+ "Change" : "Mudar",
+ "Delete" : "Excluir",
+ "Share" : "Compartilhar",
"Basic settings" : "Configurações básicas",
"Sharing" : "Compartilhamento",
"Security" : "Segurança",
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
index c45047be61f..58621a77766 100644
--- a/lib/l10n/sr.js
+++ b/lib/l10n/sr.js
@@ -27,6 +27,7 @@ OC.L10N.register(
"Following platforms are supported: %s" : "Подржане су следеће платформе: %s",
"Server version %s or higher is required." : "Потребна је верзија сервера %s или виша.",
"Server version %s or lower is required." : "Потребна је верзија сервера %s или нижа.",
+ "Logged in user must be an admin" : "Пријављени корисник мора бити администратор",
"Unknown filetype" : "Непознат тип фајла",
"Invalid image" : "Неисправна слика",
"Avatar image is not square" : "Слика аватара није квадратна",
@@ -66,6 +67,10 @@ OC.L10N.register(
"Unknown user" : "Непознат корисник",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Направи",
+ "Change" : "Измени",
+ "Delete" : "Обриши",
+ "Share" : "Подели",
"Basic settings" : "Основне поставке",
"Sharing" : "Дељење",
"Security" : "Безбедност",
diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json
index b9452807f14..fe2ea97952c 100644
--- a/lib/l10n/sr.json
+++ b/lib/l10n/sr.json
@@ -25,6 +25,7 @@
"Following platforms are supported: %s" : "Подржане су следеће платформе: %s",
"Server version %s or higher is required." : "Потребна је верзија сервера %s или виша.",
"Server version %s or lower is required." : "Потребна је верзија сервера %s или нижа.",
+ "Logged in user must be an admin" : "Пријављени корисник мора бити администратор",
"Unknown filetype" : "Непознат тип фајла",
"Invalid image" : "Неисправна слика",
"Avatar image is not square" : "Слика аватара није квадратна",
@@ -64,6 +65,10 @@
"Unknown user" : "Непознат корисник",
"APCu" : "APCu",
"Redis" : "Redis",
+ "Create" : "Направи",
+ "Change" : "Измени",
+ "Delete" : "Обриши",
+ "Share" : "Подели",
"Basic settings" : "Основне поставке",
"Sharing" : "Дељење",
"Security" : "Безбедност",
diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
index c147b5b2475..c19834b462b 100644
--- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
@@ -170,10 +170,16 @@ class SecurityMiddleware extends Middleware {
* Only allow the CSRF check to fail on OCS Requests. This kind of
* hacks around that we have no full token auth in place yet and we
* do want to offer CSRF checks for web requests.
+ *
+ * Additionally we allow Bearer authenticated requests to pass on OCS routes.
+ * This allows oauth apps (e.g. moodle) to use the OCS endpoints
*/
if(!$this->request->passesCSRFCheck() && !(
- $controller instanceof OCSController &&
- $this->request->getHeader('OCS-APIREQUEST') === 'true')) {
+ $controller instanceof OCSController && (
+ $this->request->getHeader('OCS-APIREQUEST') === 'true' ||
+ strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0
+ )
+ )) {
throw new CrossSiteRequestForgeryException();
}
}