diff --git a/swad_agenda.c b/swad_agenda.c
index cf2b3b7a..6ba81d09 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -755,9 +755,9 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
AgdEvent.Hidden ? Dat_TimeStatusClassHidden[AgdEvent.TimeStatus] :
Dat_TimeStatusClassVisible[AgdEvent.TimeStatus],
Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x6",
- Id,AgdEvent.TimeUTC[StartEndTime],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,AgdEvent.TimeUTC[StartEndTime],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x6);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_assignment.c b/swad_assignment.c
index 6feb3739..29c14259 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -391,9 +391,9 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
(Asg.Open ? "DATE_GREEN" :
"DATE_RED"),
Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Asg.TimeUTC[StartEndTime],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Asg.TimeUTC[StartEndTime],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_attendance.c b/swad_attendance.c
index ea312f93..04c218b5 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -428,9 +428,9 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
(Att->Open ? "DATE_GREEN" :
"DATE_RED"),
Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Att->TimeUTC[StartEndTime],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Att->TimeUTC[StartEndTime],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
@@ -3144,9 +3144,9 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
""
"",
NumAttEvent,Id);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,true,0x7",
- Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -3590,10 +3590,9 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
"
%s",
Id,
Gbl.AttEvents.Lst[NumAttEvent].Title);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,true,0x7",
- Id,
- Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_changelog.h b/swad_changelog.h
index a42a7f0e..2c62fab6 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
-#define Log_PLATFORM_VERSION "SWAD 19.50.1 (2019-11-01)"
+#define Log_PLATFORM_VERSION "SWAD 19.50.2 (2019-11-01)"
#define CSS_FILE "swad19.47.css"
#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: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
+ 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: Nov 01, 2019 Code refactoring related with writing of local date-time. (246016 lines)
Version 19.49: Nov 01, 2019 Code refactoring in HTML scripts. (246052 lines)
diff --git a/swad_connected.c b/swad_connected.c
index 730a1b73..071a1a5d 100644
--- a/swad_connected.c
+++ b/swad_connected.c
@@ -103,10 +103,9 @@ void Con_ShowConnectedUsrs (void)
Txt_Connected_users);
Box_BoxBegin (NULL,Gbl.Title,Con_PutIconToUpdateConnected,
Hlp_USERS_Connected,Box_NOT_CLOSABLE);
- Dat_WriteLocalDateHMSFromUTC ("'connected_current_time',%ld,"
- "%u,', ',null,false,true,0x7",
- (long) Gbl.StartExecutionTimeUTC,
- (unsigned) Gbl.Prefs.DateFormat);
+ Dat_WriteLocalDateHMSFromUTC ("connected_current_time",Gbl.StartExecutionTimeUTC,
+ Gbl.Prefs.DateFormat,", ","",
+ false,true,0x7);
/***** Number of connected users in the whole platform *****/
Con_ShowGlobalConnectedUsrs ();
diff --git a/swad_date.c b/swad_date.c
index b560312f..df236265 100644
--- a/swad_date.c
+++ b/swad_date.c
@@ -170,9 +170,9 @@ void Dat_PutScriptDateFormat (Dat_Format_t Format)
if (asprintf (&Id,"date_format_%u",(unsigned) Format) < 0)
Lay_NotEnoughMemoryExit ();
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'',null,true,false,0x0",
- Id,(long) Gbl.StartExecutionTimeUTC,
- (unsigned) Format);
+ Dat_WriteLocalDateHMSFromUTC (Id,Gbl.StartExecutionTimeUTC,
+ Format,"","",
+ true,false,0x0);
free ((void *) Id);
}
@@ -1614,29 +1614,18 @@ void Dat_WriteHoursMinutesSeconds (struct Time *Time)
/**** Write call to JavaScript function to write local date from UTC time ****/
/*****************************************************************************/
-void Dat_WriteLocalDateHMSFromUTC (const char *fmt,...)
+void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC,
+ Dat_Format_t DateFormat,const char *Separator,const char *StrToday,
+ bool WriteDateOnSameDay,bool WriteWeekDay,unsigned WriteHMS)
{
- va_list ap;
- int NumBytesPrinted;
- char *Params;
-
- if (fmt)
- if (fmt[0])
- {
- va_start (ap,fmt);
- NumBytesPrinted = vasprintf (&Params,fmt,ap);
- va_end (ap);
-
- if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
- // or some other error occurs,
- // vasprintf will return -1
- Lay_NotEnoughMemoryExit ();
-
- /***** Print HTML *****/
- HTM_SCRIPT_Begin (NULL,NULL);
- fprintf (Gbl.F.Out,"writeLocalDateHMSFromUTC(%s);",Params);
- HTM_SCRIPT_End ();
-
- free ((void *) Params);
- }
+ HTM_SCRIPT_Begin (NULL,NULL);
+ fprintf (Gbl.F.Out,"writeLocalDateHMSFromUTC('%s',%ld,%u,'%s','%s',%s,%s,0x%x);",
+ Id,(long) TimeUTC,(unsigned) DateFormat,Separator,
+ StrToday,
+ WriteDateOnSameDay ? "true" :
+ "false",
+ WriteWeekDay ? "true" :
+ "false",
+ WriteHMS);
+ HTM_SCRIPT_End ();
}
diff --git a/swad_date.h b/swad_date.h
index 14e7487b..e8cf219c 100644
--- a/swad_date.h
+++ b/swad_date.h
@@ -193,6 +193,8 @@ void Dat_WriteScriptMonths (void);
void Dat_WriteHoursMinutesSecondsFromSeconds (time_t Seconds);
void Dat_WriteHoursMinutesSeconds (struct Time *Time);
-void Dat_WriteLocalDateHMSFromUTC (const char *fmt,...);
+void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC,
+ Dat_Format_t DateFormat,const char *Separator,const char *StrToday,
+ bool WriteDateOnSameDay,bool WriteWeekDay,unsigned WriteHMS);
#endif
diff --git a/swad_file_browser.c b/swad_file_browser.c
index e423d4ae..a7c2dcb3 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -6403,9 +6403,9 @@ static void Brw_WriteDatesAssignment (void)
if (asprintf (&Id,"asg_start_date_%u",UniqueId) < 0)
Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"",Id);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,false,0x7",
- Id,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME],
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,false,0x7);
fprintf (Gbl.F.Out,"");
free ((void *) Id);
@@ -6416,9 +6416,9 @@ static void Brw_WriteDatesAssignment (void)
if (asprintf (&Id,"asg_end_date_%u",UniqueId) < 0)
Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"",Id);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',false,false,0x7",
- Id,(long) Gbl.FileBrowser.Asg.TimeUTC[Dat_END_TIME],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_END_TIME],
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ false,false,0x7);
fprintf (Gbl.F.Out,"");
free ((void *) Id);
}
@@ -6459,9 +6459,9 @@ static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
if (asprintf (&Id,"filedate%u",UniqueId) < 0)
Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"",Id);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,false,0x6",
- Id,(long) FileMetadata->Time,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,FileMetadata->Time,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,false,0x6);
free ((void *) Id);
}
HTM_TD_End ();
@@ -9578,9 +9578,9 @@ void Brw_ShowFileMetadata (void)
HTM_TD_End ();
HTM_TD_Begin ("id=\"filedate\" class=\"DAT LM\"");
- Dat_WriteLocalDateHMSFromUTC ("'filedate',%ld,%u,', ','%s',true,true,0x7",
- (long) FileMetadata.Time,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC ("filedate",FileMetadata.Time,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
HTM_TR_End ();
diff --git a/swad_forum.c b/swad_forum.c
index 330ba385..371255c2 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -3461,9 +3461,9 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
if (asprintf (&Id,"thr_date_%u",UniqueId) < 0)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"",Id,Style,BgColor);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,false,0x6",
- Id,(long) TimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,false,0x6);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_game.c b/swad_game.c
index afb4eacf..f31683b3 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -432,9 +432,9 @@ void Gam_ShowOneGame (long GamCod,
"DATE_GREEN",
Gbl.RowEvenOdd);
if (Game.TimeUTC[Dat_START_TIME])
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Game.TimeUTC[StartEndTime],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Game.TimeUTC[StartEndTime],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_group.c b/swad_group.c
index 9ba494de..c50d450d 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -2344,9 +2344,9 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
"",
Txt_Opening_of_groups,
Id);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,true,0x7",
- Id,(long) GrpTyp->OpenTimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,GrpTyp->OpenTimeUTC,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,true,0x7);
free ((void *) Id);
}
HTM_TD_End ();
diff --git a/swad_match.c b/swad_match.c
index 071230a2..b099b134 100644
--- a/swad_match.c
+++ b/swad_match.c
@@ -557,9 +557,9 @@ static void Mch_ListOneOrMoreMatchesTimes (const struct Match *Match,unsigned Un
Match->Status.QstInd >= Mch_AFTER_LAST_QUESTION ? "DATE_RED" :
"DATE_GREEN",
Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Match->TimeUTC[StartEndTime],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Match->TimeUTC[StartEndTime],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_match_result.c b/swad_match_result.c
index 2a515fdc..fbfb19ed 100644
--- a/swad_match_result.c
+++ b/swad_match_result.c
@@ -436,9 +436,9 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id =\"%s\" class=\"DAT LT COLOR%u\"",
Id,Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,false,0x7",
- Id,(long) TimeUTC[StartEndTime],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
}
@@ -792,9 +792,9 @@ void McR_ShowOneMchResult (void)
if (asprintf (&Id,"match_%u",(unsigned) StartEndTime) < 0)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"DAT LT\"",Id);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,true,0x7",
- Id,TimeUTC[StartEndTime],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime],
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_message.c b/swad_message.c
index 55f013e2..1a7620e9 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -3623,9 +3623,9 @@ void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground)
Id,ClassBackground);
/***** Write date and time *****/
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,false,0x6",
- Id,(long) TimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,false,0x6);
/***** End cell *****/
HTM_TD_End ();
diff --git a/swad_notice.c b/swad_notice.c
index 6f809cbf..0534a5c2 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -700,9 +700,9 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
Frm_LinkFormEnd ();
Frm_EndForm ();
}
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,false,0x6",
- Id,(long) TimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,false,0x6);
free ((void *) Id);
HTM_DIV_End ();
diff --git a/swad_profile.c b/swad_profile.c
index c53c479a..644871d1 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -501,9 +501,9 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat,
}
fprintf (Gbl.F.Out,")");
}
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,false,0x6",
- IdFirstClickTime,(long) UsrFigures->FirstClickTimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (IdFirstClickTime,UsrFigures->FirstClickTimeUTC,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,false,0x6);
}
else // First click time is unknown or user never logged
/***** Button to fetch and store user's figures *****/
diff --git a/swad_project.c b/swad_project.c
index 5cdf876a..675c38ee 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -1119,9 +1119,9 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
Id,ClassDate);
break;
}
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Prj->CreatTime,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -1140,9 +1140,9 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
Id,ClassDate);
break;
}
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Prj->ModifTime,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -1499,9 +1499,9 @@ static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"",
Id,ClassDate,Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Prj->CreatTime,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -1511,9 +1511,9 @@ static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"",
Id,ClassDate,Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Prj->ModifTime,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_statistic.c b/swad_statistic.c
index 31fb153c..b38c2898 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -1719,9 +1719,9 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
if (asprintf (&Id,"log_date_%u",UniqueId) < 0)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"LOG RT COLOR%u\"",Id,Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,false,0x7",
- Id,(long) Dat_GetUNIXTimeFromStr (row[3]),
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Dat_GetUNIXTimeFromStr (row[3]),
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_survey.c b/swad_survey.c
index 9a54906a..a3105b7f 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -488,9 +488,9 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
(Svy.Status.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT"),
Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,true,0x7",
- Id,Svy.TimeUTC[Svy_START_TIME],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_START_TIME],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -512,9 +512,9 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
(Svy.Status.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT"),
Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',false,true,0x7",
- Id,Svy.TimeUTC[Svy_END_TIME],
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_END_TIME],
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ false,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_test.c b/swad_test.c
index 666f27f2..74f10ec7 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -2935,9 +2935,9 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\"",
Id,Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,false,0x7",
- Id,(long) TimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -3147,9 +3147,9 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows,
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\">",
Id,Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,'
','%s',true,false,0x7",
- Id,(long) TimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
+ Gbl.Prefs.DateFormat,"
",Txt_Today,
+ true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -7784,9 +7784,9 @@ static void Tst_ShowTstResults (struct UsrData *UsrDat)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"%s RT COLOR%u\"",
Id,ClassDat,Gbl.RowEvenOdd);
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,%u,', ','%s',true,false,0x7",
- Id,(long) TimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -8122,10 +8122,9 @@ void Tst_ShowOneTstResult (void)
HTM_TD_End ();
HTM_TD_Begin ("id=\"test\" class=\"DAT LT\"");
- Dat_WriteLocalDateHMSFromUTC ("'test',%ld,"
- "%u,', ','%s',true,true,0x7",
- TstTimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC ("test",TstTimeUTC,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,true,0x7);
HTM_TD_End ();
HTM_TR_End ();
diff --git a/swad_timeline.c b/swad_timeline.c
index 10b637bf..70282786 100644
--- a/swad_timeline.c
+++ b/swad_timeline.c
@@ -1789,10 +1789,9 @@ static void TL_WriteDateTime (time_t TimeUTC)
/***** Script to write date and time in browser local time *****/
// This must be out of the div where the output is written
// because it will be evaluated in a loop in JavaScript
- Dat_WriteLocalDateHMSFromUTC ("'%s',%ld,"
- "%u,', ','%s',true,false,0x6",
- IdDateTime,(long) TimeUTC,
- (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+ Dat_WriteLocalDateHMSFromUTC (IdDateTime,TimeUTC,
+ Gbl.Prefs.DateFormat,", ",Txt_Today,
+ true,false,0x6);
}
/*****************************************************************************/