Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-14 04:36:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.241.5

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-07-04 18:17:53 +02:00
parent 6f1b939c47
commit d14c030fa6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -136,13 +136,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.241.4 (2016-07-04)" #define Log_PLATFORM_VERSION "SWAD 15.241.5 (2016-07-04)"
#define CSS_FILE "swad15.229.css" #define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.1.js" #define JS_FILE "swad15.238.1.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.241.5: Jul 04, 2015 Fix bug in form to compose message. (203628 lines)
Version 15.241.4: Jul 04, 2015 Changes in form to compose message. (203624 lines) Version 15.241.4: Jul 04, 2015 Changes in form to compose message. (203624 lines)
Version 15.241.3: Jul 04, 2015 Changes in layout of form to compose message. Version 15.241.3: Jul 04, 2015 Changes in layout of form to compose message.
Code optimization in list of selected users. (203628 lines) Code optimization in list of selected users. (203628 lines)

17
swad_message.c
View File

@ -171,7 +171,7 @@ static void Msg_PutFormMsgUsrs (char *Content)
char YN[1+1]; char YN[1+1];
unsigned NumUsrsInCrs; unsigned NumUsrsInCrs;
bool ShowUsrsInCrs = false; bool ShowUsrsInCrs = false;
bool GetListUsrs = !Gbl.Msg.ShowOnlyOneRecipient && // Show list of potential recipients bool GetUsrsInCrs = !Gbl.Msg.ShowOnlyOneRecipient && // Show list of potential recipients
(Gbl.Usrs.Me.IBelongToCurrentCrs || // If there is a course selected and I belong to it (Gbl.Usrs.Me.IBelongToCurrentCrs || // If there is a course selected and I belong to it
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
@ -209,7 +209,7 @@ static void Msg_PutFormMsgUsrs (char *Content)
else else
{ {
/***** Get list of users belonging to the current course *****/ /***** Get list of users belonging to the current course *****/
if (GetListUsrs) if (GetUsrsInCrs)
{ {
/***** Get and update type of list, /***** Get and update type of list,
number of columns in class photo number of columns in class photo
@ -236,10 +236,10 @@ static void Msg_PutFormMsgUsrs (char *Content)
/***** Get lists of selected users *****/ /***** Get lists of selected users *****/
Usr_GetListsSelectedUsrsCods (); Usr_GetListsSelectedUsrsCods ();
} }
}
/***** Get list of users' IDs or nicknames written explicitely *****/ /***** Get list of users' IDs or nicknames written explicitely *****/
Usr_GetListMsgRecipientsWrittenExplicitelyBySender (false); Usr_GetListMsgRecipientsWrittenExplicitelyBySender (false);
}
} }
/***** Start form to select recipients and write the message *****/ /***** Start form to select recipients and write the message *****/
@ -310,8 +310,11 @@ static void Msg_PutFormMsgUsrs (char *Content)
Usr_FreeListOtherRecipients (); Usr_FreeListOtherRecipients ();
/***** Free memory used for by the lists of users *****/ /***** Free memory used for by the lists of users *****/
Usr_FreeUsrsList (Rol_TEACHER); if (GetUsrsInCrs)
Usr_FreeUsrsList (Rol_STUDENT); {
Usr_FreeUsrsList (Rol_TEACHER);
Usr_FreeUsrsList (Rol_STUDENT);
}
/***** Free memory used by list of selected users' codes *****/ /***** Free memory used by list of selected users' codes *****/
Usr_FreeListsSelectedUsrsCods (); Usr_FreeListsSelectedUsrsCods ();