From 4d72ec0dedc1102327e0fad8b1d67cde26dd25de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 21 Mar 2023 19:48:36 +0100
Subject: [PATCH] Revert "Merge branch 'testing' into enh_postgresql_migration"

This reverts commit 76bd835228183b3adca408e0e23cef2f74d57692, reversing
changes made to ec0fef611cd149ea6e2cf78d4d300d4fc1d7cb3b.
---
 manifest.json                    |  4 ++--
 scripts/_ynh_mysql_connect_as.sh | 36 -------------------------------
 scripts/_ynh_mysql_dump_db.sh    | 37 --------------------------------
 scripts/backup                   |  1 -
 scripts/install                  |  7 ------
 scripts/restore                  |  1 -
 scripts/upgrade                  |  9 --------
 7 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 scripts/_ynh_mysql_connect_as.sh
 delete mode 100644 scripts/_ynh_mysql_dump_db.sh

diff --git a/manifest.json b/manifest.json
index 15bfd62..af6006b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,8 +51,8 @@
                 "name": "is_public",
                 "type": "boolean",
                 "help": {
-                    "en": "You need to enable public if you want to connect Nextcloud Desktop client to Nextcloud server. This can be changed later via the webadmin.",
-                    "fr": "Vous devez cocher cette case si vous souhaitez connecter le client Nextcloud Desktop au serveur Nextcloud. Cela peut être modifié ultérieurement via l'administrateur Web."
+                    "en": "If enabled, Nextcloud will be accessible by Nextcloud Desktop and by users without a YunoHost account. This can be changed later in the webadmin.",
+                    "fr": "Si cette case est cochée, Nextcloud sera accessible par Nextcloud Desktop et par les utilisateurs n’ayant pas de compte YunoHost. Vous pourrez changer dans la webadmin."
                 },
                 "default": true
             },
diff --git a/scripts/_ynh_mysql_connect_as.sh b/scripts/_ynh_mysql_connect_as.sh
deleted file mode 100644
index a22963e..0000000
--- a/scripts/_ynh_mysql_connect_as.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Open a connection as a user
-#
-# example: ynh_mysql_connect_as --user="user" --password="pass" <<< "UPDATE ...;"
-# example: ynh_mysql_connect_as --user="user" --password="pass" --default_character_set="utf8mb4" < /path/to/file.sql
-#
-# usage: ynh_mysql_connect_as --user=user --password=password [--database=database] [--default_character_set=character-set]
-# | arg: -u, --user=                        - the user name to connect as
-# | arg: -p, --password=                    - the user password
-# | arg: -d, --database=                    - the database to connect to
-# | arg: -c, --default_character_set=       - the charset to use
-#
-# Requires YunoHost version 2.2.4 or higher.
-ynh_mysql_connect_as() {
-    # Declare an array to define the options of this helper.
-    local legacy_args=updc
-    local -A args_array=( [u]=user= [p]=password= [d]=database= [c]=default_character_set= )
-    local user
-    local password
-    local database
-    local default_character_set
-    # Manage arguments with getopts
-    ynh_handle_getopts_args "$@"
-    database="${database:-}"
-    default_character_set="${default_character_set:-}"
-
-    if [ -n "$default_character_set" ]
-    then
-        default_character_set="--default-character-set=$default_character_set"
-    else
-        default_character_set="--default-character-set=latin1"
-    fi
-
-    mysql --user="$user" --password="$password" "$default_character_set" --batch "$database"
-}
\ No newline at end of file
diff --git a/scripts/_ynh_mysql_dump_db.sh b/scripts/_ynh_mysql_dump_db.sh
deleted file mode 100644
index 3b922bb..0000000
--- a/scripts/_ynh_mysql_dump_db.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# Dump a database
-#
-# example: ynh_mysql_dump_db --database=roundcube --default_character_set="utf8mb4" > ./dump.sql
-#
-# usage: ynh_mysql_dump_db --database=database
-# | arg: -d, --database=                    - the database name to dump
-# | arg: -c, --default_character_set=       - the charset to use
-# | ret: the mysqldump output
-#
-# Requires YunoHost version 2.2.4 or higher.
-ynh_mysql_dump_db() {
-    # Declare an array to define the options of this helper.
-    local legacy_args=dc
-    local -A args_array=( [d]=database= [c]=default_character_set= )
-    local database
-    local default_character_set
-    # Manage arguments with getopts
-    ynh_handle_getopts_args "$@"
-    default_character_set="${default_character_set:-}"
-    MYSQL_ROOT_PWD_FILE=/etc/yunohost/mysql
-
-    if [ -n "$default_character_set" ]
-    then
-        default_character_set="--default-character-set=$default_character_set"
-    else
-        # By default, default character set is "latin1"
-        default_character_set="--default-character-set=latin1"
-    fi
-    
-    if [ -f "$MYSQL_ROOT_PWD_FILE" ]; then
-        mysqldump --user="root" --password="$(cat $MYSQL_ROOT_PWD_FILE)" --single-transaction --skip-dump-date "$default_character_set" "$database"
-    else
-        mysqldump --single-transaction --skip-dump-date "$default_character_set" "$database"
-    fi
-}
\ No newline at end of file
diff --git a/scripts/backup b/scripts/backup
index cc93817..c94a3d9 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -8,7 +8,6 @@
 
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
-source ../settings/scripts/_ynh_mysql_dump_db.sh
 
 #=================================================
 # MANAGE SCRIPT FAILURE
diff --git a/scripts/install b/scripts/install
index 04d15c3..ea8f86c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -8,7 +8,6 @@
 
 source _common.sh
 source /usr/share/yunohost/helpers
-source _ynh_mysql_connect_as.sh
 
 #=================================================
 # MANAGE SCRIPT FAILURE
@@ -80,9 +79,6 @@ ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
 
-ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
-    <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -195,9 +191,6 @@ exec_occ maintenance:install \
 #=================================================
 ynh_script_progression --message="Configuring Nextcloud..." --weight=8
 
-# Set the mysql.utf8mb4 config to true in config.php
-exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"
-
 # Ensure that UpdateNotification app is disabled
 exec_occ app:disable updatenotification
 
diff --git a/scripts/restore b/scripts/restore
index d43cdda..cdb18e1 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -8,7 +8,6 @@
 
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
-source ../settings/scripts/_ynh_mysql_connect_as.sh
 
 #=================================================
 # MANAGE SCRIPT FAILURE
diff --git a/scripts/upgrade b/scripts/upgrade
index 0cea797..42b2a7a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -276,15 +276,6 @@ then
     # Print the current version number of Nextcloud
     exec_occ -V
 
-    if [ "$(exec_occ config:system:get mysql.utf8mb4)" != "true" ]; then
-        db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-        # Change your databases character set and collation
-        ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
-        <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
-        # Set the mysql.utf8mb4 config to true in config.php
-        exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"
-        exec_occ maintenance:repair
-    fi
 
     # Upgrade may fail if this app is enabled
     # Take all apps enabled, and check if mail is one of them