From f5678d6c67e8c2c1869cf43f6ea03fe57f03f0e6 Mon Sep 17 00:00:00 2001
From: didier <didier@kaz.bzh>
Date: Sun, 16 Nov 2025 10:00:48 +0100
Subject: [PATCH] =?UTF-8?q?cosm=C3=A9tique?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/gestUsers.sh | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/bin/gestUsers.sh b/bin/gestUsers.sh
index 9493d54..1a13a50 100755
--- a/bin/gestUsers.sh
+++ b/bin/gestUsers.sh
@@ -139,7 +139,7 @@ searchEmail() {
 searchMattermost() {
 		#Ici $1 est une adresse email
 		. $KAZ_KEY_DIR/env-mattermostAdmin
-        	docker exec -ti ${mattermostServName} bin/mmctl --suppress-warnings auth login $httpProto://$URL_AGORA --name local-server --username $mattermost_user --password $mattermost_pass >/dev/null 2>&1
+    docker exec -ti ${mattermostServName} bin/mmctl --suppress-warnings auth login $httpProto://$URL_AGORA --name local-server --username $mattermost_user --password $mattermost_pass >/dev/null 2>&1
 		docker exec -ti ${mattermostServName} bin/mmctl --suppress-warnings config set ServiceSettings.EnableAPIUserDeletion "true" >/dev/null 2>&1
 		#on créé la list des mails dans mattermost
 		docker exec -ti ${mattermostServName} bin/mmctl --suppress-warnings user list --all >${TFILE_MAILS_MATTERMOST} 2>/dev/null
@@ -167,9 +167,9 @@ infoEmail() {
 		while :
 		do
 			clear
-                	echo "------------------------------------------------"
+    	echo "------------------------------------------------"
 			printKazMsg "${ACTION_EN_COURS}"
-        	        echo "------------------------------------------------"
+      echo "------------------------------------------------"
 			read -p "Alias ou Mail ? (R pour retour ou M/A [M] :" RINFOMAIL
 			case ${RINFOMAIL} in
 			"" | M | m )
@@ -184,9 +184,6 @@ infoEmail() {
 					echo " ------------------------------------------------"
 					printKazMsg " DETAILS DU COMPTE DANS NEXTCLOUD PRINCIPAL"
 					echo -e ""
-					#TEMP_USER_NC=$(mktemp /tmp/$RACINE.XXXXXXXXX.TEMP_USER_NC)
-					#curl -s -o $TEMP_USER_NC -X GET -H 'OCS-APIRequest:true' $httpProto://admin:$NEXTCLOUD_ADMIN_PASSWORD@$URL_NC/ocs/v1.php/cloud/users?search=$CHOIX_MAIL
-					#cat $TEMP_USER_NC | grep -i "element" | sed -e s/[\<\>\/]//g | sed -e s/element//g
 					echo -ne "${NC}"
 					echo -ne " - Nextcloud enable : "
 					echo -ne "${GREEN}"
@@ -212,10 +209,10 @@ infoEmail() {
 					ldapsearch -H ldap://${LDAP_IP} -D "cn=${LDAP_ADMIN_USERNAME},${ldap_root}" -x -w "${LDAP_ADMIN_PASSWORD}" -b "cn=${CHOIX_MAIL},ou=users,${ldap_root}" | grep -i mailquota | cut -c 11-60
 					echo -ne "${NC}"
 					echo -ne " - Place disque des mails : "
-                                        cd ${DOCK_VOL}/postfix_mailData/_data/${DOMAINE_EN_COURS}
-                                        echo -ne "${GREEN}"
-                                        du -sh $(echo ${CHOIX_MAIL} | sed -e 's/@.*//') | cut -c 1-4
-                                        echo -ne "${NC}"
+          cd ${DOCK_VOL}/postfix_mailData/_data/${DOMAINE_EN_COURS}
+          echo -ne "${GREEN}"
+          du -sh $(echo ${CHOIX_MAIL} | sed -e 's/@.*//') | cut -c 1-4
+          echo -ne "${NC}"
 					echo -n " - Quota Nextcloud (Ldap) : "
 					echo -ne "${GREEN}"
 					ldapsearch -H ldap://${LDAP_IP} -D "cn=${LDAP_ADMIN_USERNAME},${ldap_root}" -x -w "${LDAP_ADMIN_PASSWORD}" -b "cn=${CHOIX_MAIL},ou=users,${ldap_root}" | grep -i nextcloudquota | cut -c 17-60
@@ -247,11 +244,11 @@ infoEmail() {
 					;;
 			A | a )
 					searchEmail alias
-                			echo "------------------------------------------------"
+          echo "------------------------------------------------"
 					echo  " Alias : ${CHOIX_MAIL} "
 					echo ""
 					for INFOALIAS in $(ldapsearch -H ldap://${LDAP_IP} -x -D "cn=${LDAP_ADMIN_USERNAME},${ldap_root}" \
-                		        -w "${LDAP_ADMIN_PASSWORD}" -b "${ldap_root}" "(&(objectclass=PostfixBookMailForward)(cn=*${CHOIX_MAIL}*))" mail \
+          -w "${LDAP_ADMIN_PASSWORD}" -b "${ldap_root}" "(&(objectclass=PostfixBookMailForward)(cn=*${CHOIX_MAIL}*))" mail \
 					| grep ^mail: | sed -e 's/^mail://')
 					do
 						echo -ne "=====> ${GREEN}  "
@@ -282,17 +279,17 @@ searchDestroy() {
 			-x -D "cn=${LDAP_ADMIN_USERNAME},${ldap_root}" \
 			-w "${LDAP_ADMIN_PASSWORD}" \
 			-b "${ldap_root}" "(&(objectclass=inetOrgPerson)(cn=*${REP_SEARCH_DESTROY}*))" | grep ^mailDeSecours | sed -e 's/^mailDeSecours: //')
-			echo "CHOIX=$REP_SEARCH_DESTROY"
-			echo "SECOURS=${MAIL_SECOURS}"
-			echo "domaine en cours : ${DOMAINE_EN_COURS}"
+			echo "Mail en cours = $REP_SEARCH_DESTROY"
+			echo "Mail de secours = ${MAIL_SECOURS}"
+			echo "Domaine en cours : ${DOMAINE_EN_COURS}"
 			echo "---------------------------------   SUPPRESION ----------------------------------------"
 			while :
 			do
-	                        echo "----------------------------------------------------------------------"
-        	                printKazMsg "${GREEN}${ACTION_EN_COURS}${NC}"
-                	        echo "----------------------------------------------------------------------"
+	          echo "----------------------------------------------------------------------"
+        	  printKazMsg "${GREEN}${ACTION_EN_COURS}${NC}"
+            echo "----------------------------------------------------------------------"
 				echo -e "${BLINK}           TOUT RETOUR EN ARRIERE EST IMPOSSIBLE ${NC}"
-  				read -p "ON CONTINUE ? [ o / n ]: " SEARCH_DESTROY_INPUT
+  			read -p "ON CONTINUE ? [ o / n ]: " SEARCH_DESTROY_INPUT
 				if [ "$SEARCH_DESTROY_INPUT" = "n" ] || [ "$SEARCH_DESTROY_INPUT" = "N" ]
 				then
 					searchDestroy