From a0a21733daf85cc5d0a4d298aadc07ded59f652f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 3 Nov 2019 13:19:32 +0100 Subject: [PATCH] Version19.51.5 --- swad_ID.c | 11 ++++------ swad_QR.c | 2 +- swad_account.c | 2 +- swad_agenda.c | 16 +++++++-------- swad_announcement.c | 2 +- swad_assignment.c | 6 +++--- swad_attendance.c | 28 +++++++++++++++---------- swad_banner.c | 4 ++-- swad_calendar.c | 2 +- swad_centre.c | 6 +++--- swad_changelog.h | 3 ++- swad_chat.c | 6 +++--- swad_classroom.c | 4 ++-- swad_country.c | 10 ++++----- swad_course.c | 6 +++--- swad_date.c | 21 ++++++++----------- swad_degree.c | 4 ++-- swad_degree_type.c | 4 ++-- swad_department.c | 4 ++-- swad_duplicate.c | 2 +- swad_exam.c | 2 +- swad_figure.c | 2 +- swad_file_browser.c | 10 ++++----- swad_forum.c | 10 ++++----- swad_game.c | 10 ++++----- swad_group.c | 33 +++++++++++++++++++++--------- swad_hierarchy.c | 2 +- swad_holiday.c | 4 ++-- swad_icon.c | 2 +- swad_indicator.c | 12 +++++------ swad_institution.c | 6 +++--- swad_language.c | 2 +- swad_layout.c | 2 +- swad_link.c | 2 +- swad_mail.c | 11 ++++------ swad_match.c | 6 +++--- swad_media.c | 14 +++++++------ swad_menu.c | 2 +- swad_message.c | 16 +++++++-------- swad_nickname.c | 15 ++++++++------ swad_notice.c | 2 +- swad_notification.c | 2 +- swad_pagination.c | 2 +- swad_parameter.c | 50 +++++++++++++++++++++++++++++++++++---------- swad_parameter.h | 9 ++++---- swad_password.c | 2 +- swad_photo.c | 8 ++++---- swad_place.c | 4 ++-- swad_plugin.c | 2 +- swad_profile.c | 2 +- swad_project.c | 16 +++++++-------- swad_record.c | 14 ++++++------- swad_role.c | 3 +-- swad_scope.c | 2 +- swad_setting.c | 2 +- swad_statistic.c | 32 ++++++++++++++--------------- swad_survey.c | 8 ++++---- swad_syllabus.c | 2 +- swad_tab.c | 2 +- swad_test.c | 28 ++++++++++++------------- swad_test_import.c | 2 +- swad_theme.c | 2 +- swad_timeline.c | 8 ++++---- swad_timetable.c | 19 +++++++++-------- swad_user.c | 14 +++++++------ 65 files changed, 295 insertions(+), 248 deletions(-) diff --git a/swad_ID.c b/swad_ID.c index 95463ea3..2ec35174 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -280,7 +280,7 @@ unsigned ID_GetListUsrCodsFromUsrID (struct UsrData *UsrDat, void ID_PutParamOtherUsrIDPlain (void) { - Par_PutHiddenParamString ("OtherUsrID", + Par_PutHiddenParamString (NULL,"OtherUsrID", (Gbl.Usrs.Other.UsrDat.IDs.Num && Gbl.Usrs.Other.UsrDat.IDs.List) ? Gbl.Usrs.Other.UsrDat.IDs.List[0].ID : ""); @@ -476,7 +476,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, Frm_StartFormAnchor (NextAction,Anchor); if (Gbl.Action.Original != ActUnk) { - Par_PutHiddenParamLong ("OriginalActCod", + Par_PutHiddenParamLong (NULL,"OriginalActCod", Act_GetActCod (Gbl.Action.Original)); // Original action, used to know where we came from switch (Gbl.Action.Original) { @@ -490,8 +490,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, } } Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - fprintf (Gbl.F.Out,"", - UsrDat->IDs.List[NumID].ID); + Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID); /***** Put link *****/ Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL); @@ -645,9 +644,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, Frm_StartFormAnchor (NextAction,ID_ID_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } - fprintf (Gbl.F.Out,"", - UsrDat->IDs.List[NumID].ID); + Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID); Ico_PutIconRemove (); Frm_EndForm (); } diff --git a/swad_QR.c b/swad_QR.c index cf64d73e..e9822393 100644 --- a/swad_QR.c +++ b/swad_QR.c @@ -84,7 +84,7 @@ void QR_PutLinkToPrintQRCode (Act_Action_t Action,void (*FuncParams) (void)) void QR_PutParamQRString (void) { - Par_PutHiddenParamString ("QRString",Gbl.QR.Str); + Par_PutHiddenParamString (NULL,"QRString",Gbl.QR.Str); } /*****************************************************************************/ diff --git a/swad_account.c b/swad_account.c index 3ce8a7e9..e9752b66 100644 --- a/swad_account.c +++ b/swad_account.c @@ -566,7 +566,7 @@ void Acc_PutLinkToRemoveMyAccount (void) static void Acc_PutParamsToRemoveMyAccount (void) { Usr_PutParamMyUsrCodEncrypted (); - Par_PutHiddenParamUnsigned ("RegRemAction", + Par_PutHiddenParamUnsigned (NULL,"RegRemAction", (unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM); } diff --git a/swad_agenda.c b/swad_agenda.c index f8515d36..04c569a4 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -138,7 +138,7 @@ void Agd_PutParamAgd (void) snprintf (Nickname,sizeof (Nickname), "@%s", Gbl.Usrs.Other.UsrDat.Nickname); - Par_PutHiddenParamString ("agd",Nickname); + Par_PutHiddenParamString (NULL,"agd",Nickname); } /*****************************************************************************/ @@ -288,17 +288,17 @@ static void Agd_ShowFormToSelHiddenVisiblEvents (void) static void Agd_PutHiddenParamPast__FutureEvents (unsigned Past__FutureEvents) { - Par_PutHiddenParamUnsigned (ParamPast__FutureName,Past__FutureEvents); + Par_PutHiddenParamUnsigned (NULL,ParamPast__FutureName,Past__FutureEvents); } static void Agd_PutHiddenParamPrivatPublicEvents (unsigned PrivatPublicEvents) { - Par_PutHiddenParamUnsigned (ParamPrivatPublicName,PrivatPublicEvents); + Par_PutHiddenParamUnsigned (NULL,ParamPrivatPublicName,PrivatPublicEvents); } static void Agd_PutHiddenParamHiddenVisiblEvents (unsigned HiddenVisiblEvents) { - Par_PutHiddenParamUnsigned (ParamHiddenVisiblName,HiddenVisiblEvents); + Par_PutHiddenParamUnsigned (NULL,ParamHiddenVisiblName,HiddenVisiblEvents); } /*****************************************************************************/ @@ -587,7 +587,7 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType) Pag_PutHiddenParamPagNum (Pag_ANOTHER_AGENDA,Gbl.Agenda.CurrentPage); break; } - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Agenda.SelectedOrder) @@ -891,13 +891,13 @@ void Agd_PutParamsMyAgenda (unsigned Past__FutureEvents, Agd_PutHiddenParamHiddenVisiblEvents (HiddenVisiblEvents); if (Gbl.Agenda.SelectedOrder != Agd_ORDER_DEFAULT) - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Agenda.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Agenda.SelectedOrder); if (NumPage > 1) Pag_PutHiddenParamPagNum (Pag_MY_AGENDA,NumPage); if (AgdCodToEdit > 0) - Par_PutHiddenParamLong ("AgdCod",AgdCodToEdit); + Par_PutHiddenParamLong (NULL,"AgdCod",AgdCodToEdit); } /*****************************************************************************/ @@ -931,7 +931,7 @@ static void Agd_GetParams (Agd_AgendaType_t AgendaType) void Agd_PutHiddenParamEventsOrder (void) { if (Gbl.Agenda.SelectedOrder != Agd_ORDER_DEFAULT) - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Agenda.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Agenda.SelectedOrder); } /*****************************************************************************/ diff --git a/swad_announcement.c b/swad_announcement.c index bc4b5405..67d3f92a 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -369,7 +369,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, static void Ann_PutParams (void) { - Par_PutHiddenParamLong ("AnnCod",Gbl.Announcements.AnnCod); + Par_PutHiddenParamLong (NULL,"AnnCod",Gbl.Announcements.AnnCod); } /*****************************************************************************/ diff --git a/swad_assignment.c b/swad_assignment.c index cd9f6036..1ce7d729 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -218,7 +218,7 @@ static void Asg_PutHeadForSeeing (bool PrintView) Frm_StartForm (ActSeeAsg); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_ASSIGNMENTS,Gbl.Asgs.CurrentPage); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Asgs.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -558,7 +558,7 @@ static void Asg_GetParamAsgOrder (void) void Asg_PutHiddenParamAsgOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Asgs.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Asgs.SelectedOrder); } /*****************************************************************************/ @@ -937,7 +937,7 @@ void Asg_GetNotifAssignment (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1], static void Asg_PutParamAsgCod (long AsgCod) { - Par_PutHiddenParamLong ("AsgCod",AsgCod); + Par_PutHiddenParamLong (NULL,"AsgCod",AsgCod); } /*****************************************************************************/ diff --git a/swad_attendance.c b/swad_attendance.c index 57f4f56c..0037ba74 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -252,7 +252,7 @@ static void Att_ShowAllAttEvents (void) Frm_StartForm (ActSeeAtt); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.AttEvents.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -525,7 +525,7 @@ static void Att_GetParamAttOrder (void) void Att_PutHiddenParamAttOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.AttEvents.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.AttEvents.SelectedOrder); } /*****************************************************************************/ @@ -860,7 +860,7 @@ void Att_PutParamSelectedAttCod (void) void Att_PutParamAttCod (long AttCod) { - Par_PutHiddenParamLong ("AttCod",AttCod); + Par_PutHiddenParamLong (NULL,"AttCod",AttCod); } /*****************************************************************************/ @@ -2200,10 +2200,13 @@ static void Att_PutLinkAttEvent (struct AttendanceEvent *AttEvent, static void Att_PutParamsCodGrps (long AttCod) { + extern const char *Par_SEPARATOR_PARAM_MULTIPLE; MYSQL_RES *mysql_res; MYSQL_ROW row; unsigned NumGrp; unsigned NumGrps; + size_t MaxLengthGrpCods; + char *GrpCods; /***** Get groups associated to an attendance event from database *****/ if (Gbl.Crs.Grps.NumGrps) @@ -2217,7 +2220,9 @@ static void Att_PutParamsCodGrps (long AttCod) /***** Get groups *****/ if (NumGrps) // Groups found... { - fprintf (Gbl.F.Out,""); + Par_PutHiddenParamString (NULL,"GrpCods",GrpCods); + free ((void *) GrpCods); } else /***** Write the boolean parameter that indicates if all the groups must be listed *****/ @@ -3019,7 +3025,7 @@ static void Att_PutFormToPrintMyListParams (void) Par_PutHiddenParamChar ("ShowDetails",'Y'); if (Gbl.AttEvents.StrAttCodsSelected) if (Gbl.AttEvents.StrAttCodsSelected[0]) - Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); + Par_PutHiddenParamString (NULL,"AttCods",Gbl.AttEvents.StrAttCodsSelected); } /*****************************************************************************/ @@ -3043,7 +3049,7 @@ static void Att_PutParamsToPrintStdsList (void) Usr_PutHiddenParSelectedUsrsCods (); if (Gbl.AttEvents.StrAttCodsSelected) if (Gbl.AttEvents.StrAttCodsSelected[0]) - Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); + Par_PutHiddenParamString (NULL,"AttCods",Gbl.AttEvents.StrAttCodsSelected); } /*****************************************************************************/ @@ -3061,7 +3067,7 @@ static void Att_PutButtonToShowDetails (void) Usr_PutHiddenParSelectedUsrsCods (); if (Gbl.AttEvents.StrAttCodsSelected) if (Gbl.AttEvents.StrAttCodsSelected[0]) - Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); + Par_PutHiddenParamString (NULL,"AttCods",Gbl.AttEvents.StrAttCodsSelected); Btn_PutConfirmButton (Txt_Show_more_details); Frm_EndForm (); } diff --git a/swad_banner.c b/swad_banner.c index 6fdfd5c8..294aefe4 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -509,7 +509,7 @@ static void Ban_PutParamBanCodToEdit (void) static void Ban_PutParamBanCod (long BanCod) { - Par_PutHiddenParamLong ("BanCod",BanCod); + Par_PutHiddenParamLong (NULL,"BanCod",BanCod); } /*****************************************************************************/ @@ -1045,7 +1045,7 @@ void Ban_WriteMenuWithBanners (void) HTM_DIV_Begin ("class=\"CM\""); Frm_StartForm (ActClkBan); Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod); - Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW); + Par_PutHiddenParamString (NULL,"URL",Gbl.Banners.Lst[NumBan].WWW); Frm_LinkFormSubmit (Gbl.Banners.Lst[NumBan].FullName,"BANNER",NULL); HTM_IMG (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img,Gbl.Banners.Lst[NumBan].FullName, "class=\"BANNER\""); diff --git a/swad_calendar.c b/swad_calendar.c index 0dc4070b..8743a55a 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -121,7 +121,7 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (vo FirstDayOfWeek == Gbl.Prefs.FirstDayOfWeek ? "PREF_ON" : "PREF_OFF"); Frm_StartForm (Action); - Par_PutHiddenParamUnsigned ("FirstDayOfWeek",FirstDayOfWeek); + Par_PutHiddenParamUnsigned (NULL,"FirstDayOfWeek",FirstDayOfWeek); if (FuncParams) // Extra parameters depending on the action FuncParams (); snprintf (Gbl.Title,sizeof (Gbl.Title), diff --git a/swad_centre.c b/swad_centre.c index f20dec20..5b466060 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -1733,7 +1733,7 @@ static Ctr_Status_t Ctr_GetStatusBitsFromStatusTxt (Ctr_StatusTxt_t StatusTxt) void Ctr_PutParamCtrCod (long CtrCod) { - Par_PutHiddenParamLong ("ctr",CtrCod); + Par_PutHiddenParamLong (NULL,"ctr",CtrCod); } /*****************************************************************************/ @@ -1742,7 +1742,7 @@ void Ctr_PutParamCtrCod (long CtrCod) static void Ctr_PutParamOtherCtrCod (long CtrCod) { - Par_PutHiddenParamLong ("OthCtrCod",CtrCod); + Par_PutHiddenParamLong (NULL,"OthCtrCod",CtrCod); } /*****************************************************************************/ @@ -2634,7 +2634,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) if (OrderSelectable) { Frm_StartForm (ActSeeCtr); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_CENTRES_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder) fprintf (Gbl.F.Out,""); diff --git a/swad_changelog.h b/swad_changelog.h index da213d48..e5c7f165 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.51.4 (2019-11-03)" +#define Log_PLATFORM_VERSION "SWAD 19.51.5 (2019-11-03)" #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.51.5: Nov 03, 2019 Code refactoring in HTML inputs. (246132 lines) Version 19.51.4: Nov 03, 2019 Code refactoring in HTML labels. Code refactoring in HTML inputs. (246091 lines) Version 19.51.3: Nov 02, 2019 Changes in form of exam announcement. (246127 lines) diff --git a/swad_chat.c b/swad_chat.c index 99d22e7f..d69a26d6 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -340,9 +340,9 @@ static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName) void Cht_WriteParamsRoomCodeAndNames (const char *RoomCode,const char *RoomShrtName,const char *RoomFullName) { - Par_PutHiddenParamString ("RoomCode",RoomCode); - Par_PutHiddenParamString ("RoomShrtName",RoomShrtName); - Par_PutHiddenParamString ("RoomFullName",RoomFullName); + Par_PutHiddenParamString (NULL,"RoomCode",RoomCode); + Par_PutHiddenParamString (NULL,"RoomShrtName",RoomShrtName); + Par_PutHiddenParamString (NULL,"RoomFullName",RoomFullName); } /*****************************************************************************/ diff --git a/swad_classroom.c b/swad_classroom.c index bab19a39..afb1292f 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -122,7 +122,7 @@ void Cla_SeeClassrooms (void) { HTM_TH_Begin (1,1,"LM"); Frm_StartForm (ActSeeCla); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_CLASSROOMS_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Classrooms.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -555,7 +555,7 @@ static void Cla_ListClassroomsForEdition (void) static void Cla_PutParamClaCod (long ClaCod) { - Par_PutHiddenParamLong ("ClaCod",ClaCod); + Par_PutHiddenParamLong (NULL,"ClaCod",ClaCod); } /*****************************************************************************/ diff --git a/swad_country.c b/swad_country.c index 68a0049e..d52675f3 100644 --- a/swad_country.c +++ b/swad_country.c @@ -667,7 +667,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) if (OrderSelectable) { Frm_StartForm (ActSeeCty); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Hierarchy.Sys.Ctys.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -1672,7 +1672,7 @@ static void Cty_ListCountriesForEdition (void) HTM_TD_Begin ("class=\"LT\""); Frm_StartForm (ActRenCty); Cty_PutParamOtherCtyCod (Cty->CtyCod); - Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan); + Par_PutHiddenParamUnsigned (NULL,"Lan",(unsigned) Lan); fprintf (Gbl.F.Out,"", @@ -1685,7 +1685,7 @@ static void Cty_ListCountriesForEdition (void) HTM_TD_Begin ("class=\"LT\""); Frm_StartForm (ActChgCtyWWW); Cty_PutParamOtherCtyCod (Cty->CtyCod); - Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan); + Par_PutHiddenParamUnsigned (NULL,"Lan",(unsigned) Lan); fprintf (Gbl.F.Out,"", - Id,ParamName,(long) TimeUTC); + if (asprintf (&ParamTimeUTC,"%sTimeUTC",Id) < 0) + Lay_NotEnoughMemoryExit (); + Par_PutHiddenParamLong (ParamTimeUTC,ParamTimeUTC,(long) TimeUTC); + free ((void *) ParamTimeUTC); /***** Script to set selectors to local date and time from UTC time *****/ HTM_SCRIPT_Begin (NULL,NULL); @@ -722,12 +723,8 @@ time_t Dat_GetTimeUTCFromForm (const char *ParamName) void Dat_PutHiddenParBrowserTZDiff (void) { - fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,""); + Par_PutHiddenParamString ("BrowserTZName","BrowserTZName",""); + Par_PutHiddenParamLong ("BrowserTZDiff","BrowserTZDiff",0); HTM_SCRIPT_Begin (NULL,NULL); fprintf (Gbl.F.Out,"setTZname('BrowserTZName');" "setTZ('BrowserTZDiff');"); @@ -941,8 +938,8 @@ void Dat_SetIniEndDates (void) void Dat_WriteParamsIniEndDates (void) { - Par_PutHiddenParamUnsigned ("StartTimeUTC",Gbl.DateRange.TimeUTC[0]); - Par_PutHiddenParamUnsigned ("EndTimeUTC" ,Gbl.DateRange.TimeUTC[1]); + Par_PutHiddenParamUnsigned (NULL,"StartTimeUTC",Gbl.DateRange.TimeUTC[0]); + Par_PutHiddenParamUnsigned (NULL,"EndTimeUTC" ,Gbl.DateRange.TimeUTC[1]); } /*****************************************************************************/ diff --git a/swad_degree.c b/swad_degree.c index b0abd510..ca91cbc1 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1637,7 +1637,7 @@ void Deg_RemoveDegree (void) void Deg_PutParamDegCod (long DegCod) { - Par_PutHiddenParamLong ("deg",DegCod); + Par_PutHiddenParamLong (NULL,"deg",DegCod); } /*****************************************************************************/ @@ -1646,7 +1646,7 @@ void Deg_PutParamDegCod (long DegCod) static void Deg_PutParamOtherDegCod (long DegCod) { - Par_PutHiddenParamLong ("OthDegCod",DegCod); + Par_PutHiddenParamLong (NULL,"OthDegCod",DegCod); } /*****************************************************************************/ diff --git a/swad_degree_type.c b/swad_degree_type.c index e73b4f6d..a62c3a2a 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -527,7 +527,7 @@ static void DT_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,DT_Order_t S Frm_StartForm (NextAction); if (NextAction == ActSeeUseGbl) Fig_PutHiddenParamFigures (); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); /* Link with the head of this column */ Frm_LinkFormSubmit (Txt_DEGREE_TYPES_HELP_ORDER[Order],"TIT_TBL",NULL); @@ -803,7 +803,7 @@ void DT_RemoveDegreeType (void) static void DT_PutParamOtherDegTypCod (long DegTypCod) { - Par_PutHiddenParamLong ("OthDegTypCod",DegTypCod); + Par_PutHiddenParamLong (NULL,"OthDegTypCod",DegTypCod); } /*****************************************************************************/ diff --git a/swad_department.c b/swad_department.c index 0bff7f75..71c1c06e 100644 --- a/swad_department.c +++ b/swad_department.c @@ -128,7 +128,7 @@ void Dpt_SeeDepts (void) HTM_TH_Begin (1,1,"LM"); Frm_StartForm (ActSeeDpt); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Dpts.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -612,7 +612,7 @@ static void Dpt_ListDepartmentsForEdition (void) static void Dpt_PutParamDptCod (long DptCod) { - Par_PutHiddenParamLong (Dpt_PARAM_DPT_COD_NAME,DptCod); + Par_PutHiddenParamLong (NULL,Dpt_PARAM_DPT_COD_NAME,DptCod); } /*****************************************************************************/ diff --git a/swad_duplicate.c b/swad_duplicate.c index 49627bb3..492b3af2 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -416,7 +416,7 @@ static void Dup_PutButtonToEliminateUsrAccount (const struct UsrData *UsrDat) Frm_StartForm (ActUpdOth); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Par_PutHiddenParamUnsigned ("RegRemAction",(unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM); + Par_PutHiddenParamUnsigned (NULL,"RegRemAction",(unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM); Btn_PutRemoveButtonInline (Txt_Eliminate_user_account); Frm_EndForm (); } diff --git a/swad_exam.c b/swad_exam.c index 0d1638a1..d12effef 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1559,7 +1559,7 @@ static void Exa_PutParamExaCodToEdit (void) void Exa_PutHiddenParamExaCod (long ExaCod) { - Par_PutHiddenParamLong ("ExaCod",ExaCod); + Par_PutHiddenParamLong (NULL,"ExaCod",ExaCod); } /*****************************************************************************/ diff --git a/swad_figure.c b/swad_figure.c index 4bb6e141..33f8d89e 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -291,7 +291,7 @@ void Fig_PutHiddenParamFigures (void) static void Fig_PutHiddenParamFigureType (void) { - Par_PutHiddenParamUnsigned ("FigureType",(unsigned) Gbl.Figures.FigureType); + Par_PutHiddenParamUnsigned (NULL,"FigureType",(unsigned) Gbl.Figures.FigureType); } /*****************************************************************************/ diff --git a/swad_file_browser.c b/swad_file_browser.c index 3b2fb99e..2ad44035 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -2268,7 +2268,7 @@ static void Brw_GetDataCurrentGrp (void) void Brw_PutHiddenParamFilCod (long FilCod) { - Par_PutHiddenParamLong ("FilCod",FilCod); + Par_PutHiddenParamLong (NULL,"FilCod",FilCod); } /*****************************************************************************/ @@ -2314,9 +2314,9 @@ static void Brw_PutParamsFileBrowser (const char *PathInTree,const char *FilFolL /***** Path and file *****/ if (PathInTree) - Par_PutHiddenParamString ("Path",PathInTree); + Par_PutHiddenParamString (NULL,"Path",PathInTree); if (FilFolLnkName) - Par_PutHiddenParamString (Brw_FileTypeParamName[FileType],FilFolLnkName); + Par_PutHiddenParamString (NULL,Brw_FileTypeParamName[FileType],FilFolLnkName); if (FilCod > 0) Brw_PutHiddenParamFilCod (FilCod); } @@ -8390,8 +8390,8 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) Cfg_URL_SWAD_CGI, Lan_STR_LANG_ID[Gbl.Prefs.Language], Cfg_URL_ICON_PUBLIC); - Par_PutHiddenParamLong ("act",Act_GetActCod (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type])); - Par_PutHiddenParamString ("ses",Gbl.Session.Id); + Par_PutHiddenParamLong (NULL,"act",Act_GetActCod (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type])); + Par_PutHiddenParamString (NULL,"ses",Gbl.Session.Id); Brw_PutImplicitParamsFileBrowser (); HTM_DIV_Begin ("class=\"dz-message\""); diff --git a/swad_forum.c b/swad_forum.c index b9894d95..38efe882 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1484,7 +1484,7 @@ void For_PutAllHiddenParamsForum (unsigned NumPageThreads, static void For_PutParamForumSet (For_ForumSet_t ForumSet) { - Par_PutHiddenParamUnsigned ("ForumSet",(unsigned) ForumSet); + Par_PutHiddenParamUnsigned (NULL,"ForumSet",(unsigned) ForumSet); } /*****************************************************************************/ @@ -1493,7 +1493,7 @@ static void For_PutParamForumSet (For_ForumSet_t ForumSet) static void For_PutParamForumOrder (For_Order_t Order) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); } /*****************************************************************************/ @@ -1506,7 +1506,7 @@ static void For_PutParamForumLocation (long Location) if (Location > 0) /***** Put a hidden parameter with the institution, centre, degree or course of the forum *****/ - Par_PutHiddenParamLong ("Location",Location); + Par_PutHiddenParamLong (NULL,"Location",Location); } /*****************************************************************************/ @@ -1516,7 +1516,7 @@ static void For_PutParamForumLocation (long Location) static void For_PutHiddenParamThrCod (long ThrCod) { if (ThrCod > 0) - Par_PutHiddenParamLong ("ThrCod",ThrCod); + Par_PutHiddenParamLong (NULL,"ThrCod",ThrCod); } /*****************************************************************************/ @@ -1526,7 +1526,7 @@ static void For_PutHiddenParamThrCod (long ThrCod) static void For_PutHiddenParamPstCod (long PstCod) { if (PstCod > 0) - Par_PutHiddenParamLong ("PstCod",PstCod); + Par_PutHiddenParamLong (NULL,"PstCod",PstCod); } /*****************************************************************************/ diff --git a/swad_game.c b/swad_game.c index 72cfed15..3645c9f4 100644 --- a/swad_game.c +++ b/swad_game.c @@ -223,7 +223,7 @@ static void Gam_ListAllGames (void) /* Form to change order */ Frm_StartForm (ActSeeAllGam); Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_GAMES_ORDER_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Games.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -555,7 +555,7 @@ static void Gam_WriteAuthor (struct Game *Game) void Gam_PutHiddenParamGameOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Games.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Games.SelectedOrder); } /*****************************************************************************/ @@ -617,7 +617,7 @@ long Gam_GetParams (void) static void Gam_PutHiddenParamOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Games.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Games.SelectedOrder); } /*****************************************************************************/ @@ -883,7 +883,7 @@ static void Gam_GetGameTxtFromDB (long GamCod,char Txt[Cns_MAX_BYTES_TEXT + 1]) void Gam_PutParamGameCod (long GamCod) { - Par_PutHiddenParamLong ("GamCod",GamCod); + Par_PutHiddenParamLong (NULL,"GamCod",GamCod); } /*****************************************************************************/ @@ -1393,7 +1393,7 @@ void Gam_ListTstQuestionsToSelect (void) void Gam_PutParamQstInd (unsigned QstInd) { - Par_PutHiddenParamUnsigned ("QstInd",QstInd); + Par_PutHiddenParamUnsigned (NULL,"QstInd",QstInd); } /*****************************************************************************/ diff --git a/swad_group.c b/swad_group.c index 86cfe398..d6c436c3 100644 --- a/swad_group.c +++ b/swad_group.c @@ -477,7 +477,11 @@ static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNE void Grp_PutParamsCodGrps (void) { + extern const char *Par_SEPARATOR_PARAM_MULTIPLE; unsigned NumGrpSel; + size_t MaxLengthGrpCods; + char *GrpCods; + char GrpCod[20 + 1]; /***** Write the boolean parameter that indicates if all the groups must be listed *****/ Par_PutHiddenParamChar ("AllGroups", @@ -488,16 +492,25 @@ void Grp_PutParamsCodGrps (void) if (!Gbl.Usrs.ClassPhoto.AllGroups && Gbl.Crs.Grps.LstGrpsSel.NumGrps) { - fprintf (Gbl.F.Out,""); + + Par_PutHiddenParamString (NULL,"GrpCods",GrpCods); + free ((void *) GrpCods); } } @@ -4848,7 +4861,7 @@ static long Grp_GetParamGrpCod (void) static void Grp_PutParamGrpTypCod (long GrpTypCod) { - Par_PutHiddenParamLong ("GrpTypCod",GrpTypCod); + Par_PutHiddenParamLong (NULL,"GrpTypCod",GrpTypCod); } /*****************************************************************************/ @@ -4857,7 +4870,7 @@ static void Grp_PutParamGrpTypCod (long GrpTypCod) void Grp_PutParamGrpCod (long GrpCod) { - Par_PutHiddenParamLong ("GrpCod",GrpCod); + Par_PutHiddenParamLong (NULL,"GrpCod",GrpCod); } /*****************************************************************************/ @@ -4965,17 +4978,17 @@ void Grp_PutParamWhichGrps (void) { Grp_GetParamWhichGrps (); - Par_PutHiddenParamUnsigned ("WhichGrps",(unsigned) Gbl.Crs.Grps.WhichGrps); + Par_PutHiddenParamUnsigned (NULL,"WhichGrps",(unsigned) Gbl.Crs.Grps.WhichGrps); } void Grp_PutParamWhichGrpsOnlyMyGrps (void) { - Par_PutHiddenParamUnsigned ("WhichGrps",(unsigned) Grp_MY_GROUPS); + Par_PutHiddenParamUnsigned (NULL,"WhichGrps",(unsigned) Grp_MY_GROUPS); } void Grp_PutParamWhichGrpsAllGrps (void) { - Par_PutHiddenParamUnsigned ("WhichGrps",(unsigned) Grp_ALL_GROUPS); + Par_PutHiddenParamUnsigned (NULL,"WhichGrps",(unsigned) Grp_ALL_GROUPS); } /*****************************************************************************/ @@ -4999,7 +5012,7 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) (void)) WhichGrps == Gbl.Crs.Grps.WhichGrps ? "PREF_ON" : "PREF_OFF"); Frm_StartForm (Action); - Par_PutHiddenParamUnsigned ("WhichGrps",(unsigned) WhichGrps); + Par_PutHiddenParamUnsigned (NULL,"WhichGrps",(unsigned) WhichGrps); if (FuncParams) // Extra parameters depending on the action FuncParams (); Ico_PutSettingIconLink (WhichGrps == Grp_MY_GROUPS ? "mysitemap.png" : diff --git a/swad_hierarchy.c b/swad_hierarchy.c index d75bf436..417b869b 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -215,7 +215,7 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," "); Frm_StartFormGoTo (ActMnu); - Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys); + Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys); Frm_LinkFormSubmit (Txt_System,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Txt_System); Frm_LinkFormEnd (); diff --git a/swad_holiday.c b/swad_holiday.c index 8737e924..c836e773 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -124,7 +124,7 @@ void Hld_SeeHolidays (void) HTM_TH_Begin (1,1,"LM"); Frm_StartForm (ActSeeHld); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Hlds.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -670,7 +670,7 @@ static void Hld_ListHolidaysForEdition (void) static void Hld_PutParamHldCod (long HldCod) { - Par_PutHiddenParamLong ("HldCod",HldCod); + Par_PutHiddenParamLong (NULL,"HldCod",HldCod); } /*****************************************************************************/ diff --git a/swad_icon.c b/swad_icon.c index f82db025..a0d2a6b7 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -128,7 +128,7 @@ void Ico_PutIconsToSelectIconSet (void) IconSet == Gbl.Prefs.IconSet ? "PREF_ON" : "PREF_OFF"); Frm_StartForm (ActChgIco); - Par_PutHiddenParamString ("IconSet",Ico_IconSetId[IconSet]); + Par_PutHiddenParamString (NULL,"IconSet",Ico_IconSetId[IconSet]); snprintf (Icon,sizeof (Icon), "%s/%s/cog.svg", Cfg_ICON_FOLDER_SETS, diff --git a/swad_indicator.c b/swad_indicator.c index 3f892d97..a1cb6532 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -217,10 +217,10 @@ void Ind_ReqIndicatorsCourses (void) /* Button to show more details */ Frm_StartForm (ActSeeAllStaCrs); Sco_PutParamScope ("ScopeInd",Gbl.Scope.Current); - Par_PutHiddenParamLong ("OthDegTypCod",Gbl.Stat.DegTypCod); - Par_PutHiddenParamLong (Dpt_PARAM_DPT_COD_NAME,Gbl.Stat.DptCod); + Par_PutHiddenParamLong (NULL,"OthDegTypCod",Gbl.Stat.DegTypCod); + Par_PutHiddenParamLong (NULL,Dpt_PARAM_DPT_COD_NAME,Gbl.Stat.DptCod); if (Gbl.Stat.StrIndicatorsSelected[0]) - Par_PutHiddenParamString ("Indicators",Gbl.Stat.StrIndicatorsSelected); + Par_PutHiddenParamString (NULL,"Indicators",Gbl.Stat.StrIndicatorsSelected); Btn_PutConfirmButton (Txt_Show_more_details); Frm_EndForm (); } @@ -585,10 +585,10 @@ static void Ind_PutButtonToConfirmIWantToSeeBigList (unsigned NumCrss) static void Ind_PutParamsConfirmIWantToSeeBigList (void) { Sco_PutParamScope ("ScopeInd",Gbl.Scope.Current); - Par_PutHiddenParamLong ("OthDegTypCod",Gbl.Stat.DegTypCod); - Par_PutHiddenParamLong (Dpt_PARAM_DPT_COD_NAME,Gbl.Stat.DptCod); + Par_PutHiddenParamLong (NULL,"OthDegTypCod",Gbl.Stat.DegTypCod); + Par_PutHiddenParamLong (NULL,Dpt_PARAM_DPT_COD_NAME,Gbl.Stat.DptCod); if (Gbl.Stat.StrIndicatorsSelected[0]) - Par_PutHiddenParamString ("Indicators",Gbl.Stat.StrIndicatorsSelected); + Par_PutHiddenParamString (NULL,"Indicators",Gbl.Stat.StrIndicatorsSelected); Par_PutHiddenParamChar ("ShowBigList",'Y'); } diff --git a/swad_institution.c b/swad_institution.c index fc9aa7db..94bb9b1e 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -878,7 +878,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) if (OrderSelectable) { Frm_StartForm (ActSeeIns); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_INSTITUTIONS_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Hierarchy.Cty.Inss.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -1677,7 +1677,7 @@ static Ins_Status_t Ins_GetStatusBitsFromStatusTxt (Ins_StatusTxt_t StatusTxt) void Ins_PutParamInsCod (long InsCod) { - Par_PutHiddenParamLong ("ins",InsCod); + Par_PutHiddenParamLong (NULL,"ins",InsCod); } /*****************************************************************************/ @@ -1686,7 +1686,7 @@ void Ins_PutParamInsCod (long InsCod) static void Ins_PutParamOtherInsCod (long InsCod) { - Par_PutHiddenParamLong ("OthInsCod",InsCod); + Par_PutHiddenParamLong (NULL,"OthInsCod",InsCod); } /*****************************************************************************/ diff --git a/swad_language.c b/swad_language.c index 6ad35de0..2636e258 100644 --- a/swad_language.c +++ b/swad_language.c @@ -165,7 +165,7 @@ void Lan_AskChangeLanguage (void) static void Lan_PutParamLanguage (void) { - Par_PutHiddenParamUnsigned ("Lan",(unsigned) Gbl.Prefs.Language); + Par_PutHiddenParamUnsigned (NULL,"Lan",(unsigned) Gbl.Prefs.Language); } /*****************************************************************************/ diff --git a/swad_layout.c b/swad_layout.c index 4a528e25..6a5e00bf 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -919,7 +919,7 @@ static void Lay_WritePageTopHeading (void) /* Begin form to go to home page */ Frm_StartFormGoTo (ActMnu); - Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys); + Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys); HTM_DIV_Begin ("id=\"head_row_1_logo_small\""); Frm_LinkFormSubmit (Txt_System,NULL,NULL); diff --git a/swad_link.c b/swad_link.c index ba530fbf..5a387a2d 100644 --- a/swad_link.c +++ b/swad_link.c @@ -488,7 +488,7 @@ static void Lnk_ListLinksForEdition (void) static void Lnk_PutParamLnkCod (long LnkCod) { - Par_PutHiddenParamLong ("LnkCod",LnkCod); + Par_PutHiddenParamLong (NULL,"LnkCod",LnkCod); } /*****************************************************************************/ diff --git a/swad_mail.c b/swad_mail.c index afecd0ba..bde50372 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -136,7 +136,7 @@ void Mai_SeeMailDomains (void) HTM_TH_Begin (1,1,"LM"); Frm_StartForm (ActSeeMai); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Mails.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -544,7 +544,7 @@ static void Mai_ListMailDomainsForEdition (void) static void Mai_PutParamMaiCod (long MaiCod) { - Par_PutHiddenParamLong ("MaiCod",MaiCod); + Par_PutHiddenParamLong (NULL,"MaiCod",MaiCod); } /*****************************************************************************/ @@ -1317,9 +1317,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, Frm_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } - fprintf (Gbl.F.Out,"", - row[0]); + Par_PutHiddenParamString (NULL,"Email",row[0]); Ico_PutIconRemove (); Frm_EndForm (); @@ -1359,8 +1357,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, Frm_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } - fprintf (Gbl.F.Out,"", - row[0]); // Email + Par_PutHiddenParamString (NULL,"NewEmail",row[0]); Btn_PutConfirmButtonInline ((ItsMe && NumEmail == 1) ? Txt_Confirm_email : Txt_Use_this_email); Frm_EndForm (); diff --git a/swad_match.c b/swad_match.c index 87a2572f..2e5c8de9 100644 --- a/swad_match.c +++ b/swad_match.c @@ -1134,7 +1134,7 @@ static void Mch_PutParamsPlay (void) static void Mch_PutParamMchCod (long MchCod) { - Par_PutHiddenParamLong ("MchCod",MchCod); + Par_PutHiddenParamLong (NULL,"MchCod",MchCod); } /*****************************************************************************/ @@ -2397,7 +2397,7 @@ static void Mch_ShowFormColumns (struct Match *Match) static void Mch_PutParamNumCols (unsigned NumCols) // Number of columns { - Par_PutHiddenParamUnsigned ("NumCols",NumCols); + Par_PutHiddenParamUnsigned (NULL,"NumCols",NumCols); } /*****************************************************************************/ @@ -2847,7 +2847,7 @@ static const char *Mch_GetClassBorder (unsigned NumRow) static void Mch_PutParamNumOpt (unsigned NumOpt) { - Par_PutHiddenParamUnsigned ("NumOpt",NumOpt); + Par_PutHiddenParamUnsigned (NULL,"NumOpt",NumOpt); } /*****************************************************************************/ diff --git a/swad_media.c b/swad_media.c index 05e91070..e8192f09 100644 --- a/swad_media.c +++ b/swad_media.c @@ -406,7 +406,7 @@ void Med_PutMediaUploader (int NumMediaInForm,const char *ClassInput) Hlp_Multimedia,Box_NOT_CLOSABLE); /***** Action to perform on media *****/ - Par_PutHiddenParamUnsigned (ParamUploadMedia.Action,(unsigned) Med_ACTION_NEW_MEDIA); + Par_PutHiddenParamUnsigned (NULL,ParamUploadMedia.Action,(unsigned) Med_ACTION_NEW_MEDIA); /***** Icons *****/ /* Start icons */ @@ -500,12 +500,14 @@ static void Med_PutHiddenFormTypeMediaUploader (const char UniqueId[Frm_MAX_BYTE struct MediaUploader *MediaUploader, struct ParamUploadMedia *ParamUploadMedia) { + char *Id; + /***** Hidden field with form type *****/ - /* Upload file */ - fprintf (Gbl.F.Out,"_ParamSuffix - " name=\"%s\" value=\"%u\" disabled=\"disabled\" />", - UniqueId,MediaUploader->ParamSuffix, - ParamUploadMedia->FormType,(unsigned) MediaUploader->FormType); + if (asprintf (&Id,"%s_%s",UniqueId,MediaUploader->ParamSuffix) < 0) // _ParamSuffix + Lay_NotEnoughMemoryExit (); + Par_PutHiddenParamUnsignedDisabled (Id,ParamUploadMedia->FormType, + (unsigned) MediaUploader->FormType); + free ((void *) Id); } /*****************************************************************************/ diff --git a/swad_menu.c b/swad_menu.c index d2c912fa..c5d1d08e 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -416,7 +416,7 @@ void Mnu_PutIconsToSelectMenu (void) HTM_DIV_Begin ("class=\"%s\"",Menu == Gbl.Prefs.Menu ? "PREF_ON" : "PREF_OFF"); Frm_StartForm (ActChgMnu); - Par_PutHiddenParamUnsigned ("Menu",(unsigned) Menu); + Par_PutHiddenParamUnsigned (NULL,"Menu",(unsigned) Menu); Ico_PutSettingIconLink (Mnu_MenuIcons[Menu],Txt_MENU_NAMES[Menu]); Frm_EndForm (); HTM_DIV_End (); diff --git a/swad_message.c b/swad_message.c index d709af43..f24e3048 100644 --- a/swad_message.c +++ b/swad_message.c @@ -423,8 +423,8 @@ void Msg_PutHiddenParamsSubjectAndContent (void) /***** Hidden params to send subject and content. When the user edit the subject or the content, they are copied here. *****/ - fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,""); + Par_PutHiddenParamString (NULL,"HiddenSubject",""); + Par_PutHiddenParamString (NULL,"HiddenContent",""); } /*****************************************************************************/ @@ -658,7 +658,7 @@ void Msg_PutHiddenParamAnotherRecipient (const struct UsrData *UsrDat) snprintf (NicknameWithArroba,sizeof (NicknameWithArroba), "@%s", UsrDat->Nickname); - Par_PutHiddenParamString ("OtherRecipients",NicknameWithArroba); + Par_PutHiddenParamString (NULL,"OtherRecipients",NicknameWithArroba); } /*****************************************************************************/ @@ -669,7 +669,7 @@ void Msg_PutHiddenParamOtherRecipients (void) { if (Gbl.Usrs.ListOtherRecipients) if (Gbl.Usrs.ListOtherRecipients[0]) - Par_PutHiddenParamString ("OtherRecipients",Gbl.Usrs.ListOtherRecipients); + Par_PutHiddenParamString (NULL,"OtherRecipients",Gbl.Usrs.ListOtherRecipients); } /*****************************************************************************/ @@ -2524,11 +2524,11 @@ static void Msg_PutHiddenParamsOneMsg (void) void Msg_PutHiddenParamsMsgsFilters (void) { if (Gbl.Msg.FilterCrsCod >= 0) - Par_PutHiddenParamLong ("FilterCrsCod",Gbl.Msg.FilterCrsCod); + Par_PutHiddenParamLong (NULL,"FilterCrsCod",Gbl.Msg.FilterCrsCod); if (Gbl.Msg.FilterFromTo[0]) - Par_PutHiddenParamString ("FilterFromTo",Gbl.Msg.FilterFromTo); + Par_PutHiddenParamString (NULL,"FilterFromTo",Gbl.Msg.FilterFromTo); if (Gbl.Msg.FilterContent[0]) - Par_PutHiddenParamString ("FilterContent",Gbl.Msg.FilterContent); + Par_PutHiddenParamString (NULL,"FilterContent",Gbl.Msg.FilterContent); if (Gbl.Msg.ShowOnlyUnreadMsgs) Par_PutHiddenParamChar ("OnlyUnreadMsgs",'Y'); } @@ -3648,7 +3648,7 @@ void Msg_WriteMsgContent (char *Content,unsigned long MaxLength,bool InsertLinks void Msg_PutHiddenParamMsgCod (long MsgCod) { - Par_PutHiddenParamLong ("MsgCod",MsgCod); + Par_PutHiddenParamLong (NULL,"MsgCod",MsgCod); } /*****************************************************************************/ diff --git a/swad_nickname.c b/swad_nickname.c index bcd00bcc..bbe83ce7 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -25,6 +25,8 @@ /********************************* Headers ***********************************/ /*****************************************************************************/ +#define _GNU_SOURCE // For asprintf +#include // For asprintf #include // For string functions #include "swad_account.h" @@ -231,6 +233,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its unsigned NumNicks; unsigned NumNick; Act_Action_t NextAction; + char *NewNick; /***** Start section *****/ HTM_SECTION_Begin (Nck_NICKNAME_SECTION_ID); @@ -316,9 +319,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its Frm_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } - fprintf (Gbl.F.Out,"", - row[0]); + Par_PutHiddenParamString (NULL,"Nick",row[0]); Ico_PutIconRemove (); Frm_EndForm (); } @@ -354,9 +355,11 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its Frm_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } - fprintf (Gbl.F.Out,"", - row[0]); // Nickname + + if (asprintf (&NewNick,"@%s",row[0]) < 0) + Lay_NotEnoughMemoryExit (); + Par_PutHiddenParamString (NULL,"NewNick",NewNick); // Nickname + free ((void *) NewNick); Btn_PutConfirmButtonInline (Txt_Use_this_nickname); Frm_EndForm (); } diff --git a/swad_notice.c b/swad_notice.c index 291ad3c1..99f7fff5 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -1009,7 +1009,7 @@ static void Not_PutParams (void) void Not_PutHiddenParamNotCod (long NotCod) { - Par_PutHiddenParamLong ("NotCod",NotCod); + Par_PutHiddenParamLong (NULL,"NotCod",NotCod); } /*****************************************************************************/ diff --git a/swad_notification.c b/swad_notification.c index 4eface15..ea9867f8 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -798,7 +798,7 @@ static bool Ntf_StartFormGoToAction (Ntf_NotifyEvent_t NotifyEvent, static void Ntf_PutHiddenParamNotifyEvent (Ntf_NotifyEvent_t NotifyEvent) { - Par_PutHiddenParamUnsigned ("NotifyEvent",(unsigned) NotifyEvent); + Par_PutHiddenParamUnsigned (NULL,"NotifyEvent",(unsigned) NotifyEvent); } /*****************************************************************************/ diff --git a/swad_pagination.c b/swad_pagination.c index 148b94a3..9e659841 100644 --- a/swad_pagination.c +++ b/swad_pagination.c @@ -753,7 +753,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, void Pag_PutHiddenParamPagNum (Pag_WhatPaginate_t WhatPaginate,unsigned NumPage) { - Par_PutHiddenParamUnsigned (Pag_ParamNumPag[WhatPaginate],NumPage); + Par_PutHiddenParamUnsigned (NULL,Pag_ParamNumPag[WhatPaginate],NumPage); } /*****************************************************************************/ diff --git a/swad_parameter.c b/swad_parameter.c index f1442433..4bac0cfe 100644 --- a/swad_parameter.c +++ b/swad_parameter.c @@ -44,6 +44,12 @@ extern struct Globals Gbl; +/*****************************************************************************/ +/***************************** Public constants ******************************/ +/*****************************************************************************/ + +const char *Par_SEPARATOR_PARAM_MULTIPLE = "\0x0A"; // Must be 1 <= character <= 31 + /*****************************************************************************/ /*********************** Private types and constants *************************/ /*****************************************************************************/ @@ -484,6 +490,7 @@ unsigned Par_GetParameter (tParamType ParamType,const char *ParamName, char *ParamValue,size_t MaxBytes, struct Param **ParamPtr) // NULL if not used { + extern const char *Par_SEPARATOR_PARAM_MULTIPLE; size_t BytesAlreadyCopied = 0; unsigned i; struct Param *Param; @@ -566,7 +573,7 @@ unsigned Par_GetParameter (tParamType ParamType,const char *ParamName, /* Copy separator */ if (PtrDst) - *PtrDst++ = Par_SEPARATOR_PARAM_MULTIPLE; // Separator in the destination string + *PtrDst++ = Par_SEPARATOR_PARAM_MULTIPLE[0]; // Separator in the destination string BytesAlreadyCopied++; } @@ -1021,31 +1028,49 @@ void Par_ReplaceSeparatorMultipleByComma (const char *StrSrc,char *StrDst) void Par_ReplaceCommaBySeparatorMultiple (char *Str) { + extern const char *Par_SEPARATOR_PARAM_MULTIPLE; + for (; *Str; Str++) if (*Str == ',') - *Str = Par_SEPARATOR_PARAM_MULTIPLE; + *Str = Par_SEPARATOR_PARAM_MULTIPLE[0]; } /*****************************************************************************/ /********************** Put an unsigned hidden parameter *********************/ /*****************************************************************************/ -void Par_PutHiddenParamUnsigned (const char *ParamName,unsigned Value) +void Par_PutHiddenParamUnsigned (const char *Id,const char *ParamName,unsigned Value) { - fprintf (Gbl.F.Out,"", - ParamName,Value); + fprintf (Gbl.F.Out,"",ParamName,Value); + } + +void Par_PutHiddenParamUnsignedDisabled (const char *Id,const char *ParamName,unsigned Value) + { + fprintf (Gbl.F.Out,"", + ParamName,Value); } /*****************************************************************************/ /************************* Put a long hidden parameter ***********************/ /*****************************************************************************/ -void Par_PutHiddenParamLong (const char *ParamName,long Value) +void Par_PutHiddenParamLong (const char *Id,const char *ParamName,long Value) { - fprintf (Gbl.F.Out,"", - ParamName,Value); + fprintf (Gbl.F.Out,"",ParamName,Value); } /*****************************************************************************/ @@ -1062,8 +1087,11 @@ void Par_PutHiddenParamChar (const char *ParamName,char Value) /************************ Put a string hidden parameter **********************/ /*****************************************************************************/ -void Par_PutHiddenParamString (const char *ParamName,const char *Value) +void Par_PutHiddenParamString (const char *Id,const char *ParamName,const char *Value) { - fprintf (Gbl.F.Out,"", - ParamName,Value); + fprintf (Gbl.F.Out,"",ParamName,Value); } diff --git a/swad_parameter.h b/swad_parameter.h index dc372653..6f9cdeed 100644 --- a/swad_parameter.h +++ b/swad_parameter.h @@ -57,8 +57,6 @@ typedef enum Par_PARAM_MULTIPLE, } tParamType; // Parameter is present only one time / multiple times -#define Par_SEPARATOR_PARAM_MULTIPLE ((char) 0x0A) // Must be 1 <= character <= 31 - /*****************************************************************************/ /***************************** Public prototypes *****************************/ /*****************************************************************************/ @@ -89,9 +87,10 @@ bool Par_GetNextStrUntilComma (const char **StrSrc,char *StrDst,size_t LongMax); void Par_ReplaceSeparatorMultipleByComma (const char *StrSrc,char *StrDst); void Par_ReplaceCommaBySeparatorMultiple (char *Str); -void Par_PutHiddenParamUnsigned (const char *ParamName,unsigned Value); -void Par_PutHiddenParamLong (const char *ParamName,long Value); +void Par_PutHiddenParamUnsigned (const char *Id,const char *ParamName,unsigned Value); +void Par_PutHiddenParamUnsignedDisabled (const char *Id,const char *ParamName,unsigned Value); +void Par_PutHiddenParamLong (const char *Id,const char *ParamName,long Value); void Par_PutHiddenParamChar (const char *ParamName,char Value); -void Par_PutHiddenParamString (const char *ParamName,const char *Value); +void Par_PutHiddenParamString (const char *Id,const char *ParamName,const char *Value); #endif diff --git a/swad_password.c b/swad_password.c index efcd0c69..161c3d4c 100644 --- a/swad_password.c +++ b/swad_password.c @@ -255,7 +255,7 @@ void Pwd_PutLinkToSendNewPasswd (void) static void Pwd_PutLinkToSendNewPasswdParams (void) { - Par_PutHiddenParamString ("UsrId",Gbl.Usrs.Me.UsrIdLogin); + Par_PutHiddenParamString (NULL,"UsrId",Gbl.Usrs.Me.UsrIdLogin); } /*****************************************************************************/ diff --git a/swad_photo.c b/swad_photo.c index 801ed48c..4c7a4c65 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -704,7 +704,7 @@ static bool Pho_ReceivePhotoAndDetectFaces (bool ItsMe,const struct UsrData *Usr Frm_StartForm (NextAction); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } - Par_PutHiddenParamString ("FileName",StrFileName); + Par_PutHiddenParamString (NULL,"FileName",StrFileName); Frm_EndForm (); } else @@ -1824,7 +1824,7 @@ static void Pho_PutSelectorForTypeOfAvg (void) void Pho_PutHiddenParamTypeOfAvg (void) { - Par_PutHiddenParamUnsigned ("AvgType",(unsigned) Gbl.Stat.DegPhotos.TypeOfAverage); + Par_PutHiddenParamUnsigned (NULL,"AvgType",(unsigned) Gbl.Stat.DegPhotos.TypeOfAverage); } /*****************************************************************************/ @@ -1889,7 +1889,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void) void Pho_PutHiddenParamPhotoSize (void) { - Par_PutHiddenParamUnsigned ("PhotoSize",(unsigned) Gbl.Stat.DegPhotos.HowComputePhotoSize); + Par_PutHiddenParamUnsigned (NULL,"PhotoSize",(unsigned) Gbl.Stat.DegPhotos.HowComputePhotoSize); } /*****************************************************************************/ @@ -1954,7 +1954,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void) void Pho_PutHiddenParamOrderDegrees (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Stat.DegPhotos.HowOrderDegrees); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Stat.DegPhotos.HowOrderDegrees); } /*****************************************************************************/ diff --git a/swad_place.c b/swad_place.c index eb710596..96954052 100644 --- a/swad_place.c +++ b/swad_place.c @@ -122,7 +122,7 @@ void Plc_SeePlaces (void) HTM_TH_Begin (1,1,"LM"); Frm_StartForm (ActSeePlc); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_PLACES_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Plcs.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -590,7 +590,7 @@ static void Plc_ListPlacesForEdition (void) static void Plc_PutParamPlcCod (long PlcCod) { - Par_PutHiddenParamLong ("PlcCod",PlcCod); + Par_PutHiddenParamLong (NULL,"PlcCod",PlcCod); } /*****************************************************************************/ diff --git a/swad_plugin.c b/swad_plugin.c index 2dd9744e..f1e6501e 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -501,7 +501,7 @@ static void Plg_ListPluginsForEdition (void) static void Plg_PutParamPlgCod (long PlgCod) { - Par_PutHiddenParamLong ("PlgCod",PlgCod); + Par_PutHiddenParamLong (NULL,"PlgCod",PlgCod); } /*****************************************************************************/ diff --git a/swad_profile.c b/swad_profile.c index 3acd697c..a47eccb9 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -956,7 +956,7 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs) /***** Rank in form to go to ranking *****/ Frm_StartForm (ActSeeUseGbl); Sco_PutParamScope ("ScopeSta",Hie_SYS); - Par_PutHiddenParamUnsigned ("FigureType",(unsigned) Fig_USERS_RANKING); + Par_PutHiddenParamUnsigned (NULL,"FigureType",(unsigned) Fig_USERS_RANKING); Frm_LinkFormSubmit (Gbl.Title,The_ClassFormOutBox[Gbl.Prefs.Theme],NULL); fprintf (Gbl.F.Out,"#%lu",Rank); Frm_LinkFormEnd (); diff --git a/swad_project.c b/swad_project.c index 0177f2af..cf634e9a 100644 --- a/swad_project.c +++ b/swad_project.c @@ -640,7 +640,7 @@ void Prj_PutParams (struct Prj_Filter *Filter, /***** Put order field *****/ if (Order != Prj_ORDER_DEFAULT) - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); /***** Put number of page *****/ if (NumPage > 1) @@ -661,27 +661,27 @@ void Prj_PutParams (struct Prj_Filter *Filter, static void Prj_PutHiddenParamMy_All (Prj_WhoseProjects_t My_All) { - Par_PutHiddenParamUnsigned (Prj_PARAM_MY__ALL_NAME,(unsigned) My_All); + Par_PutHiddenParamUnsigned (NULL,Prj_PARAM_MY__ALL_NAME,(unsigned) My_All); } static void Prj_PutHiddenParamAssign (unsigned Assign) { - Par_PutHiddenParamUnsigned (Prj_PARAM_PRE_NON_NAME,Assign); + Par_PutHiddenParamUnsigned (NULL,Prj_PARAM_PRE_NON_NAME,Assign); } static void Prj_PutHiddenParamHidden (unsigned Hidden) { - Par_PutHiddenParamUnsigned (Prj_PARAM_HID_VIS_NAME,Hidden); + Par_PutHiddenParamUnsigned (NULL,Prj_PARAM_HID_VIS_NAME,Hidden); } static void Prj_PutHiddenParamFaulti (unsigned Faulti) { - Par_PutHiddenParamUnsigned (Prj_PARAM_FAULTIN_NAME,Faulti); + Par_PutHiddenParamUnsigned (NULL,Prj_PARAM_FAULTIN_NAME,Faulti); } static void Prj_PutHiddenParamDptCod (long DptCod) { - Par_PutHiddenParamUnsigned (Dpt_PARAM_DPT_COD_NAME,DptCod); + Par_PutHiddenParamUnsigned (NULL,Dpt_PARAM_DPT_COD_NAME,DptCod); } /*****************************************************************************/ @@ -2477,7 +2477,7 @@ static void Prj_GetParamPrjOrder (void) void Prj_PutHiddenParamPrjOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Prjs.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Prjs.SelectedOrder); } /*****************************************************************************/ @@ -2985,7 +2985,7 @@ void Prj_FreeListProjects (void) void Prj_PutParamPrjCod (long PrjCod) { - Par_PutHiddenParamLong ("PrjCod",PrjCod); + Par_PutHiddenParamLong (NULL,"PrjCod",PrjCod); } /*****************************************************************************/ diff --git a/swad_record.c b/swad_record.c index 2e043681..ee31140d 100644 --- a/swad_record.c +++ b/swad_record.c @@ -300,7 +300,7 @@ void Rec_ListFieldsRecordsForEdition (void) /* Write icon to remove the field */ HTM_TD_Begin ("class=\"BM\""); Frm_StartForm (ActReqRemFie); - Par_PutHiddenParamLong ("FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); + Par_PutHiddenParamLong (NULL,"FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); Ico_PutIconRemove (); Frm_EndForm (); HTM_TD_End (); @@ -308,7 +308,7 @@ void Rec_ListFieldsRecordsForEdition (void) /* Name of the field */ HTM_TD_Begin ("class=\"LM\""); Frm_StartForm (ActRenFie); - Par_PutHiddenParamLong ("FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); + Par_PutHiddenParamLong (NULL,"FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); fprintf (Gbl.F.Out,"", @@ -321,7 +321,7 @@ void Rec_ListFieldsRecordsForEdition (void) /* Number of lines in the form */ HTM_TD_Begin ("class=\"CM\""); Frm_StartForm (ActChgRowFie); - Par_PutHiddenParamLong ("FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); + Par_PutHiddenParamLong (NULL,"FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); fprintf (Gbl.F.Out,"", @@ -333,7 +333,7 @@ void Rec_ListFieldsRecordsForEdition (void) /* Visibility of a field */ HTM_TD_Begin ("class=\"CM\""); Frm_StartForm (ActChgVisFie); - Par_PutHiddenParamLong ("FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); + Par_PutHiddenParamLong (NULL,"FieldCod",Gbl.Crs.Records.LstFields.Lst[NumField].FieldCod); fprintf (Gbl.F.Out,"", - Roles); + Par_PutHiddenParamUnsigned (NULL,"Roles",Roles); } /*****************************************************************************/ diff --git a/swad_scope.c b/swad_scope.c index 4622c8d3..6d8d8f39 100644 --- a/swad_scope.c +++ b/swad_scope.c @@ -176,7 +176,7 @@ void Sco_PutParamCurrentScope (void) void Sco_PutParamScope (const char *ParamName,Hie_Level_t Scope) { - Par_PutHiddenParamUnsigned (ParamName,(unsigned) Scope); + Par_PutHiddenParamUnsigned (NULL,ParamName,(unsigned) Scope); } /*****************************************************************************/ diff --git a/swad_setting.c b/swad_setting.c index 30aa5544..e9a9a606 100644 --- a/swad_setting.c +++ b/swad_setting.c @@ -258,7 +258,7 @@ static void Set_PutIconsToSelectSideCols (void) HTM_DIV_Begin ("class=\"%s\"",SideCols == Gbl.Prefs.SideCols ? "PREF_ON" : "PREF_OFF"); Frm_StartForm (ActChgCol); - Par_PutHiddenParamUnsigned ("SideCols",SideCols); + Par_PutHiddenParamUnsigned (NULL,"SideCols",SideCols); snprintf (Icon,sizeof (Icon), "layout%u%u_32x20.gif", SideCols >> 1,SideCols & 1); diff --git a/swad_statistic.c b/swad_statistic.c index 50a5df1a..bd99bb09 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -367,8 +367,8 @@ void Sta_AskShowCrsHits (void) Frm_StartFormAnchor (ActSeeAccCrs,Sta_STAT_RESULTS_SECTION_ID); Grp_PutParamsCodGrps (); - Par_PutHiddenParamLong ("FirstRow",0); - Par_PutHiddenParamLong ("LastRow",0); + Par_PutHiddenParamLong (NULL,"FirstRow",0); + Par_PutHiddenParamLong (NULL,"LastRow",0); /***** Put list of users to select some of them *****/ HTM_TABLE_BeginCenterPadding (2); @@ -1605,11 +1605,11 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql { Frm_StartFormAnchor (ActSeeAccCrs,Sta_STAT_RESULTS_SECTION_ID); Dat_WriteParamsIniEndDates (); - Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Sta_CLICKS_CRS_DETAILED_LIST); - Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction); - Par_PutHiddenParamLong ("FirstRow",FirstRow - Gbl.Stat.RowsPerPage); - Par_PutHiddenParamLong ("LastRow" ,FirstRow - 1); - Par_PutHiddenParamLong ("RowsPage",Gbl.Stat.RowsPerPage); + Par_PutHiddenParamUnsigned (NULL,"GroupedBy",(unsigned) Sta_CLICKS_CRS_DETAILED_LIST); + Par_PutHiddenParamUnsigned (NULL,"StatAct" ,(unsigned) Gbl.Stat.NumAction); + Par_PutHiddenParamLong (NULL,"FirstRow",FirstRow - Gbl.Stat.RowsPerPage); + Par_PutHiddenParamLong (NULL,"LastRow" ,FirstRow - 1); + Par_PutHiddenParamLong (NULL,"RowsPage",Gbl.Stat.RowsPerPage); Usr_PutHiddenParSelectedUsrsCods (); } HTM_TD_Begin ("class=\"LM\""); @@ -1641,11 +1641,11 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql { Frm_StartFormAnchor (ActSeeAccCrs,Sta_STAT_RESULTS_SECTION_ID); Dat_WriteParamsIniEndDates (); - Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Sta_CLICKS_CRS_DETAILED_LIST); - Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction); - Par_PutHiddenParamUnsigned ("FirstRow" ,(unsigned) (LastRow + 1)); - Par_PutHiddenParamUnsigned ("LastRow" ,(unsigned) (LastRow + Gbl.Stat.RowsPerPage)); - Par_PutHiddenParamUnsigned ("RowsPage" ,(unsigned) Gbl.Stat.RowsPerPage); + Par_PutHiddenParamUnsigned (NULL,"GroupedBy",(unsigned) Sta_CLICKS_CRS_DETAILED_LIST); + Par_PutHiddenParamUnsigned (NULL,"StatAct" ,(unsigned) Gbl.Stat.NumAction); + Par_PutHiddenParamUnsigned (NULL,"FirstRow" ,(unsigned) (LastRow + 1)); + Par_PutHiddenParamUnsigned (NULL,"LastRow" ,(unsigned) (LastRow + Gbl.Stat.RowsPerPage)); + Par_PutHiddenParamUnsigned (NULL,"RowsPage" ,(unsigned) Gbl.Stat.RowsPerPage); Usr_PutHiddenParSelectedUsrsCods (); } HTM_TD_Begin ("class=\"RM\""); @@ -2068,14 +2068,14 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES Frm_StartFormAnchor (Gbl.Action.Act,Sta_STAT_RESULTS_SECTION_ID); Dat_WriteParamsIniEndDates (); - Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Gbl.Stat.ClicksGroupedBy); - Par_PutHiddenParamUnsigned ("CountType",(unsigned) Gbl.Stat.CountType); - Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction); + Par_PutHiddenParamUnsigned (NULL,"GroupedBy",(unsigned) Gbl.Stat.ClicksGroupedBy); + Par_PutHiddenParamUnsigned (NULL,"CountType",(unsigned) Gbl.Stat.CountType); + Par_PutHiddenParamUnsigned (NULL,"StatAct" ,(unsigned) Gbl.Stat.NumAction); if (Gbl.Action.Act == ActSeeAccCrs) Usr_PutHiddenParSelectedUsrsCods (); else // Gbl.Action.Act == ActSeeAccGbl { - Par_PutHiddenParamUnsigned ("Role",(unsigned) Gbl.Stat.Role); + Par_PutHiddenParamUnsigned (NULL,"Role",(unsigned) Gbl.Stat.Role); Sta_PutHiddenParamScopeSta (); } diff --git a/swad_survey.c b/swad_survey.c index 26567afb..ab0fbe29 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -259,7 +259,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) Frm_StartForm (ActSeeAllSvy); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Svys.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -833,7 +833,7 @@ static void Svy_GetParamSvyOrder (void) void Svy_PutHiddenParamSvyOrder (void) { - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Svys.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Svys.SelectedOrder); } /*****************************************************************************/ @@ -1512,7 +1512,7 @@ void Svy_GetNotifSurvey (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1], static void Svy_PutParamSvyCod (long SvyCod) { - Par_PutHiddenParamLong ("SvyCod",SvyCod); + Par_PutHiddenParamLong (NULL,"SvyCod",SvyCod); } /*****************************************************************************/ @@ -2843,7 +2843,7 @@ static void Svy_InitQst (struct SurveyQuestion *SvyQst) static void Svy_PutParamQstCod (long QstCod) { - Par_PutHiddenParamLong ("QstCod",QstCod); + Par_PutHiddenParamLong (NULL,"QstCod",QstCod); } /*****************************************************************************/ diff --git a/swad_syllabus.c b/swad_syllabus.c index 66ac50b6..56a101f5 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -936,7 +936,7 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int static void Syl_PutParamNumItem (void) { - Par_PutHiddenParamUnsigned ("NumI",Gbl.Syllabus.ParamNumItem); + Par_PutHiddenParamUnsigned (NULL,"NumI",Gbl.Syllabus.ParamNumItem); } /*****************************************************************************/ diff --git a/swad_tab.c b/swad_tab.c index 0d6db270..1446e2ea 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -132,7 +132,7 @@ void Tab_DrawTabs (void) HTM_DIV_Begin ("class=\"class=\"ICO_HIGHLIGHT\""); Frm_StartForm (ActMnu); - Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) NumTab); + Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) NumTab); Frm_LinkFormSubmit (Txt_TABS_TXT[NumTab], NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] : The_ClassTxtTabOff[Gbl.Prefs.Theme],NULL); diff --git a/swad_test.c b/swad_test.c index 05a2dabd..debf2df9 100644 --- a/swad_test.c +++ b/swad_test.c @@ -461,8 +461,8 @@ void Tst_ShowNewTest (void) /***** Begin form *****/ Frm_StartForm (ActAssTst); Gbl.Test.NumQsts = (unsigned) NumRows; - Par_PutHiddenParamUnsigned ("NumTst",NumAccessesTst); - Par_PutHiddenParamUnsigned ("NumQst",Gbl.Test.NumQsts); + Par_PutHiddenParamUnsigned (NULL,"NumTst",NumAccessesTst); + Par_PutHiddenParamUnsigned (NULL,"NumQst",Gbl.Test.NumQsts); /***** List the questions *****/ HTM_TABLE_BeginWideMarginPadding (10); @@ -1291,7 +1291,7 @@ void Tst_ShowFormAskEditTsts (void) if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res))) { Frm_StartForm (ActLstTstQst); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Tst_ORDER_STEM); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Tst_ORDER_STEM); HTM_TABLE_BeginPadding (2); @@ -1807,7 +1807,7 @@ static void Tst_ShowFormEditTags (void) /* Form to rename this tag */ HTM_TD_Begin ("class=\"LM\""); Frm_StartForm (ActRenTag); - Par_PutHiddenParamString ("OldTagTxt",row[1]); + Par_PutHiddenParamString (NULL,"OldTagTxt",row[1]); fprintf (Gbl.F.Out,"", @@ -1838,7 +1838,7 @@ static void Tst_PutIconEnable (long TagCod,const char *TagTxt) HTM_TD_Begin ("class=\"BM\""); Frm_StartForm (ActEnableTag); - Par_PutHiddenParamLong ("TagCod",TagCod); + Par_PutHiddenParamLong (NULL,"TagCod",TagCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Tag_X_not_allowed_Click_to_allow_it, TagTxt); @@ -1857,7 +1857,7 @@ static void Tst_PutIconDisable (long TagCod,const char *TagTxt) HTM_TD_Begin ("class=\"BM\""); Frm_StartForm (ActDisableTag); - Par_PutHiddenParamLong ("TagCod",TagCod); + Par_PutHiddenParamLong (NULL,"TagCod",TagCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Tag_X_allowed_Click_to_disable_it, TagTxt); @@ -2827,7 +2827,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, Frm_StartForm (ActLstTstQst); Dat_WriteParamsIniEndDates (); Tst_WriteParamEditQst (); - Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_TST_STR_ORDER_FULL[Order],"TIT_TBL",NULL); if (Order == Gbl.Test.SelectedOrder) fprintf (Gbl.F.Out,""); @@ -2941,7 +2941,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, Tst_WriteParamEditQst (); if (NumRows == 1) Par_PutHiddenParamChar ("OnlyThisQst",'Y'); // If editing only one question, don't edit others - Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Test.SelectedOrder); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.Test.SelectedOrder); fprintf (Gbl.F.Out,"= Gbl.TimeTable.Config.IntervalsPerHour) ? Gbl.TimeTable.Config.IntervalsPerHour : // MaxDuration >= 1h ==> Dur = 1h MaxDuration; // MaxDuration < 1h ==> Dur = MaxDuration - fprintf (Gbl.F.Out,"%u:%02u\" />", - (Dur / Gbl.TimeTable.Config.IntervalsPerHour), // Hours - (Dur % Gbl.TimeTable.Config.IntervalsPerHour) * - Gbl.TimeTable.Config.Range.MinutesPerInterval); // Minutes + if (asprintf (&TTDur,"%u:%02u", + (Dur / Gbl.TimeTable.Config.IntervalsPerHour), // Hours + (Dur % Gbl.TimeTable.Config.IntervalsPerHour) * + Gbl.TimeTable.Config.Range.MinutesPerInterval) < 0) // Minutes + Lay_NotEnoughMemoryExit (); + Par_PutHiddenParamString (NULL,"TTDur",TTDur); + free ((void *) TTDur); } else { diff --git a/swad_user.c b/swad_user.c index e4cdeeec..9c56ee46 100644 --- a/swad_user.c +++ b/swad_user.c @@ -2964,7 +2964,7 @@ void Usr_PutParamOtherUsrCodEncrypted (void) void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1]) { - Par_PutHiddenParamString ("OtherUsrCod",EncryptedUsrCod); + Par_PutHiddenParamString (NULL,"OtherUsrCod",EncryptedUsrCod); } /*****************************************************************************/ @@ -5688,7 +5688,7 @@ void Usr_PutHiddenParSelectedUsrsCods (void) if (Gbl.Session.IsOpen) Ses_InsertHiddenParInDB (Usr_ParamUsrCod[Rol_UNK],Gbl.Usrs.Selected.List[Rol_UNK]); else - Par_PutHiddenParamString (Usr_ParamUsrCod[Rol_UNK],Gbl.Usrs.Selected.List[Rol_UNK]); + Par_PutHiddenParamString (NULL,Usr_ParamUsrCod[Rol_UNK],Gbl.Usrs.Selected.List[Rol_UNK]); } /*****************************************************************************/ @@ -5714,6 +5714,7 @@ void Usr_CreateListSelectedUsrsCodsAndFillWithOtherUsr (void) void Usr_GetListsSelectedUsrsCods (void) { + extern const char *Par_SEPARATOR_PARAM_MULTIPLE; unsigned Length; Rol_Role_t Role; @@ -5751,7 +5752,7 @@ void Usr_GetListsSelectedUsrsCods (void) if ((Length = strlen (Gbl.Usrs.Selected.List[Rol_UNK])) < Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS) { - Gbl.Usrs.Selected.List[Rol_UNK][Length ] = Par_SEPARATOR_PARAM_MULTIPLE; + Gbl.Usrs.Selected.List[Rol_UNK][Length ] = Par_SEPARATOR_PARAM_MULTIPLE[0]; Gbl.Usrs.Selected.List[Rol_UNK][Length + 1] = '\0'; } Str_Concat (Gbl.Usrs.Selected.List[Rol_UNK],Gbl.Usrs.Selected.List[Role], @@ -5771,6 +5772,7 @@ void Usr_GetListsSelectedUsrsCods (void) bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs) { + extern const char *Par_SEPARATOR_PARAM_MULTIPLE; extern const char *Txt_There_is_no_user_with_nickname_X; extern const char *Txt_There_is_no_user_with_email_X; extern const char *Txt_There_are_more_than_one_user_with_the_ID_X_Please_type_a_nick_or_email; @@ -5918,7 +5920,7 @@ bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs) Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS) { /* Add separator */ - Gbl.Usrs.Selected.List[Rol_UNK][LengthSelectedUsrsCods] = Par_SEPARATOR_PARAM_MULTIPLE; + Gbl.Usrs.Selected.List[Rol_UNK][LengthSelectedUsrsCods] = Par_SEPARATOR_PARAM_MULTIPLE[0]; LengthSelectedUsrsCods++; /* Add user */ @@ -7447,7 +7449,7 @@ static void Usr_GetAndUpdateUsrListType (void) void Usr_PutParamUsrListType (Usr_ShowUsrsType_t ListType) { - Par_PutHiddenParamUnsigned ("UsrListType",(unsigned) ListType); + Par_PutHiddenParamUnsigned (NULL,"UsrListType",(unsigned) ListType); } /*****************************************************************************/ @@ -7545,7 +7547,7 @@ void Usr_GetAndUpdateColsClassPhoto (void) void Usr_PutParamColsClassPhoto (void) { - Par_PutHiddenParamUnsigned ("ColsClassPhoto",Gbl.Usrs.ClassPhoto.Cols); + Par_PutHiddenParamUnsigned (NULL,"ColsClassPhoto",Gbl.Usrs.ClassPhoto.Cols); } /*****************************************************************************/