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

Version18.73.4

This commit is contained in:
Antonio Cañas Vargas 2019-03-12 10:47:40 +01:00
parent 32b8878960
commit 29e260ceea
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_action.c
View File

@ -2864,7 +2864,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqMsgUsr */{ 26, 4,TabMsg,ActReqMsgUsr ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_FormMsgUsrs ,"marker" },
/* ActSeeRcvMsg */{ 3, 5,TabMsg,ActSeeRcvMsg ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_ShowRecMsgs ,"inbox" },
/* ActSeeSntMsg */{ 70, 6,TabMsg,ActSeeSntMsg ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_ShowSntMsgs ,"share" },
/* ActMaiStd */{ 100, 7,TabMsg,ActMaiStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Mai_ListEmails ,"envelope" },
/* ActMaiStd */{ 100, 7,TabMsg,ActMaiStd ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Mai_ListEmails ,"envelope" },
// Actions not in menu:
/* ActWriAnn */{1237,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ann_ShowFormAnnouncement ,NULL},

6
swad_changelog.h
View File

@ -432,7 +432,7 @@ Lo de mutear anuncios, en principio prefiero hacer una opci
// TODO: Intentar aumentar la velocidad de carga del timeline (comprobar ralentización al mostrar la titulación de cada usuario)
// TODO: Fix bug: Don't show icon in record to send a message is user has banned me
// TODO: Poner opción en lista de estudiantes para enviar correo electrónico
/*****************************************************************************/
/****************************** Public constants *****************************/
@ -453,10 +453,12 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.73.2 (2019-03-12)"
#define Log_PLATFORM_VERSION "SWAD 18.73.4 (2019-03-12)"
#define CSS_FILE "swad18.68.3.css"
#define JS_FILE "swad18.64.js"
/*
Version 18.73.4: Mar 12, 2019 Non-editing teachers can send email to students. (239555 lines)
Version 18.73.3: Mar 12, 2019 Don't show icon in record to send a message is user has banned me. (239553 lines)
Version 18.73.2: Mar 12, 2019 Only user's groups are selectable when sending a message. (239549 lines)
Version 18.73.1: Mar 12, 2019 Code refactoring in list of options when listing several users. (239569 lines)
Version 18.73: Mar 12, 2019 New actions to follow/unfollow several users. Suggested by José María Guirao Miras. (239658 lines)

3
swad_message.c
View File

@ -151,7 +151,6 @@ static void Msg_WriteMsgTo (long MsgCod);
static void Msg_PutFormToBanSender (struct UsrData *UsrDat);
static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat);
static void Msg_UnbanSender (void);
static bool Msg_CheckIfUsrIsBanned (long FromUsrCod,long ToUsrCod);
/*****************************************************************************/
/***************** Put a form to write a new message to users ****************/
@ -3763,7 +3762,7 @@ static void Msg_UnbanSender (void)
/**************** Chech if a user is banned by another user ******************/
/*****************************************************************************/
static bool Msg_CheckIfUsrIsBanned (long FromUsrCod,long ToUsrCod)
bool Msg_CheckIfUsrIsBanned (long FromUsrCod,long ToUsrCod)
{
/***** Get if FromUsrCod is banned by ToUsrCod *****/
return (DB_QueryCOUNT ("can not check if a user is banned",

1
swad_message.h
View File

@ -110,6 +110,7 @@ void Msg_PutHiddenParamMsgCod (long MsgCod);
void Msg_BanSenderWhenShowingMsgs (void);
void Msg_UnbanSenderWhenShowingMsgs (void);
void Msg_UnbanSenderWhenListingUsrs (void);
bool Msg_CheckIfUsrIsBanned (long FromUsrCod,long ToUsrCod);
void Msg_RemoveUsrFromBanned (long UsrCod);
void Msg_ListBannedUsrs (void);

10
swad_record.c
View File

@ -2467,6 +2467,7 @@ static void Rec_PutIconsCommands (void)
extern const char *Txt_Follow;
bool ItsMe = Usr_ItsMe (Gbl.Record.UsrDat->UsrCod);
bool ICanViewUsrProfile;
bool RecipientHasBannedMe;
Act_Action_t NextAction;
if (!Gbl.Form.Inside && // Only if not inside another form
@ -2598,9 +2599,12 @@ static void Rec_PutIconsCommands (void)
QR_PutLinkToPrintQRCode (ActPrnUsrQR,Rec_PutParamUsrCodEncrypted);
/***** Button to send a message *****/
Lay_PutContextualLinkOnlyIcon (ActReqMsgUsr,NULL,Rec_PutParamsMsgUsr,
"envelope.svg",
Txt_Write_a_message);
RecipientHasBannedMe = Msg_CheckIfUsrIsBanned (Gbl.Usrs.Me.UsrDat.UsrCod, // From:
Gbl.Record.UsrDat->UsrCod); // To:
if (!RecipientHasBannedMe)
Lay_PutContextualLinkOnlyIcon (ActReqMsgUsr,NULL,Rec_PutParamsMsgUsr,
"envelope.svg",
Txt_Write_a_message);
/***** Button to follow / unfollow *****/
if (!ItsMe) // Not me