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 01/11] 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 @@
     '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',"
 

From 30130eba087a6d5e0a4a3c04b40fadb022e5ab81 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:39:27 +0200
Subject: [PATCH 02/11] Update _common.sh

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

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7712b9e..5e51860 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -10,12 +10,13 @@ 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
+contextmenu_version=3.3.1
 automatic_addressbook_version=v0.4.3
-carddav_version=4.3.0
+carddav_version=4.4.1
+calendar_version=3.5.7
 
 #=================================================
 # EXPERIMENTAL HELPERS

From 80088cf1e3a263901db4b180b5608da892c64142 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:48:30 +0200
Subject: [PATCH 03/11] Update upgrade

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 1877b73..964cc58 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -202,7 +202,8 @@ then
     # https://plugins.roundcube.net/packages/johndoh/contextmenu
     ynh_composer_exec --commands="update --no-dev --prefer-dist \
         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',"
 

From 7e430f74076a5d77e51e8fade60a2290df478dad 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:54:51 +0200
Subject: [PATCH 04/11] Fix

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

diff --git a/conf/config.inc.php b/conf/config.inc.php
index 07e6152..b32544c 100644
--- a/conf/config.inc.php
+++ b/conf/config.inc.php
@@ -141,7 +141,6 @@
     'new_user_identity',
     'newmail_notifier',
     'enigma',
-    'calendar',
     // installed plugins
 );
 
diff --git a/scripts/install b/scripts/install
index 0b77a81..9d23ef8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -153,7 +153,7 @@ ynh_composer_exec --commands="require \
     sblaisot/automatic_addressbook $automatic_addressbook_version \
     kolab/calendar $calendar_version"
 
-installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
+installed_plugins+=" 'contextmenu', 'automatic_addressbook', 'calendar',"
 
 ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php"
 mkdir -p "$final_path/plugins/enigma/home"
diff --git a/scripts/upgrade b/scripts/upgrade
index 964cc58..d06bfe4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -205,7 +205,7 @@ then
         sblaisot/automatic_addressbook $automatic_addressbook_version \
         kolab/calendar $calendar_version"
 
-    installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
+    installed_plugins+=" 'contextmenu', 'automatic_addressbook', 'calendar',"
 
     ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php"
     mkdir -p "$final_path/plugins/enigma/home"

From 19d06b45a8745e2718db4677690f7f92279effb6 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:58:35 +0200
Subject: [PATCH 05/11] Update install

---
 scripts/install | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 9d23ef8..8ff135d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -145,9 +145,10 @@ mkdir -p "$final_path/"{logs,temp}
 # Install net_LDAP
 ynh_composer_exec --commands="require kolab/net_ldap3"
 
-# Install contextmenu and automatic_addressbook plugins
-# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
-# https://plugins.roundcube.net/packages/johndoh/contextmenu
+# Install contextmenu, automatic_addressbook and calendar plugins
+# https://plugins.roundcube.net/#/packages/johndoh/contextmenu
+# https://plugins.roundcube.net/#/packages/projectmyst/automatic_addressbook
+# https://plugins.roundcube.net/#/packages/kolab/calendar
 ynh_composer_exec --commands="require \
     johndoh/contextmenu $contextmenu_version \
     sblaisot/automatic_addressbook $automatic_addressbook_version \

From 8e269a5bf166600eb514b737a680477e221e0e3e 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:59:14 +0200
Subject: [PATCH 06/11] Update upgrade

---
 scripts/upgrade | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index d06bfe4..a096f11 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -197,9 +197,10 @@ then
     # Install net_LDAP
     ynh_composer_exec --commands="require kolab/net_ldap3"
 
-    # Update or install contextmenu and automatic_addressbook plugins
-    # https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
-    # https://plugins.roundcube.net/packages/johndoh/contextmenu
+    # Update or install contextmenu, automatic_addressbook and calendar plugins
+    # https://plugins.roundcube.net/#/packages/johndoh/contextmenu
+    # https://plugins.roundcube.net/#/packages/projectmyst/automatic_addressbook
+    # https://plugins.roundcube.net/#/packages/kolab/calendar
     ynh_composer_exec --commands="update --no-dev --prefer-dist \
         johndoh/contextmenu $contextmenu_version \
         sblaisot/automatic_addressbook $automatic_addressbook_version \

From 5fc4de41d0a245788aaa1fb21d0bbf2253ef12db 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 11:21:05 +0200
Subject: [PATCH 07/11] Update upgrade

---
 scripts/upgrade | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a096f11..e76b4da 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -194,8 +194,10 @@ then
     # Create logs and temp directories
     mkdir -p "$final_path/"{logs,temp}
 
-    # Install net_LDAP
-    ynh_composer_exec --commands="require kolab/net_ldap3"
+    # Install net_LDAP and calendar
+    ynh_composer_exec --commands="require \
+    kolab/net_ldap3 \
+    kolab/calendar $calendar_version"
 
     # Update or install contextmenu, automatic_addressbook and calendar plugins
     # https://plugins.roundcube.net/#/packages/johndoh/contextmenu
@@ -203,8 +205,7 @@ then
     # https://plugins.roundcube.net/#/packages/kolab/calendar
     ynh_composer_exec --commands="update --no-dev --prefer-dist \
         johndoh/contextmenu $contextmenu_version \
-        sblaisot/automatic_addressbook $automatic_addressbook_version \
-        kolab/calendar $calendar_version"
+        sblaisot/automatic_addressbook $automatic_addressbook_version"
 
     installed_plugins+=" 'contextmenu', 'automatic_addressbook', 'calendar',"
 

From 750b3d31130a7ecacf36a9225363a12bb5cc074c 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 11:30:01 +0200
Subject: [PATCH 08/11] Update upgrade

---
 scripts/upgrade | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e76b4da..a096f11 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -194,10 +194,8 @@ then
     # Create logs and temp directories
     mkdir -p "$final_path/"{logs,temp}
 
-    # Install net_LDAP and calendar
-    ynh_composer_exec --commands="require \
-    kolab/net_ldap3 \
-    kolab/calendar $calendar_version"
+    # Install net_LDAP
+    ynh_composer_exec --commands="require kolab/net_ldap3"
 
     # Update or install contextmenu, automatic_addressbook and calendar plugins
     # https://plugins.roundcube.net/#/packages/johndoh/contextmenu
@@ -205,7 +203,8 @@ then
     # https://plugins.roundcube.net/#/packages/kolab/calendar
     ynh_composer_exec --commands="update --no-dev --prefer-dist \
         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', 'calendar',"
 

From e19c45266641fe2fc2d8b0ce91e2186db0d88913 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 8 Jul 2022 07:48:15 +0200
Subject: [PATCH 09/11] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a096f11..2c4ec2e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -201,7 +201,7 @@ then
     # https://plugins.roundcube.net/#/packages/johndoh/contextmenu
     # https://plugins.roundcube.net/#/packages/projectmyst/automatic_addressbook
     # https://plugins.roundcube.net/#/packages/kolab/calendar
-    ynh_composer_exec --commands="update --no-dev --prefer-dist \
+    ynh_composer_exec --commands="require --no-dev --prefer-dist \
         johndoh/contextmenu $contextmenu_version \
         sblaisot/automatic_addressbook $automatic_addressbook_version \
         kolab/calendar $calendar_version"

From e6c94868f77aba960775bcf3a9bc16a9688dc388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 14 Jul 2022 14:47:07 +0200
Subject: [PATCH 10/11] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a096f11..f76786d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -201,7 +201,7 @@ then
     # https://plugins.roundcube.net/#/packages/johndoh/contextmenu
     # https://plugins.roundcube.net/#/packages/projectmyst/automatic_addressbook
     # https://plugins.roundcube.net/#/packages/kolab/calendar
-    ynh_composer_exec --commands="update --no-dev --prefer-dist \
+    ynh_composer_exec --commands="update --prefer-dist \
         johndoh/contextmenu $contextmenu_version \
         sblaisot/automatic_addressbook $automatic_addressbook_version \
         kolab/calendar $calendar_version"

From 2697039e138a51c3939adb5f0553ec8917c2670e Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 19 Oct 2022 18:25:18 +0000
Subject: [PATCH 11/11] Auto-update README

---
 README.md    | 1 -
 README_fr.md | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e5d5f14..1807081 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,6 @@ In addition to Roundcube core features, the following are made available with th
 
 **Shipped version:** 1.6.0~ynh3
 
-
 **Demo:** https://demo.yunohost.org/webmail/
 
 ## Screenshots
diff --git a/README_fr.md b/README_fr.md
index 14c351d..8029dd9 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -28,8 +28,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s
 * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default.
 
 
-**Version incluse :** 1.6.0~ynh3
-
+**Version incluse :** 1.6.0~ynh3
 
 **Démo :** https://demo.yunohost.org/webmail/