diff options
Diffstat (limited to 'lib')
63 files changed, 202 insertions, 162 deletions
diff --git a/lib/base.php b/lib/base.php index a6f6f6f71d7..1f3c616fb18 100644 --- a/lib/base.php +++ b/lib/base.php @@ -135,7 +135,7 @@ class OC { OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', null); OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', null); - if (is_null(OC::$THIRDPARTYROOT) && is_null(OC::$THIRDPARTYWEBROOT)) { + if (empty(OC::$THIRDPARTYROOT) && empty(OC::$THIRDPARTYWEBROOT)) { if (file_exists(OC::$SERVERROOT . '/3rdparty')) { OC::$THIRDPARTYROOT = OC::$SERVERROOT; OC::$THIRDPARTYWEBROOT = OC::$WEBROOT; @@ -144,7 +144,7 @@ class OC { OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/'); } } - if (is_null(OC::$THIRDPARTYROOT) || !file_exists(OC::$THIRDPARTYROOT)) { + if (empty(OC::$THIRDPARTYROOT) || !file_exists(OC::$THIRDPARTYROOT)) { echo('3rdparty directory not found! Please put the ownCloud 3rdparty' . ' folder in the ownCloud folder or the folder above.' . ' You can also configure the location in the config.php file.'); @@ -279,7 +279,7 @@ class OC { * check if the instance needs to preform an upgrade * * @return bool - * @deprecated use \OCP\Util::needUpgrade instead + * @deprecated use \OCP\Util::needUpgrade() instead */ public static function needUpgrade() { return \OCP\Util::needUpgrade(); @@ -491,13 +491,6 @@ class OC { require_once $vendorAutoLoad; } - // set debug mode if an xdebug session is active - if (!defined('DEBUG') || !DEBUG) { - if (isset($_COOKIE['XDEBUG_SESSION'])) { - define('DEBUG', true); - } - } - if (!defined('PHPUNIT_RUN')) { OC\Log\ErrorHandler::setLogger(OC_Log::$object); if (defined('DEBUG') and DEBUG) { @@ -699,6 +692,9 @@ class OC { if (!OC_User::isLoggedIn()) { // Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP + if (!OC_Config::getValue('maintenance', false) && !self::checkUpgrade(false)) { + OC_App::loadApps(array('authentication')); + } OC::tryBasicAuthLogin(); } @@ -853,13 +849,6 @@ class OC { } // logon via web form elseif (OC::tryFormLogin()) { $error[] = 'invalidpassword'; - if ( OC_Config::getValue('log_authfailip', false) ) { - OC_Log::write('core', 'Login failed: user \''.$_POST["user"].'\' , wrong password, IP:'.$_SERVER['REMOTE_ADDR'], - OC_Log::WARN); - } else { - OC_Log::write('core', 'Login failed: user \''.$_POST["user"].'\' , wrong password, IP:set log_authfailip=true in conf', - OC_Log::WARN); - } } OC_Util::displayLoginPage(array_unique($error)); diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php index f3a690cd97d..46451f1ab17 100644 --- a/lib/l10n/ast.php +++ b/lib/l10n/ast.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Nun pue crease'l direutoriu \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.", "Setting locale to %s failed" => "Falló l'activación del idioma %s", -"Please install one of theses locales on your system and restart your webserver." => "Instala ún d'estos locales nel to sistema y reanicia'l sirvidor web", "Please ask your server administrator to install the module." => "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.", "PHP module %s not installed." => "Nun ta instaláu'l módulu PHP %s", "PHP %s or higher is required." => "Necesítase PHP %s o superior", diff --git a/lib/l10n/az.php b/lib/l10n/az.php index 15f78e0bce6..46d51ccb564 100644 --- a/lib/l10n/az.php +++ b/lib/l10n/az.php @@ -1,5 +1,16 @@ <?php $TRANSLATIONS = array( +"Cannot write into \"config\" directory!" => "\"configurasiya\" direktoriyasının daxilində yazmaq mümkün deyil", +"This can usually be fixed by giving the webserver write access to the config directory" => "Adətən tez həll etmək üçün WEB serverdə yazma yetkisi verilir", +"See %s" => "Bax %s", +"You are accessing the server from an untrusted domain." => "Siz serverə inamsız domain-dən girməyə çalışırsız.", +"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin. Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir.", +"Settings" => "Quraşdırmalar", +"Users" => "İstifadəçilər", +"Admin" => "İnzibatçı", +"Unknown filetype" => "Fayl tipi bəlli deyil.", +"Invalid image" => "Yalnış şəkil", +"Authentication error" => "Təyinat metodikası", "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day go_::_%n days ago_" => array("",""), diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php index bd8b7565da1..d6be0c4cf38 100644 --- a/lib/l10n/bg_BG.php +++ b/lib/l10n/bg_BG.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Неуспешен опит за създаване на \"data\" папката (%s).", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Това обикновено може да бъде оправено като <a href=\"%s\" target=\"_blank\">дадеш разрешение на уеб сървъра да записва в root папката</a>.", "Setting locale to %s failed" => "Неуспешно задаване на %s като настройка език-държава.", -"Please install one of theses locales on your system and restart your webserver." => "Моля, инсталирай една от тези език-държава комбинации на твоят сървър и рестартирай уеб сървъра.", "Please ask your server administrator to install the module." => "Моля, поискай твоят администратор да инсталира модула.", "PHP module %s not installed." => "PHP модулът %s не е инсталиран.", "PHP %s or higher is required." => "Изисква се PHP %s или по-нова.", diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php index 9a4a1a94745..46aae70dbe7 100644 --- a/lib/l10n/ca.php +++ b/lib/l10n/ca.php @@ -98,7 +98,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "No es pot crear la carpeta \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Aixó normalment es por solucionar <a href=\"%s\" target=\"_blank\">donant al servidor web permís d'accés a la carpeta arrel</a>", "Setting locale to %s failed" => "Ha fallat en establir la llengua a %s", -"Please install one of theses locales on your system and restart your webserver." => "Instal·leu una d'aquestes llengües en el sistema i reinicieu el servidor web.", "Please ask your server administrator to install the module." => "Demaneu a l'administrador del sistema que instal·li el mòdul.", "PHP module %s not installed." => "El mòdul PHP %s no està instal·lat.", "PHP %s or higher is required." => "Es requereix PHP %s o superior.", diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 4fdeea9a417..d4c92212686 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Nelze vytvořit \"data\" adresář (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "To bývá obvykle vyřešeno, když <a href=\"%s\" target=\"_blank\"> povolí webovému serveru zápis do kořenového adresáře</a>.", "Setting locale to %s failed" => "Nastavení jazyka na %s selhalo", -"Please install one of theses locales on your system and restart your webserver." => "Prosím nainstalujte alespon jeden z těchto jazyků do vašeho systému a restartujte webový server.", "Please ask your server administrator to install the module." => "Požádejte svého administrátora, ať nainstaluje příslušný modul.", "PHP module %s not installed." => "PHP modul %s není nainstalován.", "PHP %s or higher is required." => "Je vyžadováno PHP %s nebo vyšší.", diff --git a/lib/l10n/da.php b/lib/l10n/da.php index 93a727bf085..8533cf4f2aa 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -97,7 +97,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Kan ikke oprette mappen \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dette kan som regel rettes ved <a href=\"%s\" target=\"_blank\">give webserveren skriveadgang til rodmappen</a>.", "Setting locale to %s failed" => "Angivelse af %s for lokalitet mislykkedes", -"Please install one of theses locales on your system and restart your webserver." => "Installér venligst én af disse lokaliteter på dit system, og genstart din webserver.", "Please ask your server administrator to install the module." => "Du bedes anmode din serveradministrator om at installere modulet.", "PHP module %s not installed." => "PHP-modulet %s er ikke installeret.", "PHP %s or higher is required." => "Der kræves PHP %s eller nyere.", diff --git a/lib/l10n/de.php b/lib/l10n/de.php index bf44ae04461..9926da71fe2 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Das Erstellen des \"data\"-Verzeichnisses nicht möglich (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", "Setting locale to %s failed" => "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", -"Please install one of theses locales on your system and restart your webserver." => "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.", "Please ask your server administrator to install the module." => "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.", "PHP module %s not installed." => "PHP-Modul %s nicht installiert.", "PHP %s or higher is required." => "PHP %s oder höher wird benötigt.", diff --git a/lib/l10n/de_AT.php b/lib/l10n/de_AT.php index 18e8e8b51ba..58f78490d7f 100644 --- a/lib/l10n/de_AT.php +++ b/lib/l10n/de_AT.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Help" => "Hilfe", "Personal" => "Persönlich", "Settings" => "Einstellungen", "_%n minute ago_::_%n minutes ago_" => array("",""), diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index 65d508de0ff..41be9fb4d06 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Das Erstellen des \"data\"-Verzeichnisses nicht möglich (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", "Setting locale to %s failed" => "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", -"Please install one of theses locales on your system and restart your webserver." => "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.", "Please ask your server administrator to install the module." => "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.", "PHP module %s not installed." => "PHP-Modul %s nicht installiert.", "PHP %s or higher is required." => "PHP %s oder höher wird benötigt.", diff --git a/lib/l10n/el.php b/lib/l10n/el.php index c0bc46d52c5..aae6f22d4d7 100644 --- a/lib/l10n/el.php +++ b/lib/l10n/el.php @@ -98,7 +98,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Αδυναμία δημιουργίας του καταλόγου \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Αυτό μπορεί συνήθως να διορθωθεί <a href=\"%s\" target=\"_blank\">δίνοντας δικαιώματα εγγραφής για το βασικό κατάλογο στο διακομιστή δικτύου</a>.", "Setting locale to %s failed" => "Ρύθμιση τοπικών ρυθμίσεων σε %s απέτυχε", -"Please install one of theses locales on your system and restart your webserver." => "Παρακαλώ εγκαταστήστε μία από αυτές τις τοπικές ρυθμίσεις στο σύστημά σας και επανεκκινήστε το διακομιστή δικτύου.", "Please ask your server administrator to install the module." => "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.", "PHP module %s not installed." => "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ", "PHP %s or higher is required." => "PHP %s ή νεώτερη απαιτείται.", diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php index c1ad8703ea3..ba8f5557646 100644 --- a/lib/l10n/en_GB.php +++ b/lib/l10n/en_GB.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Cannot create \"data\" directory (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>.", "Setting locale to %s failed" => "Setting locale to %s failed", -"Please install one of theses locales on your system and restart your webserver." => "Please install one of theses locales on your system and restart your webserver.", "Please ask your server administrator to install the module." => "Please ask your server administrator to install the module.", "PHP module %s not installed." => "PHP module %s not installed.", "PHP %s or higher is required." => "PHP %s or higher is required.", diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 6c5ac83280a..e0c7a32773f 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "No puedo crear del directorio \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al servidor web permisos de escritura en el directorio raíz</a>.", "Setting locale to %s failed" => "Falló la activación del idioma %s ", -"Please install one of theses locales on your system and restart your webserver." => "Por favor instale uno de estos idiomas en su sitema y reinicie su servidor Web.", "Please ask your server administrator to install the module." => "Consulte al administrador de su servidor para instalar el módulo.", "PHP module %s not installed." => "El ódulo PHP %s no está instalado.", "PHP %s or higher is required." => "Se requiere PHP %s o superior.", diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index de5abef91af..715b050033e 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -98,7 +98,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Ei suuda luua \"data\" kataloogi (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Tavaliselt saab selle lahendada <a href=\"%s\" target=\"_blank\">andes veebiserverile juur-kataloogile kirjutusõigused</a>.", "Setting locale to %s failed" => "Lokaadi %s määramine ebaõnnestus.", -"Please install one of theses locales on your system and restart your webserver." => "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.", "Please ask your server administrator to install the module." => "Palu oma serveri haldajal moodul paigadalda.", "PHP module %s not installed." => "PHP moodulit %s pole paigaldatud.", "PHP %s or higher is required." => "PHP %s või uuem on nõutav.", diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php index c395e2d0821..0635fc5671f 100644 --- a/lib/l10n/eu.php +++ b/lib/l10n/eu.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Ezin da \"data\" karpeta sortu (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Hau normalean konpondu daiteke <a href=\"%s\" target=\"_blank\">web zerbitzarira erro karpetan idazteko baimenak emanez</a>.", "Setting locale to %s failed" => "Lokala %sra ezartzeak huts egin du", -"Please install one of theses locales on your system and restart your webserver." => "Mesedez instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.", "Please ask your server administrator to install the module." => "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.", "PHP module %s not installed." => "PHPren %s modulua ez dago instalaturik.", "PHP %s or higher is required." => "PHP %s edo berriagoa behar da.", diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php index b1e0cc6698f..4d91f770b32 100644 --- a/lib/l10n/fi_FI.php +++ b/lib/l10n/fi_FI.php @@ -86,7 +86,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Kansion \"data\" luominen ei onnistu (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Tämä on yleensä korjattavissa <a href=\"%s\" target=\"_blank\">antamalla http-palvelimelle kirjoitusoikeuden juurihakemistoon</a>.", "Setting locale to %s failed" => "Maa-asetuksen %s asettaminen epäonnistui", -"Please install one of theses locales on your system and restart your webserver." => "Asenna järjestelmään yksi näistä maa-asetuksista ja käynnistä http-palvelin uudelleen.", "Please ask your server administrator to install the module." => "Pyydä palvelimen ylläpitäjää asentamaan moduulin.", "PHP module %s not installed." => "PHP-moduulia %s ei ole asennettu.", "PHP %s or higher is required." => "PHP %s tai sitä uudempi vaaditaan.", diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index f1f4bf68a26..35ca49d8ae4 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Impossible de créer le répertoire \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.", "Setting locale to %s failed" => "Le choix de la langue pour %s a échoué", -"Please install one of theses locales on your system and restart your webserver." => "Veuillez installer l’une de ces langues sur votre système et redémarrez le serveur web.", "Please ask your server administrator to install the module." => "Veuillez demander à votre administrateur d’installer le module.", "PHP module %s not installed." => "Le module PHP %s n’est pas installé.", "PHP %s or higher is required." => "PHP %s ou supérieur est requis.", diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index 07e9f848c11..2bc29e7927a 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -12,24 +12,24 @@ $TRANSLATIONS = array( "Users" => "Usuarios", "Admin" => "Administración", "Failed to upgrade \"%s\"." => "Non foi posíbel anovar «%s».", -"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel con esta versión do ownCloud.", -"No app name specified" => "Non se especificou o nome do aplicativo", +"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Non é posíbel instalar a aplicación «%s» por non seren compatíbel con esta versión do ownCloud.", +"No app name specified" => "Non se especificou o nome da aplicación", "Unknown filetype" => "Tipo de ficheiro descoñecido", "Invalid image" => "Imaxe incorrecta", "web services under your control" => "servizos web baixo o seu control", -"App directory already exists" => "Xa existe o directorio do aplicativo", -"Can't create app folder. Please fix permissions. %s" => "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s", -"No source specified when installing app" => "Non foi especificada ningunha orixe ao instalar aplicativos", -"No href specified when installing app from http" => "Non foi especificada ningunha href ao instalar aplicativos", -"No path specified when installing app from local file" => "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local", +"App directory already exists" => "Xa existe o directorio da aplicación", +"Can't create app folder. Please fix permissions. %s" => "Non é posíbel crear o cartafol de aplicacións. Corrixa os permisos. %s", +"No source specified when installing app" => "Non foi especificada ningunha orixe ao instalar aplicacións", +"No href specified when installing app from http" => "Non foi especificada ningunha href ao instalar aplicacións", +"No path specified when installing app from local file" => "Non foi especificada ningunha ruta ao instalar aplicacións desde un ficheiro local", "Archives of type %s are not supported" => "Os arquivos do tipo %s non están admitidos", -"Failed to open archive when installing app" => "Non foi posíbel abrir o arquivo ao instalar aplicativos", -"App does not provide an info.xml file" => "O aplicativo non fornece un ficheiro info.xml", -"App can't be installed because of not allowed code in the App" => "Non é posíbel instalar o aplicativo por mor de conter código non permitido", -"App can't be installed because it is not compatible with this version of ownCloud" => "Non é posíbel instalar o aplicativo por non seren compatíbel con esta versión do ownCloud.", -"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Non é posíbel instalar o aplicativo por conter a etiqueta <shipped>true</shipped> que non está permitida para os aplicativos non expedidos", -"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store", -"Application is not enabled" => "O aplicativo non está activado", +"Failed to open archive when installing app" => "Non foi posíbel abrir o arquivo ao instalar aplicacións", +"App does not provide an info.xml file" => "A aplicación non fornece un ficheiro info.xml", +"App can't be installed because of not allowed code in the App" => "Non é posíbel instalar a aplicación por mor de conter código non permitido", +"App can't be installed because it is not compatible with this version of ownCloud" => "Non é posíbel instalar a aplicación por non seren compatíbel con esta versión do ownCloud.", +"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Non é posíbel instalar a aplicación por conter a etiqueta <shipped>true</shipped> que non está permitida para as aplicacións non enviadas", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Non é posíbel instalar a aplicación xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store", +"Application is not enabled" => "A aplicación non está activada", "Authentication error" => "Produciuse un erro de autenticación", "Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.", "Unknown user" => "Usuario descoñecido", @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Non é posíbel crear o directorio «data» (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Polo xeral, isto pode ser fixado para <a href=\"%s\" target=\"_blank\">permitirlle ao servidor web acceso de escritura ao directorio «root»</a>.", "Setting locale to %s failed" => "Fallou o axuste da configuración local a %s", -"Please install one of theses locales on your system and restart your webserver." => "Instale unha destas configuracións locais no seu sistema e reinicie o servidor web.", "Please ask your server administrator to install the module." => "Pregúntelle ao administrador do servidor pola instalación do módulo.", "PHP module %s not installed." => "O módulo PHP %s non está instalado.", "PHP %s or higher is required." => "Requirese PHP %s ou superior.", diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php index 116d176fa0b..a3f6ae75800 100644 --- a/lib/l10n/hu_HU.php +++ b/lib/l10n/hu_HU.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Cannot write into \"config\" directory!" => "Nem írható a \"config\" könyvtár!", "Help" => "Súgó", "Personal" => "Személyes", "Settings" => "Beállítások", @@ -25,6 +26,7 @@ $TRANSLATIONS = array( "Application is not enabled" => "Az alkalmazás nincs engedélyezve", "Authentication error" => "Azonosítási hiba", "Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.", +"Unknown user" => "Ismeretlen felhasználó", "%s enter the database username." => "%s adja meg az adatbázist elérő felhasználó login nevét.", "%s enter the database name." => "%s adja meg az adatbázis nevét.", "%s you may not use dots in the database name" => "%s az adatbázis neve nem tartalmazhat pontot", @@ -41,6 +43,8 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.", "Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.", "%s shared »%s« with you" => "%s megosztotta Önnel ezt: »%s«", +"Sharing %s failed, because the file does not exist" => "%s megosztása sikertelen, mert a fájl nem létezik", +"Cannot set expiration date. Expiration date is in the past" => "Nem lehet beállítani a lejárati időt mivel már elmúlt.", "Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\"", "seconds ago" => "pár másodperce", "_%n minute ago_::_%n minutes ago_" => array("","%n perccel ezelőtt"), @@ -54,6 +58,8 @@ $TRANSLATIONS = array( "years ago" => "több éve", "A valid username must be provided" => "Érvényes felhasználónevet kell megadnia", "A valid password must be provided" => "Érvényes jelszót kell megadnia", -"The username is already being used" => "Ez a bejelentkezési név már foglalt" +"The username is already being used" => "Ez a bejelentkezési név már foglalt", +"Cannot write into \"config\" directory" => "Nem írható a \"config\" könyvtár", +"Please upgrade your database version" => "Kérlek frissítsd az adatbázisodat" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/it.php b/lib/l10n/it.php index 1608a4461f1..9787d90ba16 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Impossibile creare la cartella \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Ciò può essere normalmente corretto <a href=\"%s\" target=\"_blank\">fornendo al server web accesso in scrittura alla cartella radice</a>.", "Setting locale to %s failed" => "L'impostazione della localizzazione a %s non è riuscita", -"Please install one of theses locales on your system and restart your webserver." => "Installa una delle seguenti localizzazioni sul tuo sistema e riavvia il server web.", "Please ask your server administrator to install the module." => "Chiedi all'amministratore del tuo server di installare il modulo.", "PHP module %s not installed." => "Il modulo PHP %s non è installato.", "PHP %s or higher is required." => "Richiesto PHP %s o superiore", diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php index 13b70541ad4..56f465071ec 100644 --- a/lib/l10n/ja.php +++ b/lib/l10n/ja.php @@ -67,6 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "%s の共有方法は、%s には適用できません。", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s の権限設定に失敗しました。%s に許可されている権限を越えています。", "Setting permissions for %s failed, because the item was not found" => "%s の権限設定に失敗しました。アイテムが存在しません。", +"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "有効期限を設定できません。共有開始から %s 以降に有効期限を設定することはできません。", "Cannot set expiration date. Expiration date is in the past" => "有効期限を設定できません。有効期限が過去を示しています。", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。", "Sharing backend %s not found" => "共有バックエンド %s が見つかりません", @@ -99,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "\"data\" ディレクトリ (%s) を作成できません", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "多くの場合、これは<a href=\"%s\" target=\"_blank\">WEBサーバーにルートディレクトリへの書き込み権限を付与</a>することで解決が可能です。", "Setting locale to %s failed" => "ロケールを %s に設定できませんでした", -"Please install one of theses locales on your system and restart your webserver." => "これらのロケールのいずれかをシステムにインストールし、WEBサーバーを再起動してください。", "Please ask your server administrator to install the module." => "サーバー管理者にモジュールのインストールを依頼してください。", "PHP module %s not installed." => "PHP のモジュール %s がインストールされていません。", "PHP %s or higher is required." => "PHP %s 以上が必要です。", diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php deleted file mode 100644 index 015c885904e..00000000000 --- a/lib/l10n/ja_JP.php +++ /dev/null @@ -1,71 +0,0 @@ -<?php -$TRANSLATIONS = array( -"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリは、このバージョンのownCloudと互換性がないためインストールできません。", -"No app name specified" => "アプリ名が未指定", -"Help" => "ヘルプ", -"Personal" => "個人", -"Settings" => "設定", -"Users" => "ユーザー", -"Admin" => "管理", -"Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。", -"Unknown filetype" => "不明なファイルタイプ", -"Invalid image" => "無効な画像", -"web services under your control" => "管理下のウェブサービス", -"ZIP download is turned off." => "ZIPダウンロードは無効です。", -"Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。", -"Back to Files" => "ファイルに戻る", -"Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。", -"Please download the files separately in smaller chunks or kindly ask your administrator." => "少しずつに分けてファイルをダウンロードするか、管理者に問い合わせてください。", -"No source specified when installing app" => "アプリインストール時のソースが未指定", -"No href specified when installing app from http" => "アプリインストール時のhttpの URL が未指定", -"No path specified when installing app from local file" => "アプリインストール時のローカルファイルのパスが未指定", -"Archives of type %s are not supported" => "\"%s\"タイプのアーカイブ形式は未サポート", -"Failed to open archive when installing app" => "アプリをインストール中にアーカイブファイルを開けませんでした。", -"App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません", -"App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません", -"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がないためインストールできません。", -"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。", -"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません", -"App directory already exists" => "アプリディレクトリはすでに存在します", -"Can't create app folder. Please fix permissions. %s" => "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。", -"Application is not enabled" => "アプリケーションは無効です", -"Authentication error" => "認証エラー", -"Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。", -"Unknown user" => "不明なユーザー", -"Files" => "ファイル", -"Text" => "TTY TDD", -"Images" => "画像", -"%s enter the database username." => "%s のデータベースのユーザー名を入力してください。", -"%s enter the database name." => "%s のデータベース名を入力してください。", -"%s you may not use dots in the database name" => "%s ではデータベース名にドットを利用できないかもしれません。", -"MS SQL username and/or password not valid: %s" => "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s", -"You need to enter either an existing account or the administrator." => "既存のアカウントもしくは管理者のどちらかを入力する必要があります。", -"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB のユーザー名及び/またはパスワードが無効", -"DB Error: \"%s\"" => "DBエラー: \"%s\"", -"Offending command was: \"%s\"" => "違反コマンド: \"%s\"", -"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB のユーザー '%s'@'localhost' はすでに存在します。", -"Drop this user from MySQL/MariaDB" => "MySQL/MariaDB からこのユーザーを削除", -"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB のユーザー '%s'@'%%' はすでに存在します", -"Drop this user from MySQL/MariaDB." => "MySQL/MariaDB からこのユーザーを削除。", -"Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。", -"Oracle username and/or password not valid" => "Oracleのユーザー名もしくはパスワードは有効ではありません", -"Offending command was: \"%s\", name: %s, password: %s" => "違反コマンド: \"%s\"、名前: %s、パスワード: %s", -"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザー名もしくはパスワードは有効ではありません", -"Set an admin username." => "管理者のユーザー名を設定", -"Set an admin password." => "管理者のパスワードを設定。", -"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。", -"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。", -"%s shared »%s« with you" => "%sが あなたと »%s«を共有しました", -"Could not find category \"%s\"" => "カテゴリ \"%s\" が見つかりませんでした", -"seconds ago" => "数秒前", -"_%n minute ago_::_%n minutes ago_" => array("%n 分前"), -"_%n hour ago_::_%n hours ago_" => array("%n 時間前"), -"today" => "今日", -"yesterday" => "1日前", -"_%n day go_::_%n days ago_" => array("%n日前"), -"last month" => "1ヶ月前", -"_%n month ago_::_%n months ago_" => array("%nヶ月前"), -"last year" => "1年前", -"years ago" => "年前" -); -$PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php index 12c5cd438fd..81fa0fbc2f0 100644 --- a/lib/l10n/nb_NO.php +++ b/lib/l10n/nb_NO.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Kan ikke opprette \"data\"-mappen (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dette kan vanligvis ordnes ved <a href=\"%s\" target=\"_blank\">gi web-serveren skrivetilgang til rotmappen</a>.", "Setting locale to %s failed" => "Setting av nasjonale innstillinger til %s feilet.", -"Please install one of theses locales on your system and restart your webserver." => "Vennligst installer en av disse nasjonale innstillingene på systemet ditt og start web-serveren på nytt.", "Please ask your server administrator to install the module." => "Be server-administratoren om å installere modulen.", "PHP module %s not installed." => "PHP-modul %s er ikke installert.", "PHP %s or higher is required." => "PHP %s eller nyere kreves.", diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index 25e77deedfe..ba81edec90a 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Kan de \"data\" directory (%s) niet aanmaken", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.", "Setting locale to %s failed" => "Instellen taal op %s mislukte", -"Please install one of theses locales on your system and restart your webserver." => "Installeer één van de talen op uw systeem en herstart uw webserver.", "Please ask your server administrator to install the module." => "Vraag uw beheerder om de module te installeren.", "PHP module %s not installed." => "PHP module %s niet geïnstalleerd.", "PHP %s or higher is required." => "PHP %s of hoger vereist.", diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index 877c3fcdbe8..87974919610 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -98,7 +98,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Nie można utworzyć katalogu \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Można to zwykle rozwiązać przez <a href=\"%s\" target=\"_blank\">dodanie serwerowi www uprawnień zapisu do katalogu głównego</a>.", "Setting locale to %s failed" => "Nie udało się zmienić języka na %s", -"Please install one of theses locales on your system and restart your webserver." => "Proszę zainstalować jeden z tych języków w twoim systemie i zrestartować serwer www.", "Please ask your server administrator to install the module." => "Proszę poproś administratora serwera aby zainstalował ten moduł.", "PHP module %s not installed." => "Moduł PHP %s nie jest zainstalowany.", "PHP %s or higher is required." => "PHP %s lub wyższe jest wymagane.", diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index ca0f94d4929..9147d20e6b1 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Não pode ser criado \"dados\" no diretório (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Isto pode ser corrigido por <a href=\"%s\" target=\"_blank\">dando ao webserver permissão de escrita ao diretório raiz</a>.", "Setting locale to %s failed" => "Falha ao configurar localidade para %s", -"Please install one of theses locales on your system and restart your webserver." => "Por favor, instale um dessas localidades em seu sistema e reinicie seu servidor web.", "Please ask your server administrator to install the module." => "Por favor, peça ao seu administrador do servidor para instalar o módulo.", "PHP module %s not installed." => "Módulo PHP %s não instalado.", "PHP %s or higher is required." => "É requerido PHP %s ou superior.", diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index db29fb52cc7..26352448cc5 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Não é possivel criar a directoria \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Isto pode ser normalmente resolvido <a href=\"%s\" target=\"_blank\">dando ao servidor web direito de escrita para o directório do root</a>.", "Setting locale to %s failed" => "Definindo local para %s falhado", -"Please install one of theses locales on your system and restart your webserver." => "Por favor instale um desses locais no seu sistema e reinicie o seu servidor web.", "Please ask your server administrator to install the module." => "Por favor pergunte ao seu administrador do servidor para instalar o modulo.", "PHP module %s not installed." => "O modulo %s PHP não está instalado.", "PHP %s or higher is required." => "Necessário PHP %s ou maior.", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index c8514fc3f9e..8e33dd708c0 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -99,7 +99,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "Невозможно создать каталог \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневой папке.", "Setting locale to %s failed" => "Установка локали в %s не удалась", -"Please install one of theses locales on your system and restart your webserver." => "Пожалуйста, установите одну из следующих локалей в вашей системе и перезапустите веб-сервер.", "Please ask your server administrator to install the module." => "Пожалуйста, попростите администратора сервера установить модуль.", "PHP module %s not installed." => "Не установлен PHP-модуль %s.", "PHP %s or higher is required." => "Требуется PHP %s или выше", diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php index 1b1d6cf3ce4..ff0232c8d4e 100644 --- a/lib/l10n/sk_SK.php +++ b/lib/l10n/sk_SK.php @@ -1,6 +1,9 @@ <?php $TRANSLATIONS = array( "Cannot write into \"config\" directory!" => "Nie je možné zapisovat do priečinka \"config\"!", +"This can usually be fixed by giving the webserver write access to the config directory" => "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou.", +"See %s" => "Pozri %s", +"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "To je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.", "You are accessing the server from an untrusted domain." => "Pristupujete na server v nedôveryhodnej doméne.", "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontaktujte administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.", "Help" => "Pomoc", @@ -64,6 +67,11 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Typ zdieľania %s nie je platný pre %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s", "Setting permissions for %s failed, because the item was not found" => "Nastavenie povolení pre %s zlyhalo, pretože položka sa nenašla", +"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Nie je možné nastaviť dátum konca platnosti. Zdieľania nemôžu skončiť neskôr ako %s po zdieľaní.", +"Cannot set expiration date. Expiration date is in the past" => "Nie je možné nastaviť dátum konca platnosti. Dátum konca platnosti je v minulosti.", +"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Backend zdieľania %s musí implementovať rozhranie OCP\\Share_Backend", +"Sharing backend %s not found" => "Backend zdieľania %s nebol nájdený", +"Sharing backend for %s not found" => "Backend zdieľania pre %s nebol nájdený", "Sharing %s failed, because the user %s is the original sharer" => "Zdieľanie %s zlyhalo, pretože používateľ %s je pôvodcom zdieľania", "Sharing %s failed, because the permissions exceed permissions granted to %s" => "Zdieľanie %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s", "Sharing %s failed, because resharing is not allowed" => "Zdieľanie %s zlyhalo, pretože zdieľanie ďalším nie je povolené", @@ -85,9 +93,13 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Musíte zadať platné heslo", "The username is already being used" => "Meno používateľa je už použité", "No database drivers (sqlite, mysql, or postgresql) installed." => "Ovládače databázy (sqlite, mysql, or postgresql) nie sú nainštalované.", +"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového adresára%s.", "Cannot write into \"config\" directory" => "Nie je možné zapisovať do priečinka \"config\"", "Cannot write into \"apps\" directory" => "Nie je možné zapisovať do priečinka \"apps\"", +"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Toto je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do adresára aplikácií%s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.", "Cannot create \"data\" directory (%s)" => "Nie je možné vytvoriť priečinok \"data\" (%s)", +"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.", +"Setting locale to %s failed" => "Nastavenie locale na %s zlyhalo", "Please ask your server administrator to install the module." => "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.", "PHP module %s not installed." => "PHP modul %s nie je nainštalovaný.", "PHP %s or higher is required." => "Požadovaná verzia PHP %s alebo vyššia.", @@ -95,10 +107,17 @@ $TRANSLATIONS = array( "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode je zapnutý. ownCloud pre správnu funkčnosť vyžaduje, aby bol vypnutý.", "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode je zastarané a väčšinou zbytočné nastavenie, ktoré by malo byť vypnuté. Prosím, požiadajte administrátora vášho serveru o jeho vypnutie v php.ini alebo v nastaveniach webového servera.", "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes sú povolené. ownCloud pre správnu funkčnosť vyžaduje, aby boli vypnuté.", +"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes je zavrhovanou a zbytočnou voľbou, ktorú by ste mali ponechať vypnutú. Prosím, požiadajte správcu svojho servera, aby ju vypol v php.ini alebo v konfigurácii vášho webového servera.", "PHP modules have been installed, but they are still listed as missing?" => "PHP moduly boli nainštalované, ale stále sú uvedené ako chýbajúce?", "Please ask your server administrator to restart the web server." => "Prosím, požiadajte administrátora vášho servera o reštartovanie webového servera.", "PostgreSQL >= 9 required" => "Vyžadované PostgreSQL >= 9", "Please upgrade your database version" => "Prosím, aktualizujte verziu svojej databázy", -"Error occurred while checking PostgreSQL version" => "Nastala chyba pri overovaní verzie PostgreSQL" +"Error occurred while checking PostgreSQL version" => "Nastala chyba pri overovaní verzie PostgreSQL", +"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Prosím, uistite sa, že máte PostgreSQL >= 9 alebo sa pozrite do protokolu, kde nájdete podrobnejšie informácie o chybe", +"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Prosím, zmeňte oprávnenia na 0770, aby tento adresár nemohli ostatní používatelia vypísať.", +"Data directory (%s) is readable by other users" => "Adresár dát (%s) je prístupný na čítanie ostatným používateľom", +"Data directory (%s) is invalid" => "Adresár dát (%s) je neplatný", +"Please check that the data directory contains a file \".ocdata\" in its root." => "Prosím, skontrolujte, či adresár dát obsahuje súbor „.ocdata“.", +"Could not obtain lock type %d on \"%s\"." => "Nepodarilo sa získať zámok typu %d na „%s“." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php index d4b9006974d..f142f176451 100644 --- a/lib/l10n/sr@latin.php +++ b/lib/l10n/sr@latin.php @@ -7,8 +7,8 @@ $TRANSLATIONS = array( "Admin" => "Adninistracija", "Authentication error" => "Greška pri autentifikaciji", "seconds ago" => "Pre par sekundi", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array("","","pre %n minuta"), +"_%n hour ago_::_%n hours ago_" => array("","","pre %n sati"), "today" => "Danas", "yesterday" => "juče", "_%n day go_::_%n days ago_" => array("","","Prije %n dana."), diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index d3b29f24937..e249b179269 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -67,7 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "%s paylaşım türü %s için geçerli değil", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı", "Setting permissions for %s failed, because the item was not found" => "%s için izinler öge bulunamadığından ayarlanamadı", -"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Son kullanma tarihi ayarlanamıyor. Paylaşımların süreleri, paylaşıldıkları süreden %s sonra dolamaz.", +"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Son kullanma tarihi ayarlanamıyor. Paylaşımlar, paylaşıldıkları süreden %s sonra dolamaz.", "Cannot set expiration date. Expiration date is in the past" => "Son kullanma tarihi ayarlanamıyor. Son kullanma tarihi geçmişte", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli", "Sharing backend %s not found" => "Paylaşım arka ucu %s bulunamadı", @@ -100,7 +100,6 @@ $TRANSLATIONS = array( "Cannot create \"data\" directory (%s)" => "\"Veri\" dizini oluşturulamıyor (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "İzinler genellikle, <a href=\"%s\" target=\"_blank\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.", "Setting locale to %s failed" => "Dili %s olarak ayarlama başarısız", -"Please install one of theses locales on your system and restart your webserver." => "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.", "Please ask your server administrator to install the module." => "Lütfen modülün kurulması için sunucu yöneticinize danışın.", "PHP module %s not installed." => "PHP modülü %s yüklü değil.", "PHP %s or higher is required." => "PHP %s veya daha üst sürümü gerekli.", diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php index cb7f33e6dd8..f5bcb063994 100644 --- a/lib/l10n/zh_CN.php +++ b/lib/l10n/zh_CN.php @@ -90,7 +90,6 @@ $TRANSLATIONS = array( "Cannot write into \"apps\" directory" => "无法写入“apps”目录", "Cannot create \"data\" directory (%s)" => "无法创建“apps”目录 (%s)", "Setting locale to %s failed" => "设置语言为 %s 失败", -"Please install one of theses locales on your system and restart your webserver." => "请在您的系统中安装这些语言并重新启动您的网页服务器。", "Please ask your server administrator to install the module." => "请联系服务器管理员安装模块。", "PHP module %s not installed." => "PHP %s 模块未安装。", "PHP %s or higher is required." => "要求 PHP 版本 %s 或者更高。", diff --git a/lib/private/app.php b/lib/private/app.php index 7bf04f11267..2887961754c 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -172,6 +172,7 @@ class OC_App { if (!$forceRefresh && !empty(self::$enabledAppsCache)) { return self::$enabledAppsCache; } + $apps = array(); $appConfig = \OC::$server->getAppConfig(); $appStatus = $appConfig->getValues(false, 'enabled'); $user = \OC_User::getUser(); @@ -832,7 +833,8 @@ class OC_App { foreach ($appList as $app) { foreach ($remoteApps AS $key => $remote) { if ($app['name'] === $remote['name'] || - $app['ocsid'] === $remote['id']) { + (isset($app['ocsid']) && + $app['ocsid'] === $remote['id'])) { unset($remoteApps[$key]); } } diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index d012c0c5a63..716b7d39402 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -215,7 +215,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { $sid = $this->getStorage()->getId(); if (!is_null($sid)) { $sid = explode(':', $sid); - return ($sid[0] !== 'local' and $sid[0] !== 'home'); + return ($sid[0] !== 'local' and $sid[0] !== 'home' and $sid[0] !== 'shared'); } return false; diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 9657b511f15..0720b8180c9 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -226,6 +226,7 @@ abstract class Common implements \OC\Files\Storage\Storage { $tmpFile = \OC_Helper::tmpFile($extension); $target = fopen($tmpFile, 'w'); \OC_Helper::streamCopy($source, $target); + fclose($target); return $tmpFile; } diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 02c3ebd0202..ce447417d20 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -295,6 +295,7 @@ class DAV extends \OC\Files\Storage\Common { \OCP\Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, \OCP\Util::ERROR); } curl_close($curl); + fclose($source); $this->removeCachedFile($target); } diff --git a/lib/private/files/storage/home.php b/lib/private/files/storage/home.php index 015b1f01885..85b06f8a510 100644 --- a/lib/private/files/storage/home.php +++ b/lib/private/files/storage/home.php @@ -66,4 +66,14 @@ class Home extends Local implements \OCP\Files\IHomeStorage { public function getUser() { return $this->user; } + + /** + * get the owner of a path + * + * @param string $path The path to get the owner + * @return string uid or false + */ + public function getOwner($path) { + return $this->user->getUID(); + } } diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 2a28e6fce88..1037056b0fb 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -670,6 +670,7 @@ class View { $source = fopen($tmpFile, 'r'); if ($source) { $this->file_put_contents($path, $source); + fclose($source); unlink($tmpFile); return true; } else { @@ -1182,6 +1183,7 @@ class View { * @return string|null */ public function getPath($id) { + $id = (int) $id; $manager = Filesystem::getMountManager(); $mounts = $manager->findIn($this->fakeRoot); $mounts[] = $manager->find($this->fakeRoot); diff --git a/lib/private/helper.php b/lib/private/helper.php index f90c38d236c..79df2e3255c 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -183,6 +183,7 @@ class OC_Helper { 'application/x-gzip' => 'package/x-generic', 'application/x-rar-compressed' => 'package/x-generic', 'application/x-tar' => 'package/x-generic', + 'application/vnd.android.package-archive' => 'package/x-generic', 'application/zip' => 'package/x-generic', 'application/msword' => 'x-office/document', diff --git a/lib/private/image.php b/lib/private/image.php index 0dff8c5a9da..7ddc8dca143 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -603,6 +603,7 @@ class OC_Image { $meta = unpack('vtype/Vfilesize/Vreserved/Voffset', fread($fh, 14)); // check for bitmap if ($meta['type'] != 19778) { + fclose($fh); trigger_error('imagecreatefrombmp: ' . $fileName . ' is not a bitmap!', E_USER_WARNING); return false; } @@ -626,6 +627,7 @@ class OC_Image { if ($meta['imagesize'] < 1) { $meta['imagesize'] = @filesize($fileName) - $meta['offset']; if ($meta['imagesize'] < 1) { + fclose($fh); trigger_error('imagecreatefrombmp: Can not obtain filesize of ' . $fileName . '!', E_USER_WARNING); return false; } @@ -666,6 +668,7 @@ class OC_Image { break; case 16: if (!($part = substr($data, $p, 2))) { + fclose($fh); trigger_error($error, E_USER_WARNING); return $im; } @@ -712,6 +715,7 @@ class OC_Image { $color[1] = $palette[ $color[1] + 1 ]; break; default: + fclose($fh); trigger_error('imagecreatefrombmp: ' . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', E_USER_WARNING); diff --git a/lib/private/installer.php b/lib/private/installer.php index c5a09349629..dc9a3558b75 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -532,10 +532,6 @@ class OC_Installer{ */ public static function checkCode($appname, $folder) { $blacklist=array( - 'exec(', - 'eval(', - // more evil pattern will go here later - // classes replaced by the public api 'OC_API::', 'OC_App::', diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php index 293e09fe2c9..2c35feefc8b 100644 --- a/lib/private/largefilehelper.php +++ b/lib/private/largefilehelper.php @@ -147,7 +147,7 @@ class LargeFileHelper { if (\OC_Helper::is_function_enabled('exec')) { $os = strtolower(php_uname('s')); $arg = escapeshellarg($filename); - $result = ''; + $result = null; if (strpos($os, 'linux') !== false) { $result = $this->exec("stat -c %s $arg"); } else if (strpos($os, 'bsd') !== false) { diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php index 4634f2c695d..68f63974e85 100644 --- a/lib/private/legacy/appconfig.php +++ b/lib/private/legacy/appconfig.php @@ -24,6 +24,8 @@ /** * This class provides an easy way for apps to store config values in the * database. + * + * @deprecated use \OC::$server->getAppConfig() to get an \OCP\IAppConfig instance */ class OC_Appconfig { /** diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php index 899c19532f0..4d6fefc4e17 100644 --- a/lib/private/legacy/config.php +++ b/lib/private/legacy/config.php @@ -37,6 +37,8 @@ /** * This class is responsible for reading and writing config.php, the very basic * configuration file of ownCloud. + * + * @deprecated use \OC::$server->getConfig() to get an \OCP\Config instance */ class OC_Config { diff --git a/lib/private/legacy/log.php b/lib/private/legacy/log.php index 027cb89e97c..99c9254e90f 100644 --- a/lib/private/legacy/log.php +++ b/lib/private/legacy/log.php @@ -14,6 +14,9 @@ */ OC_Log::$object = new \OC\Log(); +/** + * @deprecated use \OC::$server->getLogger() to get an \OCP\ILogger instance + */ class OC_Log { public static $object; diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php index 060274085fe..4b68b0e69aa 100644 --- a/lib/private/legacy/preferences.php +++ b/lib/private/legacy/preferences.php @@ -21,10 +21,11 @@ * */ +OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection()); /** * This class provides an easy way for storing user preferences. + * @deprecated use \OC\Preferences instead */ -OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection()); class OC_Preferences{ public static $object; /** diff --git a/lib/private/legacy/search.php b/lib/private/legacy/search.php index f77b43be2e0..19aba2a8b8c 100644 --- a/lib/private/legacy/search.php +++ b/lib/private/legacy/search.php @@ -22,7 +22,8 @@ /** * provides an interface to all search providers - * @deprecated see lib/search.php + * + * @deprecated use \OCP\ISearch / \OC\Search instead */ class OC_Search { /** diff --git a/lib/private/legacy/search/provider.php b/lib/private/legacy/search/provider.php index b296aeb23d8..b183caf5511 100644 --- a/lib/private/legacy/search/provider.php +++ b/lib/private/legacy/search/provider.php @@ -19,6 +19,7 @@ /** * Class OC_Search_Provider + * * @deprecated use \OCP\Search\Provider instead */ abstract class OC_Search_Provider extends \OCP\Search\Provider { diff --git a/lib/private/legacy/search/provider/file.php b/lib/private/legacy/search/provider/file.php index e610281131d..079ce85bf54 100644 --- a/lib/private/legacy/search/provider/file.php +++ b/lib/private/legacy/search/provider/file.php @@ -17,6 +17,9 @@ * */ +/** + * @deprecated use \OC\Search\Provider\File instead + */ class OC_Search_Provider_File extends \OC\Search\Provider\File { } diff --git a/lib/private/legacy/search/result.php b/lib/private/legacy/search/result.php index f3e6ecbb990..d5aa3391dc8 100644 --- a/lib/private/legacy/search/result.php +++ b/lib/private/legacy/search/result.php @@ -17,8 +17,10 @@ * */ +/** + * @deprecated use \OCP\Search\Result instead + */ class OC_Search_Result extends \OCP\Search\Result { - /** * Create a new search result * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]' diff --git a/lib/private/legacy/updater.php b/lib/private/legacy/updater.php index eea7bb129cf..190748066c6 100644 --- a/lib/private/legacy/updater.php +++ b/lib/private/legacy/updater.php @@ -6,6 +6,11 @@ * See the COPYING-README file. */ +/** + * provides an interface to all search providers + * + * @deprecated use \OC\Updater instead + */ class OC_Updater { public static function check() { $updater = new \OC\Updater(); diff --git a/lib/private/mail.php b/lib/private/mail.php index 82107c32dc7..691ae1dd33f 100644 --- a/lib/private/mail.php +++ b/lib/private/mail.php @@ -70,6 +70,7 @@ class OC_Mail { $mailo->From = $fromaddress; $mailo->FromName = $fromname;; $mailo->Sender = $fromaddress; + $mailo->XMailer = ' '; try { $toaddress = self::buildAsciiEmail($toaddress); $mailo->AddAddress($toaddress, $toname); diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index 8db78361433..a44ec1daa1e 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -32,6 +32,7 @@ return array( '7z' => array('application/x-7z-compressed', null), 'accdb' => array('application/msaccess', null), 'ai' => array('application/illustrator', null), + 'apk' => array('application/vnd.android.package-archive', null), 'avi' => array('video/x-msvideo', null), 'bash' => array('text/x-shellscript', null), 'blend' => array('application/x-blender', null), diff --git a/lib/private/preview.php b/lib/private/preview.php index aeb9806904a..cc15ab84fe7 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -477,12 +477,15 @@ class Preview { $cached = $this->isCached($fileId); if ($cached) { $stream = $this->userView->fopen($cached, 'r'); - $image = new \OC_Image(); - $image->loadFromFileHandle($stream); - $this->preview = $image->valid() ? $image : null; + $this->preview = null; + if ($stream) { + $image = new \OC_Image(); + $image->loadFromFileHandle($stream); + $this->preview = $image->valid() ? $image : null; - $this->resizeAndCrop(); - fclose($stream); + $this->resizeAndCrop(); + fclose($stream); + } } if (is_null($this->preview)) { diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php index cb74dcf8b90..1f4645eed9f 100644 --- a/lib/private/share/mailnotifications.php +++ b/lib/private/share/mailnotifications.php @@ -99,15 +99,20 @@ class MailNotifications { } } + // Link to folder, or root folder if a file + if ($itemType === 'folder') { - $foldername = "/Shared/" . $filename; + $args = array( + 'dir' => $filename, + ); } else { - // if it is a file we can just link to the Shared folder, - // that's the place where the user will find the file - $foldername = "/Shared"; + $args = array( + 'dir' => '/', + 'scrollto' => $filename, + ); } - $link = \OCP\Util::linkToAbsolute('files', 'index.php', array("dir" => $foldername)); + $link = \OCP\Util::linkToAbsolute('files', 'index.php', $args); list($htmlMail, $alttextMail) = $this->createMailBody($filename, $link, $expiration); diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 646511fd64d..4bf6622c561 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -820,17 +820,18 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemSource * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK + * @param string $recipient with whom was the file shared * @param boolean $status */ - public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) { + public static function setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status) { $status = $status ? 1 : 0; $query = \OC_DB::prepare( 'UPDATE `*PREFIX*share` SET `mail_send` = ? - WHERE `item_type` = ? AND `item_source` = ? AND `share_type` = ?'); + WHERE `item_type` = ? AND `item_source` = ? AND `share_type` = ? AND `share_with` = ?'); - $result = $query->execute(array($status, $itemType, $itemSource, $shareType)); + $result = $query->execute(array($status, $itemType, $itemSource, $shareType, $recipient)); if($result === false) { \OC_Log::write('OCP\Share', 'Couldn\'t set send mail status', \OC_Log::ERROR); diff --git a/lib/private/user.php b/lib/private/user.php index 5efe205ced9..cdef4d8fe65 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -64,7 +64,7 @@ class OC_User { /** * registers backend * @param string $backend name of the backend - * @deprecated Add classes by calling useBackend with a class instance instead + * @deprecated Add classes by calling OC_User::useBackend() with a class instance instead * @return bool * * Makes a list of backends that can be used by other modules diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index d4d91163003..a54755e71c5 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -164,6 +164,11 @@ class Manager extends PublicEmitter implements IUserManager { } } } + + $remoteAddr = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ''; + $forwardedFor = isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : ''; + + \OC::$server->getLogger()->warning('Login failed: \''. $loginname .'\' (Remote IP: \''. $remoteAddr .'\', X-Forwarded-For: \''. $forwardedFor .'\')', array('app' => 'core')); return false; } diff --git a/lib/private/util.php b/lib/private/util.php index 896b076afa6..1485377828d 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -208,7 +208,10 @@ class OC_Util { * @param string $userDirectory */ public static function copySkeleton($userDirectory) { - OC_Util::copyr(\OC::$SERVERROOT.'/core/skeleton' , $userDirectory); + $skeletonDirectory = OC_Config::getValue('skeletondirectory', \OC::$SERVERROOT.'/core/skeleton'); + if (!empty($skeletonDirectory)) { + OC_Util::copyr($skeletonDirectory , $userDirectory); + } } /** @@ -472,7 +475,7 @@ class OC_Util { 'error' => $l->t('Setting locale to %s failed', array('en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/' .'pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8')), - 'hint' => $l->t('Please install one of theses locales on your system and restart your webserver.') + 'hint' => $l->t('Please install one of these locales on your system and restart your webserver.') ); } @@ -1467,4 +1470,11 @@ class OC_Util { return false; } } + + /** + * @return string + */ + public static function isPhpCharSetUtf8() { + return ini_get('default_charset') === 'UTF-8'; + } } diff --git a/lib/public/appframework/db/mapper.php b/lib/public/appframework/db/mapper.php index a23149e796b..03f0fe3aa75 100644 --- a/lib/public/appframework/db/mapper.php +++ b/lib/public/appframework/db/mapper.php @@ -125,6 +125,7 @@ abstract class Mapper { * Updates an entry in the db from an entity * @throws \InvalidArgumentException if entity has no id * @param Entity $entity the entity that should be created + * @return Entity the saved entity with the set id */ public function update(Entity $entity){ // if entity wasn't changed it makes no sense to run a db query @@ -142,7 +143,7 @@ abstract class Mapper { // get updated fields to save, fields have to be set using a setter to // be saved - // dont update the id field + // do not update the id field unset($properties['id']); $columns = ''; @@ -171,6 +172,8 @@ abstract class Mapper { array_push($params, $id); $this->execute($sql, $params); + + return $entity; } diff --git a/lib/public/share.php b/lib/public/share.php index e6519dd3e3a..bb9c6ec5886 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -274,10 +274,11 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemSource * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK + * @param string $recipient with whom was the item shared * @param bool $status */ - public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) { - return \OC\Share\Share::setSendMailStatus($itemType, $itemSource, $shareType, $status); + public static function setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status) { + return \OC\Share\Share::setSendMailStatus($itemType, $itemSource, $shareType, $recipient, $status); } /** diff --git a/lib/public/template.php b/lib/public/template.php index b1264e0c3ad..2e265bb5e8e 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -97,7 +97,7 @@ function relative_modified_date( $timestamp, $dateOnly = false ) { /** * Return a human readable outout for a file size. - * @deprecated human_file_size() instead + * @deprecated use human_file_size() instead * @param integer $bytes size of a file in byte * @return string human readable interpretation of a file size */ diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php index f7618c6e060..e3f4402cfd5 100644 --- a/lib/repair/repairmimetypes.php +++ b/lib/repair/repairmimetypes.php @@ -113,6 +113,44 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { } } + private function fixAPKMimeType() { + $existsStmt = \OC_DB::prepare(' + SELECT count(`mimetype`) + FROM `*PREFIX*mimetypes` + WHERE `mimetype` = ? + '); + + $insertStmt = \OC_DB::prepare(' + INSERT INTO `*PREFIX*mimetypes` ( `mimetype` ) + VALUES ( ? ) + '); + + + $updateByNameStmt = \OC_DB::prepare(' + UPDATE `*PREFIX*filecache` + SET `mimetype` = ( + SELECT `id` + FROM `*PREFIX*mimetypes` + WHERE `mimetype` = ? + ) WHERE `name` LIKE ? + '); + + + $mimeTypeExtension = 'apk'; + $mimeTypeName = 'application/vnd.android.package-archive'; + + $result = \OC_DB::executeAudited($existsStmt, array($mimeTypeName)); + $exists = $result->fetchOne(); + + if ( ! $exists ) { + // insert mimetype + \OC_DB::executeAudited($insertStmt, array($mimeTypeName)); + } + + // change mimetype for files with x extension + \OC_DB::executeAudited($updateByNameStmt, array($mimeTypeName, '%.'.$mimeTypeExtension)); + } + /** * Fix mime types */ @@ -120,6 +158,10 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { if ($this->fixOfficeMimeTypes()) { $this->emit('\OC\Repair', 'info', array('Fixed office mime types')); } + + if ($this->fixAPKMimeType()) { + $this->emit('\OC\Repair', 'info', array('Fixed APK mime type')); + } } } |