Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.19.1

This commit is contained in:
Antonio Cañas Vargas 2016-10-10 20:02:47 +02:00
parent ce45f328b4
commit 5c7ee9a192
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
swad_account.c
View File

@ -437,6 +437,10 @@ void Acc_ShowFormChangeMyAccount (void)
IShouldFillID = true;
}
/***** Show alert to report that confirmation e-mail has been sent *****/
if (Gbl.Usrs.Me.ConfirmEmailJustSent)
Mai_ShowMsgConfirmEmailHasBeenSent ();
/***** Put links to change my password and to remove my account*****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Pwd_PutLinkToChangeMyPassword ();
@ -462,17 +466,12 @@ void Acc_ShowFormChangeMyAccount (void)
Acc_PrintAccountSeparator ();
/***** E-mail *****/
if (IMustFillEmail || IShouldConfirmEmail ||
Gbl.Usrs.Me.ConfirmEmailJustSent)
if (IMustFillEmail || IShouldConfirmEmail)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
if (IMustFillEmail)
Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_email_address);
else if (IShouldConfirmEmail)
Lay_ShowAlert (Lay_WARNING,Txt_Please_check_and_confirm_your_email_address);
else // Gbl.Usrs.Me.ConfirmEmailJustSent
Mai_ShowMsgConfirmEmailHasBeenSent ();
Lay_ShowAlert (Lay_WARNING,IMustFillEmail ? Txt_Please_fill_in_your_email_address :
Txt_Please_check_and_confirm_your_email_address);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}

2
swad_changelog.h
View File

@ -155,7 +155,7 @@
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 16.19.1: Oct 10, 2016 Message to report that confirmation e-mail has been sent. (? lines)
Version 16.19.1: Oct 10, 2016 Message to report that confirmation e-mail has been sent. (205203 lines)
Version 16.19: Oct 10, 2016 Warning in User > Session to confirm user's e-mail address.
Changes in form to edit user's account. (205194 lines)
Version 16.18.1: Oct 10, 2016 Warning in User > Account to confirm user's e-mail address. (205116 lines)

3
swad_mail.c
View File

@ -1407,8 +1407,7 @@ static void Mai_NewUsrEmail (struct UsrData *UsrDat,bool ItsMe)
/***** Send message via email
to confirm the new email address *****/
if (ItsMe)
if (Mai_SendMailMsgToConfirmEmail ())
Mai_ShowMsgConfirmEmailHasBeenSent ();
Mai_SendMailMsgToConfirmEmail ();
}
else
{