From 5deddf6c35996bdbf94310be02d7f5964895be79 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 24 Mar 2024 19:58:37 +0000 Subject: [PATCH 01/12] Auto-update READMEs --- ALL_README.md | 1 - README.md | 46 +++++++++++++++++++++++----------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/ALL_README.md b/ALL_README.md index b412b5e..ecbaeae 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -3,6 +3,5 @@ [Read the README in English](README.md) -* [Lire le README en français](README_fr.md) diff --git a/README.md b/README.md index 73bd48a..d0938eb 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,45 @@ -# Piwigo pour YunoHost +# Piwigo for YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Status du fonctionnement](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Statut demaintenance](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Working status](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) -[![Installer Piwigo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) +[![Install Piwigo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) -*[Lire le README dans d'autres langues.](./ALL_README.md)* +*[Read this README is other languages.](./ALL_README.md)* -> *Ce package vous permet d’installer Piwigo rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *This package allows you to install Piwigo quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* -## Vue d'ensemble +## Overview Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. -**Version incluse :** 14.3.0~ynh1 +**Shipped version:** 14.3.0~ynh1 -**Démo:** +**Demo:** -## Captures d'écran +## Screenshots -![Capture d'écran de Piwigo](./doc/screenshots/screenshot_Piwigo.jpg) +![Screenshot of Piwigo](./doc/screenshots/screenshot_Piwigo.jpg) -## Documentations et ressources +## Documentation and resources -- Site officiel de l’app : -- Documentation officielle de l'admin : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: -## Informations pour les développeurs +## Developer info -Merci de faire vos pull request sur la [branche branch](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing), +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing), -Pour essayer la branche testing, procédez comme suit. +To try the testing branch, please proceed like that. ```bash sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug @@ -47,4 +47,4 @@ or sudo yunohost app upgrade piwigo -u https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**More info regarding app packaging:** From 5cf039ea7426ec9d3555b674ae70ec8166d267b0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 7 Jun 2024 06:40:05 +0000 Subject: [PATCH 02/12] Auto-update READMEs --- ALL_README.md | 4 +++- README.md | 11 ++++++----- README_es.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,8 @@ # All available README files by language - [Read the README in English](README.md) +- [Lea el README en español](README_es.md) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index fd4c8d9..fd56925 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,16 @@ It shall NOT be edited by hand. [![Install Piwigo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Piwigo quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Piwigo quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. + **Shipped version:** 14.3.0~ynh1 **Demo:** @@ -36,9 +37,9 @@ Piwigo is a photo gallery software for the web, built by an active community of ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing), +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..602159f --- /dev/null +++ b/README_es.md @@ -0,0 +1,50 @@ + + +# Piwigo para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) + +[![Instalar Piwigo con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarPiwigo rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. + + +**Versión actual:** 14.3.0~ynh1 + +**Demo:** + +## Capturas + +![Captura de Piwigo](./doc/screenshots/screenshot_Piwigo.jpg) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +o +sudo yunohost app upgrade piwigo -u https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..ca29b0e --- /dev/null +++ b/README_eu.md @@ -0,0 +1,50 @@ + + +# Piwigo YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) + +[![Instalatu Piwigo YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Piwigo YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. + + +**Paketatutako bertsioa:** 14.3.0~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Piwigo(r)en pantaila-argazkia](./doc/screenshots/screenshot_Piwigo.jpg) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +edo +sudo yunohost app upgrade piwigo -u https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..ad1418a --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,50 @@ + + +# YunoHost 上的 Piwigo + +[![集成程度](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![工作状态](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) + +[![使用 YunoHost 安装 Piwigo](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Piwigo。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. + + +**分发版本：** 14.3.0~ynh1 + +**演示：** + +## 截图 + +![Piwigo 的截图](./doc/screenshots/screenshot_Piwigo.jpg) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +或 +sudo yunohost app upgrade piwigo -u https://github.com/YunoHost-Apps/piwigo_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 64032c2f73292af3124267d6cbbb33fc0a2662ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 08:48:22 +0200 Subject: [PATCH 03/12] Update manifest.toml --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1cbd09a..e55f9b5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Piwigo" description.en = "Open source photo gallery for the web" description.fr = "Galerie de photos open source pour le web" -version = "14.3.0~ynh1" +version = "14.4.0~ynh1" maintainers = ["JimboJoe"] @@ -58,15 +58,15 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://piwigo.org/download/dlcounter.php?code=14.3.0" - sha256 = "ab1d329afbb092ef74534bc09f56ef75a81d26443383e6ae47fe9801808552ef" + url = "https://piwigo.org/download/dlcounter.php?code=14.4.0" + sha256 = "d9c4c422626537e1beb65a9cadcf712a5ead2f63cae3775d85ae17241c3e3dc0" format = "zip" autoupdate.strategy = "latest_github_release" [resources.sources.ldap_plugin] - url = "https://piwigo.org/ext/download.php?rid=7036" - sha256 = "3c22652f6c0653aaeebe239435796748ee57612ad44e8e5f2553277545d36e5e" + url = "https://piwigo.org/ext/download.php?rid=8962" + sha256 = "ba34c461c46c0558b05a33290a009b24461aedc7701e7cf642f3a4d667150787" format = "zip" autoupdate.upstream = "https://github.com/kipjr/ldap_login" From 7efd0d936d050c5ffeb84dfb9462f7c476867867 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 7 Jun 2024 06:48:34 +0000 Subject: [PATCH 04/12] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fd56925..1bc6c94 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. -**Shipped version:** 14.3.0~ynh1 +**Shipped version:** 14.4.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 602159f..42a456e 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. -**Versión actual:** 14.3.0~ynh1 +**Versión actual:** 14.4.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index ca29b0e..88076de 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. -**Paketatutako bertsioa:** 14.3.0~ynh1 +**Paketatutako bertsioa:** 14.4.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index af87963..2c8bcb1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Piwigo est un logiciel de galerie photo pour le web, construit par une communauté active d'utilisateurs et de développeurs. Des extensions rendent Piwigo facilement personnalisable. -**Version incluse :** 14.3.0~ynh1 +**Version incluse :** 14.4.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 43b213a..81d5d8c 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. -**Versión proporcionada:** 14.3.0~ynh1 +**Versión proporcionada:** 14.4.0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index ad1418a..15ea058 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ Piwigo is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable. -**分发版本：** 14.3.0~ynh1 +**分发版本：** 14.4.0~ynh1 **演示：** From 835acee37db7e953490aa939e87f63be71ec4463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 08:53:52 +0200 Subject: [PATCH 05/12] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index e55f9b5..6db6ad6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -73,8 +73,8 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_release" [resources.sources.log_failed_logins_plugin] - url = "http://piwigo.org/ext/download.php?rid=5525" - sha256 = "85b9a06f2c7ca8ae9698e6151c7631f519c945f696b02da72f9ff53243d7e4ca" + url = "http://piwigo.org/ext/download.php?rid=8501" + sha256 = "8c21fb42675968ffaf41bd0735cf1b0541756550e0a6b6d3357f3aaaa84f1bd5" in_subdir = false format = "zip" From 51fd24efed41a8edda95fc44564860fc5186d3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:02:52 +0200 Subject: [PATCH 06/12] Update install --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 719d0af..b2c4495 100644 --- a/scripts/install +++ b/scripts/install @@ -71,13 +71,17 @@ ynh_script_progression --message="Configuring LDAP plugin..." --weight=2 # Login with admin account ynh_local_curl "/ws.php?format=json" "method=pwg.session.login" "username=$admin" "password=$password" + # Get session token status=$(ynh_local_curl "/ws.php?format=json" "method=pwg.session.getStatus") pwg_token=$(jq --raw-output .result.pwg_token <<< "$status") + # Install the Ldap_Login plugin ynh_local_curl "/ws.php?format=json" "method=pwg.plugins.performAction" "action=install" "plugin=Ldap_Login" "pwg_token=$pwg_token" + # Activate the Ldap_Login plugin ynh_local_curl "/ws.php?format=json" "method=pwg.plugins.performAction" "action=activate" "plugin=Ldap_Login" "pwg_token=$pwg_token" + # Log out ynh_local_curl "/ws.php?format=json" "method=pwg.session.logout" From 47403f0131d97632071ca80a2209000d2d0b1108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:06:09 +0200 Subject: [PATCH 07/12] upgrade PHP --- manifest.toml | 12 ++++++------ scripts/upgrade | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6db6ad6..6337e4d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -92,12 +92,12 @@ ram.runtime = "50M" packages = [ "mariadb-server", "imagemagick", - "php8.0-gd", - "php8.0-imagick", - "php8.0-xml", - "php8.0-mbstring", - "php8.0-mysqli", - "php8.0-ldap", + "php8.3-gd", + "php8.3-imagick", + "php8.3-xml", + "php8.3-mbstring", + "php8.3-mysqli", + "php8.3-ldap", ] [resources.database] diff --git a/scripts/upgrade b/scripts/upgrade index 6227e48..e47c871 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,11 +83,14 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name # ... isn't there a way to enable the damn LDAP login plugin from the command line or something ... ynh_local_curl "/ws.php?format=json" "method=pwg.session.login" "username=$admin" "password=$password" + # Get session token status=$(ynh_local_curl "/ws.php?format=json" "method=pwg.session.getStatus") pwg_token=$(jq --raw-output .result.pwg_token <<< "$status") + # Activate the Ldap_Login plugin ynh_local_curl "/ws.php?format=json" "method=pwg.plugins.performAction" "action=activate" "plugin=Ldap_Login" "pwg_token=$pwg_token" + # Log out ynh_local_curl "/ws.php?format=json" "method=pwg.session.logout" From 61e5405c3b46f7c9709f81f6a945ae4b7bc071c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Jun 2024 21:47:30 +0200 Subject: [PATCH 08/12] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6337e4d..a605c3d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -48,7 +48,7 @@ ram.runtime = "50M" ask.fr = "Choisissez la langue de l'application" type = "select" choices = ["fr_FR", "en_UK"] - default = "en_UK" + default = "fr_FR" [install.admin] type = "user" From 2e3d945a633e16ca267060bdbd54d0fa41f1ca53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Jun 2024 22:27:59 +0200 Subject: [PATCH 09/12] Update manifest.toml --- manifest.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index a605c3d..35bef21 100644 --- a/manifest.toml +++ b/manifest.toml @@ -92,12 +92,12 @@ ram.runtime = "50M" packages = [ "mariadb-server", "imagemagick", - "php8.3-gd", - "php8.3-imagick", - "php8.3-xml", - "php8.3-mbstring", - "php8.3-mysqli", - "php8.3-ldap", + "php8.0-gd", + "php8.0-imagick", + "php8.0-xml", + "php8.0-mbstring", + "php8.0-mysqli", + "php8.0-ldap", ] [resources.database] From b7a89ffa97fe39fa504cf035d97942735feb3743 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Jun 2024 22:48:06 +0200 Subject: [PATCH 10/12] Debug (#138) * Auto-update READMEs * debug * fix * Update config.inc.php * Update manifest.toml * Update install * Update install * Update manifest.toml * fix * Update manifest.toml * Auto-update READMEs * Update manifest.toml * Update manifest.toml * Revert "Update manifest.toml" This reverts commit 0a0fd27318fa080a5eccd376329a1cd3740d1b7e. --------- Co-authored-by: yunohost-bot --- conf/config.inc.php | 992 +------------------------------------------- manifest.toml | 4 +- scripts/_common.sh | 10 - scripts/backup | 6 - scripts/install | 5 +- scripts/restore | 9 - scripts/upgrade | 2 +- 7 files changed, 7 insertions(+), 1021 deletions(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index d4dedda..ceee03a 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -1,997 +1,13 @@ 'PWG website', -// 'http://piwigo.org/forum' => 'PWG forum', -// ); -// -// Advanced use: -// You can also used special options. Instead to pass a string like parameter value -// you can pass a array with different optional parameter values -// $conf['links'] = array( -// 'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'), -// 'http://piwigo.org/forum' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'), -// 'http://piwigo.org/ext' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'), -// 'http://piwigo.org/downloads' => -// array('label' => 'PopUp', 'new_window' => true, -// 'nw_name' => 'PopUp', 'nw_features' => 'width=800,height=450,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'), -// ); -// Parameters: -// 'label': -// Label to display for the link, must be defined -// 'new_window': -// If true open link on tab/window -// [Default value is true if it's not defined] -// 'nw_name': -// Name use when new_window is true -// [Default value is '' if it's not defined] -// 'nw_features': -// features use when new_window is true -// [Default value is '' if it's not defined] -// 'eval_visible': -// It's php code witch must return if the link is visible or not -// [Default value is true if it's not defined] -// -// Equivalence: -// $conf['links'] = array( -// 'http://piwigo.org' => 'PWG website', -// ); -// $conf['links'] = array( -// 'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'visible' => 'return true;'), -// ); -// -// If the array is empty, the "Links" box won't be displayed on the main -// page. -$conf['links'] = array(); - -// random_index_redirect: list of 'internal' links to use when no section is defined on index.php. -// An example is the best than a long explanation : -// -// for each link is associated a php condition -// '' condition is equivalent to 'return true;' -// $conf['random_index_redirect'] = array( -// PHPWG_ROOT_PATH.'index.php?/best_rated' => 'return true;', -// PHPWG_ROOT_PATH.'index.php?/recent_pics' => 'return is_a_guest();', -// PHPWG_ROOT_PATH.'random.php' => '', -// PHPWG_ROOT_PATH.'index.php?/categories' => '', -// ); -$conf['random_index_redirect'] = array(); - -// List of notes to display on all header page -// example $conf['header_notes'] = array('Test', 'Hello'); -$conf['header_notes'] = array(); - -// show_thumbnail_caption : on thumbnails page, show thumbnail captions ? -$conf['show_thumbnail_caption'] = true; - -// allow_random_representative : do you wish Piwigo to search among -// categories elements a new representative at each reload ? -// -// If false, an element is randomly or manually chosen to represent its -// category and remains the representative as long as an admin does not -// change it. -// -// Warning : setting this parameter to true is CPU consuming. Each time you -// change the value of this parameter from false to true, an administrator -// must update categories informations in screen [Admin > General > -// Maintenance]. -$conf['allow_random_representative'] = false; - -// representative_cache_on_level: if a thumbnail is chosen as representative -// but has higher privacy level than current user, Piwigo randomly selects -// another thumbnail. Should be store this thumbnail in cache to avoid -// another consuming SQL query on next page refresh? -$conf['representative_cache_on_level'] = true; - -// representative_cache_on_subcats: if a category (= album) only contains -// sub-categories, Piwigo randomly selects a thumbnail among sub-categories -// representative. Should we store this thumbnail in cache to avoid another -// "slightly" consuming SQL query on next page refresh? -$conf['representative_cache_on_subcats'] = true; - -// allow_html_descriptions : authorize administrators to use HTML in -// category and element description. -$conf['allow_html_descriptions'] = true; - -// image level permissions available in the admin interface -$conf['available_permission_levels'] = array(0,1,2,4,8); - -// check_upgrade_feed: check if there are database upgrade required. Set to -// true, a message will strongly encourage you to upgrade your database if -// needed. -// -// This configuration parameter is set to true in BSF branch and to false -// elsewhere. -$conf['check_upgrade_feed'] = false; - -// rate_items: available rates for a picture -$conf['rate_items'] = array(0,1,2,3,4,5); - -// Define default method to use ('http' or 'html' in order to do redirect) -$conf['default_redirect_method'] = 'http'; - -// Define using double password type in admin's users management panel -$conf['double_password_type_in_admin'] = false; - -// Define if logins must be case sensitive or not of user's registration. ie : -// If set true, the login "user" will equal "User" or "USER" or "user", -// etc. ... And it will be impossible to use such login variation to create a -// new user account. -$conf['insensitive_case_logon'] = false; - -// how should we check for unicity when adding a photo. Can be 'md5sum' or -// 'filename' -$conf['uniqueness_mode'] = 'md5sum'; - -// Library used for image resizing. Value could be 'auto', 'imagick', -// 'ext_imagick' or 'gd'. If value is 'auto', library will be chosen in this -// order. If chosen library is not available, another one will be picked up. -$conf['graphics_library'] = 'auto'; - -// If library used is external installation of ImageMagick ('ext_imagick'), -// you can define imagemagick directory. -$conf['ext_imagick_dir'] = ''; - -// how many user comments to display by default on comments.php. Use 'all' -// to display all user comments without pagination. Default available values -// are array(5,10,20,50,'all') but you can set any other numeric value. -$conf['comments_page_nb_comments'] = 10; +// Use external authentication +$conf['external_authentification'] = true; // how often should we check for new versions of Piwigo on piwigo.org? In // seconds. The check is made only if there are visits on Piwigo. // 0 to disable. $conf['update_notify_check_period'] = 0; - -// how often should be remind of new versions available? For example a first -// notification was sent on May 5th 2017 for 2.9.1, after how many seconds -// we send it again? 0 to disable. -$conf['update_notify_reminder_period'] = 7*24*60*60; - -// should the album description be displayed on all pages (value=true) or -// only the first page (value=false) -$conf['album_description_on_all_pages'] = false; - -// Number of years displayed in the history compare mode (for the years chart) -$conf['stat_compare_year_displayed'] = 5; - -// Limit for linked albums search -$conf['linked_album_search_limit'] = 100; - -// how often should we check for missing photos in the filesystem. Only in the -// administration. Consider the fs_quick_check is always performed on -// dashboard and maintenance pages. This setting is only for any other -// administration page. -// 0 to disable. -$conf['fs_quick_check_period'] = 24*60*60; - -// +-----------------------------------------------------------------------+ -// | email | -// +-----------------------------------------------------------------------+ - -// send_bcc_mail_webmaster: send bcc mail to webmaster. Set true for debug -// or test. -$conf['send_bcc_mail_webmaster'] = false; - -// define the name of sender mail: if value is empty, gallery title is used -$conf['mail_sender_name'] = '__APP__'; - -// define the email of sender mail: if value is empty, webmaster email is used -$conf['mail_sender_email'] = '__APP__@__DOMAIN__'; - -// set true to allow text/html emails -$conf['mail_allow_html'] = true; - -// smtp configuration (work if fsockopen function is allowed for smtp port) -// smtp_host: smtp server host -// if null, regular mail function is used -// format: hoststring[:port] -// exemple: smtp.pwg.net:21 -// smtp_user/smtp_password: user & password for smtp authentication -$conf['smtp_host'] = 'localhost:25'; -$conf['smtp_user'] = '__APP__'; -$conf['smtp_password'] = '__MAIL_PWD__'; - -// 'ssl' or 'tls' -$conf['smtp_secure'] = null; - -// +-----------------------------------------------------------------------+ -// | metadata | -// +-----------------------------------------------------------------------+ - -// show_iptc: Show IPTC metadata on picture.php if asked by user -$conf['show_iptc'] = false; - -// show_iptc_mapping : is used for showing IPTC metadata on picture.php -// page. For each key of the array, you need to have the same key in the -// $lang array. For example, if my first key is 'iptc_keywords' (associated -// to '2#025') then you need to have $lang['iptc_keywords'] set in -// language/$user['language']/common.lang.php. If you don't have the lang -// var set, the key will be simply displayed -// -// To know how to associated iptc_field with their meaning, use -// tools/metadata.php -$conf['show_iptc_mapping'] = array( - 'iptc_keywords' => '2#025', - 'iptc_caption_writer' => '2#122', - 'iptc_byline_title' => '2#085', - 'iptc_caption' => '2#120' - ); - -// use_iptc: Use IPTC data during database synchronization with files -// metadata -$conf['use_iptc'] = false; - -// use_iptc_mapping : in which IPTC fields will Piwigo find image -// information ? This setting is used during metadata synchronisation. It -// associates a piwigo_images column name to a IPTC key -$conf['use_iptc_mapping'] = array( - 'keywords' => '2#025', - 'date_creation' => '2#055', - 'author' => '2#122', - 'name' => '2#005', - 'comment' => '2#120' - ); - -// show_exif: Show EXIF metadata on picture.php (table or line presentation -// available) -$conf['show_exif'] = true; - -// show_exif_fields : in EXIF fields, you can choose to display fields in -// sub-arrays, for example ['COMPUTED']['ApertureFNumber']. for this, add -// 'COMPUTED;ApertureFNumber' in $conf['show_exif_fields'] -// -// The key displayed in picture.php will be $lang['exif_field_Make'] for -// example and if it exists. For compound fields, only take into account the -// last part : for key 'COMPUTED;ApertureFNumber', you need -// $lang['exif_field_ApertureFNumber'] -// -// for PHP version newer than 4.1.2 : -// $conf['show_exif_fields'] = array('CameraMake','CameraModel','DateTime'); -// -$conf['show_exif_fields'] = array( - 'Make', - 'Model', - 'DateTimeOriginal', - 'COMPUTED;ApertureFNumber' - ); - -// use_exif: Use EXIF data during database synchronization with files -// metadata -$conf['use_exif'] = true; - -// use_exif_mapping: same behaviour as use_iptc_mapping -$conf['use_exif_mapping'] = array( - 'date_creation' => 'DateTimeOriginal' - ); - -// allow_html_in_metadata: in case the origin of the photo is unsecure (user -// upload), we remove HTML tags to avoid XSS (malicious execution of -// javascript) -$conf['allow_html_in_metadata'] = false; - -// decide which characters can be used as keyword separators (works in EXIF -// and IPTC). Coma "," cannot be removed from this list. -$conf['metadata_keyword_separator_regex'] = '/[.,;]/'; - -// +-----------------------------------------------------------------------+ -// | sessions | -// +-----------------------------------------------------------------------+ - -// session_use_cookies: specifies to use cookie to store -// the session id on client side -$conf['session_use_cookies'] = true; - -// session_use_only_cookies: specifies to only use cookie to store -// the session id on client side -$conf['session_use_only_cookies'] = true; - -// session_use_trans_sid: do not use transparent session id support -$conf['session_use_trans_sid'] = false; - -// session_name: specifies the name of the session which is used as cookie name -$conf['session_name'] = 'pwg_id'; - -// session_save_handler: comment the line below -// to use file handler for sessions. -$conf['session_save_handler'] = 'db'; - -// authorize_remembering : permits user to stay logged for a long time. It -// creates a cookie on client side. -$conf['authorize_remembering'] = true; - -// remember_me_name: specifies the name of the cookie used to stay logged -$conf['remember_me_name'] = 'pwg_remember'; - -// remember_me_length : time of validity for "remember me" cookies, in -// seconds. -$conf['remember_me_length'] = 5184000; - -// session_length : time of validity for normal session, in seconds. -$conf['session_length'] = 3600; - -// session_use_ip_address: avoid session hijacking by using a part of the IP -// address -$conf['session_use_ip_address'] = true; - -// Probability, on each page generated, to launch session garbage -// collector. Integer value between 1 and 100, in %. 0 to disable and let -// the system default behavior (on Debian-like, it's "never delete -// session"). -$conf['session_gc_probability'] = 1; - -// +-----------------------------------------------------------------------+ -// | debug/performance | -// +-----------------------------------------------------------------------+ - -// number of photos beyond which individual photos are added in the -// lounge, a temporary zone where photos wait before being "launched". -// 50k photos by default. -$conf['lounge_activate_threshold'] = 1; - -// Lounge is automatically emptied (photos are being pushed to their -// albums) when the oldest one reaches this duration. Lounge can be emptied -// before, either manually or at the end of the upload. In seconds. -// 5 minutes by default. -$conf['lounge_max_duration'] = 5*60; - -// show_queries : for debug purpose, show queries and execution times -$conf['show_queries'] = false; - -// show_gt : display generation time at the bottom of each page -$conf['show_gt'] = false; - -// debug_l10n : display a warning message each time an unset language key is -// accessed -$conf['debug_l10n'] = false; - -// activate template debugging - a new window will appear -$conf['debug_template'] = false; - -// save copies of sent mails into local data dir -$conf['debug_mail'] = false; - -// die_on_sql_error: if an SQL query fails, should everything stop? -$conf['die_on_sql_error'] = false; - -// if true, some language strings are replaced during template compilation -// (instead of template output). this results in better performance. however -// any change in the language file will not be propagated until you purge -// the compiled templates from the admin / maintenance menu -$conf['compiled_template_cache_language'] = false; - -// This tells Smarty whether to check for recompiling or not. Recompiling -// does not need to happen unless a template is changed. false results in -// better performance. -$conf['template_compile_check'] = true; - -// This forces Smarty to (re)compile templates on every invocation. This is -// handy for development and debugging. It should never be used in a -// production environment. -$conf['template_force_compile'] = false; - -// activate merging of javascript / css files -$conf['template_combine_files'] = true; - -// this permit to show the php errors reporting (see INI 'error_reporting' -// for possible values) -// gives an empty value '' to deactivate -$conf['show_php_errors'] = E_ALL; - -// This sets the display_errors php option to true, so php errors and warning -// messages are shown in the browser. If this is false, the error messages are -// available in the php log of the server if show_php_errors has any set. -// If the below is turned off in local config and errors are still shown on -// frontend, check for display_errors setting server's php config -$conf['show_php_errors_on_frontend'] = true; - - -// +-----------------------------------------------------------------------+ -// | authentication | -// +-----------------------------------------------------------------------+ - -// apache_authentication : use Apache authentication as reference instead of -// users table ? -$conf['apache_authentication'] = false; - -// users_table: which table is the reference for users? Can be a different -// table than Piwigo table -// -// If you decide to use another table than the default one, you need to -// prepare your database by deleting some datas : -// -// delete from piwigo_user_access; -// delete from piwigo_user_cache; -// delete from piwigo_user_feed; -// delete from piwigo_user_group; -// delete from piwigo_user_infos; -// delete from piwigo_sessions; -// delete from piwigo_rate; -// update piwigo_images set rating_score = null, added_by = ; -// delete from piwigo_caddie; -// delete from piwigo_favorites; -// -// All informations contained in these tables and column are related to -// piwigo_users table. -$conf['users_table'] = null; - -// If you decide to use external authentication -// change conf below by $conf['external_authentification'] = true; -$conf['external_authentification'] = true; - -// Other tables can be changed, if you define associated constants -// Example: -// define('USER_INFOS_TABLE', 'pwg_main'.'user_infos'); - -// user_fields : mapping between generic field names and table specific -// field names. For example, in PWG, the mail address is names -// "mail_address" and in punbb, it's called "email". -//$conf['user_fields'] = array( -// 'id' => 'id', -// 'username' => 'username', -// 'password' => 'password', -// 'email' => 'mail_address' -// ); - -// password_hash: function hash the clear user password to store it in the -// database. The function takes only one parameter: the clear password. -//$conf['password_hash'] = 'pwg_password_hash'; - -// password_verify: function that checks the password against its hash. The -// function takes 2 mandatory parameter : clear password, hashed password + -// an optional parameter user_id. The user_id is used to update the password -// with the new hash introduced in Piwigo 2.5. See function -// pwg_password_verify in include/functions_user.inc.php -//$conf['password_verify'] = 'pwg_password_verify'; - -// guest_id : id of the anonymous user -//$conf['guest_id'] = 2; - -// default_user_id : id of user used for default value -//$conf['default_user_id'] = $conf['guest_id']; - -// Registering process and guest/generic members get language from the browser -// if language isn't available PHPWG_DEFAULT_LANGUAGE is used as previously -$conf['browser_language'] = true; - -// webmaster_id : webmaster'id. -$conf['webmaster_id'] = 1; - -// does the guest have access ? -// (not a security feature, set your categories "private" too) -// If false it'll be redirected from index.php to identification.php -$conf['guest_access'] = true; - -// +-----------------------------------------------------------------------+ -// | history | -// +-----------------------------------------------------------------------+ - -// nb_logs_page : how many logs to display on a page -$conf['nb_logs_page'] = 300; - -// Every X new line in history, perform an automatic purge. The more often, -// the fewer lines to delete. 0 to disable. -$conf['history_autopurge_every'] = 1021; - -// How many lines to keep in history on autopurge? 0 to disable. -$conf['history_autopurge_keep_lines'] = 1000000; - -// On history autopurge, how many lines should to deleted at once, maximum? -$conf['history_autopurge_blocksize'] = 50000; - -// +-----------------------------------------------------------------------+ -// | urls | -// +-----------------------------------------------------------------------+ - -// gallery_url : you can set a specific URL for the home page of your -// gallery. This is for very specific use and you don't need to change this -// setting when move your gallery to a new directory or a new domain name. -$conf['gallery_url'] = null; - -// question_mark_in_urls : the generated urls contain a ? sign. This can be -// changed to false only if the server translates PATH_INFO variable -// (depends on the server AcceptPathInfo directive configuration) -$conf['question_mark_in_urls'] = true; - -// php_extension_in_urls : if true, the urls generated for picture and -// category will not contain the .php extension. This will work only if -// .htaccess defines Options +MultiViews parameter or url rewriting rules -// are active. -$conf['php_extension_in_urls'] = true; - -// category_url_style : one of 'id' (default) or 'id-name'. 'id-name' -// means that an simplified ascii representation of the category name will -// appear in the url -$conf['category_url_style'] = 'id'; - -// picture_url_style : one of 'id' (default), 'id-file' or 'file'. 'id-file' -// or 'file' mean that the file name (without extension will appear in the -// url). Note that one additional sql query will occur if 'file' is chosen. -// Note that you might experience navigation issues if you choose 'file' -// and your file names are not unique -$conf['picture_url_style'] = 'id'; - -// tag_url_style : one of 'id-tag' (default), 'id' or 'tag'. -// Note that if you choose 'tag' and the url (ascii) representation of your -// tags is not unique, all tags with the same url representation will be shown -$conf['tag_url_style'] = 'id-tag'; - -// +-----------------------------------------------------------------------+ -// | tags | -// +-----------------------------------------------------------------------+ - -// full_tag_cloud_items_number: number of tags to show in the full tag -// cloud. Only the most represented tags will be shown -$conf['full_tag_cloud_items_number'] = 200; - -// menubar_tag_cloud_items_number: number of tags to show in the tag -// cloud in the menubar. Only the most represented tags will be shown -$conf['menubar_tag_cloud_items_number'] = 20; - -// menubar_tag_cloud_content: 'always_all', 'current_only' or 'all_or_current' -// For the tag cloud in the menubar. -// 'always_all': tag cloud always displays all tags available to the user -// 'current_only': tag cloud always displays the tags from the current pictures -// 'all_or_current': when pictures are displayed, tag cloud shows their tags, but -// when none are displayed, all the tags available to the user are shown. -$conf['menubar_tag_cloud_content'] = 'all_or_current'; - -// content_tag_cloud_items_number: number of related tags to show in the tag -// cloud on the content page, when the current section is not a set of -// tags. Only the most represented tags will be shown -$conf['content_tag_cloud_items_number'] = 12; - -// tags_levels: number of levels to use for display. Each level is bind to a -// CSS class tagLevelX. -$conf['tags_levels'] = 5; - -// tags_default_display_mode: group tags by letter or display a tag cloud by -// default? 'letters' or 'cloud'. -$conf['tags_default_display_mode'] = 'cloud'; - -// tag_letters_column_number: how many columns to display tags by letter -$conf['tag_letters_column_number'] = 4; - -// +-----------------------------------------------------------------------+ -// | Related albums | -// +-----------------------------------------------------------------------+ - -// beyond this limit, do not try to find related albums. If there are too -// many items, the SQL query will be slow and the results irrelevant, -// because showing too many related albums. -$conf['related_albums_maximum_items_to_compute'] = 1000; - -// once found the related albums, how many to show in the menubar? We take -// the heaviest (with more relations). -$conf['related_albums_display_limit'] = 20; - -// +-----------------------------------------------------------------------+ -// | Notification by mail | -// +-----------------------------------------------------------------------+ - -// Default Value for nbm user -$conf['nbm_default_value_user_enabled'] = false; - -// Search list user to send quickly (List all without to check news) -// More quickly but less fun to use -$conf['nbm_list_all_enabled_users_to_send'] = false; - -// Max time used on one pass in order to send mails. -// Timeout delay ratio. -$conf['nbm_max_treatment_timeout_percent'] = 0.8; - -// If timeout cannot be combined with nbm_max_treatment_timeout_percent, -// nbm_treatment_timeout_default is used by default -$conf['nbm_treatment_timeout_default'] = 20; - -// Parameters used in get_recent_post_dates for the 2 kind of notification -$conf['recent_post_dates'] = array( - 'RSS' => array('max_dates' => 5, 'max_elements' => 6, 'max_cats' => 6), - 'NBM' => array('max_dates' => 7, 'max_elements' => 3, 'max_cats' => 9) - ); - -// the author shown in the RSS feed element -$conf['rss_feed_author'] = 'Piwigo notifier'; - -// how long does the authentication key stays valid, in seconds. 3 days by -// default. 0 to disable. -$conf['auth_key_duration'] = 3*24*60*60; - -// +-----------------------------------------------------------------------+ -// | Set admin layout | -// +-----------------------------------------------------------------------+ - -$conf['admin_theme'] = 'clear'; - -// should we load the active plugins ? true=Yes, false=No -$conf['enable_plugins']=true; - -// Web services are allowed (true) or completely forbidden (false) -$conf['allow_web_services'] = true; - -// Maximum number of images to be returned foreach call to the web service -$conf['ws_max_images_per_page'] = 500; - -// Maximum number of users to be returned foreach call to the web service -$conf['ws_max_users_per_page'] = 1000; - -// Display a link to subscribe to Piwigo Announcements Newsletter -$conf['show_newsletter_subscription'] = true; - -// Fetch and show latest news from piwigo.org -$conf['show_piwigo_latest_news'] = true; - -// Check for available updates on Piwigo or extensions, performed each time -// the dashboard is displayed -$conf['dashboard_check_for_updates'] = true; - -// Number Weeks displayed on activity chart on the dashboard -$conf['dashboard_activity_nb_weeks'] = 4; - -// On the Admin>Users>Activity page, should we display the connection/disconnections? -// 'all' = do not filter, display all -// 'admins_only' = only display connections of admin users -// 'none' = don't even display connections of admin users -$conf['activity_display_connections'] = 'admins_only'; - -// On album mover page, number of seconds before auto openning album when -// dragging an album. In milliseconds. 3 seconds by default. -$conf['album_move_delay_before_auto_opening'] = 3*1000; - -// This variable is used to show or hide the template tab in the side menu -$conf['show_template_in_side_menu'] = false; - -// Add last calculated cache size to Dashboard Storage chart if true. -// To recalculate use Tools -> Maintenance, Refresh. -// To disable, set to false. -$conf['add_cache_to_storage_chart'] = true; - -// +-----------------------------------------------------------------------+ -// | Filter | -// +-----------------------------------------------------------------------+ -// $conf['filter_pages'] contains configuration for each pages -// o If values are not defined for a specific page, default value are used -// o Array is composed by the basename of each page without extension -// o List of value names: -// - used: filter function are used -// (if false nothing is done [start, cancel, stop, ...] -// - cancel: cancel current started filter -// - add_notes: add notes about current started filter on the header -// o Empty configuration in order to disable completely filter functions -// No filter, No icon,... -// $conf['filter_pages'] = array(); -$conf['filter_pages'] = array - ( - // Default page - 'default' => array( - 'used' => true, 'cancel' => false, 'add_notes' => false), - // Real pages - 'index' => array('add_notes' => true), - 'tags' => array('add_notes' => true), - 'search' => array('add_notes' => true), - 'comments' => array('add_notes' => true), - 'admin' => array('used' => false), - 'feed' => array('used' => false), - 'notification' => array('used' => false), - 'nbm' => array('used' => false), - 'popuphelp' => array('used' => false), - 'profile' => array('used' => false), - 'ws' => array('used' => false), - 'identification' => array('cancel' => true), - 'install' => array('cancel' => true), - 'password' => array('cancel' => true), - 'register' => array('cancel' => true), - ); - -// +-----------------------------------------------------------------------+ -// | Slideshow | -// +-----------------------------------------------------------------------+ -// slideshow_period : waiting time in seconds before loading a new page -// during automated slideshow -// slideshow_period_min, slideshow_period_max are bounds of slideshow_period -// slideshow_period_step is the step of navigation between min and max -$conf['slideshow_period_min'] = 1; -$conf['slideshow_period_max'] = 10; -$conf['slideshow_period_step'] = 1; -$conf['slideshow_period'] = 4; - -// slideshow_repeat : slideshow loops on pictures -$conf['slideshow_repeat'] = true; - -// $conf['light_slideshow'] indicates to use slideshow.tpl in state of -// picture.tpl for slideshow -// Take care to have slideshow.tpl in all available templates -// Or set it false. -// Check if Picture's plugins are compliant with it -// Every plugin from 1.7 would be design to manage light_slideshow case. -$conf['light_slideshow'] = true; - -// the local data directory is used to store data such as compiled templates, -// plugin variables, combined css/javascript or resized images. Beware of -// mandatory trailing slash. -$conf['data_location'] = '__DATA_DIR__/_data/'; - -// where should the API/UploadForm add photos? This path must be relative to -// the Piwigo installation directory (but can be outside, as long as it's -// reachable from your webserver). -$conf['upload_dir'] = '__DATA_DIR__/upload'; - -// where should the user be guided when there is no photo in his gallery yet? -$conf['no_photo_yet_url'] = 'admin.php?page=photos_add'; - -// directory with themes inside -$conf['themes_dir'] = PHPWG_ROOT_PATH.'themes'; - -// enable the synchronization method for adding photos -$conf['enable_synchronization'] = true; - -// enable the update of Piwigo core from administration pages -$conf['enable_core_update'] = true; - -// enable install/update of plugins/themes/languages from administration pages -$conf['enable_extensions_install'] = true; - -// Permitted characters for files/directories during synchronization. -// Do not add the ' U+0027 single quote apostrophe character, it WILL make some -// SQL queries fail. URI reserved characters (see -// https://tools.ietf.org/html/rfc3986#section-2.2 ) MAY make things fail, this -// is known for example for the & character leading to a query parameter -// separator if the resulting URI path is not urlencoded. Adding accented -// characters or characters of Unicode letter or digit classes in the basic -// plane *usually* are fine iff the file system's names *and* the config file -// content are both UTF-8 encoded, as is the MySQL database table, and the file -// system does not use decomposed Unicode characters for accented characters. -// -// Possible expressions could be: -// * Just add the space character: -// $conf['sync_chars_regex'] = '/^[a-zA-Z0-9-_. ]+$/'; -// * Add space character and German umlauts and sharp s (sz) (note this is -// UTF-8 encoded, if you see "odd" sequences then the encoding in your viewer -// or editor is wrong, and maybe your file system is as well), and -// parentheses and brackets; also note the trailing 'u' regex option to have -// PHP interpret the expression as UTF-8 string instead of ASCII: -// $conf['sync_chars_regex'] = '/^[a-zA-Z0-9-_. äÄöÖüÜßẞ()\[\]]+$/u'; -// * Allow all Unicode letter and numeric and whitespace characters (largely -// encoding independent but still might have quirks with file system's file -// name encoding) and parentheses and brackets; again with the 'u' regex -// option to let PHP match Unicode characters and properties: -// $conf['sync_chars_regex'] = '/^[-_.\p{L}\p{N}\p{Z}()\[\]]+$/u'; -// You may try your expression at https://regex101.com/ choosing the -// PCRE2 (PHP >=7.3) flavor. -// See also: -// https://www.regular-expressions.info/unicode.html -// https://www.regular-expressions.info/php.html#preg -// https://www.php.net/manual/en/pcre.pattern.php -// -// The default expression is restrictive but safe and sane ASCII only -// alphanumeric and hyphen-minus and underscore and dot. -$conf['sync_chars_regex'] = '/^[a-zA-Z0-9-_.]+$/'; - -// folders name excluded during synchronization -$conf['sync_exclude_folders'] = array(); - -// PEM url (default is http://piwigo.org/ext) -$conf['alternative_pem_url'] = ''; - -// categories ID on PEM -$conf['pem_plugins_category'] = 12; -$conf['pem_themes_category'] = 10; -$conf['pem_languages_category'] = 8; - -// based on the EXIF "orientation" tag, should we rotate photos added in the -// upload form or through pwg.images.addSimple web API method? -$conf['upload_form_automatic_rotation'] = true; - -// 0-'auto', 1-'derivative' 2-'script' -$conf['derivative_url_style']=0; - -$conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755; - -// 'small', 'medium' or 'large' -$conf['derivative_default_size'] = 'medium'; - -// below which size (in pixels, ie width*height) do we remove metadata -// EXIF/IPTC... from derivative? -$conf['derivatives_strip_metadata_threshold'] = 256000; - -//Maximum Ajax requests at once, for thumbnails on-the-fly generation -$conf['max_requests']=3; - -// one of '', 'images', 'all' -//TODO: Put this in admin and also manage .htaccess in #sites and upload folders -$conf['original_url_protection'] = ''; - - -// Default behaviour when a new album is created: should the new album inherit the group/user -// permissions from its parent? Note that config is only used for Ftp synchro, -// and if that option is not explicitly transmit when the album is created. -$conf['inheritance_by_default'] = false; - -// 'png' or 'jpg': your uploaded TIF photos will have a representative in -// JPEG or PNG file format -$conf['tiff_representative_ext'] = 'png'; - -// in the upload form, let users upload only picture_exts or all file_exts? -// for some file types, Piwigo will try to generate a pwg_representative -// (TIFF, videos, PDF) -$conf['upload_form_all_types'] = false; - -// Size of chunks, in kilobytes. Fast connections will have better -// performances with high values, such as 5000. -$conf['upload_form_chunk_size'] = 500; - -// Maximum size for a file in the upload form, in megabytes. -$conf['upload_form_max_file_size'] = 1000; - -// If we try to generate a pwg_representative for a video we use ffmpeg. If -// "ffmpeg" is not visible by the web user, you can define the full path of -// the directory where "ffmpeg" executable is. -$conf['ffmpeg_dir'] = ''; - -// batch manager: how many images should Piwigo display by default on the -// global mode. Must be among values {20,50,100} -$conf['batch_manager_images_per_page_global'] = 20; - -// batch manager: how many images should Piwigo display by default on the -// unit mode. Must be among values {5, 10, 50} -$conf['batch_manager_images_per_page_unit'] = 5; - -// how many missing md5sum should Piwigo compute at once. -$conf['checksum_compute_blocksize'] = 50; - -// quicksearch engine: include all photos from sub-albums of any matching -// album. For example, if search is "bear", then we display photos from -// "bear/grizzly". When value changed, delete database cache files in -// _data/cache directory -$conf['quick_search_include_sub_albums'] = false; - -// +-----------------------------------------------------------------------+ -// | log | -// +-----------------------------------------------------------------------+ -// Logs directory, relative to $conf['data_location'] -$conf['log_dir'] = '/logs'; - -// Log level (OFF, CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG) -// development = DEBUG, production = ERROR -$conf['log_level'] = 'DEBUG'; - -// Keep logs file during X days -$conf['log_archive_days'] = 30; - -// +-----------------------------------------------------------------------+ -// | Proxy Settings | -// +-----------------------------------------------------------------------+ - -// If piwigo needs a http-proxy to connect to the internet, set this to true -$conf['use_proxy'] = false; - -// Connection string of the proxy -$conf['proxy_server'] = 'proxy.domain.org:port'; - -// If the http-proxy requires authentication, set username and password here -// e.g. username:password -$conf['proxy_auth'] = ''; ?> - diff --git a/manifest.toml b/manifest.toml index 35bef21..45b997c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -79,12 +79,10 @@ ram.runtime = "50M" format = "zip" [resources.system_user] - allow_email = true + #allow_email = true [resources.install_dir] - [resources.data_dir] - [resources.permissions] main.url = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index 0e701fc..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,16 +8,6 @@ # PERSONAL HELPERS #================================================= -_create_data_dirs_if_required() { - dirs=(_data galleries upload) - for dir in "${dirs[@]}"; do - if [ ! -d "$data_dir/$dir" ]; then - rsync -a "$install_dir/$dir/" "$data_dir/$dir/" - fi - ynh_secure_remove "$install_dir/$dir" - done -} - #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 82ac839..773fbb3 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,12 +19,6 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" -#================================================= -# BACKUP THE DATA DIR -#================================================= - -ynh_backup --src_path="$data_dir" --is_big - #================================================= # BACKUP THE SYSTEM CONFIGURATION #================================================= diff --git a/scripts/install b/scripts/install index b2c4495..223b301 100644 --- a/scripts/install +++ b/scripts/install @@ -21,14 +21,11 @@ ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir/plugins/Ldap_Login" --source_id=ldap_plugin ynh_setup_source --dest_dir="$install_dir/plugins" --source_id=log_failed_logins_plugin -_create_data_dirs_if_required +#_create_data_dirs_if_required chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" -chmod -R o-rwx "$data_dir" -chown -R "$app:www-data" "$data_dir" - #================================================= # SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/restore b/scripts/restore index f492243..e814040 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,15 +18,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" -#================================================= -# RESTORE THE DATA DIRECTORY -#================================================= -ynh_script_progression --message="Restoring the data directory..." --weight=2 - -ynh_restore_file --origin_path="$data_dir" --not_mandatory - -chown -R "$app:www-data" "$data_dir" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e47c871..fc61473 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,7 +25,7 @@ fi #================================================= ynh_script_progression --message="Upgrading source files..." --weight=3 -ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="local/config/config.inc.php local/config/database.inc.php" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="local/config/config.inc.php local/config/database.inc.php _data galleries upload" ynh_setup_source --dest_dir="$install_dir/plugins/Ldap_Login" --source_id=ldap_plugin --full_replace=1 ynh_setup_source --dest_dir="$install_dir/plugins" --source_id=log_failed_logins_plugin --full_replace=1 From f560256456b9d23cb833ad0347909eb3814e9278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Jun 2024 23:05:40 +0200 Subject: [PATCH 11/12] Update upgrade --- scripts/upgrade | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e47c871..a88987f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,11 +29,6 @@ ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="local/config ynh_setup_source --dest_dir="$install_dir/plugins/Ldap_Login" --source_id=ldap_plugin --full_replace=1 ynh_setup_source --dest_dir="$install_dir/plugins" --source_id=log_failed_logins_plugin --full_replace=1 -_create_data_dirs_if_required - -chmod -R o-rwx "$data_dir" -chown -R "$app:www-data" "$data_dir" - chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" From 637ffdcbff23d389ec077c40ba97cee057f268ac Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Jul 2024 20:04:09 +0000 Subject: [PATCH 12/12] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1bc6c94..286a22a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Piwigo for YunoHost -[![Integration level](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Working status](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/piwigo.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) ![Working status](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) [![Install Piwigo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) diff --git a/README_es.md b/README_es.md index 42a456e..b499b0b 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Piwigo para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/piwigo.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) [![Instalar Piwigo con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) diff --git a/README_eu.md b/README_eu.md index 88076de..9279c37 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Piwigo YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/piwigo.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) [![Instalatu Piwigo YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) diff --git a/README_fr.md b/README_fr.md index 2c8bcb1..240029d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Piwigo pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/piwigo.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) [![Installer Piwigo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) diff --git a/README_gl.md b/README_gl.md index 81d5d8c..741f8ad 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Piwigo para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/piwigo.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) [![Instalar Piwigo con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 15ea058..17a8101 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Piwigo -[![集成程度](https://dash.yunohost.org/integration/piwigo.svg)](https://dash.yunohost.org/appci/app/piwigo) ![工作状态](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/piwigo.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/piwigo.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/piwigo.maintain.svg) [![使用 YunoHost 安装 Piwigo](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=piwigo)