diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,6 @@ - [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) +- [Прочитать README на русский](README_ru.md) - [阅读中文(简体)的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 51e7b19..c7d8547 100644 --- a/README.md +++ b/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:** diff --git a/README_es.md b/README_es.md index e317f74..edccbcc 100644 --- a/README_es.md +++ b/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:** diff --git a/README_eu.md b/README_eu.md index f31cb34..8075906 100644 --- a/README_eu.md +++ b/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:** diff --git a/README_fr.md b/README_fr.md index c9d247a..a06bc39 100644 --- a/README_fr.md +++ b/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 :** diff --git a/README_gl.md b/README_gl.md index 0327e76..788d1bb 100644 --- a/README_gl.md +++ b/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:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..8824454 --- /dev/null +++ b/README_id.md @@ -0,0 +1,50 @@ + + +# 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:** + +## Tangkapan Layar + +![Tangkapan Layar pada DotClear 2](./doc/screenshots/ss2_dotclear.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## 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:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..e5a0bd8 --- /dev/null +++ b/README_ru.md @@ -0,0 +1,50 @@ + + +# 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 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана DotClear 2](./doc/screenshots/ss2_dotclear.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `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 +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index e8c935c..b7eb11b 100644 --- a/README_zh_Hans.md +++ b/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 **演示:** diff --git a/conf/class.auth.ldap.php b/conf/class.auth.ldap.php index 28d9701..49ddcc9 100644 --- a/conf/class.auth.ldap.php +++ b/conf/class.auth.ldap.php @@ -1,13 +1,15 @@ 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 @@ class ldapDcAuth extends dcAuth $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 @@ class ldapDcAuth extends dcAuth $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(); diff --git a/doc/POST_UPGRADE.d/2.30.0~ynh1.md b/doc/POST_UPGRADE.d/2.30.0~ynh1.md new file mode 100644 index 0000000..864af3b --- /dev/null +++ b/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. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 2f1fc3e..3f52411 100644 --- a/manifest.toml +++ b/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] diff --git a/scripts/install b/scripts/install index 19755e4..f04c718 100755 --- a/scripts/install +++ b/scripts/install @@ -95,8 +95,10 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_ cat << EOF >> $php_config -require dirname(__FILE__).'/class.auth.ldap.php'; -define('DC_AUTH_CLASS','ldapDcAuth'); +require_once dirname(__FILE__).'/class.auth.ldap.php'; +define('DC_AUTH_LDAP','ldapDcAuth'); +use Dotclear\Helper\Container\Factories; +Factories::addService("core", AuthInterface::class, DC_AUTH_LDAP); EOF ynh_store_file_checksum --file=$php_config diff --git a/scripts/upgrade b/scripts/upgrade index 74f06d6..5240104 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,6 +58,15 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +if ynh_compare_current_package_version --comparison lt --version 2.30.0~ynh1; then + ynh_print_warn --message="Disable all plugins before the migration. To reactivate them, navigate to all plugins at $install_dir/plugins/, and remove each \"_disabled\" file one by one, and make sure you blog works as expected after each deletion" + for folder in "$install_dir"/plugins/*/ + do + ynh_print_warn --message="Plugin $folder disabled" + touch "$folder"/_disabled + done +fi + if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." @@ -116,8 +125,10 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_ cat << EOF >> $php_config -require dirname(__FILE__).'/class.auth.ldap.php'; -define('DC_AUTH_CLASS','ldapDcAuth'); +require_once dirname(__FILE__).'/class.auth.ldap.php'; +define('DC_AUTH_LDAP','ldapDcAuth'); +use Dotclear\Helper\Container\Factories; +Factories::addService("core", AuthInterface::class, DC_AUTH_LDAP); EOF # Recalculate and store the checksum of the file for the next upgrade. diff --git a/tests.toml b/tests.toml index 15bdcb9..7cfb44b 100644 --- a/tests.toml +++ b/tests.toml @@ -6,8 +6,9 @@ test_format = 1.0 args.init_admin_permission="package_checker" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.name = "2.24.1~ynh1" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.domain="domain.tld" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.path="/dotclear2" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.admin="package_checker" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.is_public="true" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.name = "2.27.3~ynh1" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.domain="domain.tld" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.path="/dotclear2" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.admin="package_checker" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.is_public="true" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.init_admin_permission="package_checker"