Testing

ALL_README.md

@@ -5,4 +5,7 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [Lees de README in het Nederlands](README_nl.md)
+- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # DotClear 2 for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Working status](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Working status](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
 
 [![Install DotClear 2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
 
@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
 
 
-**Shipped version:** 2.27.3~ynh1
+**Shipped version:** 2.31.1~ynh1
 
 **Demo:** <https://www.softaculous.com/demos/Dotclear>
 

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # DotClear 2 para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
 
 [![Instalar DotClear 2 con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
 
@@ -19,7 +19,7 @@ No se debe editar a mano.
 Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
 
 
-**Versión actual:** 2.27.3~ynh1
+**Versión actual:** 2.31.1~ynh1
 
 **Demo:** <https://www.softaculous.com/demos/Dotclear>
 
@@ -37,7 +37,7 @@ Dotclear is an open-source web publishing software. Dotclear project's purpose i
 
 ## Información para desarrolladores
 
-Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing
+Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing).
 
 Para probar la rama `testing`, sigue asÍ:
 

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # DotClear 2 YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
 
 [![Instalatu DotClear 2 YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
 
@@ -19,7 +19,7 @@ EZ editatu eskuz.
 Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
 
 
-**Paketatutako bertsioa:** 2.27.3~ynh1
+**Paketatutako bertsioa:** 2.31.1~ynh1
 
 **Demoa:** <https://www.softaculous.com/demos/Dotclear>
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # DotClear 2 pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
 
 [![Installer DotClear 2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
 
@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Dotclear est un logiciel de publication Web open source. L'objectif du projet Dotclear est de fournir un outil convivial permettant à chacun de publier sur le Web, quelles que soient ses compétences techniques.
 
 
-**Version incluse :** 2.27.3~ynh1
+**Version incluse :** 2.31.1~ynh1
 
 **Démo :** <https://www.softaculous.com/demos/Dotclear>
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # DotClear 2 para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
 
 [![Instalar DotClear 2 con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
 
@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
 
 
-**Versión proporcionada:** 2.27.3~ynh1
+**Versión proporcionada:** 2.31.1~ynh1
 
 **Demo:** <https://www.softaculous.com/demos/Dotclear>
 

README_id.md

@@ -0,0 +1,50 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# DotClear 2 untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+
+[![Pasang DotClear 2 dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang DotClear 2 secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
+
+
+**Versi terkirim:** 2.31.1~ynh1
+
+**Demo:** <https://www.softaculous.com/demos/Dotclear>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada DotClear 2](./doc/screenshots/ss2_dotclear.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://dotclear.org>
+- Dokumentasi admin resmi: <https://dotclear.org/documentation/2.0>
+- Depot kode aplikasi hulu: <https://git.dotclear.org/dev/dotclear>
+- Gudang YunoHost: <https://apps.yunohost.org/app/dotclear2>
+- Laporkan bug: <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_nl.md

@@ -0,0 +1,50 @@
+<!--
+NB: Deze README is automatisch gegenereerd door <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Hij mag NIET handmatig aangepast worden.
+-->
+
+# DotClear 2 voor Yunohost
+
+[![Integratieniveau](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+
+[![DotClear 2 met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
+
+*[Deze README in een andere taal lezen.](./ALL_README.md)*
+
+> *Met dit pakket kun je DotClear 2 snel en eenvoudig op een YunoHost-server installeren.*  
+> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.*
+
+## Overzicht
+
+Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
+
+
+**Geleverde versie:** 2.31.1~ynh1
+
+**Demo:** <https://www.softaculous.com/demos/Dotclear>
+
+## Schermafdrukken
+
+![Schermafdrukken van DotClear 2](./doc/screenshots/ss2_dotclear.png)
+
+## Documentatie en bronnen
+
+- Officiele website van de app: <https://dotclear.org>
+- Officiele beheerdersdocumentatie: <https://dotclear.org/documentation/2.0>
+- Upstream app codedepot: <https://git.dotclear.org/dev/dotclear>
+- YunoHost-store: <https://apps.yunohost.org/app/dotclear2>
+- Meld een bug: <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
+
+## Ontwikkelaarsinformatie
+
+Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing).
+
+Om de `testing`-branch uit te proberen, ga als volgt te werk:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+of
+sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+```
+
+**Verdere informatie over app-packaging:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -0,0 +1,50 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# DotClear 2 для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+
+[![Установите DotClear 2 с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить DotClear 2 быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
+
+
+**Поставляемая версия:** 2.31.1~ynh1
+
+**Демо-версия:** <https://www.softaculous.com/demos/Dotclear>
+
+## Снимки экрана
+
+![Снимок экрана DotClear 2](./doc/screenshots/ss2_dotclear.png)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://dotclear.org>
+- Официальная документация администратора: <https://dotclear.org/documentation/2.0>
+- Репозиторий кода главной ветки приложения: <https://git.dotclear.org/dev/dotclear>
+- Магазин YunoHost: <https://apps.yunohost.org/app/dotclear2>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 DotClear 2
 
-[![集成程度](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![工作状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
 
 [![使用 YunoHost 安装 DotClear 2](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
 
@@ -19,7 +19,7 @@
 Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
 
 
-**分发版本：** 2.27.3~ynh1
+**分发版本：** 2.31.1~ynh1
 
 **演示：** <https://www.softaculous.com/demos/Dotclear>
 

conf/class.auth.ldap.php

@@ -1,13 +1,15 @@
 <?php
-class ldapDcAuth extends dcAuth
+use Dotclear\App;
+use Dotclear\Core\Auth;
+class ldapDcAuth extends Auth
 {
     # The user can't change his password
-    protected $allow_pass_change = false;
+    protected bool $allow_pass_change = false;
 
     # LDAP parameter
-    private $server = "localhost";
-    private $port = "389";
-    private $base = "dc=yunohost,dc=org";
+    private string $server = "localhost";
+    private string $port = "389";
+    private string $base = "dc=yunohost,dc=org";
 
     public function checkUser(string $user_id, ?string $pwd = NULL, ?string $user_key = NULL, bool $check_blog = true): bool
     {
@@ -56,9 +58,9 @@ public function checkUser(string $user_id, ?string $pwd = NULL, ?string $user_ke
                         }
 
                         # If the user exist, then we just update his password.
-                        if (dcCore::app()->userExists($user_id))
+                        if (App::users()->userExists($user_id))
                         {
-                            $this->sudo(array(dcCore::app(), 'updUser'), $user_id, $cur);
+                            $this->sudo(array(App::users(), 'updUser'), $user_id, $cur);
                         }
                         # If not, we create him.
                         # In order for him to connect,
@@ -69,7 +71,7 @@ public function checkUser(string $user_id, ?string $pwd = NULL, ?string $user_ke
                             $cur->user_lang = 'fr';                         # Can change this, PR are welcome
                             $cur->user_tz = 'Europe/Paris';                 # Can change this, PR are welcome
                             $cur->user_default_blog = 'default';            # Can change this, PR are welcome
-                            $this->sudo(array(dcCore::app(),'addUser'), $cur);
+                            $this->sudo(array(App::users(),'addUser'), $cur);
                             # Possible roles:
                             # admin "administrator"
                             #   contentadmin "manage all entries and comments"
@@ -100,7 +102,7 @@ public function checkUser(string $user_id, ?string $pwd = NULL, ?string $user_ke
                                     $set_perms[$perm_id] = true;
                                 }
                             }
-                            $this->sudo(array(dcCore::app(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true);
+                            $this->sudo(array(App::users(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true);
                         }
 
                         $this->con->commit();

doc/POST_UPGRADE.d/2.30.0~ynh1.md

@@ -0,0 +1,5 @@
+There are a lot of broken plugins after the 2.30 migration.
+
+In order to migrate your blog, we had to deactivate all plugins by creating a `_disabled` file inside each plugin folder located in `__INSTALL_DIR__/plugins/`.
+
+Please remove these `_disabled` files one by one and make sure your blog is still working after each deletion.

manifest.toml

@@ -7,7 +7,7 @@ name = "DotClear 2"
 description.en = "Blog publishing application"
 description.fr = "Moteur de blog"
 
-version = "2.27.3~ynh1"
+version = "2.31.1~ynh1"
 
 maintainers = ["kay0u"]
 
@@ -56,14 +56,14 @@ ram.runtime = "50M"
     [resources.sources.latest]
     prefetch = false
     in_subdir = 2
-    url = "https://download.dotclear.org/latest/dotclear-2.27.3.tar.gz"
-    sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6"
+    url = "https://download.dotclear.org/latest/dotclear-2.31.1.tar.gz"
+    sha256 = "b5cdfee93674dc2004c311a3009d65f957dfd3688be1ede238fb797eabccfbd0"
 
     [resources.sources.attic]
     prefetch = false
     in_subdir = 2
-    url = "https://download.dotclear.org/attic/dotclear-2.27.3.tar.gz"
-    sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6"
+    url = "https://download.dotclear.org/attic/dotclear-2.31.1.tar.gz"
+    sha256 = "b5cdfee93674dc2004c311a3009d65f957dfd3688be1ede238fb797eabccfbd0"
 
     [resources.system_user]