From 9b6ba73686045508ad101b3761f255e4cec206ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 10 Nov 2019 13:31:47 +0100 Subject: [PATCH] Version19.61.2 --- swad_HTML.c | 7 ++- swad_HTML.h | 1 + swad_account.c | 2 +- swad_attendance.c | 15 +++--- swad_centre.c | 24 ++++----- swad_changelog.h | 3 +- swad_country.c | 54 ++++++++++----------- swad_course.c | 20 ++++---- swad_degree.c | 11 ++--- swad_degree_type.c | 6 +-- swad_department.c | 15 +++--- swad_enrolment.c | 2 +- swad_figure.c | 116 ++++++++++++++++++++++---------------------- swad_file_browser.c | 4 +- swad_follow.c | 2 +- swad_game.c | 2 +- swad_group.c | 7 ++- swad_indicator.c | 22 ++++----- swad_institution.c | 32 ++++++------ swad_layout.c | 2 +- swad_mail.c | 4 +- swad_match.c | 6 +-- swad_match_result.c | 10 ++-- swad_network.c | 2 +- swad_pagination.c | 10 ++-- swad_photo.c | 6 +-- swad_place.c | 8 +-- swad_project.c | 6 +-- swad_survey.c | 2 +- swad_test.c | 18 +++---- swad_user.c | 4 +- 31 files changed, 212 insertions(+), 211 deletions(-) diff --git a/swad_HTML.c b/swad_HTML.c index 0f68f1ea..620abd0b 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -1407,7 +1407,7 @@ void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disable switch (Type) { case HTM_Type_UNSIGNED: - fprintf (Gbl.F.Out,"%u",*((unsigned *) ValuePtr)); + HTM_Unsigned (*((unsigned *) ValuePtr)); break; case HTM_Type_LONG: fprintf (Gbl.F.Out,"%ld",*((long *) ValuePtr)); @@ -1519,3 +1519,8 @@ void HTM_TxtColon (const char *Txt) HTM_Txt (Txt); HTM_Txt (":"); } + +void HTM_Unsigned (unsigned Num) + { + fprintf (Gbl.F.Out,"%u",Num); + } diff --git a/swad_HTML.h b/swad_HTML.h index 68ed3c7f..faa95678 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -151,5 +151,6 @@ void HTM_BR (void); void HTM_Txt (const char *Txt); void HTM_TxtColon (const char *Txt); +void HTM_Unsigned (unsigned Num); #endif diff --git a/swad_account.c b/swad_account.c index 3fcbaf60..76ae4bd0 100644 --- a/swad_account.c +++ b/swad_account.c @@ -278,7 +278,7 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD HTM_TR_Begin (NULL); HTM_TD_Begin ("rowspan=\"2\" class=\"USR_LIST_NUM_N RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumUsr); + HTM_Unsigned (NumUsr); HTM_TD_End (); /***** Write user's ID and name *****/ diff --git a/swad_attendance.c b/swad_attendance.c index 515d3e4f..fbf0e605 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -456,7 +456,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt Att->Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Att->NumStdsTotal); + HTM_Unsigned (Att->NumStdsTotal); HTM_TD_End (); HTM_TR_End (); @@ -2092,7 +2092,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr, UsrDat->Accepted ? "DAT_N" : "DAT", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumUsr); + HTM_Unsigned (NumUsr); HTM_TD_End (); /***** Show student's photo *****/ @@ -3147,7 +3147,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Gbl.AttEvents.Lst[NumAttEvent].NumStdsTotal); + HTM_Unsigned (Gbl.AttEvents.Lst[NumAttEvent].NumStdsTotal); HTM_TD_End (); HTM_TR_End (); @@ -3257,15 +3257,14 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView, if (Gbl.AttEvents.Lst[NumAttEvent].Selected) { HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u", - Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList); + HTM_Unsigned (Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList); HTM_TD_End (); Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList; } HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",Total); + HTM_Unsigned (Total); HTM_TD_End (); HTM_TR_End (); @@ -3346,7 +3345,7 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr UsrDat->Accepted ? "DAT_N" : "DAT", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumUsr + 1); + HTM_Unsigned (NumUsr + 1); HTM_TD_End (); /***** Show user's photo *****/ @@ -3402,7 +3401,7 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr /***** Last column with the number of times this user is present *****/ HTM_TD_Begin ("class=\"DAT_N RM COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumTimesPresent); + HTM_Unsigned (NumTimesPresent); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_centre.c b/swad_centre.c index c5d854cf..331f0384 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -626,7 +626,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsWhoClaimToBelongToCtr (Gbl.Hierarchy.Ctr.CtrCod)); + HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToCtr (Gbl.Hierarchy.Ctr.CtrCod)); HTM_TD_End (); HTM_TR_End (); @@ -646,7 +646,7 @@ static void Ctr_Configuration (bool PrintView) Txt_Degrees_of_CENTRE_X, Gbl.Hierarchy.Ctr.ShrtName); Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); - fprintf (Gbl.F.Out,"%u",Deg_GetNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod)); + HTM_Unsigned (Deg_GetNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod)); Frm_LinkFormEnd (); Frm_EndForm (); HTM_TD_End (); @@ -661,7 +661,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInCtr (Gbl.Hierarchy.Ctr.CtrCod)); + HTM_Unsigned (Crs_GetNumCrssInCtr (Gbl.Hierarchy.Ctr.CtrCod)); HTM_TD_End (); HTM_TR_End (); @@ -747,7 +747,7 @@ static void Ctr_ShowNumUsrsInCrssOfCtr (Rol_Role_t Role) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsInCrssOfCtr (Role,Gbl.Hierarchy.Ctr.CtrCod)); + HTM_Unsigned (Usr_GetNumUsrsInCrssOfCtr (Role,Gbl.Hierarchy.Ctr.CtrCod)); HTM_TD_End (); HTM_TR_End (); @@ -900,7 +900,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) /***** Number of centre in this list *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",NumCtr); + HTM_Unsigned (NumCtr); HTM_TD_End (); /***** Centre logo and name *****/ @@ -911,7 +911,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) /***** Number of users who claim to belong to this centre *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ctr->NumUsrsWhoClaimToBelongToCtr); + HTM_Unsigned (Ctr->NumUsrsWhoClaimToBelongToCtr); HTM_TD_End (); /***** Place *****/ @@ -921,17 +921,17 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) /***** Number of degrees *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ctr->Degs.Num); + HTM_Unsigned (Ctr->Degs.Num); HTM_TD_End (); /***** Number of courses *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ctr->NumCrss); + HTM_Unsigned (Ctr->NumCrss); HTM_TD_End (); /***** Number of users in courses of this centre *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ctr->NumUsrs); + HTM_Unsigned (Ctr->NumUsrs); HTM_TD_End (); /***** Centre status *****/ @@ -1584,17 +1584,17 @@ static void Ctr_ListCentresForEdition (void) /* Number of users who claim to belong to this centre */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ctr->NumUsrsWhoClaimToBelongToCtr); + HTM_Unsigned (Ctr->NumUsrsWhoClaimToBelongToCtr); HTM_TD_End (); /* Number of degrees */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ctr->Degs.Num); + HTM_Unsigned (Ctr->Degs.Num); HTM_TD_End (); /* Number of users in courses of this centre */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ctr->NumUsrs); + HTM_Unsigned (Ctr->NumUsrs); HTM_TD_End (); /* Centre requester */ diff --git a/swad_changelog.h b/swad_changelog.h index 0c0e6f7d..21b400a6 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.61.1 (2019-11-10)" +#define Log_PLATFORM_VERSION "SWAD 19.61.2 (2019-11-10)" #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.61.2: Nov 10, 2019 Code refactoring in HTML text printing. (? lines) Version 19.61.1: Nov 10, 2019 Code refactoring in HTML text printing. (246291 lines) Version 19.61: Nov 10, 2019 Code refactoring in HTML text printing. (246298 lines) Version 19.60.3: Nov 09, 2019 Code refactoring in HTML select options. (246311 lines) diff --git a/swad_country.c b/swad_country.c index aea317cc..35c10b55 100644 --- a/swad_country.c +++ b/swad_country.c @@ -383,8 +383,7 @@ static void Cty_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u", - Usr_GetNumUsrsWhoClaimToBelongToCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToCty (Gbl.Hierarchy.Cty.CtyCod)); HTM_TD_End (); HTM_TR_End (); @@ -404,7 +403,7 @@ static void Cty_Configuration (bool PrintView) Txt_Institutions_of_COUNTRY_X, Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); - fprintf (Gbl.F.Out,"%u",Ins_GetNumInssInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_Unsigned (Ins_GetNumInssInCty (Gbl.Hierarchy.Cty.CtyCod)); Frm_LinkFormEnd (); Frm_EndForm (); HTM_TD_End (); @@ -419,7 +418,7 @@ static void Cty_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Ctr_GetNumCtrsInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_Unsigned (Ctr_GetNumCtrsInCty (Gbl.Hierarchy.Cty.CtyCod)); HTM_TD_End (); HTM_TR_End (); @@ -432,7 +431,7 @@ static void Cty_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Deg_GetNumDegsInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_Unsigned (Deg_GetNumDegsInCty (Gbl.Hierarchy.Cty.CtyCod)); HTM_TD_End (); HTM_TR_End (); @@ -445,7 +444,7 @@ static void Cty_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_Unsigned (Crs_GetNumCrssInCty (Gbl.Hierarchy.Cty.CtyCod)); HTM_TD_End (); HTM_TR_End (); @@ -491,8 +490,7 @@ static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u", - Usr_GetNumUsrsInCrssOfCty (Role,Gbl.Hierarchy.Cty.CtyCod)); + HTM_Unsigned (Usr_GetNumUsrsInCrssOfCty (Role,Gbl.Hierarchy.Cty.CtyCod)); HTM_TD_End (); HTM_TR_End (); @@ -563,27 +561,27 @@ void Cty_ListCountries2 (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Cty_GetNumUsrsWhoClaimToBelongToCty (0)); + HTM_Unsigned (Cty_GetNumUsrsWhoClaimToBelongToCty (0)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ins_GetNumInssInCty (0)); + HTM_Unsigned (Ins_GetNumInssInCty (0)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ctr_GetNumCtrsInCty (0)); + HTM_Unsigned (Ctr_GetNumCtrsInCty (0)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Deg_GetNumDegsInCty (0)); + HTM_Unsigned (Deg_GetNumDegsInCty (0)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInCty (0)); + HTM_Unsigned (Crs_GetNumCrssInCty (0)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsInCrssOfCty (Rol_TCH,0)); + HTM_Unsigned (Usr_GetNumUsrsInCrssOfCty (Rol_TCH,0)); HTM_TD_End (); HTM_TR_End (); @@ -599,23 +597,23 @@ void Cty_ListCountries2 (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Cty_GetNumUsrsWhoClaimToBelongToCty (-1L)); + HTM_Unsigned (Cty_GetNumUsrsWhoClaimToBelongToCty (-1L)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ins_GetNumInssInCty (-1L)); + HTM_Unsigned (Ins_GetNumInssInCty (-1L)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ctr_GetNumCtrsInCty (-1L)); + HTM_Unsigned (Ctr_GetNumCtrsInCty (-1L)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Deg_GetNumDegsInCty (-1L)); + HTM_Unsigned (Deg_GetNumDegsInCty (-1L)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInCty (-1L)); + HTM_Unsigned (Crs_GetNumCrssInCty (-1L)); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -709,7 +707,7 @@ static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty) /***** Number of country in this list *****/ HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",NumCty); + HTM_Unsigned (NumCty); HTM_TD_End (); /***** Country map (and link to WWW if exists) *****/ @@ -722,27 +720,27 @@ static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty) /* Write stats of this country */ HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",Cty->NumUsrsWhoClaimToBelongToCty); + HTM_Unsigned (Cty->NumUsrsWhoClaimToBelongToCty); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",Cty->Inss.Num); + HTM_Unsigned (Cty->Inss.Num); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",Cty->NumCtrs); + HTM_Unsigned (Cty->NumCtrs); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",Cty->NumDegs); + HTM_Unsigned (Cty->NumDegs); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",Cty->NumCrss); + HTM_Unsigned (Cty->NumCrss); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",Cty->NumUsrs); + HTM_Unsigned (Cty->NumUsrs); HTM_TD_End (); HTM_TR_End (); @@ -1639,12 +1637,12 @@ static void Cty_ListCountriesForEdition (void) /* Number of users */ HTM_TD_Begin ("rowspan=\"%u\" class=\"DAT RT\"",1 + Lan_NUM_LANGUAGES); - fprintf (Gbl.F.Out,"%u",Cty->NumUsrsWhoClaimToBelongToCty); + HTM_Unsigned (Cty->NumUsrsWhoClaimToBelongToCty); HTM_TD_End (); /* Number of institutions */ HTM_TD_Begin ("rowspan=\"%u\" class=\"DAT RT\"",1 + Lan_NUM_LANGUAGES); - fprintf (Gbl.F.Out,"%u",Cty->Inss.Num); + HTM_Unsigned (Cty->Inss.Num); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_course.c b/swad_course.c index 0f4d33b4..6645aacb 100644 --- a/swad_course.c +++ b/swad_course.c @@ -503,7 +503,7 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Gbl.Hierarchy.Crs.NumUsrs[Role]); + HTM_Unsigned (Gbl.Hierarchy.Crs.NumUsrs[Role]); HTM_TD_End (); HTM_TR_End (); @@ -1264,13 +1264,13 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) /* Current number of teachers in this course */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Crs->NumUsrs[Rol_TCH] + - Crs->NumUsrs[Rol_NET]); + HTM_Unsigned (Crs->NumUsrs[Rol_TCH] + + Crs->NumUsrs[Rol_NET]); HTM_TD_End (); /* Current number of students in this course */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Crs->NumUsrs[Rol_STD]); + HTM_Unsigned (Crs->NumUsrs[Rol_STD]); HTM_TD_End (); /* Course status */ @@ -1507,13 +1507,13 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) /* Current number of teachers in this course */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Crs->NumUsrs[Rol_TCH] + - Crs->NumUsrs[Rol_NET]); + HTM_Unsigned (Crs->NumUsrs[Rol_TCH] + + Crs->NumUsrs[Rol_NET]); HTM_TD_End (); /* Current number of students in this course */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Crs->NumUsrs[Rol_STD]); + HTM_Unsigned (Crs->NumUsrs[Rol_STD]); HTM_TD_End (); /* Course requester */ @@ -3161,7 +3161,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA /***** Write number of course in this search *****/ HTM_TD_Begin ("class=\"%s RT %s\"",StyleNoBR,BgColor); - fprintf (Gbl.F.Out,"%u",NumCrs); + HTM_Unsigned (NumCrs); HTM_TD_End (); /***** Write degree logo, degree short name (row[2]) @@ -3199,12 +3199,12 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA /***** Write number of teachers in course *****/ HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); - fprintf (Gbl.F.Out,"%u",NumTchs); + HTM_Unsigned (NumTchs); HTM_TD_End (); /***** Write number of students in course *****/ HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); - fprintf (Gbl.F.Out,"%u",NumStds); + HTM_Unsigned (NumStds); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_degree.c b/swad_degree.c index 2c8ab682..1518dc9b 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -515,7 +515,7 @@ static void Deg_Configuration (bool PrintView) Txt_Courses_of_DEGREE_X, Gbl.Hierarchy.Deg.ShrtName); Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); - fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod)); + HTM_Unsigned (Crs_GetNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod)); Frm_LinkFormEnd (); Frm_EndForm (); HTM_TD_End (); @@ -570,8 +570,7 @@ static void Deg_ShowNumUsrsInCrssOfDeg (Rol_Role_t Role) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u", - Usr_GetNumUsrsInCrssOfDeg (Role,Gbl.Hierarchy.Deg.DegCod)); + HTM_Unsigned (Usr_GetNumUsrsInCrssOfDeg (Role,Gbl.Hierarchy.Deg.DegCod)); HTM_TD_End (); HTM_TR_End (); @@ -811,7 +810,7 @@ static void Deg_ListDegreesForEdition (void) /* Current number of courses in this degree */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumCrss); + HTM_Unsigned (NumCrss); HTM_TD_End (); /* Degree requester */ @@ -1231,7 +1230,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) /***** Number of degree in this list *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",NumDeg); + HTM_Unsigned (NumDeg); HTM_TD_End (); /***** Degree logo and name *****/ @@ -1247,7 +1246,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) /***** Current number of courses in this degree *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",NumCrss); + HTM_Unsigned (NumCrss); HTM_TD_End (); /***** Degree status *****/ diff --git a/swad_degree_type.c b/swad_degree_type.c index 6af8295d..c2ca4681 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -326,7 +326,7 @@ static void DT_ListDegreeTypesForSeeing (void) /* Number of degree type in this list */ HTM_TD_Begin ("class=\"DAT_N RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",NumDegTyp + 1); + HTM_Unsigned (NumDegTyp + 1); HTM_TD_End (); /* Name of degree type */ @@ -336,7 +336,7 @@ static void DT_ListDegreeTypesForSeeing (void) /* Number of degrees of this type */ HTM_TD_Begin ("class=\"DAT_N RM %s\"",BgColor); - fprintf (Gbl.F.Out,"%u",Gbl.DegTypes.Lst[NumDegTyp].NumDegs); + HTM_Unsigned (Gbl.DegTypes.Lst[NumDegTyp].NumDegs); HTM_TD_End (); HTM_TR_End (); @@ -422,7 +422,7 @@ static void DT_ListDegreeTypesForEdition (void) /* Number of degrees of this type */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Gbl.DegTypes.Lst[NumDegTyp].NumDegs); + HTM_Unsigned (Gbl.DegTypes.Lst[NumDegTyp].NumDegs); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_department.c b/swad_department.c index 68d57d33..5f2df9d2 100644 --- a/swad_department.c +++ b/swad_department.c @@ -158,7 +158,7 @@ void Dpt_SeeDepts (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Gbl.Dpts.Lst[NumDpt].NumTchs); + HTM_Unsigned (Gbl.Dpts.Lst[NumDpt].NumTchs); HTM_TD_End (); HTM_TR_End (); @@ -184,7 +184,7 @@ void Dpt_SeeDepts (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumTchsInOtherDpts); + HTM_Unsigned (NumTchsInOtherDpts); HTM_TD_End (); HTM_TR_End (); @@ -198,11 +198,10 @@ void Dpt_SeeDepts (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u", - Usr_GetTotalNumberOfUsersInCourses (Hie_INS, - 1 << Rol_NET | - 1 << Rol_TCH) - - NumTchsInsWithDpt); + HTM_Unsigned (Usr_GetTotalNumberOfUsersInCourses (Hie_INS, + 1 << Rol_NET | + 1 << Rol_TCH) - + NumTchsInsWithDpt); HTM_TD_End (); HTM_TR_End (); @@ -582,7 +581,7 @@ static void Dpt_ListDepartmentsForEdition (void) /* Number of teachers */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Dpt->NumTchs); + HTM_Unsigned (Dpt->NumTchs); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_enrolment.c b/swad_enrolment.c index aca8182c..0c9a47e4 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2855,7 +2855,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) /***** Number of teachers in the course *****/ HTM_TD_Begin ("class=\"DAT RT\""); - fprintf (Gbl.F.Out,"%u",Crs.NumUsrs[Rol_TCH]); + HTM_Unsigned (Crs.NumUsrs[Rol_TCH]); HTM_TD_End (); /***** User photo *****/ diff --git a/swad_figure.c b/swad_figure.c index 33db1e5d..e08a345e 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -432,7 +432,7 @@ static void Fig_GetAndShowNumUsrsInCrss (Rol_Role_t Role) HTM_TD_End (); HTM_TD_Begin ("class=\"%s\"",Class); - fprintf (Gbl.F.Out,"%u",NumUsrs); + HTM_Unsigned (NumUsrs); HTM_TD_End (); HTM_TD_Begin ("class=\"%s\"",Class); @@ -463,7 +463,7 @@ static void Fig_GetAndShowNumUsrsNotBelongingToAnyCrs (void) HTM_TD_End (); HTM_TD_Begin ("class=\"%s\"",Class); - fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsNotBelongingToAnyCrs ()); + HTM_Unsigned (Usr_GetNumUsrsNotBelongingToAnyCrs ()); HTM_TD_End (); HTM_TD_Begin ("class=\"%s\"",Class); @@ -1425,7 +1425,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, HTM_TD_Begin ("class=\"%s CM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); Ins_DrawInstitutionLogoWithLink (&Ins,40); HTM_BR (); - fprintf (Gbl.F.Out,"%u",NumberThisRow); + HTM_Unsigned (NumberThisRow); HTM_TD_End (); /***** End user's cell *****/ @@ -1465,7 +1465,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, if (NumberThisRow != NumberLastRow) NumOrder = NumIns; HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumOrder); + HTM_Unsigned (NumOrder); HTM_TD_End (); /***** Write link to institution *****/ @@ -1488,7 +1488,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, /***** Write statistic *****/ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumberThisRow); + HTM_Unsigned (NumberThisRow); HTM_TD_End (); HTM_TR_End (); @@ -2610,7 +2610,7 @@ static void Fig_WriteRowStatsFileBrowsers1 (const char *NameOfFileZones, HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM\"",Class); - fprintf (Gbl.F.Out,"%u",SizeOfFileZones->MaxLevels); + HTM_Unsigned (SizeOfFileZones->MaxLevels); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM\"",Class); @@ -2971,11 +2971,11 @@ static void Fig_GetAndShowAssignmentsStats (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumAssignments); + HTM_Unsigned (NumAssignments); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumCoursesWithAssignments); + HTM_Unsigned (NumCoursesWithAssignments); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -2983,7 +2983,7 @@ static void Fig_GetAndShowAssignmentsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumNotif); + HTM_Unsigned (NumNotif); HTM_TD_End (); HTM_TR_End (); @@ -3029,11 +3029,11 @@ static void Fig_GetAndShowProjectsStats (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumProjects); + HTM_Unsigned (NumProjects); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumCoursesWithProjects); + HTM_Unsigned (NumCoursesWithProjects); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -3102,7 +3102,7 @@ static void Fig_GetAndShowTestsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Stats.NumCoursesWithQuestions); + HTM_Unsigned (Stats.NumCoursesWithQuestions); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -3114,7 +3114,7 @@ static void Fig_GetAndShowTestsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Stats.NumQsts); + HTM_Unsigned (Stats.NumQsts); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -3151,7 +3151,7 @@ static void Fig_GetAndShowTestsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",Stats.NumCoursesWithQuestions); + HTM_Unsigned (Stats.NumCoursesWithQuestions); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); @@ -3163,7 +3163,7 @@ static void Fig_GetAndShowTestsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",Stats.NumQsts); + HTM_Unsigned (Stats.NumQsts); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); @@ -3229,11 +3229,11 @@ static void Fig_GetAndShowGamesStats (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumGames); + HTM_Unsigned (NumGames); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumCoursesWithGames); + HTM_Unsigned (NumCoursesWithGames); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -3409,7 +3409,7 @@ static void Fig_GetAndShowSocialActivityStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs); + HTM_Unsigned (NumUsrs); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -3530,7 +3530,7 @@ static void Fig_GetAndShowSocialActivityStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs); + HTM_Unsigned (NumUsrs); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); @@ -3696,7 +3696,7 @@ static void Fig_GetAndShowFollowStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs); + HTM_Unsigned (NumUsrs); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -4085,19 +4085,19 @@ static void Fig_WriteForumTitleAndStats (For_ForumType_t ForumType, HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RT\""); - fprintf (Gbl.F.Out,"%u",NumForums); + HTM_Unsigned (NumForums); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RT\""); - fprintf (Gbl.F.Out,"%u",NumThreads); + HTM_Unsigned (NumThreads); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RT\""); - fprintf (Gbl.F.Out,"%u",NumPosts); + HTM_Unsigned (NumPosts); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RT\""); - fprintf (Gbl.F.Out,"%u",NumUsrsToBeNotifiedByEMail); + HTM_Unsigned (NumUsrsToBeNotifiedByEMail); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RT\""); @@ -4145,19 +4145,19 @@ static void Fig_WriteForumTotalStats (struct Fig_FiguresForum *FiguresForum) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",FiguresForum->NumForums); + HTM_Unsigned (FiguresForum->NumForums); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",FiguresForum->NumThreads); + HTM_Unsigned (FiguresForum->NumThreads); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",FiguresForum->NumPosts); + HTM_Unsigned (FiguresForum->NumPosts); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",FiguresForum->NumUsrsToBeNotifiedByEMail); + HTM_Unsigned (FiguresForum->NumUsrsToBeNotifiedByEMail); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); @@ -4348,7 +4348,7 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[NotifyEvent]); + HTM_Unsigned (NumUsrs[NotifyEvent]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -4359,11 +4359,11 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumEvents[NotifyEvent]); + HTM_Unsigned (NumEvents[NotifyEvent]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumMails[NotifyEvent]); + HTM_Unsigned (NumMails[NotifyEvent]); HTM_TD_End (); HTM_TR_End (); @@ -4377,7 +4377,7 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent); + HTM_Unsigned (NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); @@ -4388,11 +4388,11 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",NumEventsTotal); + HTM_Unsigned (NumEventsTotal); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",NumMailsTotal); + HTM_Unsigned (NumMailsTotal); HTM_TD_End (); HTM_TR_End (); @@ -4453,23 +4453,23 @@ static void Fig_GetAndShowNoticesStats (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumNotices[Not_ACTIVE_NOTICE]); + HTM_Unsigned (NumNotices[Not_ACTIVE_NOTICE]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumNotices[Not_OBSOLETE_NOTICE]); + HTM_Unsigned (NumNotices[Not_OBSOLETE_NOTICE]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumNoticesDeleted); + HTM_Unsigned (NumNoticesDeleted); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N RM\""); - fprintf (Gbl.F.Out,"%u", NumTotalNotices); + HTM_Unsigned ( NumTotalNotices); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumTotalNotifications); + HTM_Unsigned (NumTotalNotifications); HTM_TD_End (); HTM_TR_End (); @@ -4528,15 +4528,15 @@ static void Fig_GetAndShowMsgsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumMsgsSentNotDeleted); + HTM_Unsigned (NumMsgsSentNotDeleted); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumMsgsSentDeleted); + HTM_Unsigned (NumMsgsSentDeleted); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N RM\""); - fprintf (Gbl.F.Out,"%u",NumMsgsSentNotDeleted + NumMsgsSentDeleted); + HTM_Unsigned (NumMsgsSentNotDeleted + NumMsgsSentDeleted); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -4552,19 +4552,19 @@ static void Fig_GetAndShowMsgsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumMsgsReceivedNotDeleted); + HTM_Unsigned (NumMsgsReceivedNotDeleted); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumMsgsReceivedAndDeleted); + HTM_Unsigned (NumMsgsReceivedAndDeleted); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N RM\""); - fprintf (Gbl.F.Out,"%u",NumMsgsReceivedNotDeleted + NumMsgsReceivedAndDeleted); + HTM_Unsigned (NumMsgsReceivedNotDeleted + NumMsgsReceivedAndDeleted); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumMsgsReceivedAndNotified); + HTM_Unsigned (NumMsgsReceivedAndNotified); HTM_TD_End (); HTM_TR_End (); @@ -4619,11 +4619,11 @@ static void Fig_GetAndShowSurveysStats (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumSurveys); + HTM_Unsigned (NumSurveys); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumCoursesWithSurveys); + HTM_Unsigned (NumCoursesWithSurveys); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -4635,7 +4635,7 @@ static void Fig_GetAndShowSurveysStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumNotif); + HTM_Unsigned (NumNotif); HTM_TD_End (); HTM_TR_End (); @@ -4733,7 +4733,7 @@ static void Fig_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject, HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[Visibility]); + HTM_Unsigned (NumUsrs[Visibility]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -4820,7 +4820,7 @@ static void Fig_GetAndShowNumUsrsPerCookies (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[i]); + HTM_Unsigned (NumUsrs[i]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -4896,7 +4896,7 @@ static void Fig_GetAndShowNumUsrsPerLanguage (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[Lan]); + HTM_Unsigned (NumUsrs[Lan]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -4985,7 +4985,7 @@ static void Fig_GetAndShowNumUsrsPerFirstDayOfWeek (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[FirstDayOfWeek]); + HTM_Unsigned (NumUsrs[FirstDayOfWeek]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -5060,7 +5060,7 @@ static void Fig_GetAndShowNumUsrsPerDateFormat (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[Format]); + HTM_Unsigned (NumUsrs[Format]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -5142,7 +5142,7 @@ static void Fig_GetAndShowNumUsrsPerIconSet (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[IconSet]); + HTM_Unsigned (NumUsrs[IconSet]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -5218,7 +5218,7 @@ static void Fig_GetAndShowNumUsrsPerMenu (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[Menu]); + HTM_Unsigned (NumUsrs[Menu]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -5300,7 +5300,7 @@ static void Fig_GetAndShowNumUsrsPerTheme (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[Theme]); + HTM_Unsigned (NumUsrs[Theme]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -5381,7 +5381,7 @@ static void Fig_GetAndShowNumUsrsPerSideColumns (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs[SideCols]); + HTM_Unsigned (NumUsrs[SideCols]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); diff --git a/swad_file_browser.c b/swad_file_browser.c index 7e3fbfb6..c210ce54 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -9636,7 +9636,7 @@ void Brw_ShowFileMetadata (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",FileMetadata.NumMyViews); + HTM_Unsigned (FileMetadata.NumMyViews); HTM_TD_End (); HTM_TR_End (); @@ -9667,7 +9667,7 @@ void Brw_ShowFileMetadata (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",FileMetadata.NumPublicViews); + HTM_Unsigned (FileMetadata.NumPublicViews); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_follow.c b/swad_follow.c index e5575922..808a0bf2 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -612,7 +612,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, else HTM_SPAN_Begin ("class=\"%s\"",(Gbl.Action.Act == Action) ? "FOLLOW_NUM_B" : "FOLLOW_NUM"); - fprintf (Gbl.F.Out,"%u",NumUsrs); + HTM_Unsigned (NumUsrs); if (NumUsrs) { Frm_LinkFormEnd (); diff --git a/swad_game.c b/swad_game.c index 389516b0..f918f781 100644 --- a/swad_game.c +++ b/swad_game.c @@ -479,7 +479,7 @@ void Gam_ShowOneGame (long GamCod, "ASG_TITLE",NULL); if (ShowOnlyThisGame) fprintf (Gbl.F.Out,"%s: ",Txt_Matches); - fprintf (Gbl.F.Out,"%u",Game.NumMchs); + HTM_Unsigned (Game.NumMchs); Frm_LinkFormEnd (); Frm_EndForm (); diff --git a/swad_group.c b/swad_group.c index a24fec65..0a1eb043 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1389,7 +1389,7 @@ static void Grp_ListGroupTypesForEdition (void) /* Number of groups of this type */ HTM_TD_Begin ("class=\"DAT CM\""); - fprintf (Gbl.F.Out,"%u",Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps); + HTM_Unsigned (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps); HTM_TD_End (); HTM_TR_End (); @@ -2440,9 +2440,8 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight) if (Grp->MaxStudents <= Grp_MAX_STUDENTS_IN_A_GROUP) { Vacant = (int) Grp->MaxStudents - (int) Grp->NumUsrs[Rol_STD]; - fprintf (Gbl.F.Out,"%u", - Vacant > 0 ? (unsigned) Vacant : - 0); + HTM_Unsigned (Vacant > 0 ? (unsigned) Vacant : + 0); } HTM_TD_End (); } diff --git a/swad_indicator.c b/swad_indicator.c index d6b11654..6d849a27 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -676,12 +676,12 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 HTM_TD_Begin ("class=\"%s\"",Class); HTM_LABEL_Begin ("for=\"Indicators%u\"",Ind); - fprintf (Gbl.F.Out,"%u",Ind); + HTM_Unsigned (Ind); HTM_LABEL_End (); HTM_TD_End (); HTM_TD_Begin ("class=\"%s\"",Class); - fprintf (Gbl.F.Out,"%u",NumCrssWithIndicatorYes[Ind]); + HTM_Unsigned (NumCrssWithIndicatorYes[Ind]); HTM_TD_End (); HTM_TD_Begin ("class=\"%s\"",Class); @@ -704,7 +704,7 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%u",NumCrss); + HTM_Unsigned (NumCrss); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); @@ -942,7 +942,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat (Indicators.CoursePartiallyOK ? "DAT_SMALL" : "DAT_SMALL_RED"), Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Indicators.NumIndicators); + HTM_Unsigned (Indicators.NumIndicators); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM COLOR%u\"", @@ -1051,14 +1051,14 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat NumTchs != 0 ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumTchs); + HTM_Unsigned (NumTchs); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM COLOR%u\"", NumStds != 0 ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumStds); + HTM_Unsigned (NumStds); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM COLOR%u\"", @@ -1066,7 +1066,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat (Indicators.CoursePartiallyOK ? "DAT_SMALL" : "DAT_SMALL_RED"), Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Indicators.NumIndicators); + HTM_Unsigned (Indicators.NumIndicators); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM COLOR%u\"", @@ -1118,7 +1118,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat (Indicators.NumAssignments != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Indicators.NumAssignments); + HTM_Unsigned (Indicators.NumAssignments); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM COLOR%u\"", @@ -1151,21 +1151,21 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat (Indicators.NumThreads != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Indicators.NumThreads); + HTM_Unsigned (Indicators.NumThreads); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM COLOR%u\"", (Indicators.NumPosts != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Indicators.NumPosts); + HTM_Unsigned (Indicators.NumPosts); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM COLOR%u\"", (Indicators.NumMsgsSentByTchs != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Indicators.NumMsgsSentByTchs); + HTM_Unsigned (Indicators.NumMsgsSentByTchs); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM COLOR%u\"", diff --git a/swad_institution.c b/swad_institution.c index 8c983060..1cf1f384 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -523,7 +523,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsWhoClaimToBelongToIns (Gbl.Hierarchy.Ins.InsCod)); + HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToIns (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); HTM_TR_End (); @@ -542,7 +542,7 @@ static void Ins_Configuration (bool PrintView) Txt_Centres_of_INSTITUTION_X, Gbl.Hierarchy.Ins.ShrtName); Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); - fprintf (Gbl.F.Out,"%u",Ctr_GetNumCtrsInIns (Gbl.Hierarchy.Ins.InsCod)); + HTM_Unsigned (Ctr_GetNumCtrsInIns (Gbl.Hierarchy.Ins.InsCod)); Frm_LinkFormEnd (); Frm_EndForm (); HTM_TD_End (); @@ -557,7 +557,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Deg_GetNumDegsInIns (Gbl.Hierarchy.Ins.InsCod)); + HTM_Unsigned (Deg_GetNumDegsInIns (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); HTM_TR_End (); @@ -570,7 +570,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInIns (Gbl.Hierarchy.Ins.InsCod)); + HTM_Unsigned (Crs_GetNumCrssInIns (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); HTM_TR_End (); @@ -583,7 +583,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Dpt_GetNumDepartmentsInInstitution (Gbl.Hierarchy.Ins.InsCod)); + HTM_Unsigned (Dpt_GetNumDepartmentsInInstitution (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); HTM_TR_End (); @@ -637,7 +637,7 @@ static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsInCrssOfIns (Role,Gbl.Hierarchy.Ins.InsCod)); + HTM_Unsigned (Usr_GetNumUsrsInCrssOfIns (Role,Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); HTM_TR_End (); @@ -780,7 +780,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns) /***** Number of institution in this list *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",NumIns); + HTM_Unsigned (NumIns); HTM_TD_End (); /***** Institution logo and name *****/ @@ -792,32 +792,32 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns) /***** Stats *****/ /* Number of users who claim to belong to this institution */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ins->NumUsrsWhoClaimToBelongToIns); + HTM_Unsigned (Ins->NumUsrsWhoClaimToBelongToIns); HTM_TD_End (); /* Number of centres in this institution */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ins->Ctrs.Num); + HTM_Unsigned (Ins->Ctrs.Num); HTM_TD_End (); /* Number of degrees in this institution */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ins->NumDegs); + HTM_Unsigned (Ins->NumDegs); HTM_TD_End (); /* Number of courses in this institution */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ins->NumCrss); + HTM_Unsigned (Ins->NumCrss); HTM_TD_End (); /* Number of departments in this institution */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ins->NumDpts); + HTM_Unsigned (Ins->NumDpts); HTM_TD_End (); /* Number of users in courses of this institution */ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); - fprintf (Gbl.F.Out,"%u",Ins->NumUsrs); + HTM_Unsigned (Ins->NumUsrs); HTM_TD_End (); /***** Institution status *****/ @@ -1532,17 +1532,17 @@ static void Ins_ListInstitutionsForEdition (void) /* Number of users who claim to belong to this institution */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ins->NumUsrsWhoClaimToBelongToIns); + HTM_Unsigned (Ins->NumUsrsWhoClaimToBelongToIns); HTM_TD_End (); /* Number of centres */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ins->Ctrs.Num); + HTM_Unsigned (Ins->Ctrs.Num); HTM_TD_End (); /* Number of users in courses of this institution */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ins->NumUsrs); + HTM_Unsigned (Ins->NumUsrs); HTM_TD_End (); /* Institution requester */ diff --git a/swad_layout.c b/swad_layout.c index fdcf6838..c5153c2c 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1502,7 +1502,7 @@ void Lay_RefreshNotifsAndConnected (void) } fprintf (Gbl.F.Out,"|"); if (ShowConnected) - fprintf (Gbl.F.Out,"%u",Gbl.Usrs.Connected.NumUsrsToList); + HTM_Unsigned (Gbl.Usrs.Connected.NumUsrsToList); fprintf (Gbl.F.Out,"|"); if (ShowConnected) for (NumUsr = 0; diff --git a/swad_mail.c b/swad_mail.c index b4afb4e1..d4197a61 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -167,7 +167,7 @@ void Mai_SeeMailDomains (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RT\""); - fprintf (Gbl.F.Out,"%u",Gbl.Mails.Lst[NumMai].NumUsrs); + HTM_Unsigned (Gbl.Mails.Lst[NumMai].NumUsrs); HTM_TD_End (); HTM_TR_End (); @@ -522,7 +522,7 @@ static void Mai_ListMailDomainsForEdition (void) /* Number of users */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Mai->NumUsrs); + HTM_Unsigned (Mai->NumUsrs); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_match.c b/swad_match.c index d6e2e875..809773b1 100644 --- a/swad_match.c +++ b/swad_match.c @@ -656,7 +656,7 @@ static void Mch_ListOneOrMoreMatchesNumPlayers (const struct Match *Match) { /***** Number of players who have answered any question in the match ******/ HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Mch_GetNumUsrsWhoHaveAnswerMch (Match->MchCod)); + HTM_Unsigned (Mch_GetNumUsrsWhoHaveAnswerMch (Match->MchCod)); HTM_TD_End (); } @@ -2165,9 +2165,9 @@ static void Mch_ShowRefreshablePartTch (struct Match *Match) fprintf (Gbl.F.Out,""); if (Match->Status.QstInd > 0 && Match->Status.QstInd < Mch_AFTER_LAST_QUESTION) - fprintf (Gbl.F.Out,"%u",NumAnswerersQst); + HTM_Unsigned (NumAnswerersQst); else - fprintf (Gbl.F.Out,"-"); + HTM_Txt ("-"); if (Match->Status.Playing) { /* Get current number of players */ diff --git a/swad_match_result.c b/swad_match_result.c index f1ec4915..ace01842 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -343,7 +343,7 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther) HTM_BR (); fprintf (Gbl.F.Out,"%s
",Txt_out_of_PART_OF_A_SCORE); HTM_BR (); - fprintf (Gbl.F.Out,"%u",Tst_SCORE_MAX); + HTM_Unsigned (Tst_SCORE_MAX); HTM_TH_End (); HTM_TH_Empty (1); @@ -473,12 +473,12 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther) /* Write number of questions */ HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumQstsInThisResult); + HTM_Unsigned (NumQstsInThisResult); HTM_TD_End (); /* Write number of questions not blank */ HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumQstsNotBlankInThisResult); + HTM_Unsigned (NumQstsNotBlankInThisResult); HTM_TD_End (); /* Write score */ @@ -574,13 +574,13 @@ static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults, /***** Write total number of questions *****/ HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); if (NumResults) - fprintf (Gbl.F.Out,"%u",NumTotalQsts); + HTM_Unsigned (NumTotalQsts); HTM_TD_End (); /***** Write total number of questions not blank *****/ HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); if (NumResults) - fprintf (Gbl.F.Out,"%u",NumTotalQstsNotBlank); + HTM_Unsigned (NumTotalQstsNotBlank); HTM_TD_End (); /***** Write total score *****/ diff --git a/swad_network.c b/swad_network.c index 185bfe74..148a5e35 100644 --- a/swad_network.c +++ b/swad_network.c @@ -583,7 +583,7 @@ void Net_ShowWebAndSocialNetworksStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumUsrs); + HTM_Unsigned (NumUsrs); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); diff --git a/swad_pagination.c b/swad_pagination.c index f68631bc..f6922aab 100644 --- a/swad_pagination.c +++ b/swad_pagination.c @@ -451,7 +451,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Pagination->LeftPage, Pagination->NumPags); Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL); - fprintf (Gbl.F.Out,"%u",Pagination->LeftPage); + HTM_Unsigned (Pagination->LeftPage); Frm_LinkFormEnd (); Frm_EndForm (); if (Pagination->LeftPage < Pagination->StartPage - 1) @@ -473,7 +473,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, if (!LinkToPagCurrent && NumPage == Pagination->CurrentPage) { HTM_SPAN_Begin ("title=\"%s\" class=\"PAG_CUR %s\"",Gbl.Title,Font); - fprintf (Gbl.F.Out,"%u",NumPage); + HTM_Unsigned (NumPage); HTM_SPAN_End (); } else @@ -559,7 +559,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, break; } Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL); - fprintf (Gbl.F.Out,"%u",NumPage); + HTM_Unsigned (NumPage); Frm_LinkFormEnd (); Frm_EndForm (); } @@ -659,7 +659,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Txt_Page_X_of_Y, Pagination->RightPage,Pagination->NumPags); Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL); - fprintf (Gbl.F.Out,"%u",Pagination->RightPage); + HTM_Unsigned (Pagination->RightPage); Frm_LinkFormEnd (); Frm_EndForm (); } @@ -757,7 +757,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Txt_Page_X_of_Y, Pagination->NumPags,Pagination->NumPags); Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL); - fprintf (Gbl.F.Out,"%u",Pagination->NumPags); + HTM_Unsigned (Pagination->NumPags); Frm_LinkFormEnd (); Frm_EndForm (); } diff --git a/swad_photo.c b/swad_photo.c index d08d3429..1b14beed 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1254,7 +1254,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, HTM_DIV_Begin ("class=\"ZOOM_TXT_LINE\""); HTM_SPAN_Begin ("class=\"DAT_N_BOLD\""); - fprintf (Gbl.F.Out,"%u",NumFollowing); + HTM_Unsigned (NumFollowing); HTM_SPAN_End (); HTM_SPAN_Begin ("class=\"DAT_SMALL\""); @@ -1262,7 +1262,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, HTM_SPAN_End (); HTM_SPAN_Begin ("class=\"DAT_N_BOLD\""); - fprintf (Gbl.F.Out,"%u",NumFollowers); + HTM_Unsigned (NumFollowers); HTM_SPAN_End (); HTM_SPAN_Begin ("class=\"DAT_SMALL\""); @@ -2262,7 +2262,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) /***** Show logo and name of this degree *****/ HTM_TD_Begin ("class=\"DAT RM COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",++NumDegsNotEmpty); + HTM_Unsigned (++NumDegsNotEmpty); HTM_TD_End (); /***** Show logo and name of this degree *****/ diff --git a/swad_place.c b/swad_place.c index a7d6af2b..af8b3cbe 100644 --- a/swad_place.c +++ b/swad_place.c @@ -149,7 +149,7 @@ void Plc_SeePlaces (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Gbl.Plcs.Lst[NumPlc].NumCtrs); + HTM_Unsigned (Gbl.Plcs.Lst[NumPlc].NumCtrs); HTM_TD_End (); HTM_TR_End (); @@ -172,7 +172,7 @@ void Plc_SeePlaces (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",NumCtrsInOtherPlcs); + HTM_Unsigned (NumCtrsInOtherPlcs); HTM_TD_End (); HTM_TR_End (); @@ -186,7 +186,7 @@ void Plc_SeePlaces (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Ctr_GetNumCtrsInIns (Gbl.Hierarchy.Ins.InsCod) - + HTM_Unsigned (Ctr_GetNumCtrsInIns (Gbl.Hierarchy.Ins.InsCod) - NumCtrsWithPlc); HTM_TD_End (); @@ -568,7 +568,7 @@ static void Plc_ListPlacesForEdition (void) /* Number of centres */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%u",Plc->NumCtrs); + HTM_Unsigned (Plc->NumCtrs); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_project.c b/swad_project.c index 402c67e9..f071410d 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1072,7 +1072,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, case Prj_LIST_PROJECTS: HTM_TD_Begin ("rowspan=\"3\" class=\"BIG_INDEX RT COLOR%u\"", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumIndex); + HTM_Unsigned (NumIndex); if (PrjIsFaulty) { @@ -1246,7 +1246,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, ClassData); break; } - fprintf (Gbl.F.Out,"%u",Prj->NumStds); + HTM_Unsigned (Prj->NumStds); if (Faults.WrongNumStds) Prj_PutWarningIcon (); HTM_TD_End (); @@ -1533,7 +1533,7 @@ static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj) /***** Number of students *****/ HTM_TD_Begin ("class=\"LT %s COLOR%u\"",ClassData,Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",Prj->NumStds); + HTM_Unsigned (Prj->NumStds); HTM_TD_End (); /***** Project members *****/ diff --git a/swad_survey.c b/swad_survey.c index 8e6490ab..5ec5f312 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -3283,7 +3283,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy, if (sscanf (row[1],"%u",&(SvyQst->QstInd)) != 1) Lay_ShowErrorAndExit ("Error: wrong question index."); HTM_TD_Begin ("class=\"DAT_SMALL CT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",SvyQst->QstInd + 1); + HTM_Unsigned (SvyQst->QstInd + 1); HTM_TD_End (); /* Write the question type (row[2]) */ diff --git a/swad_test.c b/swad_test.c index 86db5a4a..fbbd9969 100644 --- a/swad_test.c +++ b/swad_test.c @@ -989,7 +989,7 @@ static void Tst_ShowTestResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"BIG_INDEX RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumQst + 1); + HTM_Unsigned (NumQst + 1); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_LIGHT LT COLOR%u\"",Gbl.RowEvenOdd); @@ -1036,7 +1036,7 @@ static void Tst_WriteQstAndAnsTest (Tst_ActionToDoWithQuestions_t ActionToDoWith /***** Write number of question *****/ HTM_DIV_Begin ("class=\"BIG_INDEX\""); - fprintf (Gbl.F.Out,"%u",NumQst + 1); + HTM_Unsigned (NumQst + 1); HTM_DIV_End (); /***** Write answer type (row[2]) *****/ @@ -7711,7 +7711,7 @@ static void Tst_ShowHeaderTestResults (void) HTM_BR (); HTM_Txt (Txt_out_of_PART_OF_A_SCORE); HTM_BR (); - fprintf (Gbl.F.Out,"%u",Tst_SCORE_MAX); + HTM_Unsigned (Tst_SCORE_MAX); HTM_TH_End (); HTM_TH_Empty (1); @@ -7851,13 +7851,13 @@ static void Tst_ShowTstResults (struct UsrData *UsrDat) /* Write number of questions */ HTM_TD_Begin ("class=\"%s RT COLOR%u\"",ClassDat,Gbl.RowEvenOdd); if (ICanViewTest) - fprintf (Gbl.F.Out,"%u",NumQstsInThisTest); + HTM_Unsigned (NumQstsInThisTest); HTM_TD_End (); /* Write number of questions not blank */ HTM_TD_Begin ("class=\"%s RT COLOR%u\"",ClassDat,Gbl.RowEvenOdd); if (ICanViewTest) - fprintf (Gbl.F.Out,"%u",NumQstsNotBlankInThisTest); + HTM_Unsigned (NumQstsNotBlankInThisTest); HTM_TD_End (); /* Write score */ @@ -7981,13 +7981,13 @@ static void Tst_ShowTestResultsSummaryRow (bool ItsMe, /***** Write total number of questions *****/ HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); if (NumExams) - fprintf (Gbl.F.Out,"%u",NumTotalQsts); + HTM_Unsigned (NumTotalQsts); HTM_TD_End (); /***** Write total number of questions not blank *****/ HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); if (NumExams) - fprintf (Gbl.F.Out,"%u",NumTotalQstsNotBlank); + HTM_Unsigned (NumTotalQstsNotBlank); HTM_TD_End (); /***** Write total score *****/ @@ -8285,7 +8285,7 @@ void Tst_ShowTestResult (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"BIG_INDEX RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumQst + 1); + HTM_Unsigned (NumQst + 1); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_LIGHT LT COLOR%u\"",Gbl.RowEvenOdd); @@ -8314,7 +8314,7 @@ void Tst_ShowTestResult (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"BIG_INDEX RT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumQst + 1); + HTM_Unsigned (NumQst + 1); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_LIGHT LT COLOR%u\"",Gbl.RowEvenOdd); diff --git a/swad_user.c b/swad_user.c index 0832492f..f50cf270 100644 --- a/swad_user.c +++ b/swad_user.c @@ -3662,7 +3662,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat, UsrDat->Accepted ? "USR_LIST_NUM_N" : "USR_LIST_NUM", BgColor); - fprintf (Gbl.F.Out,"%u",NumUsr); + HTM_Unsigned (NumUsr); HTM_TD_End (); if (Gbl.Usrs.Listing.WithPhotos) @@ -4006,7 +4006,7 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat) /***** Write number of user *****/ HTM_TD_Begin ("class=\"USR_LIST_NUM_N CM COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%u",NumUsr); + HTM_Unsigned (NumUsr); HTM_TD_End (); if (Gbl.Usrs.Listing.WithPhotos)