");
- /***** Start section with user list *****/
- Lay_StartSection (Usr_USER_LIST_SECTION_ID);
+ /***** Initialize structure with user's data *****/
+ Usr_UsrDataConstructor (&UsrDat);
- if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
+ /***** Get email addresses of the selected users *****/
+ StrAddresses[0] = '\0';
+ Ptr = Gbl.Usrs.Selected.List[Rol_UNK];
+ while (*Ptr)
{
- if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs,NULL,NULL))
- {
- /***** Initialize structure with user's data *****/
- Usr_UsrDataConstructor (&UsrDat);
+ /* Get next user */
+ Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
+ Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat);
- /***** List the students' email addresses *****/
- fprintf (Gbl.F.Out,"
");
- for (NumUsr = 0, NumStdsWithEmail = 0, NumAcceptedStdsWithEmail = 0,
- StrAddresses[0] = '\0';
- NumUsr < Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs;
- NumUsr++)
- {
- /* Copy user's basic data from list */
- Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol_STD].Lst[NumUsr]);
+ /* Get user's email */
+ Mai_GetEmailFromUsrCod (&UsrDat);
- /* Get user's email */
- Mai_GetEmailFromUsrCod (&UsrDat);
+ if (UsrDat.Email[0])
+ {
+ NumUsrsWithEmail++;
- if (UsrDat.Email[0])
+ /* Check if users has accepted inscription in current course */
+ UsrDat.Accepted = Usr_CheckIfUsrHasAcceptedInCurrentCrs (&UsrDat);
+
+ if (UsrDat.Accepted) // If student has email and has accepted
+ {
+ if (NumAcceptedUsrsWithEmail > 0)
{
- NumStdsWithEmail++;
- if (UsrDat.Accepted) // If student has email and has accepted
- {
- if (NumAcceptedStdsWithEmail > 0)
- {
- fprintf (Gbl.F.Out,", ");
- LengthStrAddr ++;
- if (LengthStrAddr > Mai_MAX_BYTES_STR_ADDR)
- Lay_ShowErrorAndExit ("The space allocated to store email addresses is full.");
- Str_Concat (StrAddresses,",",
- Mai_MAX_BYTES_STR_ADDR);
- }
- LengthStrAddr += strlen (UsrDat.Email);
- if (LengthStrAddr > Mai_MAX_BYTES_STR_ADDR)
- Lay_ShowErrorAndExit ("The space allocated to store email addresses is full.");
- Str_Concat (StrAddresses,UsrDat.Email,
- Mai_MAX_BYTES_STR_ADDR);
- fprintf (Gbl.F.Out,"
%s",
- UsrDat.Email,Gbl.Hierarchy.Crs.FullName,UsrDat.Email);
-
- NumAcceptedStdsWithEmail++;
- }
+ fprintf (Gbl.F.Out,", ");
+ LengthStrAddr ++;
+ if (LengthStrAddr > Mai_MAX_BYTES_STR_ADDR)
+ Lay_ShowErrorAndExit ("The space allocated to store email addresses is full.");
+ Str_Concat (StrAddresses,",",
+ Mai_MAX_BYTES_STR_ADDR);
}
- }
- fprintf (Gbl.F.Out,"
");
+ LengthStrAddr += strlen (UsrDat.Email);
+ if (LengthStrAddr > Mai_MAX_BYTES_STR_ADDR)
+ Lay_ShowErrorAndExit ("The space allocated to store email addresses is full.");
+ Str_Concat (StrAddresses,UsrDat.Email,
+ Mai_MAX_BYTES_STR_ADDR);
+ fprintf (Gbl.F.Out,"
%s",
+ UsrDat.Email,Gbl.Hierarchy.Crs.FullName,UsrDat.Email);
- /***** Free memory used for user's data *****/
- Usr_UsrDataDestructor (&UsrDat);
-
- /***** Show a message with the number of students with email ****/
- fprintf (Gbl.F.Out,"
");
- fprintf (Gbl.F.Out,Txt_X_students_who_have_email,
- NumStdsWithEmail,
- ((float) NumStdsWithEmail /
- (float) Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) * 100.0,
- Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs);
- fprintf (Gbl.F.Out,"
");
-
- /***** Show a message with the number of students who have accepted and have email ****/
- fprintf (Gbl.F.Out,"
");
- fprintf (Gbl.F.Out,Txt_X_students_who_have_accepted_and_who_have_email,
- NumAcceptedStdsWithEmail,
- ((float) NumAcceptedStdsWithEmail /
- (float) Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) * 100.0,
- Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs);
- fprintf (Gbl.F.Out,"
");
-
- /***** Icon to open the client email program *****/
- fprintf (Gbl.F.Out,"");
- }
+ NumAcceptedUsrsWithEmail++;
+ }
+ }
}
- else // Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs == 0
- /***** Show warning indicating no students found *****/
- Usr_ShowWarningNoUsersFound (Rol_STD);
- /***** End section with user list *****/
- Lay_EndSection ();
+ /***** Free memory used for user's data *****/
+ Usr_UsrDataDestructor (&UsrDat);
+
+ /***** End list with users' email addresses *****/
+ fprintf (Gbl.F.Out,"
");
+ fprintf (Gbl.F.Out,Txt_X_users_who_have_email,
+ NumUsrsWithEmail);
+ fprintf (Gbl.F.Out,"
");
+
+ /***** Show a message with the number of users who have accepted and have email ****/
+ fprintf (Gbl.F.Out,"");
+ fprintf (Gbl.F.Out,Txt_X_users_who_have_accepted_and_who_have_email,
+ NumAcceptedUsrsWithEmail);
+ fprintf (Gbl.F.Out,"
");
+
+ /***** Icon to open the client email program *****/
+ fprintf (Gbl.F.Out,"");
/***** End the box used to list the emails *****/
Box_EndBox ();
-
- /***** Free memory for students list *****/
- Usr_FreeUsrsList (Rol_STD);
-
- /***** Free memory for list of selected groups *****/
- Grp_FreeListCodSelectedGrps ();
}
/*****************************************************************************/
diff --git a/swad_mail.h b/swad_mail.h
index cf4e470a..84104942 100644
--- a/swad_mail.h
+++ b/swad_mail.h
@@ -72,7 +72,8 @@ void Mai_RenameMailDomainFull (void);
void Mai_ContEditAfterChgMai (void);
void Mai_RecFormNewMailDomain (void);
-void Mai_ListEmails (void); // Creates an email message to students
+void Mai_ReqUsrsToListEmails (void);
+void Mai_GetSelectedUsrsAndListEmails (void);
bool Mai_CheckIfEmailIsValid (const char *Email);
bool Mai_GetEmailFromUsrCod (struct UsrData *UsrDat);
diff --git a/swad_menu.c b/swad_menu.c
index 2e86652a..a6d55e56 100644
--- a/swad_menu.c
+++ b/swad_menu.c
@@ -255,7 +255,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB
ActReqMsgUsr, // 4
ActSeeRcvMsg, // 5
ActSeeSntMsg, // 6
- ActMaiStd, // 7
+ ActReqMaiUsr, // 7
0, // 8
0, // 9
0, // 10
diff --git a/swad_project.c b/swad_project.c
index 6762bff0..2b52a4f9 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -1999,9 +1999,6 @@ static void Prj_AddUsrsToProject (Prj_RoleInProject_t RoleInProject)
}
}
- /***** Free memory used by list of selected users' codes *****/
- Usr_FreeListsSelectedUsrsCods ();
-
/***** Put form to edit project again *****/
Prj_RequestCreatOrEditPrj (PrjCod);
}
diff --git a/swad_text.c b/swad_text.c
index 1e2f2ff8..490b8974 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -10232,6 +10232,27 @@ const char *Txt_Email =
"Email";
#endif
+const char *Txt_Email_addresses =
+#if L==1 // ca
+ "Adreces de correu";
+#elif L==2 // de
+ "E-Mail-Adressen";
+#elif L==3 // en
+ "Email addresses";
+#elif L==4 // es
+ "Direcciones de correo";
+#elif L==5 // fr
+ "Adresses e-mail";
+#elif L==6 // gn
+ "Direcciones de correo"; // Okoteve traducción
+#elif L==7 // it
+ "Indirizzi email";
+#elif L==8 // pl
+ "Adresy e-mail";
+#elif L==9 // pt
+ "Endereços de email";
+#endif
+
const char *Txt_Email_domain_X_removed = // Warning: it is very important to include %s in the following sentences
#if L==1 // ca
"Dominio de correo