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 15.238

This commit is contained in:
Antonio Cañas Vargas 2016-07-01 14:40:01 +02:00
parent 5005f764fc
commit f5d2864173
5 changed files with 23 additions and 1272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1259
js/swad15.237.3.js
View File

File diff suppressed because it is too large Load Diff

6
swad_changelog.h
View File

@ -125,7 +125,6 @@
// TODO: FIX BUG: Searching messages received gives unordered list
// TODO: Put Raúl Hinojosa (iSWAD developer) in a row of marks file of EC (B,C) and publish file
// TODO: Fill hidden subject and content of message in selectors of class photo / list
// TODO: Add path to information about file in notifications
// TODO: Add new WS functions to count the number of users to return in call to functions getUsers/findUsers?
@ -134,13 +133,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.237.3 (2016-07-01)"
#define Log_PLATFORM_VERSION "SWAD 15.238 (2016-07-01)"
#define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.237.3.js"
#define JS_FILE "swad15.238.js"
// 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 15.238: Jul 01, 2015 Hidden fields in in selectors of class photo / list with message subject and content. (203274 lines)
Version 15.237.3: Jul 01, 2015 Fixed bug in messages. (203257 lines)
Version 15.237.2: Jul 01, 2015 Fixed minor problem in textarea for message content. (203261 lines)
Version 15.237.1: Jul 01, 2015 Code refactoring in function to send e-mail to students. (203254 lines)

28
swad_message.c
View File

@ -149,9 +149,9 @@ void Msg_FormMsgUsrs (void)
{
char Content[Cns_MAX_BYTES_LONG_TEXT+1];
/***** Get possible subject and body of the message *****/
Par_GetParToHTML ("Subject",Gbl.Msg.Subject,Cns_MAX_BYTES_SUBJECT);
Par_GetParAndChangeFormat ("Content",Content,Cns_MAX_BYTES_LONG_TEXT,
/***** Get possible hidden subject and content of the message *****/
Par_GetParToHTML ("HiddenSubject",Gbl.Msg.Subject,Cns_MAX_BYTES_SUBJECT);
Par_GetParAndChangeFormat ("HiddenContent",Content,Cns_MAX_BYTES_LONG_TEXT,
Str_TO_TEXT,false);
Msg_PutFormMsgUsrs (Content);
@ -357,13 +357,21 @@ static void Msg_PutParamsShowMorePotentialRecipients (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
Usr_PutParamOtherUsrCodEncrypted ();
/***** Hidden params to send subject and content *****/
Msg_PutHiddenParamsSubjectAndContent ();
}
/*****************************************************************************/
/********** Put hidden parameters with message subject and content ***********/
/*****************************************************************************/
void Msg_PutHiddenParamsSubjectAndContent (void)
{
/***** Hidden params to send subject and content.
When the user edit the subject or the content,
they are copied here. *****/
fprintf (Gbl.F.Out,"<input type=\"hidden\" id=\"ShowMoreRecipientsSubject\""
" name=\"Subject\" value=\"\" />"
"<input type=\"hidden\" id=\"ShowMoreRecipientsContent\""
" name=\"Content\" value=\"\" />");
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"HiddenSubject\" value=\"\" />"
"<input type=\"hidden\" name=\"HiddenContent\" value=\"\" />");
}
/*****************************************************************************/
@ -477,7 +485,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgSubject\" name=\"Subject\""
" cols=\"72\" rows=\"2\""
" onblur=\"CopyMessageToShowMoreRecipients();\">",
" onblur=\"CopyMessageToHiddenFields();\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Subject);
@ -526,7 +534,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\""
" cols=\"72\" rows=\"20\""
" onblur=\"CopyMessageToShowMoreRecipients();\">",
" onblur=\"CopyMessageToHiddenFields();\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Message);
/* Start textarea with a '\n', that will be not visible in textarea.
@ -557,7 +565,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\""
" cols=\"72\" rows=\"20\""
" onblur=\"CopyMessageToShowMoreRecipients();\">",
" onblur=\"CopyMessageToHiddenFields();\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Message);

1
swad_message.h
View File

@ -57,6 +57,7 @@ typedef enum
/*****************************************************************************/
void Msg_FormMsgUsrs (void);
void Msg_PutHiddenParamsSubjectAndContent (void);
void Msg_PutHiddenParamAnotherRecipient (const struct UsrData *UsrDat);
void Msg_PutHiddenParamOtherRecipients (void);
void Msg_RecMsgFromUsr (void);

1
swad_user.c
View File

@ -4934,6 +4934,7 @@ void Usr_PutExtraParamsUsrList (Act_Action_t NextAction)
case ActReqMsgUsr:
Usr_PutHiddenParUsrCodAll (NextAction,Gbl.Usrs.Select.All);
Msg_PutHiddenParamOtherRecipients ();
Msg_PutHiddenParamsSubjectAndContent ();
if (Gbl.Msg.Reply.IsReply)
{
Par_PutHiddenParamChar ("IsReply",'Y');