From 656f566c0ad4607b292bad369b4d558e98ded4d0 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:31:40 +0200
Subject: [PATCH] Add calendar plugin

---
 conf/config.inc.php | 1 +
 scripts/install     | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/config.inc.php b/conf/config.inc.php
index b32544c..07e6152 100644
--- a/conf/config.inc.php
+++ b/conf/config.inc.php
@@ -141,6 +141,7 @@ $config['plugins'] = array(
     'new_user_identity',
     'newmail_notifier',
     'enigma',
+    'calendar',
     // installed plugins
 );
 
diff --git a/scripts/install b/scripts/install
index 5120e14..0b77a81 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"
 
 #=================================================
@@ -150,7 +150,8 @@ ynh_composer_exec --commands="require kolab/net_ldap3"
 # https://plugins.roundcube.net/packages/johndoh/contextmenu
 ynh_composer_exec --commands="require \
     johndoh/contextmenu $contextmenu_version \
-    sblaisot/automatic_addressbook $automatic_addressbook_version"
+    sblaisot/automatic_addressbook $automatic_addressbook_version \
+    kolab/calendar $calendar_version"
 
 installed_plugins+=" 'contextmenu', 'automatic_addressbook',"