From 0015f5b6d5e5605e5d1afdc4a3fe3b06c09f3938 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 9 Jul 2019 08:30:38 +0200
Subject: [PATCH] fix ldap firstname and lastname

---
 scripts/install           |  5 ++---
 scripts/restore           |  2 +-
 scripts/upgrade           |  4 ++--
 scripts/ynh_sanitize_name | 22 ----------------------
 4 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 scripts/ynh_sanitize_name

diff --git a/scripts/install b/scripts/install
index 189d111..6f02f56 100644
--- a/scripts/install
+++ b/scripts/install
@@ -8,7 +8,6 @@
 
 source _common.sh
 source ynh_send_readme_to_admin__2
-source ynh_sanitize_name
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -31,7 +30,7 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
 
 app=$YNH_APP_INSTANCE_NAME
 
-ldap_user=$(ynh_sanitize_name --name="${app}ldap")
+ldap_user="svc_${app}_ldap"
 ldap_password=$(ynh_string_random --length=8)
 
 #=================================================
@@ -121,7 +120,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 ynh_print_info --message="Creating LDAP user..."
 
-yunohost user create $ldap_user --firstname $ldap_user --lastname $ldap_user --mail ${ldap_user}@$domain --password $ldap_password -q 0
+yunohost user create $ldap_user --firstname "SvcWikijsLdap" --lastname "SvcWikijsLdap" --mail ${ldap_user}@$domain --password $ldap_password -q 0
 
 #=================================================
 # SETUP SYSTEMD
diff --git a/scripts/restore b/scripts/restore
index 1d0f994..dad24bc 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -125,7 +125,7 @@ sleep 30
 #=================================================
 ynh_print_info --message="Creating LDAP user..."
 
-yunohost user create $ldap_user --firstname $ldap_user --lastname $ldap_user --mail ${ldap_user}@$domain --password $ldap_password -q 0
+yunohost user create $ldap_user --firstname "SvcWikijsLdap" --lastname "SvcWikijsLdap" --mail ${ldap_user}@$domain --password $ldap_password -q 0
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 78a33d4..2585817 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -63,11 +63,11 @@ fi
 
 # If ldap_user doesn't exist, retrieve it or create it
 if [[ -z "$ldap_user" ]]; then
-	ldap_user=$(ynh_sanitize_name --name="${app}ldap")
+	ldap_user="svc_${app}_ldap"
 	ldap_password=$(ynh_string_random --length=8)
 	ynh_app_setting_set "$app" ldap_user "$ldap_user"
 	ynh_app_setting_set "$app" ldap_password "$ldap_password"
-	yunohost user create $ldap_user --firstname $app --lastname $app --mail ${ldap_user}@$domain --password $ldap_password -q 0
+	yunohost user create $ldap_user --firstname "SvcWikijsLdap" --lastname "SvcWikijsLdap" --mail ${ldap_user}@$domain --password $ldap_password -q 0
 fi
 
 # Remove yarn repository
diff --git a/scripts/ynh_sanitize_name b/scripts/ynh_sanitize_name
deleted file mode 100644
index 7d6f7c2..0000000
--- a/scripts/ynh_sanitize_name
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Sanitize a string intended to be the firstname lastname
-# (More specifically : removing - . and _)
-#
-# example: username=$(ynh_sanitize_name --name=$app)
-#
-# usage: ynh_sanitize_name --name=name
-# | arg: -n, --name - name to correct/sanitize
-# | ret: the corrected name
-#
-ynh_sanitize_name () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=n
-	declare -Ar args_array=( [n]=name= )
-	local name
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-
-	# We should avoid having - and . in the name of databases. They are replaced by _
-	echo ${name//[-._]/}
-}
\ No newline at end of file