From 721c8b085e709c23a8f3b9f03c2c6ba5ca59aec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 9 Oct 2018 22:15:12 +0200 Subject: [PATCH] Version 18.3.4 --- swad_account.c | 8 +++++++- swad_changelog.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/swad_account.c b/swad_account.c index 51b404c07..9e99c938a 100644 --- a/swad_account.c +++ b/swad_account.c @@ -900,10 +900,12 @@ void Acc_GetUsrCodAndRemUsrGbl (void) void Acc_ReqRemAccountOrRemAccount (Acc_ReqOrRemUsr_t RequestOrRemove) { + bool ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod); + switch (RequestOrRemove) { case Acc_REQUEST_REMOVE_USR: // Ask if eliminate completely the user from the platform - Acc_AskIfRemoveUsrAccount (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod); + Acc_AskIfRemoveUsrAccount (ItsMe); break; case Acc_REMOVE_USR: // Eliminate completely the user from the platform if (Pwd_GetConfirmationOnDangerousAction ()) @@ -913,6 +915,8 @@ void Acc_ReqRemAccountOrRemAccount (Acc_ReqOrRemUsr_t RequestOrRemove) /***** Move unused contents of messages to table of deleted contents of messages *****/ Msg_MoveUnusedMsgsContentToDeleted (); } + else + Acc_AskIfRemoveUsrAccount (ItsMe); break; } } @@ -1014,6 +1018,8 @@ void Acc_RemoveMyAccount (void) /***** Move unused contents of messages to table of deleted contents of messages *****/ Msg_MoveUnusedMsgsContentToDeleted (); } + else + Acc_AskIfRemoveUsrAccount (true); } void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, diff --git a/swad_changelog.h b/swad_changelog.h index f6f75cf1d..b311c6164 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -355,10 +355,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.3.3 (2018-10-09)" +#define Log_PLATFORM_VERSION "SWAD 18.3.4 (2018-10-09)" #define CSS_FILE "swad18.3.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.3.4: Oct 09, 2018 Changes in form to remove account. (234938 lines) Version 18.3.3: Oct 09, 2018 Changes in form to remove account. (234932 lines) Version 18.3.2: Oct 09, 2018 Changes in form to change password. (234935 lines) Version 18.3.1: Oct 09, 2018 Changes in layout of session option. (234904 lines)