From a3c25937c2a39581ad67016847da3414994f7992 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 23 Nov 2021 17:38:41 +0100
Subject: [PATCH] Fix

---
 check_process         |  1 -
 conf/config.php       | 17 -----------------
 doc/DESCRIPTION_fr.md |  1 +
 doc/DISCLAIMER_fr.md  |  3 +++
 manifest.json         |  2 +-
 scripts/install       |  3 ++-
 6 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 conf/config.php
 create mode 100644 doc/DESCRIPTION_fr.md
 create mode 100644 doc/DISCLAIMER_fr.md

diff --git a/check_process b/check_process
index 0e4d873..cfd7fab 100644
--- a/check_process
+++ b/check_process
@@ -5,7 +5,6 @@
 		admin="john"
 		is_public=1
 		password="password_fluxbb"
-		port="666"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
diff --git a/conf/config.php b/conf/config.php
deleted file mode 100644
index c3536ee..0000000
--- a/conf/config.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$db_type = 'mysqli';
-$db_host = 'localhost';
-$db_name = 'DB_NAME';
-$db_username = 'DB_USER';
-$db_password = 'DB_PASS';
-$db_prefix = '';
-$p_connect = false;
-
-$cookie_name = 'pun_cookie_a07c36';
-$cookie_domain = '';
-$cookie_path = '/';
-$cookie_secure = 0;
-$cookie_seed = 'b47bf15566b0f545';
-
-define('PUN', 1);
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..928cf96
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+FluxBB est conçu comme une alternative plus légère et plus rapide à certaines des applications traditionnelles de forum lourdes en fonctionnalités. Il est facile à utiliser et a fait ses preuves en matière de stabilité et de sécurité, ce qui en fait un choix de forum idéal pour votre site Web. 
\ No newline at end of file
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
new file mode 100644
index 0000000..bc92e70
--- /dev/null
+++ b/doc/DISCLAIMER_fr.md
@@ -0,0 +1,3 @@
+### Limitations avec YunoHost
+
+Les authentifications HTTP et LDAP ne sont pas prises en charge. 
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 05fcfc1..ff1366d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Fast, light, user-friendly forum software",
         "fr": "Forum de discussions rapide et léger"
     },
-    "version": "1.5.11~ynh4",
+    "version": "1.5.11~ynh5",
     "url": "https://fluxbb.org/",
     "upstream": {
         "license": "GPL-2.0-only",
diff --git a/scripts/install b/scripts/install
index 5fbf042..337f73c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -25,6 +25,7 @@ path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 password=$YNH_APP_ARG_PASSWORD
+email=$(ynh_user_get_info --username=$admin --key=mail)
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -109,7 +110,7 @@ ynh_systemd_action --service_name=nginx --action=reload
 # Installation with cURL
 ynh_script_progression --message="Finalizing installation..."
 
-ynh_local_curl "/install.php" "form_sent=1" "install_lang=English" "req_db_type=mysqli_innodb" "req_db_host=localhost" "req_db_name=$db_name" "db_username=$db_user" "db_password=$db_pwd" "db_prefix=fl_" "req_username=$admin" "req_password1=$password" "req_password2=$password" "req_email=$admin@$domain" "req_title=YunoFluxBB" "desc=FluxBB_package_for_Yunohost" "req_base_url=https://$domain$path_url"  "req_default_lang=English" "req_default_style=Air" 
+ynh_local_curl "/install.php" "form_sent=1" "install_lang=English" "req_db_type=mysqli_innodb" "req_db_host=localhost" "req_db_name=$db_name" "db_username=$db_user" "db_password=$db_pwd" "db_prefix=fl_" "req_username=$admin" "req_password1=$password" "req_password2=$password" "req_email=$email" "req_title=YunoFluxBB" "desc=FluxBB_package_for_Yunohost" "req_base_url=https://$domain$path_url"  "req_default_lang=English" "req_default_style=Air" 
 
 ynh_secure_remove  "$final_path/install.php"