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

Version19.50.3

This commit is contained in:
Antonio Cañas Vargas 2019-11-02 11:45:41 +01:00
parent e649d7e4a4
commit 4d9493c185
21 changed files with 76 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_agenda.c
View File

@ -713,7 +713,6 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
{ {
extern const char *Dat_TimeStatusClassVisible[Dat_NUM_TIME_STATUS]; extern const char *Dat_TimeStatusClassVisible[Dat_NUM_TIME_STATUS];
extern const char *Dat_TimeStatusClassHidden[Dat_NUM_TIME_STATUS]; extern const char *Dat_TimeStatusClassHidden[Dat_NUM_TIME_STATUS];
extern const char *Txt_Today;
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
@ -756,8 +755,8 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
Dat_TimeStatusClassVisible[AgdEvent.TimeStatus], Dat_TimeStatusClassVisible[AgdEvent.TimeStatus],
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,AgdEvent.TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,AgdEvent.TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x6); true,true,true,0x6);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
} }

5
swad_assignment.c
View File

@ -339,7 +339,6 @@ void Asg_PrintOneAssignment (void)
static void Asg_ShowOneAssignment (long AsgCod,bool PrintView) static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
{ {
extern const char *Txt_Today;
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
@ -392,8 +391,8 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
"DATE_RED"), "DATE_RED"),
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Asg.TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,Asg.TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
} }

15
swad_attendance.c
View File

@ -371,7 +371,6 @@ static void Att_PutParamsToCreateNewAttEvent (void)
static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAttEventComplete) static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAttEventComplete)
{ {
extern const char *Txt_Today;
extern const char *Txt_View_event; extern const char *Txt_View_event;
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
@ -429,8 +428,8 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
"DATE_RED"), "DATE_RED"),
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Att->TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,Att->TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
} }
@ -3074,7 +3073,6 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
extern const char *Txt_Events; extern const char *Txt_Events;
extern const char *Txt_Event; extern const char *Txt_Event;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Today;
extern const char *Txt_Update_attendance; extern const char *Txt_Update_attendance;
unsigned UniqueId; unsigned UniqueId;
char *Id; char *Id;
@ -3145,8 +3143,8 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
"</label>", "</label>",
NumAttEvent,Id); NumAttEvent,Id);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME], Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -3491,7 +3489,6 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumUsrsInList,
static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
{ {
extern const char *Txt_Today;
extern const char *Txt_Student_comment; extern const char *Txt_Student_comment;
extern const char *Txt_Teachers_comment; extern const char *Txt_Teachers_comment;
char PhotoURL[PATH_MAX + 1]; char PhotoURL[PATH_MAX + 1];
@ -3591,8 +3588,8 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
Id, Id,
Gbl.AttEvents.Lst[NumAttEvent].Title); Gbl.AttEvents.Lst[NumAttEvent].Title);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME], Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);

3
swad_changelog.h
View File

@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.50.2 (2019-11-01)" #define Log_PLATFORM_VERSION "SWAD 19.50.3 (2019-11-01)"
#define CSS_FILE "swad19.47.css" #define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.39.js" #define JS_FILE "swad19.39.js"
/* /*
@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia) // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
Version 19.50.3: Nov 02, 2019 Code refactoring related with writing of local date-time. (246059 lines)
Version 19.50.2: Nov 01, 2019 Code refactoring related with writing of local date-time. (246079 lines) Version 19.50.2: Nov 01, 2019 Code refactoring related with writing of local date-time. (246079 lines)
Version 19.50.1: Nov 01, 2019 Code refactoring related with writing of local date-time. (246088 lines) Version 19.50.1: Nov 01, 2019 Code refactoring related with writing of local date-time. (246088 lines)
Version 19.50: Nov 01, 2019 Code refactoring related with writing of local date-time. (246016 lines) Version 19.50: Nov 01, 2019 Code refactoring related with writing of local date-time. (246016 lines)

4
swad_connected.c
View File

@ -104,8 +104,8 @@ void Con_ShowConnectedUsrs (void)
Box_BoxBegin (NULL,Gbl.Title,Con_PutIconToUpdateConnected, Box_BoxBegin (NULL,Gbl.Title,Con_PutIconToUpdateConnected,
Hlp_USERS_Connected,Box_NOT_CLOSABLE); Hlp_USERS_Connected,Box_NOT_CLOSABLE);
Dat_WriteLocalDateHMSFromUTC ("connected_current_time",Gbl.StartExecutionTimeUTC, Dat_WriteLocalDateHMSFromUTC ("connected_current_time",Gbl.StartExecutionTimeUTC,
Gbl.Prefs.DateFormat,",&nbsp;","", Gbl.Prefs.DateFormat,",&nbsp;",
false,true,0x7); false,false,true,0x7);
/***** Number of connected users in the whole platform *****/ /***** Number of connected users in the whole platform *****/
Con_ShowGlobalConnectedUsrs (); Con_ShowGlobalConnectedUsrs ();

14
swad_date.c
View File

@ -171,8 +171,8 @@ void Dat_PutScriptDateFormat (Dat_Format_t Format)
if (asprintf (&Id,"date_format_%u",(unsigned) Format) < 0) if (asprintf (&Id,"date_format_%u",(unsigned) Format) < 0)
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.StartExecutionTimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,Gbl.StartExecutionTimeUTC,
Format,"","", Format,"",
true,false,0x0); false,true,false,0x0);
free ((void *) Id); free ((void *) Id);
} }
@ -1615,13 +1615,17 @@ void Dat_WriteHoursMinutesSeconds (struct Time *Time)
/*****************************************************************************/ /*****************************************************************************/
void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC, void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC,
Dat_Format_t DateFormat,const char *Separator,const char *StrToday, Dat_Format_t DateFormat,const char *Separator,
bool WriteDateOnSameDay,bool WriteWeekDay,unsigned WriteHMS) bool WriteToday,bool WriteDateOnSameDay,
bool WriteWeekDay,unsigned WriteHMS)
{ {
extern const char *Txt_Today;
HTM_SCRIPT_Begin (NULL,NULL); HTM_SCRIPT_Begin (NULL,NULL);
fprintf (Gbl.F.Out,"writeLocalDateHMSFromUTC('%s',%ld,%u,'%s','%s',%s,%s,0x%x);", fprintf (Gbl.F.Out,"writeLocalDateHMSFromUTC('%s',%ld,%u,'%s','%s',%s,%s,0x%x);",
Id,(long) TimeUTC,(unsigned) DateFormat,Separator, Id,(long) TimeUTC,(unsigned) DateFormat,Separator,
StrToday, WriteToday ? Txt_Today :
"",
WriteDateOnSameDay ? "true" : WriteDateOnSameDay ? "true" :
"false", "false",
WriteWeekDay ? "true" : WriteWeekDay ? "true" :

5
swad_date.h
View File

@ -194,7 +194,8 @@ void Dat_WriteHoursMinutesSecondsFromSeconds (time_t Seconds);
void Dat_WriteHoursMinutesSeconds (struct Time *Time); void Dat_WriteHoursMinutesSeconds (struct Time *Time);
void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC, void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC,
Dat_Format_t DateFormat,const char *Separator,const char *StrToday, Dat_Format_t DateFormat,const char *Separator,
bool WriteDateOnSameDay,bool WriteWeekDay,unsigned WriteHMS); bool WriteToday,bool WriteDateOnSameDay,
bool WriteWeekDay,unsigned WriteHMS);
#endif #endif

19
swad_file_browser.c
View File

@ -6385,7 +6385,6 @@ void Brw_CreateTmpPublicLinkToPrivateFile (const char *FullPathIncludingFile,
static void Brw_WriteDatesAssignment (void) static void Brw_WriteDatesAssignment (void)
{ {
extern const char *Txt_Today;
extern const char *Txt_unknown_assignment; extern const char *Txt_unknown_assignment;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
@ -6404,8 +6403,8 @@ static void Brw_WriteDatesAssignment (void)
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"<span id=\"%s\">",Id); fprintf (Gbl.F.Out,"<span id=\"%s\">",Id);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME], Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME],
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,false,0x7); true,true,false,0x7);
fprintf (Gbl.F.Out,"</span>"); fprintf (Gbl.F.Out,"</span>");
free ((void *) Id); free ((void *) Id);
@ -6417,8 +6416,8 @@ static void Brw_WriteDatesAssignment (void)
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"<span id=\"%s\">",Id); fprintf (Gbl.F.Out,"<span id=\"%s\">",Id);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_END_TIME], Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_END_TIME],
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
false,false,0x7); true,false,false,0x7);
fprintf (Gbl.F.Out,"</span>"); fprintf (Gbl.F.Out,"</span>");
free ((void *) Id); free ((void *) Id);
} }
@ -6433,7 +6432,6 @@ static void Brw_WriteDatesAssignment (void)
static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata) static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
{ {
extern const char *Txt_Today;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1]; char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
@ -6460,8 +6458,8 @@ static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"<span id=\"%s\"></span>",Id); fprintf (Gbl.F.Out,"<span id=\"%s\"></span>",Id);
Dat_WriteLocalDateHMSFromUTC (Id,FileMetadata->Time, Dat_WriteLocalDateHMSFromUTC (Id,FileMetadata->Time,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,false,0x6); true,true,false,0x6);
free ((void *) Id); free ((void *) Id);
} }
HTM_TD_End (); HTM_TD_End ();
@ -9367,7 +9365,6 @@ void Brw_ShowFileMetadata (void)
extern const char *Txt_Uploaded_by; extern const char *Txt_Uploaded_by;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Date_of_creation; extern const char *Txt_Date_of_creation;
extern const char *Txt_Today;
extern const char *Txt_Availability; extern const char *Txt_Availability;
extern const char *Txt_Private_available_to_certain_users_identified; extern const char *Txt_Private_available_to_certain_users_identified;
extern const char *Txt_Public_open_educational_resource_OER_for_everyone; extern const char *Txt_Public_open_educational_resource_OER_for_everyone;
@ -9579,8 +9576,8 @@ void Brw_ShowFileMetadata (void)
HTM_TD_Begin ("id=\"filedate\" class=\"DAT LM\""); HTM_TD_Begin ("id=\"filedate\" class=\"DAT LM\"");
Dat_WriteLocalDateHMSFromUTC ("filedate",FileMetadata.Time, Dat_WriteLocalDateHMSFromUTC ("filedate",FileMetadata.Time,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();

5
swad_forum.c
View File

@ -3331,7 +3331,6 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
extern const char *Txt_Thread_with_posts_from_you; extern const char *Txt_Thread_with_posts_from_you;
extern const char *Txt_There_are_new_posts; extern const char *Txt_There_are_new_posts;
extern const char *Txt_No_new_posts; extern const char *Txt_No_new_posts;
extern const char *Txt_Today;
unsigned NumThr; unsigned NumThr;
unsigned NumThrInScreen; // From 0 to Pag_ITEMS_PER_PAGE-1 unsigned NumThrInScreen; // From 0 to Pag_ITEMS_PER_PAGE-1
unsigned UniqueId; unsigned UniqueId;
@ -3462,8 +3461,8 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"",Id,Style,BgColor); HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"",Id,Style,BgColor);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,false,0x6); true,true,false,0x6);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
} }

5
swad_game.c
View File

@ -370,7 +370,6 @@ void Gam_ShowOneGame (long GamCod,
{ {
extern const char *Hlp_ASSESSMENT_Games; extern const char *Hlp_ASSESSMENT_Games;
extern const char *Txt_Game; extern const char *Txt_Game;
extern const char *Txt_Today;
extern const char *Txt_View_game; extern const char *Txt_View_game;
extern const char *Txt_No_of_questions; extern const char *Txt_No_of_questions;
extern const char *Txt_Matches; extern const char *Txt_Matches;
@ -433,8 +432,8 @@ void Gam_ShowOneGame (long GamCod,
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
if (Game.TimeUTC[Dat_START_TIME]) if (Game.TimeUTC[Dat_START_TIME])
Dat_WriteLocalDateHMSFromUTC (Id,Game.TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,Game.TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
} }

5
swad_group.c
View File

@ -2321,7 +2321,6 @@ static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp,
static void Grp_WriteGrpHead (struct GroupType *GrpTyp) static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
{ {
extern const char *Txt_Opening_of_groups; extern const char *Txt_Opening_of_groups;
extern const char *Txt_Today;
extern const char *Txt_Group; extern const char *Txt_Group;
extern const char *Txt_Classroom; extern const char *Txt_Classroom;
extern const char *Txt_Max_BR_students; extern const char *Txt_Max_BR_students;
@ -2345,8 +2344,8 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
Txt_Opening_of_groups, Txt_Opening_of_groups,
Id); Id);
Dat_WriteLocalDateHMSFromUTC (Id,GrpTyp->OpenTimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,GrpTyp->OpenTimeUTC,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,true,0x7); true,true,true,0x7);
free ((void *) Id); free ((void *) Id);
} }
HTM_TD_End (); HTM_TD_End ();

5
swad_match.c
View File

@ -542,7 +542,6 @@ static void Mch_ListOneOrMoreMatchesAuthor (const struct Match *Match)
static void Mch_ListOneOrMoreMatchesTimes (const struct Match *Match,unsigned UniqueId) static void Mch_ListOneOrMoreMatchesTimes (const struct Match *Match,unsigned UniqueId)
{ {
extern const char *Txt_Today;
Dat_StartEndTime_t StartEndTime; Dat_StartEndTime_t StartEndTime;
char *Id; char *Id;
@ -558,8 +557,8 @@ static void Mch_ListOneOrMoreMatchesTimes (const struct Match *Match,unsigned Un
"DATE_GREEN", "DATE_GREEN",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Match->TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,Match->TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
} }

10
swad_match_result.c
View File

@ -352,7 +352,6 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther) static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
{ {
extern const char *Txt_Today;
extern const char *Txt_Match_result; extern const char *Txt_Match_result;
extern const char *Txt_Hidden_result; extern const char *Txt_Hidden_result;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
@ -437,8 +436,8 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
HTM_TD_Begin ("id =\"%s\" class=\"DAT LT COLOR%u\"", HTM_TD_Begin ("id =\"%s\" class=\"DAT LT COLOR%u\"",
Id,Gbl.RowEvenOdd); Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,false,0x7); true,true,false,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
} }
@ -622,7 +621,6 @@ void McR_ShowOneMchResult (void)
extern const char *Txt_The_user_does_not_exist; extern const char *Txt_The_user_does_not_exist;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME]; extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Today;
extern const char *Txt_Questions; extern const char *Txt_Questions;
extern const char *Txt_non_blank_QUESTIONS; extern const char *Txt_non_blank_QUESTIONS;
extern const char *Txt_Score; extern const char *Txt_Score;
@ -793,8 +791,8 @@ void McR_ShowOneMchResult (void)
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"DAT LT\"",Id); HTM_TD_Begin ("id=\"%s\" class=\"DAT LT\"",Id);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);

5
swad_message.c
View File

@ -3610,7 +3610,6 @@ static void Msg_WriteMsgTo (long MsgCod)
void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground) void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground)
{ {
extern const char *Txt_Today;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
@ -3624,8 +3623,8 @@ void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground)
/***** Write date and time *****/ /***** Write date and time *****/
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,false,0x6); true,true,false,0x6);
/***** End cell *****/ /***** End cell *****/
HTM_TD_End (); HTM_TD_End ();

5
swad_notice.c
View File

@ -613,7 +613,6 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
Not_Status_t Status) Not_Status_t Status)
{ {
extern const char *Txt_See_full_notice; extern const char *Txt_See_full_notice;
extern const char *Txt_Today;
static const char *ContainerClass[Not_NUM_STATUS] = static const char *ContainerClass[Not_NUM_STATUS] =
{ {
"NOTICE_CONTAINER_ACTIVE", // Not_ACTIVE_NOTICE "NOTICE_CONTAINER_ACTIVE", // Not_ACTIVE_NOTICE
@ -701,8 +700,8 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
Frm_EndForm (); Frm_EndForm ();
} }
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,false,0x6); true,true,false,0x6);
free ((void *) Id); free ((void *) Id);
HTM_DIV_End (); HTM_DIV_End ();

5
swad_profile.c
View File

@ -462,7 +462,6 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat,
extern const char *Txt_months; extern const char *Txt_months;
extern const char *Txt_day; extern const char *Txt_day;
extern const char *Txt_days; extern const char *Txt_days;
extern const char *Txt_Today;
char IdFirstClickTime[Frm_MAX_BYTES_ID + 1]; char IdFirstClickTime[Frm_MAX_BYTES_ID + 1];
int NumYears; int NumYears;
int NumMonths; int NumMonths;
@ -502,8 +501,8 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat,
fprintf (Gbl.F.Out,")"); fprintf (Gbl.F.Out,")");
} }
Dat_WriteLocalDateHMSFromUTC (IdFirstClickTime,UsrFigures->FirstClickTimeUTC, Dat_WriteLocalDateHMSFromUTC (IdFirstClickTime,UsrFigures->FirstClickTimeUTC,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,false,0x6); true,true,false,0x6);
} }
else // First click time is unknown or user never logged else // First click time is unknown or user never logged
/***** Button to fetch and store user's figures *****/ /***** Button to fetch and store user's figures *****/

18
swad_project.c
View File

@ -1023,7 +1023,6 @@ void Prj_PrintOneProject (void)
static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
Prj_ProjectView_t ProjectView) Prj_ProjectView_t ProjectView)
{ {
extern const char *Txt_Today;
extern const char *Txt_Project_files; extern const char *Txt_Project_files;
extern const char *Txt_Assigned_QUESTION; extern const char *Txt_Assigned_QUESTION;
extern const char *Txt_Yes; extern const char *Txt_Yes;
@ -1120,8 +1119,8 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
break; break;
} }
Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime, Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -1141,8 +1140,8 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
break; break;
} }
Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime, Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -1471,7 +1470,6 @@ static void Prj_PutIconToToggleProject (unsigned UniqueId,
static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj) static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
{ {
extern const char *Txt_Today;
extern const char *Txt_Yes; extern const char *Txt_Yes;
extern const char *Txt_No; extern const char *Txt_No;
extern const char *Txt_PROJECT_STATUS[Prj_NUM_PROPOSAL_TYPES]; extern const char *Txt_PROJECT_STATUS[Prj_NUM_PROPOSAL_TYPES];
@ -1500,8 +1498,8 @@ static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"", HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"",
Id,ClassDate,Gbl.RowEvenOdd); Id,ClassDate,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime, Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -1512,8 +1510,8 @@ static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"", HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"",
Id,ClassDate,Gbl.RowEvenOdd); Id,ClassDate,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime, Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);

5
swad_statistic.c
View File

@ -1535,7 +1535,6 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
extern const char *Txt_Action; extern const char *Txt_Action;
extern const char *Txt_LOG_More_info; extern const char *Txt_LOG_More_info;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Today;
unsigned long NumRow; unsigned long NumRow;
unsigned long FirstRow; // First row to show unsigned long FirstRow; // First row to show
unsigned long LastRow; // Last rows to show unsigned long LastRow; // Last rows to show
@ -1720,8 +1719,8 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Lay_NotEnoughMemoryExit (); Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"LOG RT COLOR%u\"",Id,Gbl.RowEvenOdd); HTM_TD_Begin ("id=\"%s\" class=\"LOG RT COLOR%u\"",Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Dat_GetUNIXTimeFromStr (row[3]), Dat_WriteLocalDateHMSFromUTC (Id,Dat_GetUNIXTimeFromStr (row[3]),
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,false,0x7); true,true,false,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);

9
swad_survey.c
View File

@ -422,7 +422,6 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
{ {
extern const char *Hlp_ASSESSMENT_Surveys; extern const char *Hlp_ASSESSMENT_Surveys;
extern const char *Txt_Survey; extern const char *Txt_Survey;
extern const char *Txt_Today;
extern const char *Txt_View_survey; extern const char *Txt_View_survey;
extern const char *Txt_No_of_questions; extern const char *Txt_No_of_questions;
extern const char *Txt_No_of_users; extern const char *Txt_No_of_users;
@ -489,8 +488,8 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
"DATE_RED_LIGHT"), "DATE_RED_LIGHT"),
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_START_TIME], Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_START_TIME],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -513,8 +512,8 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
"DATE_RED_LIGHT"), "DATE_RED_LIGHT"),
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_END_TIME], Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_END_TIME],
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
false,true,0x7); true,false,true,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);

20
swad_test.c
View File

@ -2802,7 +2802,6 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
extern const char *Txt_TST_STR_ORDER_SHORT[Tst_NUM_TYPES_ORDER_QST]; extern const char *Txt_TST_STR_ORDER_SHORT[Tst_NUM_TYPES_ORDER_QST];
extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES]; extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
extern const char *Txt_Shuffle; extern const char *Txt_Shuffle;
extern const char *Txt_Today;
Tst_QuestionsOrder_t Order; Tst_QuestionsOrder_t Order;
unsigned long NumRow; unsigned long NumRow;
MYSQL_ROW row; MYSQL_ROW row;
@ -2936,8 +2935,8 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\"", HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\"",
Id,Gbl.RowEvenOdd); Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,false,0x7); true,true,false,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -3062,7 +3061,6 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows,
extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES]; extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
extern const char *Txt_Shuffle; extern const char *Txt_Shuffle;
extern const char *Txt_Question; extern const char *Txt_Question;
extern const char *Txt_Today;
extern const char *Txt_Add_questions; extern const char *Txt_Add_questions;
unsigned long NumRow; unsigned long NumRow;
MYSQL_ROW row; MYSQL_ROW row;
@ -3148,8 +3146,8 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows,
HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\">", HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\">",
Id,Gbl.RowEvenOdd); Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
Gbl.Prefs.DateFormat,"<br />",Txt_Today, Gbl.Prefs.DateFormat,"<br />",
true,false,0x7); true,true,false,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -7685,7 +7683,6 @@ static void Tst_ShowHeaderTestResults (void)
static void Tst_ShowTstResults (struct UsrData *UsrDat) static void Tst_ShowTstResults (struct UsrData *UsrDat)
{ {
extern const char *Txt_Today;
extern const char *Txt_View_test; extern const char *Txt_View_test;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
MYSQL_ROW row; MYSQL_ROW row;
@ -7785,8 +7782,8 @@ static void Tst_ShowTstResults (struct UsrData *UsrDat)
HTM_TD_Begin ("id=\"%s\" class=\"%s RT COLOR%u\"", HTM_TD_Begin ("id=\"%s\" class=\"%s RT COLOR%u\"",
Id,ClassDat,Gbl.RowEvenOdd); Id,ClassDat,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC, Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,false,0x7); true,true,false,0x7);
HTM_TD_End (); HTM_TD_End ();
free ((void *) Id); free ((void *) Id);
@ -7994,7 +7991,6 @@ void Tst_ShowOneTstResult (void)
extern const char *Txt_The_user_does_not_exist; extern const char *Txt_The_user_does_not_exist;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Date; extern const char *Txt_Date;
extern const char *Txt_Today;
extern const char *Txt_Questions; extern const char *Txt_Questions;
extern const char *Txt_non_blank_QUESTIONS; extern const char *Txt_non_blank_QUESTIONS;
extern const char *Txt_Score; extern const char *Txt_Score;
@ -8123,8 +8119,8 @@ void Tst_ShowOneTstResult (void)
HTM_TD_Begin ("id=\"test\" class=\"DAT LT\""); HTM_TD_Begin ("id=\"test\" class=\"DAT LT\"");
Dat_WriteLocalDateHMSFromUTC ("test",TstTimeUTC, Dat_WriteLocalDateHMSFromUTC ("test",TstTimeUTC,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,true,0x7); true,true,true,0x7);
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();

5
swad_timeline.c
View File

@ -1776,7 +1776,6 @@ static void TL_WriteAuthorNote (const struct UsrData *UsrDat)
static void TL_WriteDateTime (time_t TimeUTC) static void TL_WriteDateTime (time_t TimeUTC)
{ {
extern const char *Txt_Today;
char IdDateTime[Frm_MAX_BYTES_ID + 1]; char IdDateTime[Frm_MAX_BYTES_ID + 1];
/***** Create unique Id *****/ /***** Create unique Id *****/
@ -1790,8 +1789,8 @@ static void TL_WriteDateTime (time_t TimeUTC)
// This must be out of the div where the output is written // This must be out of the div where the output is written
// because it will be evaluated in a loop in JavaScript // because it will be evaluated in a loop in JavaScript
Dat_WriteLocalDateHMSFromUTC (IdDateTime,TimeUTC, Dat_WriteLocalDateHMSFromUTC (IdDateTime,TimeUTC,
Gbl.Prefs.DateFormat,",&nbsp;",Txt_Today, Gbl.Prefs.DateFormat,",&nbsp;",
true,false,0x6); true,true,false,0x6);
} }
/*****************************************************************************/ /*****************************************************************************/