mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-17 22:15:43 +02:00
Version 15.237.2
This commit is contained in:
parent
2c70fc6956
commit
3eec99be82
|
@ -125,7 +125,6 @@
|
||||||
// TODO: FIX BUG: Searching messages received gives unordered list
|
// 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: Put Raúl Hinojosa (iSWAD developer) in a row of marks file of EC (B,C) and publish file
|
||||||
// TODO: Check if white lines are correct when composing a message and clicking in "Show more recipients"
|
|
||||||
// TODO: Fill hidden subject and content of message in selectors of class photo / list
|
// 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 path to information about file in notifications
|
||||||
|
|
||||||
|
@ -135,13 +134,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.237.1 (2016-07-01)"
|
#define Log_PLATFORM_VERSION "SWAD 15.237.2 (2016-07-01)"
|
||||||
#define CSS_FILE "swad15.229.css"
|
#define CSS_FILE "swad15.229.css"
|
||||||
#define JS_FILE "swad15.237.js"
|
#define JS_FILE "swad15.237.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.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)
|
Version 15.237.1: Jul 01, 2015 Code refactoring in function to send e-mail to students. (203254 lines)
|
||||||
Version 15.237: Jul 01, 2015 The form "Show more recipients" now have a hidden field with the content. (203243 lines)
|
Version 15.237: Jul 01, 2015 The form "Show more recipients" now have a hidden field with the content. (203243 lines)
|
||||||
Version 15.236: Jun 30, 2015 The form "Show more recipients" now have a hidden field with the subject. (? lines)
|
Version 15.236: Jun 30, 2015 The form "Show more recipients" now have a hidden field with the subject. (? lines)
|
||||||
|
|
|
@ -42,8 +42,6 @@
|
||||||
#include "swad_file.h"
|
#include "swad_file.h"
|
||||||
#include "swad_string.h"
|
#include "swad_string.h"
|
||||||
|
|
||||||
#include "swad_database.h" // Only for debug purposes. Remove this line!
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/************** External global variables from others modules ****************/
|
/************** External global variables from others modules ****************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -528,9 +528,17 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
|
||||||
" cols=\"72\" rows=\"20\""
|
" cols=\"72\" rows=\"20\""
|
||||||
" onblur=\"CopyContentToShowMoreRecipients();\">",
|
" onblur=\"CopyContentToShowMoreRecipients();\">",
|
||||||
The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Message);
|
The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Message);
|
||||||
|
|
||||||
|
/* Start textarea with a '\n', that will be not visible in textarea.
|
||||||
|
When Content is "\nLorem ipsum" (a white line before "Lorem ipsum"),
|
||||||
|
if we don't put the initial '\n' ==> the form will be sent starting
|
||||||
|
by "Lorem", without the white line */
|
||||||
|
fprintf (Gbl.F.Out,"\n");
|
||||||
|
|
||||||
if (!SubjectAndContentComeFromForm)
|
if (!SubjectAndContentComeFromForm)
|
||||||
fprintf (Gbl.F.Out,"\n\n\n\n\n----- %s -----\n",
|
fprintf (Gbl.F.Out,"\n\n----- %s -----\n",
|
||||||
Txt_Original_message);
|
Txt_Original_message);
|
||||||
|
|
||||||
Msg_WriteMsgContent (Content,Cns_MAX_BYTES_LONG_TEXT,false,true);
|
Msg_WriteMsgContent (Content,Cns_MAX_BYTES_LONG_TEXT,false,true);
|
||||||
}
|
}
|
||||||
else // It's not a reply
|
else // It's not a reply
|
||||||
|
@ -549,11 +557,15 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
|
||||||
"<td class=\"LEFT_MIDDLE\">"
|
"<td class=\"LEFT_MIDDLE\">"
|
||||||
"<textarea id=\"MsgContent\" name=\"Content\""
|
"<textarea id=\"MsgContent\" name=\"Content\""
|
||||||
" cols=\"72\" rows=\"20\""
|
" cols=\"72\" rows=\"20\""
|
||||||
" onblur=\"CopyContentToShowMoreRecipients();\">"
|
" onblur=\"CopyContentToShowMoreRecipients();\">",
|
||||||
"%s",
|
|
||||||
The_ClassForm[Gbl.Prefs.Theme],
|
The_ClassForm[Gbl.Prefs.Theme],
|
||||||
Txt_MSG_Message,
|
Txt_MSG_Message);
|
||||||
Content);
|
|
||||||
|
/* Start textarea with a '\n', that will be not visible in textarea.
|
||||||
|
When Content is "\nLorem ipsum" (a white line before "Lorem ipsum"),
|
||||||
|
if we don't put the initial '\n' ==> the form will be sent starting
|
||||||
|
by "Lorem", without the white line */
|
||||||
|
fprintf (Gbl.F.Out,"\n%s",Content);
|
||||||
}
|
}
|
||||||
fprintf (Gbl.F.Out,"</textarea>"
|
fprintf (Gbl.F.Out,"</textarea>"
|
||||||
"</td>"
|
"</td>"
|
||||||
|
|
|
@ -33,8 +33,6 @@
|
||||||
#include "swad_action.h"
|
#include "swad_action.h"
|
||||||
#include "swad_config.h"
|
#include "swad_config.h"
|
||||||
|
|
||||||
#include "swad_database.h" // TODO: remove when debug ends
|
|
||||||
|
|
||||||
#include "swad_global.h"
|
#include "swad_global.h"
|
||||||
#include "swad_parameter.h"
|
#include "swad_parameter.h"
|
||||||
#include "swad_password.h"
|
#include "swad_password.h"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user