From 7236907cadefb28d5fa98ef7ed0cd437840fd8f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 27 Jun 2022 10:34:33 +0200
Subject: [PATCH 1/3] user

---
 scripts/install | 4 ++--
 scripts/remove  | 3 ++-
 scripts/restore | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index 5120e14..ebb8c65 100644
--- a/scripts/install
+++ b/scripts/install
@@ -58,7 +58,7 @@ ynh_script_progression --message="Creating a MySQL database..." --weight=2
 db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name
+ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -123,7 +123,7 @@ ynh_install_composer
 #=================================================
 ynh_script_progression --message="Initializing database..." --weight=3
 
-ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \
+ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" \
     < "$final_path/SQL/mysql.initial.sql"
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 2c7f294..dd5bd70 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
@@ -26,7 +27,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 ynh_script_progression --message="Removing the MySQL database..." --weight=2
 
 # Remove a database if it exists, along with the associated user
-ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name
+ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 
 #=================================================
 # REMOVE APP MAIN DIR
diff --git a/scripts/restore b/scripts/restore
index 8022c1b..25c084d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -93,8 +93,8 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Restoring the MySQL database..." --weight=5
 
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd
-ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql
+ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
 #=================================================
 # GENERIC FINALIZATION

From 72ce0b2ac90eb120c579caf0249c4818ffe8e535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 27 Jun 2022 10:42:34 +0200
Subject: [PATCH 2/3] Update _common.sh

---
 scripts/_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7712b9e..94af0be 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,9 +13,9 @@ pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysq
 YNH_COMPOSER_VERSION=2.1.1
 
 # Plugins version
-contextmenu_version=3.3
+contextmenu_version=3.3.1
 automatic_addressbook_version=v0.4.3
-carddav_version=4.3.0
+carddav_version=4.4.1
 
 #=================================================
 # EXPERIMENTAL HELPERS

From 97b9dd909df4423cd0866aa0cc518c2db588864d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 27 Jun 2022 10:43:00 +0200
Subject: [PATCH 3/3] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 94af0be..ad483bc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -10,7 +10,7 @@ YNH_PHP_VERSION="7.3"
 pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl"
 
 # Composer version
-YNH_COMPOSER_VERSION=2.1.1
+YNH_COMPOSER_VERSION=2.3.7
 
 # Plugins version
 contextmenu_version=3.3.1