diff options
Diffstat (limited to 'lib')
36 files changed, 141 insertions, 51 deletions
diff --git a/lib/base.php b/lib/base.php index 1d944685654..c0feee3d1e7 100644 --- a/lib/base.php +++ b/lib/base.php @@ -602,8 +602,12 @@ class OC { \OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd); \OC::$server->getEventLogger()->start('boot', 'Initialize'); + // Override php.ini and log everything if we're troubleshooting + if (self::$config->getValue('loglevel') === ILogger::DEBUG) { + error_reporting(E_ALL); + } + // Don't display errors and log them - error_reporting(E_ALL | E_STRICT); @ini_set('display_errors', '0'); @ini_set('log_errors', '1'); diff --git a/lib/l10n/es.js b/lib/l10n/es.js index b0f413979ab..cf5297cc41e 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -15,8 +15,8 @@ OC.L10N.register( "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s, y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", "Education Edition" : "Edición Educación", - "Enterprise bundle" : "Conjunto para empresas", - "Groupware bundle" : "Conjunto de groupware", + "Enterprise bundle" : "Pack para empresas", + "Groupware bundle" : "Pack groupware", "Hub bundle" : "Conjunto de Hub", "Social sharing bundle" : "Conjunto para compartir en redes", "PHP %s or higher is required." : "Se requiere PHP %s o superior.", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index 5addb89b11b..494eec9d978 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -13,8 +13,8 @@ "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s, y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", "Education Edition" : "Edición Educación", - "Enterprise bundle" : "Conjunto para empresas", - "Groupware bundle" : "Conjunto de groupware", + "Enterprise bundle" : "Pack para empresas", + "Groupware bundle" : "Pack groupware", "Hub bundle" : "Conjunto de Hub", "Social sharing bundle" : "Conjunto para compartir en redes", "PHP %s or higher is required." : "Se requiere PHP %s o superior.", diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js index 0011ba1f1d2..4a31db8673b 100644 --- a/lib/l10n/eu.js +++ b/lib/l10n/eu.js @@ -170,6 +170,7 @@ OC.L10N.register( "Verify" : "Egiaztatu", "Sharing %s failed, because the backend does not allow shares from type %i" : "%s partekatzeak huts egin du, motorrak %i motako partekatzeak baimentzen ez dituelako", "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen", + "Sharing %s failed, because you can not share with yourself" : "Ezin izan da %s partekatu, zure buruarekin ezin baituzu partekatu.", "You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude", "Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako", "Not allowed to create a federated share with the same user" : "Ezin da erabiltzaile berdinarekin federatutako partekatzea sortu.", diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json index 3066aa97277..b50a8b11140 100644 --- a/lib/l10n/eu.json +++ b/lib/l10n/eu.json @@ -168,6 +168,7 @@ "Verify" : "Egiaztatu", "Sharing %s failed, because the backend does not allow shares from type %i" : "%s partekatzeak huts egin du, motorrak %i motako partekatzeak baimentzen ez dituelako", "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen", + "Sharing %s failed, because you can not share with yourself" : "Ezin izan da %s partekatu, zure buruarekin ezin baituzu partekatu.", "You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude", "Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako", "Not allowed to create a federated share with the same user" : "Ezin da erabiltzaile berdinarekin federatutako partekatzea sortu.", diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js index 5bdc6033293..c153a9dd27f 100644 --- a/lib/l10n/fi.js +++ b/lib/l10n/fi.js @@ -20,6 +20,15 @@ OC.L10N.register( "Server version %s or higher is required." : "Palvelinversio %s tai sitä uudempi vaaditaan.", "Server version %s or lower is required." : "Palvelinversio %s tai alhaisempi vaaditaan.", "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä", + "Wiping of device %s has started" : "Laitteen %s tyhjennys aloitettiin", + "Wiping of device »%s« has started" : "Laitteen »%s« tyhjennys aloitettiin", + "»%s« started remote wipe" : "»%s« aloitti etätyhjennyksen", + "Wiping of device %s has finished" : "Laitteen %s tyhjennys valmistui", + "Wiping of device »%s« has finished" : "Laitteen »%s« tyhjennys valmistui", + "Remote wipe started" : "Etätyhjennys aloitettiin", + "A remote wipe was started on device %s" : "Laitteen %s etätyhjennys aloitettiin", + "Remote wipe finished" : "Etätyhjennys valmistui", + "The remote wipe on %s has finished" : "Etätyhjennys laitteella %s valmistui", "Authentication" : "Tunnistautuminen", "Unknown filetype" : "Tuntematon tiedostotyyppi", "Invalid image" : "Virheellinen kuva", @@ -43,6 +52,7 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minuutti sitten","%n minuuttia sitten"], "in a few seconds" : "muutaman sekunnin päästä", "seconds ago" : "sekunteja sitten", + "Empty file" : "Tyhjä tiedosto", "File name is a reserved word" : "Tiedoston nimi on varattu sana", "File name contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin", "File name is too long" : "Tiedoston nimi on liian pitkä", diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json index e8971d2b692..e179f37005d 100644 --- a/lib/l10n/fi.json +++ b/lib/l10n/fi.json @@ -18,6 +18,15 @@ "Server version %s or higher is required." : "Palvelinversio %s tai sitä uudempi vaaditaan.", "Server version %s or lower is required." : "Palvelinversio %s tai alhaisempi vaaditaan.", "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä", + "Wiping of device %s has started" : "Laitteen %s tyhjennys aloitettiin", + "Wiping of device »%s« has started" : "Laitteen »%s« tyhjennys aloitettiin", + "»%s« started remote wipe" : "»%s« aloitti etätyhjennyksen", + "Wiping of device %s has finished" : "Laitteen %s tyhjennys valmistui", + "Wiping of device »%s« has finished" : "Laitteen »%s« tyhjennys valmistui", + "Remote wipe started" : "Etätyhjennys aloitettiin", + "A remote wipe was started on device %s" : "Laitteen %s etätyhjennys aloitettiin", + "Remote wipe finished" : "Etätyhjennys valmistui", + "The remote wipe on %s has finished" : "Etätyhjennys laitteella %s valmistui", "Authentication" : "Tunnistautuminen", "Unknown filetype" : "Tuntematon tiedostotyyppi", "Invalid image" : "Virheellinen kuva", @@ -41,6 +50,7 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minuutti sitten","%n minuuttia sitten"], "in a few seconds" : "muutaman sekunnin päästä", "seconds ago" : "sekunteja sitten", + "Empty file" : "Tyhjä tiedosto", "File name is a reserved word" : "Tiedoston nimi on varattu sana", "File name contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin", "File name is too long" : "Tiedoston nimi on liian pitkä", diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js index 29287c54660..e9805990ee0 100644 --- a/lib/l10n/gl.js +++ b/lib/l10n/gl.js @@ -178,7 +178,7 @@ OC.L10N.register( "Login canceled by app" : "Acceso cancelado pola aplicación", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Non é posíbel instalar a aplicación «%1$s» por mor de non cumprirse as dependencias: %2$s", "a safe home for all your data" : "un lugar seguro para todos os seus datos", - "File is currently busy, please try again later" : "O ficheiro está ocupado neste momento, ténteo máis tarde.", + "File is currently busy, please try again later" : "O ficheiro está ocupado neste momento, ténteo máis adiante.", "Can't read file" : "Non é posíbel ler o ficheiro", "Application is not enabled" : "A aplicación non está activada", "Authentication error" : "Produciuse un erro de autenticación", diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json index e1b5706cf2b..f31e3bcee53 100644 --- a/lib/l10n/gl.json +++ b/lib/l10n/gl.json @@ -176,7 +176,7 @@ "Login canceled by app" : "Acceso cancelado pola aplicación", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Non é posíbel instalar a aplicación «%1$s» por mor de non cumprirse as dependencias: %2$s", "a safe home for all your data" : "un lugar seguro para todos os seus datos", - "File is currently busy, please try again later" : "O ficheiro está ocupado neste momento, ténteo máis tarde.", + "File is currently busy, please try again later" : "O ficheiro está ocupado neste momento, ténteo máis adiante.", "Can't read file" : "Non é posíbel ler o ficheiro", "Application is not enabled" : "A aplicación non está activada", "Authentication error" : "Produciuse un erro de autenticación", diff --git a/lib/l10n/he.js b/lib/l10n/he.js index 15f75222222..0cc6fdda3f4 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -85,6 +85,7 @@ OC.L10N.register( "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", "Sharing backend for %s not found" : "צד אחורי לשיתוף של %s לא נמצא", "Open »%s«" : "פתיחת „%s”", + "%1$s via %2$s" : "%1$s דרך %2$s", "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", "Can’t increase permissions of %s" : "לא ניתן לחזק את ההרשאות של %s", "Files can’t be shared with delete permissions" : "לא ניתן לשתף קבצים עם הרשאת מחיקה", diff --git a/lib/l10n/he.json b/lib/l10n/he.json index a5435aaa24f..65709c7d55b 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -83,6 +83,7 @@ "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", "Sharing backend for %s not found" : "צד אחורי לשיתוף של %s לא נמצא", "Open »%s«" : "פתיחת „%s”", + "%1$s via %2$s" : "%1$s דרך %2$s", "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", "Can’t increase permissions of %s" : "לא ניתן לחזק את ההרשאות של %s", "Files can’t be shared with delete permissions" : "לא ניתן לשתף קבצים עם הרשאת מחיקה", diff --git a/lib/l10n/it.js b/lib/l10n/it.js index a491b1e8aa1..66ac0187b5d 100644 --- a/lib/l10n/it.js +++ b/lib/l10n/it.js @@ -30,7 +30,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 or sub admin" : "L'utente che ha eseguito l'accesso deve esere un amministratore o sub-amministratore", + "Logged in user must be an admin or sub admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore o sub-amministratore", "Logged in user must be an admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore ", "Wiping of device %s has started" : "La cancellazione del dispositivo %s è iniziata", "Wiping of device »%s« has started" : "La cancellazione del dispositivo «%s» è iniziata", diff --git a/lib/l10n/it.json b/lib/l10n/it.json index 5734b89e3ee..988da392dfe 100644 --- a/lib/l10n/it.json +++ b/lib/l10n/it.json @@ -28,7 +28,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 or sub admin" : "L'utente che ha eseguito l'accesso deve esere un amministratore o sub-amministratore", + "Logged in user must be an admin or sub admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore o sub-amministratore", "Logged in user must be an admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore ", "Wiping of device %s has started" : "La cancellazione del dispositivo %s è iniziata", "Wiping of device »%s« has started" : "La cancellazione del dispositivo «%s» è iniziata", diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js index 44cc1340ef3..37b087a84fe 100644 --- a/lib/l10n/mk.js +++ b/lib/l10n/mk.js @@ -1,7 +1,7 @@ OC.L10N.register( "lib", { - "Cannot write into \"config\" directory!" : "Не можам да впишувам во \"config\" директориумот!", + "Cannot write into \"config\" directory!" : "Не може да зе запишува во \"config\" директориумот!", "See %s" : "Види %s", "Sample configuration detected" : "Детектирана е едноставна конфигурација", "%1$s and %2$s" : "%1$s и %2$s", @@ -48,6 +48,7 @@ OC.L10N.register( "Empty file" : "Празна датотека", "File name is too long" : "Името на датотеката е премногу долго", "Empty filename is not allowed" : "Датотеки без име не се дозболени", + "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликацијата \"%s\" неможе да се инсталира бидејќи не е компатибилна со верзијата на серверот.", "__language_name__" : "Македонски", "This is an automatically sent email, please do not reply." : "Ова е автоматски испратена порака, не одговарајте на истата.", "Help" : "Помош", @@ -73,6 +74,7 @@ OC.L10N.register( "Open »%s«" : "Отвори »%s«", "%1$s via %2$s" : "%1$s преку %2$s", "You are not allowed to share %s" : "Не сте овластени да ја споделите %s", + "Expiration date is in the past" : "Рокот на траење е во минато време", "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« со вас", "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« со вас.", "Click the button below to open it." : "Кликнете на копчето подолу за да ја отворите.", @@ -130,15 +132,23 @@ OC.L10N.register( "The username is already being used" : "Корисничкото име е веќе во употреба", "User disabled" : "Оневозможен корисник", "a safe home for all your data" : "безбеден дом за сите ваши податоци", + "File is currently busy, please try again later" : "Датотеката моментално е зафатена, обидете се повторно", "Can't read file" : "Неможе да се прочита датотеката", "Application is not enabled" : "Апликацијата не е овозможена", "Authentication error" : "Грешка во автентикација", "Token expired. Please reload page." : "Жетонот е истечен. Ве молам превчитајте ја страницата.", + "Cannot write into \"config\" directory" : "Не може да зе запишува во \"config\" директориумот", + "Cannot write into \"apps\" directory" : "Не може да зе запишува во \"apps\" директориумот", "Setting locale to %s failed" : "Неуспешно поставување на локацијата %s ", + "Please ask your server administrator to install the module." : "Замолете го сервер администраторот да го инсталира додатокот.", "PHP module %s not installed." : "PHP модулот %s не е инсталиран.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP поставката \"%s\" не е поставена до \"%s\".", "Please ask your server administrator to restart the web server." : "Замолете го сервер администраторот да го рестартира веб серверот.", "PostgreSQL >= 9 required" : "Потребно е PostgreSQL >= 9 ", + "Please upgrade your database version" : "Ве молиме надградете ја верзијата на базата со податоци", + "Storage unauthorized. %s" : "Неавторизирано складиште. %s", + "Storage incomplete configuration. %s" : "Конфигурацијата на складиштето не е комплетна. %s", + "Storage connection error. %s" : "Грешка во конекција до складиштето. %s", "Storage is temporarily not available" : "Складиштето моментално не е достапно", "Create" : "Креирај", "Change" : "Измени", @@ -155,6 +165,7 @@ OC.L10N.register( "Verifying" : "Потврдување", "Verifying …" : "Потврдување …", "Verify" : "Потврди", + "Sharing %s failed, because you can not share with yourself" : "Споделувањето на %s е неуспешно, бидејќи неможете да го споделите сами со себе", "Sharing %1$s failed, because this item is already shared with %2$s" : "Споделувањето на %1$s е неуспешно, бидејќи истото веќе е споделено со %2$s", "Not allowed to create a federated share with the same user" : "Не е овозможено да креирате федерално споделување со ист корисник", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable." : "Споделувањето на %1$s е неуспешно, неможе да се пронајде %2$s, можеби серверот моментално не е достапен.", diff --git a/lib/l10n/mk.json b/lib/l10n/mk.json index f0e3cfc8ee2..2b85faef77c 100644 --- a/lib/l10n/mk.json +++ b/lib/l10n/mk.json @@ -1,5 +1,5 @@ { "translations": { - "Cannot write into \"config\" directory!" : "Не можам да впишувам во \"config\" директориумот!", + "Cannot write into \"config\" directory!" : "Не може да зе запишува во \"config\" директориумот!", "See %s" : "Види %s", "Sample configuration detected" : "Детектирана е едноставна конфигурација", "%1$s and %2$s" : "%1$s и %2$s", @@ -46,6 +46,7 @@ "Empty file" : "Празна датотека", "File name is too long" : "Името на датотеката е премногу долго", "Empty filename is not allowed" : "Датотеки без име не се дозболени", + "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликацијата \"%s\" неможе да се инсталира бидејќи не е компатибилна со верзијата на серверот.", "__language_name__" : "Македонски", "This is an automatically sent email, please do not reply." : "Ова е автоматски испратена порака, не одговарајте на истата.", "Help" : "Помош", @@ -71,6 +72,7 @@ "Open »%s«" : "Отвори »%s«", "%1$s via %2$s" : "%1$s преку %2$s", "You are not allowed to share %s" : "Не сте овластени да ја споделите %s", + "Expiration date is in the past" : "Рокот на траење е во минато време", "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« со вас", "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« со вас.", "Click the button below to open it." : "Кликнете на копчето подолу за да ја отворите.", @@ -128,15 +130,23 @@ "The username is already being used" : "Корисничкото име е веќе во употреба", "User disabled" : "Оневозможен корисник", "a safe home for all your data" : "безбеден дом за сите ваши податоци", + "File is currently busy, please try again later" : "Датотеката моментално е зафатена, обидете се повторно", "Can't read file" : "Неможе да се прочита датотеката", "Application is not enabled" : "Апликацијата не е овозможена", "Authentication error" : "Грешка во автентикација", "Token expired. Please reload page." : "Жетонот е истечен. Ве молам превчитајте ја страницата.", + "Cannot write into \"config\" directory" : "Не може да зе запишува во \"config\" директориумот", + "Cannot write into \"apps\" directory" : "Не може да зе запишува во \"apps\" директориумот", "Setting locale to %s failed" : "Неуспешно поставување на локацијата %s ", + "Please ask your server administrator to install the module." : "Замолете го сервер администраторот да го инсталира додатокот.", "PHP module %s not installed." : "PHP модулот %s не е инсталиран.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP поставката \"%s\" не е поставена до \"%s\".", "Please ask your server administrator to restart the web server." : "Замолете го сервер администраторот да го рестартира веб серверот.", "PostgreSQL >= 9 required" : "Потребно е PostgreSQL >= 9 ", + "Please upgrade your database version" : "Ве молиме надградете ја верзијата на базата со податоци", + "Storage unauthorized. %s" : "Неавторизирано складиште. %s", + "Storage incomplete configuration. %s" : "Конфигурацијата на складиштето не е комплетна. %s", + "Storage connection error. %s" : "Грешка во конекција до складиштето. %s", "Storage is temporarily not available" : "Складиштето моментално не е достапно", "Create" : "Креирај", "Change" : "Измени", @@ -153,6 +163,7 @@ "Verifying" : "Потврдување", "Verifying …" : "Потврдување …", "Verify" : "Потврди", + "Sharing %s failed, because you can not share with yourself" : "Споделувањето на %s е неуспешно, бидејќи неможете да го споделите сами со себе", "Sharing %1$s failed, because this item is already shared with %2$s" : "Споделувањето на %1$s е неуспешно, бидејќи истото веќе е споделено со %2$s", "Not allowed to create a federated share with the same user" : "Не е овозможено да креирате федерално споделување со ист корисник", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable." : "Споделувањето на %1$s е неуспешно, неможе да се пронајде %2$s, можеби серверот моментално не е достапен.", diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index b2a4980da9f..18866603348 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -17,6 +17,7 @@ OC.L10N.register( "Education Edition" : "Onderwijs Editie", "Enterprise bundle" : "Zakelijke bundel", "Groupware bundle" : "Groupware bundel", + "Hub bundle" : "Hub bundel", "Social sharing bundle" : "Sociaal delen bundel", "PHP %s or higher is required." : "PHP %s of hoger vereist.", "PHP with a version lower than %s is required." : "PHP met een versie lager dan %s is vereist.", @@ -88,6 +89,7 @@ OC.L10N.register( "%s enter the database username." : "%s voer de database gebruikersnaam in.", "%s enter the database name." : "%s voer de databasenaam in.", "%s you may not use dots in the database name" : "%s er mogen geen punten in de databasenaam voorkomen", + "MySQL username and/or password not valid" : "MySQL gebruikersnaam en/of wachtwoord ongeldig", "You need to enter details of an existing account." : "Geef de details van een bestaand account op.", "Oracle connection could not be established" : "Er kon geen verbinding met Oracle worden gemaakt.", "Oracle username and/or password not valid" : "Oracle gebruikersnaam en/of wachtwoord ongeldig", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index d7ec880598b..85d3d2a2137 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -15,6 +15,7 @@ "Education Edition" : "Onderwijs Editie", "Enterprise bundle" : "Zakelijke bundel", "Groupware bundle" : "Groupware bundel", + "Hub bundle" : "Hub bundel", "Social sharing bundle" : "Sociaal delen bundel", "PHP %s or higher is required." : "PHP %s of hoger vereist.", "PHP with a version lower than %s is required." : "PHP met een versie lager dan %s is vereist.", @@ -86,6 +87,7 @@ "%s enter the database username." : "%s voer de database gebruikersnaam in.", "%s enter the database name." : "%s voer de databasenaam in.", "%s you may not use dots in the database name" : "%s er mogen geen punten in de databasenaam voorkomen", + "MySQL username and/or password not valid" : "MySQL gebruikersnaam en/of wachtwoord ongeldig", "You need to enter details of an existing account." : "Geef de details van een bestaand account op.", "Oracle connection could not be established" : "Er kon geen verbinding met Oracle worden gemaakt.", "Oracle username and/or password not valid" : "Oracle gebruikersnaam en/of wachtwoord ongeldig", diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php index 9ccb443aabb..2eca9d55b28 100644 --- a/lib/private/AllConfig.php +++ b/lib/private/AllConfig.php @@ -129,7 +129,9 @@ class AllConfig implements \OCP\IConfig { * * @param string $key the key of the value, under which it was saved * @param mixed $default the default value to be returned if the value isn't set - * @return mixed the value or $default + * + * @return bool + * * @since 16.0.0 */ public function getSystemValueBool(string $key, bool $default = false): bool { @@ -141,7 +143,9 @@ class AllConfig implements \OCP\IConfig { * * @param string $key the key of the value, under which it was saved * @param mixed $default the default value to be returned if the value isn't set - * @return mixed the value or $default + * + * @return int + * * @since 16.0.0 */ public function getSystemValueInt(string $key, int $default = 0): int { @@ -153,7 +157,9 @@ class AllConfig implements \OCP\IConfig { * * @param string $key the key of the value, under which it was saved * @param mixed $default the default value to be returned if the value isn't set - * @return mixed the value or $default + * + * @return string + * * @since 16.0.0 */ public function getSystemValueString(string $key, string $default = ''): string { diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php index 68456289be5..c7aa5ad073b 100644 --- a/lib/private/AppFramework/OCS/BaseResponse.php +++ b/lib/private/AppFramework/OCS/BaseResponse.php @@ -48,7 +48,7 @@ abstract class BaseResponse extends Response { /** * BaseResponse constructor. * - * @param DataResponse|null $dataResponse + * @param DataResponse $dataResponse * @param string $format * @param string|null $statusMessage * @param int|null $itemsCount diff --git a/lib/private/Authentication/TwoFactorAuth/EnforcementState.php b/lib/private/Authentication/TwoFactorAuth/EnforcementState.php index 46bcc596d92..abd0ec7f2e7 100644 --- a/lib/private/Authentication/TwoFactorAuth/EnforcementState.php +++ b/lib/private/Authentication/TwoFactorAuth/EnforcementState.php @@ -55,7 +55,7 @@ class EnforcementState implements JsonSerializable { } /** - * @return string[] + * @return bool */ public function isEnforced(): bool { return $this->enforced; diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php index 7fba6d4874a..b048d4e1f3c 100644 --- a/lib/private/Authentication/TwoFactorAuth/Manager.php +++ b/lib/private/Authentication/TwoFactorAuth/Manager.php @@ -181,7 +181,7 @@ class Manager { /** * @param array $states - * @param IProvider $providers + * @param IProvider[] $providers */ private function isProviderMissing(array $states, array $providers): bool { $indexed = []; diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php index cf4eb43bc8f..8b1621a5f55 100644 --- a/lib/private/DB/Migrator.php +++ b/lib/private/DB/Migrator.php @@ -62,7 +62,7 @@ class Migrator { private $noEmit = false; /** - * @param \Doctrine\DBAL\Connection|Connection $connection + * @param \Doctrine\DBAL\Connection $connection * @param ISecureRandom $random * @param IConfig $config * @param EventDispatcherInterface $dispatcher diff --git a/lib/private/DB/MySQLMigrator.php b/lib/private/DB/MySQLMigrator.php index 8cc537f6b75..73122fb0715 100644 --- a/lib/private/DB/MySQLMigrator.php +++ b/lib/private/DB/MySQLMigrator.php @@ -51,7 +51,7 @@ class MySQLMigrator extends Migrator { return $schemaDiff; } - + /** * Speed up migration test by disabling autocommit and unique indexes check * diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php index 3809d4c2aeb..59cff9b3a41 100644 --- a/lib/private/Files/Cache/Updater.php +++ b/lib/private/Files/Cache/Updater.php @@ -224,12 +224,15 @@ class Updater implements IUpdater { private function updateStorageMTimeOnly($internalPath) { $fileId = $this->cache->getId($internalPath); if ($fileId !== -1) { - $this->cache->update( - $fileId, [ - 'mtime' => null, // this magic tells it to not overwrite mtime - 'storage_mtime' => $this->storage->filemtime($internalPath) - ] - ); + $mtime = $this->storage->filemtime($internalPath); + if ($mtime !== false) { + $this->cache->update( + $fileId, [ + 'mtime' => null, // this magic tells it to not overwrite mtime + 'storage_mtime' => $mtime + ] + ); + } } } diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 67b3f2e7286..e0d437839a0 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -349,12 +349,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { public function getMimeType($path) { $path = $this->normalizePath($path); - $stat = $this->stat($path); - if (is_array($stat)) { - return $stat['mimetype']; - } else { - return false; - } + return parent::getMimeType($path); } public function touch($path, $mtime = null) { diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 2c01c112ad4..90ac1e1988d 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1946,7 +1946,8 @@ class View { // rethrow with the a human-readable path throw new LockedException( $this->getPathRelativeToFiles($absolutePath), - $e + $e, + $e->getExistingLock() ); } } @@ -1988,12 +1989,14 @@ class View { // rethrow with the a human-readable path throw new LockedException( $this->getPathRelativeToFiles($absolutePath), - $e + $e, + $e->getExistingLock() ); - } catch (\InvalidArgumentException $e) { + } catch (\InvalidArgumentException $ex) { throw new LockedException( $absolutePath, - $e + $ex, + $e->getExistingLock() ); } } diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index 450fffe573e..27dad809f89 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -400,7 +400,8 @@ class Database extends ABackend * get the number of disabled users in a group * * @param string $search - * @return int|bool + * + * @return int */ public function countDisabledInGroup(string $gid): int { $this->fixDI(); diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 7af3d16f75c..df5f2687daa 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -169,7 +169,7 @@ class Mailer implements IMailer { $debugMode = $this->config->getSystemValue('mail_smtpdebug', false); if (empty($message->getFrom())) { - $message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]); + $message->setFrom([\OCP\Util::getDefaultEmailAddress('no-reply') => $this->defaults->getName()]); } $failedRecipients = []; diff --git a/lib/private/Preview/GeneratorHelper.php b/lib/private/Preview/GeneratorHelper.php index 0e271947b56..470cad2d0a6 100644 --- a/lib/private/Preview/GeneratorHelper.php +++ b/lib/private/Preview/GeneratorHelper.php @@ -52,10 +52,11 @@ class GeneratorHelper { } /** - * @param IProvider $provider + * @param IProviderV2 $provider * @param File $file * @param int $maxWidth * @param int $maxHeight + * * @return bool|IImage */ public function getThumbnail(IProviderV2 $provider, File $file, $maxWidth, $maxHeight) { diff --git a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php index 773cde18a9a..7298fbe2eda 100644 --- a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php +++ b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php @@ -82,7 +82,7 @@ class ContentSecurityPolicyNonceManager { // Firefox 45+ '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/', // Safari 12+ - '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/(1[2-9]|[2-9][0-9])\.[0-9]+ Safari\/[0-9.A-Z]+$/', + '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/(?:1[2-9]|[2-9][0-9])\.[0-9]+(?:\.[0-9]+)? Safari\/[0-9.A-Z]+$/', ]; if($this->request->isUserAgent($browserWhitelist)) { diff --git a/lib/private/Support/Subscription/Registry.php b/lib/private/Support/Subscription/Registry.php index dfcff8ff96a..f0d946a2911 100644 --- a/lib/private/Support/Subscription/Registry.php +++ b/lib/private/Support/Subscription/Registry.php @@ -27,6 +27,7 @@ declare(strict_types=1); namespace OC\Support\Subscription; +use OCP\IConfig; use OCP\Support\Subscription\Exception\AlreadyRegisteredException; use OCP\Support\Subscription\IRegistry; use OCP\Support\Subscription\ISubscription; @@ -37,6 +38,13 @@ class Registry implements IRegistry { /** @var ISubscription */ private $subscription = null; + /** @var IConfig */ + private $config; + + public function __construct(IConfig $config) { + $this->config = $config; + } + /** * Register a subscription instance. In case it is called multiple times the * first one is used. @@ -71,6 +79,11 @@ class Registry implements IRegistry { * @since 17.0.0 */ public function delegateHasValidSubscription(): bool { + // Allow overwriting this manually for environments where the subscription information cannot be fetched + if ($this->config->getSystemValueBool('has_valid_subscription')) { + return true; + } + if ($this->subscription instanceof ISubscription) { return $this->subscription->hasValidSubscription(); } diff --git a/lib/private/Updater/ChangesCheck.php b/lib/private/Updater/ChangesCheck.php index 7346ceab6b1..259fb750c05 100644 --- a/lib/private/Updater/ChangesCheck.php +++ b/lib/private/Updater/ChangesCheck.php @@ -56,8 +56,8 @@ class ChangesCheck { $version = $this->normalizeVersion($version); $changesInfo = $this->mapper->getChanges($version); $changesData = json_decode($changesInfo->getData(), true); - if(empty($changesData)) { - throw new DoesNotExistException(); + if (empty($changesData)) { + throw new DoesNotExistException('Unable to decode changes info'); } return $changesData; } diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index 4aa9074b4a4..602f779c901 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -317,7 +317,7 @@ class Session implements IUserSession, Emitter { } /** - * @return mixed + * @return null|string */ public function getImpersonatingUserID(): ?string { diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 757bf998d32..ed1e5627961 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -109,16 +109,18 @@ class OC_Template extends \OC\Template\Base { OC_Util::addScript ( 'backgroundjobs', null, true ); } } - OC_Util::addStyle('css-variables', null, true); OC_Util::addStyle('server', null, true); - OC_Util::addTranslations("core", null, true); - OC_Util::addStyle('search', 'results'); - OC_Util::addScript('search', 'search', true); - OC_Util::addScript('search', 'searchprovider'); - OC_Util::addScript('merged-template-prepend', null, true); - OC_Util::addScript('files/fileinfo'); - OC_Util::addScript('files/client'); + OC_Util::addTranslations('core', null, true); + + if (\OC::$server->getSystemConfig()->getValue ('installed', false)) { + OC_Util::addStyle('search', 'results'); + OC_Util::addScript('search', 'search', true); + OC_Util::addScript('search', 'searchprovider'); + OC_Util::addScript('merged-template-prepend', null, true); + OC_Util::addScript('files/fileinfo'); + OC_Util::addScript('files/client'); + } OC_Util::addScript('core', 'dist/main', true); if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) { diff --git a/lib/public/FullTextSearch/Model/IIndex.php b/lib/public/FullTextSearch/Model/IIndex.php index 9d0d9e0fe71..c63ddc19906 100644 --- a/lib/public/FullTextSearch/Model/IIndex.php +++ b/lib/public/FullTextSearch/Model/IIndex.php @@ -181,7 +181,7 @@ interface IIndex { * @since 15.0.0 * * @param string $option - * @param string|int $value + * @param string $value * * @return IIndex */ diff --git a/lib/public/Lock/LockedException.php b/lib/public/Lock/LockedException.php index 99205b54d24..582157010cc 100644 --- a/lib/public/Lock/LockedException.php +++ b/lib/public/Lock/LockedException.php @@ -44,6 +44,9 @@ class LockedException extends \Exception { */ private $path; + /** @var string|null */ + private $existingLock; + /** * LockedException constructor. * @@ -54,6 +57,7 @@ class LockedException extends \Exception { */ public function __construct(string $path, \Exception $previous = null, string $existingLock = null) { $message = '"' . $path . '" is locked'; + $this->existingLock = $existingLock; if ($existingLock) { $message .= ', existing lock on file: ' . $existingLock; } @@ -68,4 +72,12 @@ class LockedException extends \Exception { public function getPath(): string { return $this->path; } + + /** + * @return string + * @since 19.0.0 + */ + public function getExistingLock(): ?string { + return $this->existingLock; + } } |